Prepare repo for .NET 8

.github/workflows/ci.yml

@@ -14,15 +14,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ windows-2019, ubuntu-20.04 ]
+        os: [ windows-2022, ubuntu-22.04 ]
         transport: [ Learning, RabbitMQ, AzureServiceBus, AzureStorageQueue, SqlServer, AmazonSQS, MSMQ ]
         include:
-          - os: windows-2019
+          - os: windows-2022
             os-name: Windows
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             os-name: Linux
         exclude:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             transport: MSMQ
       fail-fast: false
     steps:
@@ -38,9 +38,8 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/[email protected]
         with:
-          dotnet-version: |
-            7.0.x
-            6.0.x
+          dotnet-version: 8.0.x
+          dotnet-quality: 'preview'
       - name: Build
         run: dotnet build src --configuration Release
       - name: Upload packages
@@ -66,7 +65,7 @@ jobs:
         shell: pwsh
         run: |
           echo "Create extra databases"
-          sqlcmd -Q "CREATE DATABASE nservicebus2"          
+          sqlcmd -Q "CREATE DATABASE nservicebus2"
       - name: Setup Azure Service Bus
         if: matrix.transport == 'AzureServiceBus'
         uses: Particular/[email protected]

.github/workflows/release.yml

@@ -8,16 +8,17 @@ env:
   DOTNET_NOLOGO: true
 jobs:
   release:
-    runs-on: windows-2019 # Windows required for ILMerge to work in ScriptBuilderTask
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/[email protected]
         with:
-          fetch-depth: 0     
+          fetch-depth: 0
       - name: Setup .NET SDK
         uses: actions/[email protected]
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
+          dotnet-quality: 'preview'
       - name: Build
         run: dotnet build src --configuration Release
       - name: Sign NuGet packages

src/AcceptanceTesting/AcceptanceTesting.csproj

@@ -1,24 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="8.1.2" />
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="8.1.2" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\NServiceBus.MessagingBridge\NServiceBus.MessagingBridge.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\NServiceBusTests.snk">
-      <Link>NServiceBusTests.snk</Link>
-    </None>
+    <PackageReference Include="NServiceBus" Version="9.0.0-alpha.6" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0-alpha.6" />
   </ItemGroup>
 
 </Project>

src/AcceptanceTests.ASB/AcceptanceTests.ASB.csproj

@@ -1,28 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="8.1.2" />
-    <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="3.2.1" />
+    <ProjectReference Include="..\AcceptanceTesting\AcceptanceTesting.csproj" />
+    <ProjectReference Include="..\NServiceBus.MessagingBridge\NServiceBus.MessagingBridge.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0-alpha.6" />
+    <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="4.0.0-alpha.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AcceptanceTesting\AcceptanceTesting.csproj" />
-    <ProjectReference Include="..\NServiceBus.MessagingBridge\NServiceBus.MessagingBridge.csproj" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\AcceptanceTests\Shared\**\*.cs" Link="Shared\%(RecursiveDir)\%(Filename).%(Extension)" />
+    <Compile Include="..\AcceptanceTests\Shared\**\*.cs" LinkBase="Shared" />
   </ItemGroup>
 
 </Project>

src/AcceptanceTests.ASQ/AcceptanceTests.ASQ.csproj

@@ -1,29 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="8.1.2" />
+    <ProjectReference Include="..\AcceptanceTesting\AcceptanceTesting.csproj" />
+    <ProjectReference Include="..\NServiceBus.MessagingBridge\NServiceBus.MessagingBridge.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NServiceBus.Newtonsoft.Json" Version="3.0.0" />
-    <PackageReference Include="NServiceBus.Transport.AzureStorageQueues" Version="12.0.1" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0-alpha.6" />
+    <PackageReference Include="NServiceBus.Transport.AzureStorageQueues" Version="13.0.0-alpha.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AcceptanceTesting\AcceptanceTesting.csproj" />
-    <ProjectReference Include="..\NServiceBus.MessagingBridge\NServiceBus.MessagingBridge.csproj" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\AcceptanceTests\Shared\**\*.cs" Link="Shared\%(RecursiveDir)\%(Filename).%(Extension)" />
+    <Compile Include="..\AcceptanceTests\Shared\**\*.cs" LinkBase="Shared" />
   </ItemGroup>
 
 </Project>

src/AcceptanceTests.Learning/AcceptanceTests.Learning.csproj

@@ -1,27 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="8.1.2" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\AcceptanceTesting\AcceptanceTesting.csproj" />
     <ProjectReference Include="..\NServiceBus.MessagingBridge\NServiceBus.MessagingBridge.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\AcceptanceTests\Shared\**\*.cs" Link="Shared\%(RecursiveDir)\%(Filename).%(Extension)" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0-alpha.6" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\AcceptanceTests\Shared\**\*.cs" LinkBase="Shared" />
+  </ItemGroup>
+
 </Project>

src/AcceptanceTests.Msmq/AcceptanceTests.Msmq.csproj

@@ -1,28 +1,34 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="8.1.2" />
-    <PackageReference Include="NServiceBus.Transport.Msmq" Version="2.0.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\AcceptanceTesting\AcceptanceTesting.csproj" />
     <ProjectReference Include="..\NServiceBus.MessagingBridge\NServiceBus.MessagingBridge.csproj" />
+    <ProjectReference Include="..\NServiceBus.MessagingBridge.Msmq\NServiceBus.MessagingBridge.Msmq.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\AcceptanceTests\Shared\**\*.cs" Link="Shared\%(RecursiveDir)\%(Filename).%(Extension)" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0-alpha.6" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\AcceptanceTests\Shared\**\*.cs" LinkBase="Shared" />
+  </ItemGroup>
+
+  <!-- Workaround for "NETSDK1073: The FrameworkReference 'Microsoft.WindowsDesktop.App.WindowsForms' was not recognized" -->
+  <!-- This should not be required, but something is incorrectly causing the Microsoft.WindowsDesktop.App.WindowsForms reference -->
+  <PropertyGroup>
+    <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
+  </PropertyGroup>
+
 </Project>

src/AcceptanceTests.Msmq/ConfigureMsmqTransportTestExecution.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Messaging;
 using System.Threading;
 using System.Threading.Tasks;
+using MSMQ.Messaging;
 using NServiceBus;
 using NServiceBus.AcceptanceTesting.Support;
 
@@ -24,7 +24,7 @@ public Func<CancellationToken, Task> ConfigureTransportForEndpoint(EndpointConfi
     {
         var transportDefinition = new TestableMsmqTransport();
         var routingConfig = endpointConfiguration.UseTransport(transportDefinition);
-        endpointConfiguration.UsePersistence<MsmqPersistence, StorageType.Subscriptions>();
+        endpointConfiguration.UsePersistence<AcceptanceTestingPersistence, StorageType.Subscriptions>();
 
         foreach (var publisher in publisherMetadata.Publishers)
         {

src/AcceptanceTests.Msmq/TestableMsmqTransport.cs

@@ -6,11 +6,11 @@
 using NServiceBus.Transport;
 
 /// <summary>
-/// A dedicated subclass of the MsmqTransport that enables us to intercept the receive queues for the test.
+/// A dedicated subclass of the MsmqBridgeTransport that enables us to intercept the receive queues for the test.
 /// </summary>
-class TestableMsmqTransport : MsmqTransport
+class TestableMsmqTransport : MsmqBridgeTransport
 {
-    public string[] ReceiveQueues = new string[0];
+    public string[] ReceiveQueues = Array.Empty<string>();
 
     public override async Task<TransportInfrastructure> Initialize(HostSettings hostSettings, ReceiveSettings[] receivers, string[] sendingAddresses, CancellationToken cancellationToken = default)
     {

src/AcceptanceTests.RabbitMQ/AcceptanceTests.RabbitMQ.csproj

@@ -1,28 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="8.1.2" />
-    <PackageReference Include="NServiceBus.RabbitMQ" Version="8.0.3" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\AcceptanceTesting\AcceptanceTesting.csproj" />
     <ProjectReference Include="..\NServiceBus.MessagingBridge\NServiceBus.MessagingBridge.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\AcceptanceTests\Shared\**\*.cs" Link="Shared\%(RecursiveDir)\%(Filename).%(Extension)" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0-alpha.6" />
+    <PackageReference Include="NServiceBus.RabbitMQ" Version="9.0.0-alpha.1" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\AcceptanceTests\Shared\**\*.cs" LinkBase="Shared" />
+  </ItemGroup>
+
 </Project>

src/AcceptanceTests.SQS/AcceptanceTests.SQS.csproj

@@ -1,28 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="8.1.2" />
-    <PackageReference Include="NServiceBus.AmazonSQS" Version="6.1.1" />
+    <ProjectReference Include="..\AcceptanceTesting\AcceptanceTesting.csproj" />
+    <ProjectReference Include="..\NServiceBus.MessagingBridge\NServiceBus.MessagingBridge.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0-alpha.6" />
+    <PackageReference Include="NServiceBus.AmazonSQS" Version="7.0.0-alpha.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AcceptanceTesting\AcceptanceTesting.csproj" />
-    <ProjectReference Include="..\NServiceBus.MessagingBridge\NServiceBus.MessagingBridge.csproj" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\AcceptanceTests\Shared\**\*.cs" Link="Shared\%(RecursiveDir)\%(Filename).%(Extension)" />
+    <Compile Include="..\AcceptanceTests\Shared\**\*.cs" LinkBase="Shared" />
   </ItemGroup>
 
 </Project>

src/AcceptanceTests.SQS/SQSCleanup.cs

@@ -5,6 +5,7 @@
 using Amazon.Runtime;
 using Amazon.S3;
 using Amazon.S3.Model;
+using Amazon.S3.Util;
 using Amazon.SimpleNotificationService;
 using Amazon.SimpleNotificationService.Model;
 using Amazon.SQS;
@@ -90,7 +91,7 @@ await Task.WhenAll(listBucketsResponse.Buckets.Where(x => x.BucketName.StartsWit
             {
                 try
                 {
-                    if (!await s3Client.DoesS3BucketExistAsync(bucketName))
+                    if (!await AmazonS3Util.DoesS3BucketExistV2Async(s3Client, bucketName))
                     {
                         return;
                     }