Update to .NET 6 and newer libnng

Author: endeavour

README.md

@@ -27,10 +27,7 @@ __Goals of nng<span>.</span>NET__:
 ## Usage
 
 Supports projects targeting:
-- .NET 5
-- .NET Core App 1.0+
-- .NET Standard 1.5+
-    - [`SuppressUnmanagedCodeSecurity`](https://docs.microsoft.com/en-us/dotnet/api/system.security.suppressunmanagedcodesecurityattribute) is used with .NET Standard 2.0+ for improved PInvoke performance
+- .NET 6
 
 [Supported platforms](https://github.com/jeikabu/nng.NETCore/tree/master/nng.NETCore/runtimes):
 - Windows Vista or later 32/64-bit (built on Windows Server 2019)

common.targets

@@ -1,19 +1,16 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.5;netstandard2.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <RootNamespace>nng</RootNamespace>
     <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'=='net5.0'">
+  <PropertyGroup Condition="'$(TargetFramework)'=='net6.0'">
     <LangVersion>9.0</LangVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'!='net5.0'">
-    <LangVersion>7.3</LangVersion>
-  </PropertyGroup>
 
   <PropertyGroup>
     <VersionPrefix>1.4.0</VersionPrefix>

nng.NET.Shared/AssemblyLoadContext.cs

@@ -46,16 +46,7 @@ protected override Assembly Load(AssemblyName assemblyName)
             if (assemblyName.Name == managedAssemblyName)
             {
                 // Try framework-specific managed assembly path
-                var path = Path.Combine(assemblyPath, "runtimes", "any", "lib", 
-                    #if NETSTANDARD1_5
-                    "netstandard1.5"
-                    #elif NETSTANDARD2_0
-                    "netstandard2.0"
-                    #elif NET5_0
-                    "net5.0"
-                    #else
-                    #error "Unsupported framework?"
-                    #endif
+                var path = Path.Combine(assemblyPath, "runtimes", "any", "lib", "net6.0"
                     , managedAssemblyName + ".dll");
                 if (!File.Exists(path))
                 {
@@ -72,11 +63,7 @@ protected override IntPtr LoadUnmanagedDll(string unmanagedDllName)
         {
             if (unmanagedDllName == "nng")
             {
-#if NETSTANDARD2_0
-                bool is64bit = Environment.Is64BitProcess;
-#else
                 bool is64bit = (IntPtr.Size == 8);
-#endif
                 string arch = string.Empty;
                 switch (RuntimeInformation.ProcessArchitecture)
                 {
@@ -104,7 +91,8 @@ protected override IntPtr LoadUnmanagedDll(string unmanagedDllName)
                     throw new Exception("Unexpected runtime OS platform: " + RuntimeInformation.OSDescription);
                 }
             }
-            return IntPtr.Zero;
+
+            return base.LoadUnmanagedDll(unmanagedDllName);
         }
 
         const string managedAssemblyName = "nng.NET";

nng.NET.Shared/nng.NET.Shared.csproj

@@ -13,10 +13,4 @@
     <PackageOutputPath>../bin/$(Configuration)</PackageOutputPath>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="system.memory" Version="4.5.4" />
-    <PackageReference Include="system.valuetuple" Version="4.5.0" />
-    <PackageReference Include="system.runtime.loader" Version="4.3.0" />
-  </ItemGroup>
-
 </Project>

nng.NET/nng.NET.csproj

@@ -17,10 +17,6 @@
     <NoWarn>$(NoWarn);NU5128</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="system.memory" Version="4.5.4" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\nng.NET.Shared\nng.NET.Shared.csproj">
       <Private>false</Private>

nng.NET/runtimes/linux-arm/native/libnng.so

@@ -4,7 +4,7 @@
   <Import Project="..\nng.NET\build\nng.NET.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPackable>false</IsPackable>
@@ -13,13 +13,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="3.0.2">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
   <ItemGroup>