Add net8.0 target and increase net47 to net472

.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/ClientServer.cs

@@ -54,7 +54,7 @@ public void Tcp()
         }
 
         [Fact]
-        public async void Async()
+        public async Task Async()
         {
             using var server = new ServerSocket();
             using var client = new ClientSocket();
@@ -72,7 +72,7 @@ public async void Async()
         }
 
         [Fact]
-        public async void AsyncWithCancellationToken()
+        public async Task AsyncWithCancellationToken()
         {
             using CancellationTokenSource source = new CancellationTokenSource();
             using var server = new ServerSocket();

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/MessageTests.cs

@@ -128,7 +128,7 @@ public void Issue52_ReqToRouterBug()
 
                 var msg = router.ReceiveMultipartMessage();
                 Assert.Equal(3, msg.FrameCount);
-                Assert.Equal(msg[2].ConvertToString(), testmessage);
+                Assert.Equal(testmessage, msg[2].ConvertToString());
             }
         }
 

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" />
@@ -39,14 +39,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
-    <PackageReference Include="xunit" Version="2.4.2-pre.13" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net47' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
     <PackageReference Include="ZeroMQ" Version="4.1.0.31" />
   </ItemGroup>
 

src/NetMQ.Tests/NetMQMonitorTests.cs

@@ -57,9 +57,9 @@ public void Monitoring()
             }
         }
 
-#if !NET35
+
         [Fact]
-        public void StartAsync()
+        public async Task StartAsync()
         {
             using (var rep = new ResponseSocket())
             using (var monitor = new NetMQMonitor(rep, "inproc://foo", SocketEvents.Closed))
@@ -68,10 +68,11 @@ public void StartAsync()
                 Thread.Sleep(200);
                 Assert.Equal(TaskStatus.Running, task.Status);
                 monitor.Stop();
-                Assert.True(task.Wait(TimeSpan.FromMilliseconds(1000)));
+                var completedTask = await Task.WhenAny(task, Task.Delay(1000));
+                Assert.Equal(task, completedTask);
             }
         }
-#endif
+
 
         [Fact]
         public void NoHangWhenMonitoringUnboundInprocAddress()
@@ -126,7 +127,7 @@ public void ErrorCodeTest()
         }
 
         [Fact]
-        public void MonitorDisposeProperlyWhenDisposedAfterMonitoredTcpSocket()
+        public async Task  MonitorDisposeProperlyWhenDisposedAfterMonitoredTcpSocket()
         {
             // The bug:
             // Given we monitor a netmq tcp socket
@@ -141,7 +142,7 @@ public void MonitorDisposeProperlyWhenDisposedAfterMonitoredTcpSocket()
                 using (var req = new RequestSocket())
                 {
                     monitor = new NetMQMonitor(req, "inproc://#monitor", SocketEvents.All);
-                    Task.Factory.StartNew(monitor.Start);
+                    _ = Task.Factory.StartNew(monitor.Start);
 
                     // Bug only occurs when monitoring a tcp socket
                     var port = res.BindRandomPort("tcp://127.0.0.1");
@@ -152,10 +153,12 @@ public void MonitorDisposeProperlyWhenDisposedAfterMonitoredTcpSocket()
                     res.SendFrame("response");
                     Assert.Equal("response", req.ReceiveFrameString());
                 }
-                Thread.Sleep(100);
+
+                await Task.Delay(100);
                 // Monitor.Dispose should complete
-                var completed = Task.Factory.StartNew(() => monitor.Dispose()).Wait(1000);
-                Assert.True(completed);
+                var task = Task.Factory.StartNew(() => monitor.Dispose());
+                var completedTask = await Task.WhenAny(task, Task.Delay(1000));
+                Assert.Equal(task, completedTask);
             }
             // NOTE If this test fails, it will hang because context.Dispose will block
         }

src/NetMQ.Tests/NetMQPollerTest.cs

@@ -10,6 +10,7 @@
 
 #if !NET35
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 #endif
 
 // ReSharper disable AccessToDisposedClosure
@@ -318,7 +319,7 @@ public void AddTwoSocketAfterRemoving()
 
 
         [Fact]
-        public void RemoveSocket()
+        public async Task RemoveSocket()
         {
             using (var router1 = new RouterSocket())
             using (var router2 = new RouterSocket())
@@ -395,8 +396,8 @@ public void RemoveSocket()
 
                 poller.Stop();
                 // await the pollerTask, 1ms should suffice
-                pollerTask.Wait(1);
-                Assert.True(pollerTask.IsCompleted);
+                var completedTask = await Task.WhenAny(pollerTask, Task.Delay(1));
+                Assert.Equal(pollerTask, completedTask);
             }
         }
 
@@ -865,7 +866,7 @@ public void NativeSocket()
 
 #if !NET35
         [Fact]
-        public void OneTask()
+        public async Task OneTask()
         {
             bool triggered = false;
 
@@ -879,27 +880,27 @@ public void OneTask()
                     Assert.True(poller.CanExecuteTaskInline, "Should be on NetMQPoller thread");
                 });
                 task.Start(poller);
-                task.Wait();
+                await task;
 
                 Assert.True(triggered);
             }
         }
 
         [Fact]
-        public void SetsCurrentTaskScheduler()
+        public async Task  SetsCurrentTaskScheduler()
         {
             using (var poller = new NetMQPoller())
             {
                 poller.RunAsync();
 
                 var task = new Task(() => Assert.Same(TaskScheduler.Current, poller));
                 task.Start(poller);
-                task.Wait();
+                await task;
             }
         }
 
         [Fact]
-        public void CanExecuteTaskInline()
+        public async Task CanExecuteTaskInline()
         {
             using (var poller = new NetMQPoller())
             {
@@ -911,12 +912,12 @@ public void CanExecuteTaskInline()
 
                 var task = new Task(() => Assert.True(poller.CanExecuteTaskInline));
                 task.Start(poller);
-                task.Wait();
+                await task;
             }
         }
 
         [Fact]
-        public void ContinueWith()
+        public async Task ContinueWith()
         {
             int threadId1 = 0;
             int threadId2 = 1;
@@ -941,8 +942,7 @@ public void ContinueWith()
                 }, poller);
 
                 task.Start(poller);
-                task.Wait();
-                task2.Wait();
+                await Task.WhenAll(new List<Task>{task, task2});
 
                 Assert.Equal(threadId1, threadId2);
                 Assert.Equal(1, runCount1);
@@ -951,7 +951,7 @@ public void ContinueWith()
         }
 
         [Fact]
-        public void TwoThreads()
+        public async Task TwoThreads()
         {
             int count1 = 0;
             int count2 = 0;
@@ -982,9 +982,8 @@ public void TwoThreads()
                     }
                 });
 
-                t1.Wait(1000);
-                t2.Wait(1000);
-                Task.WaitAll(allTasks.ToArray(), 1000);
+                 await Task.WhenAny(Task.WhenAll(new List<Task>{ t1, t2 }), Task.Delay(1000));
+                 await Task.WhenAny(Task.WhenAll(allTasks.ToArray()), Task.Delay(1000));
 
                 Assert.Equal(100, count1);
                 Assert.Equal(100, count2);

src/NetMQ.Tests/NetMQQueueTests.cs

@@ -24,7 +24,7 @@ public void EnqueueDequeue()
         }
 
         [Fact]
-        public void EnqueueShouldNotBlockWhenCapacityIsZero()
+        public async Task EnqueueShouldNotBlockWhenCapacityIsZero()
         {
             using (var mockSocket = new PairSocket())
             using (var queue = new NetMQQueue<int>())
@@ -39,8 +39,8 @@ public void EnqueueShouldNotBlockWhenCapacityIsZero()
                     }
                 });
 
-                bool completed = task.Wait(TimeSpan.FromSeconds(1));
-                Assert.True(completed, "Enqueue task should have completed " + socketWatermarkCapacity + " enqueue within 1 second");
+                var completedTask = await Task.WhenAny(task, Task.Delay(1000));
+                Assert.True(task == completedTask, "Enqueue task should have completed " + socketWatermarkCapacity + " enqueue within 1 second");
             }
         }
 

src/NetMQ.Tests/PgmTests.cs

@@ -187,7 +187,7 @@ public void TwoPublishers()
         }
 
         [Fact(Skip = "Requires MSMQ for PGM sockets")]
-        public void Sending1000Messages()
+        public async Task Sending1000Messages()
         {
             // creating two different context and sending 1000 messages
 
@@ -230,8 +230,8 @@ public void Sending1000Messages()
                 }
             });
 
-            pubTask.Wait();
-            subTask.Wait();
+            await pubTask;
+            await subTask;
 
             Assert.Equal(1000, count);
         }
@@ -266,7 +266,7 @@ public void LargeMessage()
         [Theory(Skip = "Requires MSMQ for PGM sockets")]
         [InlineData("pgm://239.0.0.1:1000")]
         [InlineData("tcp://localhost:60000")]
-        public void SubscriberCleanupOnUnbind(string address)
+        public async Task SubscriberCleanupOnUnbind(string address)
         {
             for (var i = 0; i < 10; i++)
             {
@@ -290,8 +290,8 @@ public void SubscriberCleanupOnUnbind(string address)
 //                        var duration = DateTime.Now - time;
 
                         monitor.Stop();
-
-                        monitorTask.Wait();
+                         
+                        await monitorTask;
                     }
                 }
             }

src/NetMQ.Tests/RadioDish.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading;
+using System.Threading.Tasks;
 using NetMQ.Sockets;
 using Xunit;
 using Xunit.Abstractions;
@@ -47,7 +48,7 @@ public void TestBlocking()
         }
 
         [Fact]
-        public async void TestAsync()
+        public async Task TestAsync()
         {
             using var radio = new RadioSocket();
             using var dish = new DishSocket();
@@ -56,7 +57,7 @@ public async void TestAsync()
             int port = radio.BindRandomPort("tcp://*");
             dish.Connect($"tcp://127.0.0.1:{port}");
 
-            Thread.Sleep(100);
+            await Task.Delay(100);
 
             await radio.SendAsync("1", "HELLO");
             await radio.SendAsync("2", "HELLO");

src/NetMQ.Tests/RouterTests.cs

@@ -44,7 +44,7 @@ public void ReceiveReadyDot35Bug()
             using (var server = new RouterSocket())
             {
                 server.BindRandomPort("tcp://127.0.0.1");
-                server.ReceiveReady += (s, e) => Assert.True(false, "Should not receive");
+                server.ReceiveReady += (s, e) => Assert.Fail( "Should not receive");
 
                 Assert.False(server.Poll(TimeSpan.FromMilliseconds(1500)));
             }