bump Vanara.PInvoke.IpHlpApi up to 4.1.1

Author: smdn

src/Smdn.Net.AddressResolution/Smdn.Net.AddressResolution.csproj

@@ -40,7 +40,17 @@ This library also provides a functionality for referencing the system's address
     <PackageReference Include="Microsoft.Bcl.HashCode" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Vanara.PInvoke.IpHlpApi" Version="3.4.13" />
+    <PackageReference Include="Vanara.Core" Version="4.1.1">
+      <!--
+        `Vanara.Core` imports code analysis attributes such as `NotNullWhenAttributes` for backward compatibility.
+        Therefore, depending on the configuration of <TargetFramework>s, this may conflict with
+        type names imported from the assembly `netstandard`.
+        So, define separate namespaces with the Aliases property, and allow names imported from each
+        assembly to be referenced separately by using `extern aliases`.
+      -->
+      <Aliases>VanaraCore</Aliases>
+    </PackageReference>
+    <PackageReference Include="Vanara.PInvoke.IpHlpApi" Version="4.1.1" />
   </ItemGroup>
 
   <ItemGroup>

src/Smdn.Net.AddressResolution/Smdn.Net.AddressTables/AddressTable.Create.cs

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: 2023 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
 using System;
+using System.Runtime.InteropServices;
 
 namespace Smdn.Net.AddressTables;
 
@@ -11,7 +12,7 @@ public static IAddressTable Create(
     IServiceProvider? serviceProvider = null
   )
   {
-    if (IpHlpApiAddressTable.IsSupported)
+    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && IpHlpApiAddressTable.IsSupported)
       return new IpHlpApiAddressTable(serviceProvider);
 
     if (ProcfsArpAddressTable.IsSupported)

src/Smdn.Net.AddressResolution/Smdn.Net.AddressTables/IpHlpApiAddressTable.cs

@@ -6,6 +6,9 @@
 #if SYSTEM_RUNTIME_EXCEPTIONSERVICES_EXCEPTIONDISPATCHINFO_SETCURRENTSTACKTRACE
 using System.Runtime.ExceptionServices;
 #endif
+#if SYSTEM_RUNTIME_VERSIONING_SUPPORTEDOSPLATFORMATTRIBUTE
+using System.Runtime.Versioning;
+#endif
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -17,6 +20,9 @@
 
 namespace Smdn.Net.AddressTables;
 
+#if SYSTEM_RUNTIME_VERSIONING_SUPPORTEDOSPLATFORMATTRIBUTE
+[SupportedOSPlatform("windows")]
+#endif
 public sealed class IpHlpApiAddressTable : AddressTable {
   public static bool IsSupported => LazyIsSupported.Value;
 
@@ -50,6 +56,9 @@ [EnumeratorCancellation] CancellationToken cancellationToken
   {
     using var table = await GetIpNetTable2Async().ConfigureAwait(false);
 
+    if (table.Table is null)
+      yield break;
+
     foreach (var ipnetRow2 in table.Table) {
       cancellationToken.ThrowIfCancellationRequested();
 
@@ -82,7 +91,7 @@ ValueTask<MIB_IPNET_TABLE2> GetIpNetTable2Async()
 
         table.Dispose();
 
-        var ex = ret.GetException();
+        var ex = ret.GetException() ?? new InvalidOperationException($"GetIpNetTable2 failed: {ret}");
 
 #if SYSTEM_RUNTIME_EXCEPTIONSERVICES_EXCEPTIONDISPATCHINFO_SETCURRENTSTACKTRACE
         ex = ExceptionDispatchInfo.SetCurrentStackTrace(ex);

src/Smdn.Net.AddressResolution/Smdn.Net.AddressTables/ProcfsArpAddressTable.cs

@@ -2,9 +2,6 @@
 // SPDX-License-Identifier: MIT
 using System;
 using System.Collections.Generic;
-#if NULL_STATE_STATIC_ANALYSIS_ATTRIBUTES
-using System.Diagnostics.CodeAnalysis;
-#endif
 using System.Globalization;
 using System.IO;
 using System.Net;
@@ -15,6 +12,13 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
+#if NULL_STATE_STATIC_ANALYSIS_ATTRIBUTES
+// `Vanara.Core` imports code analysis attributes such as `NotNullWhenAttributes`.
+// Since there is a name conflict between `Vanara.Core` and `netstandard`, assign a different
+// alias to `Vanara.Core` in csproj and refer to the netstandard name by the global alias here.
+using NotNullWhenAttribute = global::System.Diagnostics.CodeAnalysis.NotNullWhenAttribute;
+#endif
+
 namespace Smdn.Net.AddressTables;
 
 public sealed class ProcfsArpAddressTable : AddressTable {

src/Smdn.Net.AddressResolution/Smdn.Net.NetworkScanning/IpHlpApiNetworkScanner.cs

@@ -6,6 +6,9 @@
 #if SYSTEM_RUNTIME_EXCEPTIONSERVICES_EXCEPTIONDISPATCHINFO_SETCURRENTSTACKTRACE
 using System.Runtime.ExceptionServices;
 #endif
+#if SYSTEM_RUNTIME_VERSIONING_SUPPORTEDOSPLATFORMATTRIBUTE
+using System.Runtime.Versioning;
+#endif
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -19,6 +22,9 @@
 
 namespace Smdn.Net.NetworkScanning;
 
+#if SYSTEM_RUNTIME_VERSIONING_SUPPORTEDOSPLATFORMATTRIBUTE
+[SupportedOSPlatform("windows")]
+#endif
 public sealed class IpHlpApiNetworkScanner : NetworkScanner {
   // ref:
   //   https://github.com/MicrosoftDocs/win32/blob/docs/desktop-src/wpd_sdk/error-constants.md
@@ -125,7 +131,7 @@ IPAddress address
 
     Logger?.LogWarning("ResolveIpNetEntry2({Address}) {Result}", address, ret.ToString());
 
-    var ex = ret.GetException();
+    var ex = ret.GetException() ?? new InvalidOperationException($"ResolveIpNetEntry2({address}) failed: {ret}");
 
 #if SYSTEM_RUNTIME_EXCEPTIONSERVICES_EXCEPTIONDISPATCHINFO_SETCURRENTSTACKTRACE
     ex = ExceptionDispatchInfo.SetCurrentStackTrace(ex);