Updating to make net 5.0 work

.github/dependabot.yml

@@ -0,0 +1,23 @@
+version: 2
+updates:
+- package-ecosystem: nuget
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  target-branch: net50
+  ignore:
+  - dependency-name: rebus
+    versions:
+    - 6.4.1
+    - 6.5.0
+    - 6.5.2
+    - 6.5.3
+    - 6.5.4
+  - dependency-name: microsoft.net.test.sdk
+    versions:
+    - 16.9.1
+  - dependency-name: rebus.tests.contracts
+    versions:
+    - 6.4.0

.github/workflows/dotnet-release.yml

@@ -0,0 +1,94 @@
+name: .NET Release
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+
+jobs:
+  build-ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: getong/[email protected]
+      with:
+        rabbitmq version: '3.8.2-management-alpine'
+        host port: 5672
+        rabbitmq user: 'guest'
+        rabbitmq password: 'guest'
+    - name: Setup .NET 2.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 2.1.x
+    - name: Setup .NET 3.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.x
+    - name: Setup .NET 5.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore -c Release
+    - name: Test
+      run: dotnet test Rebus.RabbitMq.Tests --no-build --verbosity normal -c Release
+  build-windows:
+    needs: build-ubuntu
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET 2.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 2.1.x
+    - name: Setup .NET 3.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.x
+    - name: Setup .NET 5.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+    - name: Install rabbitmq
+      shell: pwsh
+      run: choco install rabbitmq -Version 3.8.5
+    - name: Restore dependencies
+      run:  |
+        dotnet nuget locals all --clear
+        dotnet restore
+    - name: Build
+      run: dotnet build --no-restore -c Release
+    - name: Test
+      run: dotnet test Rebus.RabbitMq.Tests --no-build --verbosity normal -c Release
+  deploy:
+    needs: build-windows
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET 2.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 2.1.x
+    - name: Setup .NET 3.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.x
+    - name: Setup .NET 5.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+    - name: Install dependencies
+      run: |
+        dotnet clean
+        dotnet restore
+    - name: Get the version
+      id: get_version
+      run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3 | cut -d "v" -f 2)
+    - name: Build
+      run: dotnet build --configuration Release
+    - name: Pack
+      run: dotnet pack Rebus.RabbitMq.sln -c Release -o ./artifacts -p:PackageVersion=${{ steps.get_version.outputs.VERSION }}
+    - name: Push generated Rebus package to GitHub registry
+      run: dotnet nuget push /home/runner/work/Rebus.RabbitMq/Rebus.RabbitMq/artifacts/Microting.Rebus.RabbitMq.${{ steps.get_version.outputs.VERSION }}.nupkg -k ${{secrets.NUGET_SECRET_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols true

.github/workflows/dotnet-ubuntu.yml

@@ -0,0 +1,39 @@
+name: .NET Ubuntu
+
+on:
+  push:
+    branches: [ master,net50 ]
+  pull_request:
+    branches: [ master,net50 ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: getong/[email protected]
+      with:
+        rabbitmq version: '3.8.2-management-alpine'
+        host port: 5672
+        rabbitmq user: 'guest'
+        rabbitmq password: 'guest'
+    - name: Setup .NET 2.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 2.1.x
+    - name: Setup .NET 3.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.x
+    - name: Setup .NET 5.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore -c Release
+    - name: Test
+      run: dotnet test Rebus.RabbitMq.Tests --no-build --verbosity normal -c Release

.github/workflows/dotnet-windows.yml

@@ -0,0 +1,38 @@
+name: .NET Windows
+
+on:
+  push:
+    branches: [ master,net50 ]
+  pull_request:
+    branches: [ master,net50 ]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET 2.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 2.1.x
+    - name: Setup .NET 3.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.x
+    - name: Setup .NET 5.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+    - name: Install rabbitmq
+      shell: pwsh
+      run: choco install rabbitmq -Version 3.8.5
+    - name: Restore dependencies
+      run:  |
+        dotnet nuget locals all --clear
+        dotnet restore
+    - name: Build
+      run: dotnet build --no-restore -c Release
+    - name: Test
+      run: dotnet test Rebus.RabbitMq.Tests --no-build --verbosity normal -c Release

Rebus.RabbitMq.Tests/MoreCustomExchangeNamesTests.cs

@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using NUnit.Framework;
 using Rebus.Activation;
+using Rebus.Bus;
 using Rebus.Config;
 using Rebus.Tests.Contracts;
 using Rebus.Tests.Contracts.Extensions;
@@ -46,6 +47,9 @@ public async Task CanSendToAlternativeExchange()
                 }
             });
 
+            firstActivator.Bus.Advanced.Workers.SetNumberOfWorkers(1);
+            secondActivator.Bus.Advanced.Workers.SetNumberOfWorkers(1);
+
             await secondActivator.Bus.Advanced.Routing.Send($"{firstQueueName}@{firstExchangeName}Direct", "from second exchange");
             await firstActivator.Bus.Advanced.Routing.Send($"{secondQueueName}@{secondExchangeName}Direct", "from first exchange");
 
@@ -73,6 +77,7 @@ BuiltinHandlerActivator ConfigureBus(string queueName, string exchangeName)
             Configure.With(activator)
                 .Transport(t => t.UseRabbitMq(ConnectionString, queueName)
                     .ExchangeNames(directExchangeName, topicExchangeName))
+                .Options(o => o.SetNumberOfWorkers(0))
                 .Start();
 
             return activator;

Rebus.RabbitMq.Tests/RabbitMqReceiveSubscriptionTests.cs

@@ -46,18 +46,19 @@ async Task HandlerMethod(string data)
                     using (var subscriber = StartBus(_subscriberQueueName, HandlerMethod))
                     {
                         await subscriber.Subscribe<string>();
+                        subscriber.Advanced.Workers.SetNumberOfWorkers(1);
 
                         // remove the input queue
                         RabbitMqTransportFactory.DeleteQueue(_subscriberQueueName);
 
                         // wait a short while
-                        await Task.Delay(200000);
+                        await Task.Delay(10);
 
                         // check that published message is received without problems
                         await publisher.Publish(message);
 
                         receivedEvent.WaitOrDie(TimeSpan.FromSeconds(2),
-                            "The event has not been receved by the subscriber within the expected time");
+                            "The event has not been received by the subscriber within the expected time");
                     }
                 }
             }
@@ -70,7 +71,9 @@ IBus StartBus(string queueName, Func<string, Task> handlerMethod = null)
 
             Using(activator);
 
-            activator.Handle(handlerMethod);
+            if (handlerMethod != null) {
+                activator.Handle(handlerMethod);
+            }
 
             Configure.With(activator)
                 .Transport(t =>
@@ -82,7 +85,7 @@ IBus StartBus(string queueName, Func<string, Task> handlerMethod = null)
 
                     t.UseRabbitMq(RabbitMqTransportFactory.ConnectionString, queueName)
                         .AddClientProperties(properties);
-                })
+                }).Options(o => o.SetNumberOfWorkers(0))
                 .Start();
 
             return activator.Bus;

Rebus.RabbitMq.Tests/Rebus.RabbitMq.Tests.csproj

@@ -5,7 +5,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Rebus.RabbitMq.Tests</RootNamespace>
     <AssemblyName>Rebus.RabbitMq.Tests</AssemblyName>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
@@ -31,17 +31,17 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Rebus.RabbitMq\Rebus.RabbitMq.csproj" />
-    <PackageReference Include="microsoft.net.test.sdk" Version="16.5.0" />
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+    <PackageReference Include="microsoft.net.test.sdk" Version="16.9.4" />
+    <PackageReference Include="Microting.Rebus" Version="7.1.0" />
+    <PackageReference Include="Microting.Rebus.Tests.Contracts" Version="7.1.0" />
+    <PackageReference Include="nunit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="rabbitmq.client" Version="6.2.1" />
-    <PackageReference Include="rebus" Version="6.0.0" />
-    <PackageReference Include="rebus.tests.contracts" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Links\" />
   </ItemGroup>
-</Project>
+</Project>

Rebus.RabbitMq.Tests/ReceiveNonRebusMessageWithRabbitMq.cs

@@ -5,6 +5,7 @@
 using NUnit.Framework;
 using RabbitMQ.Client;
 using Rebus.Activation;
+using Rebus.Bus;
 using Rebus.Config;
 using Rebus.Exceptions;
 using Rebus.Extensions;
@@ -24,16 +25,18 @@ public class ReceiveNonRebusMessageWithRabbitMq : FixtureBase
         const string ConnectionString = RabbitMqTransportFactory.ConnectionString;
         readonly string _inputQueueName = TestConfig.GetName("custom-msg");
         BuiltinHandlerActivator _activator;
+        private IBus _bus;
 
         protected override void SetUp()
         {
             RabbitMqTransportFactory.DeleteQueue(_inputQueueName);
 
             _activator = Using(new BuiltinHandlerActivator());
 
-            Configure.With(_activator)
+            _bus = Configure.With(_activator)
                 .Logging(l => l.Console(LogLevel.Warn))
                 .Transport(t => t.UseRabbitMq(ConnectionString, _inputQueueName))
+                .Options(o => o.SetNumberOfWorkers(0))
                 .Serialization(s => s.Decorate(c => new Utf8Fallback(c.Get<ISerializer>())))
                 .Start();
         }
@@ -51,6 +54,7 @@ public void CanReceiveNonRebusMessage()
                 }
                 receivedCustomStringMessage.Set();
             });
+            _bus.Advanced.Workers.SetNumberOfWorkers(1);
 
             using (var connection = new ConnectionFactory { Uri = new Uri(ConnectionString) }.CreateConnection())
             {

Rebus.RabbitMq.Tests/TestRabbitExpress.cs

@@ -30,11 +30,14 @@ protected override void SetUp()
             Using(new QueueDeleter(queueName));
 
             _activator = Using(new BuiltinHandlerActivator());
-
             _bus = Configure.With(_activator)
                 .Logging(l => l.ColoredConsole(LogLevel.Info))
                 .Transport(t => t.UseRabbitMq(RabbitMqTransportFactory.ConnectionString, queueName))
-                .Options(o => o.SetMaxParallelism(100))
+                .Options(o =>
+                {
+                    o.SetMaxParallelism(100);
+                    o.SetNumberOfWorkers(0);
+                } )
                 .Start();
         }
 
@@ -47,7 +50,7 @@ public async Task TestPerformance(int messageCount, bool express)
             var receivedMessages = 0L;
             _activator.Handle<object>(async msg => Interlocked.Increment(ref receivedMessages));
 
-            _bus.Advanced.Workers.SetNumberOfWorkers(0);
+            //_bus.Advanced.Workers.SetNumberOfWorkers(0);
 
             var stopwatch = Stopwatch.StartNew();