update net47 -> net472

Author: Christoph Bauer

.github/workflows/CI.yml

@@ -34,8 +34,8 @@ jobs:
       run: dotnet build src/NetMQ.sln /p:Configuration=Release /verbosity:minimal
     - name: test net9.0
       run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net9.0 src\NetMQ.Tests\NetMQ.Tests.csproj
-    - name: test net47
-      run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net47 src\NetMQ.Tests\NetMQ.Tests.csproj
+    - name: test net472
+      run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net472 src\NetMQ.Tests\NetMQ.Tests.csproj
     - name: coverage
       run: |
         OpenCover.Console.exe -register:user -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:"test --no-build --configuration Release -f net6.0 --logger:trx;LogFileName=results.trx /p:DebugType=full src\NetMQ.Tests\NetMQ.Tests.csproj" -filter:"+[NetMQ*]* -[NetMQ.Tests*]*" -output:".\NetMQ_coverage.xml" -oldStyle

src/NetMQ.Tests/CurveTests.cs

@@ -2,7 +2,7 @@
 using NetMQ.Sockets;
 using Xunit;
 
-#if NET47
+#if NETFRAMEWORK
 using ZeroMQ;
 #endif
 
@@ -39,7 +39,7 @@ public void CurveTest()
 
         }
 
-#if NET47
+#if NETFRAMEWORK
         [Fact]
         public void WithLibzmqClient()
         {

src/NetMQ.Tests/NetMQ.Tests.csproj

@@ -7,7 +7,7 @@
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <IsTestProject>true</IsTestProject>
-    <TargetFrameworks>net9.0;net47</TargetFrameworks>
+    <TargetFrameworks>net9.0;net472</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -20,13 +20,13 @@
     <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/lib/mono')">/usr/lib/mono</BaseFrameworkPathOverrideForMono>
     <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/local/lib/mono')">/usr/local/lib/mono</BaseFrameworkPathOverrideForMono>
 
-    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net47'">$(BaseFrameworkPathOverrideForMono)/4.7-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net472'">$(BaseFrameworkPathOverrideForMono)/4.7-api</FrameworkPathOverride>
 
     <!-- Add the Facades directory.  Not sure how else to do this. Necessary at least for .NET 4.5 -->
     <AssemblySearchPaths Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net47' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -49,7 +49,7 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net47' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
     <PackageReference Include="ZeroMQ" Version="4.1.0.31" />
   </ItemGroup>
 

src/NetMQ.Tests/ZMTPTests.cs

@@ -10,7 +10,7 @@
 using NetMQ.Sockets;
 using Xunit;
 
-#if NET47
+#if NETFRAMEWORK
 using ZeroMQ;
 #endif
 
@@ -156,7 +156,7 @@ public void V3Test()
             }
         }
 
-#if NET47
+#if NETFRAMEWORK
         [Fact]
         public void WithLibzmq()
         {

src/NetMQ/Core/Transports/Tcp/TcpConnector.cs

@@ -262,7 +262,6 @@ public void OutCompleted(SocketError socketError, int bytesTransferred)
                         bytes.PutInteger(endian, m_options.TcpKeepaliveIdle, 4);
                         bytes.PutInteger(endian, m_options.TcpKeepaliveIntvl, 8);
 
-                        bytes.PutInteger(endian, m_options.TcpKeepaliveIntvl, 8);
 #if NET
                         if (!OperatingSystem.IsWindows())
                         {

src/NetMQ/NetMQ.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>A 100% native C# port of the lightweight high performance messaging library ZeroMQ</Description>
     <Version>4.0.0.0</Version>
-    <TargetFrameworks>net8.0;net47;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net472;netstandard2.1</TargetFrameworks>
     <DebugType>portable</DebugType>
     <AssemblyOriginatorKeyFile>./NetMQ.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
@@ -24,7 +24,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net47' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>	
 

src/NetMQ/NetMQBeacon.cs

@@ -125,7 +125,7 @@ private void Configure(string interfaceName, int port)
 							// on linux to receive broadcast you must bind to the broadcast address specifically
 							//bindTo = @interface.Address;
 							sendTo = @interface.BroadcastAddress;
-#if NET45 || NET47
+#if NETFRAMEWORK
 							if (Environment.OSVersion.Platform==PlatformID.Unix)
 #else
 							if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))