Merge branch 'master' into PollerTestsFix

Author: drewnoakes

.github/workflows/CI.yml

@@ -4,36 +4,39 @@ on: [push, pull_request]
 jobs:
   ununtu:
     runs-on: ubuntu-latest
+    env:
+      DOTNET_NOLOGO: true
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4.2.2
+    - uses: actions/setup-dotnet@v4.1.0
+      with:
+        dotnet-version: 9.0.x
     - run: dotnet restore src/NetMQ.sln
     - name: build 
       run: dotnet build src/NetMQ.sln /p:Configuration=Release /verbosity:minimal
-    - name: test netcoreapp3.1
-      run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f netcoreapp3.1 src/NetMQ.Tests/NetMQ.Tests.csproj
-    - name: test netcoreapp2.1
-      run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f netcoreapp2.1 src/NetMQ.Tests/NetMQ.Tests.csproj
+    - 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
   windows:
     runs-on: windows-latest
+    env:
+      DOTNET_NOLOGO: true
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4.2.2
+    - uses: actions/setup-dotnet@v4.1.0
+      with:
+        dotnet-version: 9.0.x
     - name: Install codecov
       run: |
         choco install opencover.portable 
         choco install codecov
     - run: dotnet restore src/NetMQ.sln
     - name: build 
       run: dotnet build src/NetMQ.sln /p:Configuration=Release /verbosity:minimal
-    - name: test netcoreapp2.1
-      run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f netcoreapp2.1 src\NetMQ.Tests\NetMQ.Tests.csproj
-    - name: test netcoreapp3.1
-      run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f netcoreapp3.1 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 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 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 netcoreapp2.1 --logger:trx;LogFileName=results.trx /p:DebugType=full src\NetMQ.Tests\NetMQ.Tests.csproj" -filter:"+[NetMQ*]* -[NetMQ.Tests*]*" -output:".\NetMQ_coverage.xml" -oldStyle
+        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
         codecov -f "NetMQ_coverage.xml"
-       
-       
-

.github/workflows/prerelease.yml

@@ -7,7 +7,7 @@ jobs:
  windows:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Get the version
       id: get_version
       run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}

.github/workflows/release.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: windows-latest
     if: "!github.event.release.prerelease"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Get the version
       id: get_version
       run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}

.gitignore

@@ -46,3 +46,4 @@ _ReSharper*/
 #Ignore lock files
 *.lock.json
 .idea/
+/src/*.DotSettings

.readthedocs.yml

@@ -0,0 +1,14 @@
+# Read the Docs configuration file for MkDocs projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+
+mkdocs:
+  configuration: mkdocs.yml

.travis.yml

@@ -1,6 +1,7 @@
 <img src="https://cdn.rawgit.com/zeromq/netmq/master/img/NetMQLogo.svg" width="350" />
 
-[![NetMQ AppVeyor Build](https://ci.appveyor.com/api/projects/status/as5fiw8a3suw53iu/branch/master?svg=true)](https://ci.appveyor.com/project/somdoron/netmq-2bhss) [![codecov](https://codecov.io/gh/zeromq/netmq/branch/master/graph/badge.svg)](https://codecov.io/gh/zeromq/netmq) [![NetMQ NuGet version](https://img.shields.io/nuget/v/NetMQ.svg)](https://www.nuget.org/packages/NetMQ/) [![NetMQ NuGet prerelease version](https://img.shields.io/nuget/vpre/NetMQ.svg)](https://www.nuget.org/packages/NetMQ/)
+[![GitHub Actions CI](https://github.com/zeromq/netmq/actions/workflows/CI.yml/badge.svg)](https://github.com/zeromq/netmq/actions/workflows/CI.yml)
+[![NetMQ NuGet version](https://img.shields.io/nuget/v/NetMQ.svg)](https://www.nuget.org/packages/NetMQ/)
 
 NetMQ is a 100% native C# port of the lightweight messaging library ZeroMQ.
 

README.md

@@ -117,10 +117,10 @@ This is covered in much more detail in the [Message](message.md) documentation p
 
 ZeroMQ (and therefore NetMQ) is all about patterns and building blocks. The <a href="http://zguide.zeromq.org/page:all" target="_blank">ZeroMQ guide</a> covers everything you need to know to help you with these patterns. You should make sure you read the following sections before you attempt to start work with NetMQ.
 
-+ <a href="http://zguide.zeromq.org/page:all#Chapter-Sockets-and-Patterns" target="_blank">Chapter 2 - Sockets and Patterns</a>
-+ <a href="http://zguide.zeromq.org/page:all#Chapter-Advanced-Request-Reply-Patterns" target="_blank">Chapter 3 - Advanced Request-Reply Patterns</a>
-+ <a href="http://zguide.zeromq.org/page:all#Chapter-Reliable-Request-Reply-Patterns" target="_blank">Chapter 4 - Reliable Request-Reply Patterns</a>
-+ <a href="http://zguide.zeromq.org/page:all#Chapter-Advanced-Pub-Sub-Patterns" target="_blank">Chapter 5 - Advanced Pub-Sub Patterns</a>
++ <a href="https://zguide.zeromq.org/docs/chapter2/" target="_blank">Chapter 2 - Sockets and Patterns</a>
++ <a href="https://zguide.zeromq.org/docs/chapter3/" target="_blank">Chapter 3 - Advanced Request-Reply Patterns</a>
++ <a href="https://zguide.zeromq.org/docs/chapter4/" target="_blank">Chapter 4 - Reliable Request-Reply Patterns</a>
++ <a href="https://zguide.zeromq.org/docs/chapter5/" target="_blank">Chapter 5 - Advanced Pub-Sub Patterns</a>
 
 
 NetMQ also has some examples of a few of these patterns written using the NetMQ APIs. Should you find the pattern you are looking for in the <a href="http://zguide.zeromq.org/page:all" target="_blank">ZeroMQ guide</a> it should be fairly easy to translate that into NetMQ usage.
@@ -132,7 +132,7 @@ Here are some links to the patterns that are available within the NetMQ codebase
 + <a href="https://github.com/NetMQ/Samples/blob/master/src/Pirate%20Pattern/Lazy%20Pirate" target="_blank">Lazy Pirate Pattern</a>
 + <a href="https://github.com/NetMQ/Samples/blob/master/src/Pirate%20Pattern/Simple%20Pirate" target="_blank">Simple Pirate Pattern</a>
 
-For other patterns, the <a href="http://zguide.zeromq.org/page:all" target="_blank">ZeroMQ guide</a>
+For other patterns, the <a href="https://zguide.zeromq.org/" target="_blank">ZeroMQ guide</a>
 will be your first port of call
 
 ZeroMQ patterns are implemented by pairs of sockets of particular types. In other words, to understand ZeroMQ patterns you need to understand socket types and how they work together. Mostly, this just takes study; there is little that is obvious at this level.

docs/introduction.md

@@ -35,7 +35,7 @@ namespace Ventilator
             // Sends batch of tasks to workers via that socket
             Console.WriteLine("====== VENTILATOR ======");
             using (var sender = new PushSocket("@tcp://*:5557"))
-            using (var sink = new PullSocket(">tcp://localhost:5558"))
+            using (var sink = new PushSocket(">tcp://localhost:5558"))
             {
                 Console.WriteLine("Press enter when worker are ready");
                 Console.ReadLine();

docs/push-pull.md

@@ -8,7 +8,7 @@ Producers call `Enqueue(T)`.
 
 This class can eliminate boilerplate code associated with marshalling operations onto a single thread.
 
-```csharp
+``` csharp
 using (var queue = new NetMQQueue<ICommand>())
 using (var poller = new NetMQPoller { queue })
 {