Prepare repo for .NET 8

.github/workflows/ci.yml

@@ -15,9 +15,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: windows-2019
+          - os: windows-2022
             name: Windows
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             name: Linux
       fail-fast: false
     steps:
@@ -28,13 +28,8 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/[email protected]
         with:
-          dotnet-version: |
-            7.0.x
-            6.0.x
-      - name: Setup .NET Core 3.1 runtime
-        uses: actions/[email protected]
-        with:
-          dotnet-version: 3.1.x
+          dotnet-version: 8.0.x
+          dotnet-quality: 'preview'
       - name: Build
         run: dotnet build src --configuration Release
       - name: Upload packages
@@ -50,12 +45,12 @@ jobs:
           connection-string-env-var: SqlServerTransportConnectionString
           catalog: nservicebus
       - name: Prepare SQL Server
-        shell: pwsh       
+        shell: pwsh
         run: |
           echo "Create extra databases"
           sqlcmd -Q "CREATE DATABASE nservicebus1"
           sqlcmd -Q "CREATE DATABASE nservicebus2"
-          
+
           echo "Create additional schemas"
           sqlcmd -Q "CREATE SCHEMA receiver AUTHORIZATION db_owner" -d "nservicebus"
           sqlcmd -Q "CREATE SCHEMA sender AUTHORIZATION db_owner" -d "nservicebus"

.github/workflows/release.yml

@@ -8,16 +8,17 @@ env:
   DOTNET_NOLOGO: true
 jobs:
   release:
-    runs-on: ubuntu-20.04
+    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
@@ -36,5 +37,5 @@ jobs:
       - name: Deploy
         uses: Particular/[email protected]
         with:
-          octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}	
-          
+          octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}
+

src/Custom.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <MinVerMinimumMajorMinor>7.1</MinVerMinimumMajorMinor>
+    <MinVerMinimumMajorMinor>8.0</MinVerMinimumMajorMinor>
     <MinVerAutoIncrement>minor</MinVerAutoIncrement>
   </PropertyGroup>
 

src/NServiceBus.SqlServer.AcceptanceTests/NServiceBus.SqlServer.AcceptanceTests.csproj

@@ -1,7 +1,7 @@
-<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>
     <DefineConstants>$(DefineConstants);SYSTEMDATASQLCLIENT</DefineConstants>
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="8.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.0.0-alpha.4" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />

src/NServiceBus.SqlServer.IntegrationTests/NServiceBus.SqlServer.IntegrationTests.csproj

@@ -1,7 +1,7 @@
-<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>
     <DefineConstants>$(DefineConstants);SYSTEMDATASQLCLIENT</DefineConstants>
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NServiceBus" Version="8.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
+    <PackageReference Include="NServiceBus" Version="9.0.0-alpha.4" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />

src/NServiceBus.SqlServer.TransportTests/NServiceBus.SqlServer.TransportTests.csproj

@@ -1,7 +1,7 @@
-<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>
     <DefineConstants>$(DefineConstants);SYSTEMDATASQLCLIENT</DefineConstants>
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NServiceBus.TransportTests.Sources" Version="8.1.1" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
+    <PackageReference Include="NServiceBus.TransportTests.Sources" Version="9.0.0-alpha.4" GeneratePathProperty="true" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />

src/NServiceBus.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt

@@ -53,11 +53,6 @@ namespace NServiceBus
         public NServiceBus.TransactionScopeOptions TransactionScope { get; }
         public override System.Collections.Generic.IReadOnlyCollection<NServiceBus.TransportTransactionMode> GetSupportedTransactionModes() { }
         public override System.Threading.Tasks.Task<NServiceBus.Transport.TransportInfrastructure> Initialize(NServiceBus.Transport.HostSettings hostSettings, NServiceBus.Transport.ReceiveSettings[] receivers, string[] sendingAddresses, System.Threading.CancellationToken cancellationToken = default) { }
-        [System.Obsolete("Inject the ITransportAddressResolver type to access the address translation mecha" +
-            "nism at runtime. See the NServiceBus version 8 upgrade guide for further details" +
-            ". Will be treated as an error from version 8.0.0. Will be removed in version 9.0" +
-            ".0.", false)]
-        public override string ToTransportAddress(NServiceBus.Transport.QueueAddress address) { }
     }
     public static class SqlServerTransportSettingsExtensions
     {
@@ -79,9 +74,6 @@ namespace NServiceBus
         public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> UseSchemaForQueue(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, string queueName, string schema) { }
         public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> UseTransport<T>(this NServiceBus.EndpointConfiguration config)
             where T : NServiceBus.SqlServerTransport { }
-        [System.Obsolete("Use `QueuePeekerOptions` instead. The member currently throws a NotImplementedExc" +
-            "eption. Will be removed in version 8.0.0.", true)]
-        public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> WithPeekDelay(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, System.TimeSpan? delay = default) { }
     }
     public class TransactionScopeOptions
     {
@@ -94,22 +86,11 @@ namespace NServiceBus.Transport.SqlServer
     public class DelayedDeliveryOptions
     {
         public int BatchSize { get; set; }
-        [System.Obsolete("Delayed message polling now uses an adaptive delays and no longer needs a process" +
-            "ing interval. This setting is safe to remove. The member currently throws a NotI" +
-            "mplementedException. Will be removed in version 8.0.0.", true)]
-        public System.TimeSpan ProcessingInterval { get; set; }
         public string TableSuffix { get; set; }
     }
     public class DelayedDeliverySettings
     {
         public void BatchSize(int batchSize) { }
-        [System.Obsolete("Timeout manager has been removed from NServiceBus. See the upgrade guide for more" +
-            " details. Will be removed in version 8.0.0.", true)]
-        public void EnableTimeoutManagerCompatibility() { }
-        [System.Obsolete("Delayed message polling now uses an adaptive delays and no longer needs a process" +
-            "ing interval. This setting is safe to remove. The member currently throws a NotI" +
-            "mplementedException. Will be removed in version 8.0.0.", true)]
-        public void ProcessingInterval(System.TimeSpan interval) { }
         public void TableSuffix(string suffix) { }
     }
     public class QueueSchemaAndCatalogOptions

src/NServiceBus.SqlServer.UnitTests/NServiceBus.SqlServer.UnitTests.csproj

@@ -1,7 +1,7 @@
-<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>
@@ -11,8 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NServiceBus" Version="8.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
+    <PackageReference Include="NServiceBus" Version="9.0.0-alpha.4" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Particular.Approvals" Version="0.5.0" />

src/NServiceBus.SqlServer.sln

@@ -9,8 +9,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.SqlServer.Accep
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A8C6EF3B-1488-44A7-BF9E-D85DB09B0FFE}"
 	ProjectSection(SolutionItems) = preProject
+		..\.github\workflows\ci.yml = ..\.github\workflows\ci.yml
 		Scripts\Create-Databases.sql = Scripts\Create-Databases.sql
 		Custom.Build.props = Custom.Build.props
+		..\.github\workflows\release.yml = ..\.github\workflows\release.yml
 		Scripts\Reset-Database.sql = Scripts\Reset-Database.sql
 	EndProjectSection
 EndProject
@@ -32,11 +34,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Transport.SqlSe
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Transport.SqlServer.UnitTests", "NServiceBus.Transport.SqlServer.UnitTests\NServiceBus.Transport.SqlServer.UnitTests.csproj", "{F08C8BAB-C329-4F96-A6AF-F25419C623FD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Transport.SqlServer.CompatibilityTests", "NServiceBus.Transport.SqlServer.CompatibilityTests\NServiceBus.Transport.SqlServer.CompatibilityTests.csproj", "{A34A2296-D65D-49AF-ABCE-B712017FF92D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FA1193BF-325C-4201-BB78-484032E09809} = {FA1193BF-325C-4201-BB78-484032E09809}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -83,10 +80,6 @@ Global
 		{F08C8BAB-C329-4F96-A6AF-F25419C623FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F08C8BAB-C329-4F96-A6AF-F25419C623FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F08C8BAB-C329-4F96-A6AF-F25419C623FD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A34A2296-D65D-49AF-ABCE-B712017FF92D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A34A2296-D65D-49AF-ABCE-B712017FF92D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A34A2296-D65D-49AF-ABCE-B712017FF92D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A34A2296-D65D-49AF-ABCE-B712017FF92D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj

@@ -1,13 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>NServiceBus.Transport.SqlServer</AssemblyName>
     <RootNamespace>NServiceBus.Transport.SqlServer</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
     <DefineConstants>$(DefineConstants);SYSTEMDATASQLCLIENT</DefineConstants>
-    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -20,7 +19,7 @@
     <PackageReference Include="Janitor.Fody" Version="1.9.0" PrivateAssets="All" />
     <PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="All" />
     <PackageReference Include="Particular.Packaging" Version="3.0.0" PrivateAssets="All" />
-    <PackageReference Include="NServiceBus" Version="[8.1.1, 9.0.0)" />
+    <PackageReference Include="NServiceBus" Version="9.0.0-alpha.4" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
   </ItemGroup>
 

src/NServiceBus.Transport.SqlServer.AcceptanceTests/ConfigureEndpointSqlServerTransport.cs

@@ -24,9 +24,11 @@ public ConfigureEndpointSqlServerTransport()
         transport = new SqlServerTransport(connectionString);
         transport.Subscriptions.DisableCaching = true;
 
-#if !NETFRAMEWORK
-        transport.TransportTransactionMode = TransportTransactionMode.SendsAtomicWithReceive;
-#endif
+        //On non windows operating systems we need to explicitly set the transaction mode to SendsAtomicWithReceive since distributed transactions is not available there
+        if (!OperatingSystem.IsWindows() && transport.TransportTransactionMode == TransportTransactionMode.TransactionScope)
+        {
+            transport.TransportTransactionMode = TransportTransactionMode.SendsAtomicWithReceive;
+        }
     }
 
     public Task Configure(string endpointName, EndpointConfiguration configuration, RunSettings runSettings, PublisherMetadata publisherMetadata)

src/NServiceBus.Transport.SqlServer.AcceptanceTests/NServiceBus.Transport.SqlServer.AcceptanceTests.csproj

@@ -1,7 +1,7 @@
-<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>
@@ -11,8 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="8.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.0.0-alpha.4" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />

src/NServiceBus.Transport.SqlServer.AcceptanceTests/TestSuiteConstraints.cs

@@ -4,11 +4,8 @@ namespace NServiceBus.AcceptanceTests
 
     public partial class TestSuiteConstraints
     {
-#if NETFRAMEWORK
-        public bool SupportsDtc => true;
-#else
+        //TODO: Change this to true once scopes work with DTC on .NET - https://github.com/Particular/NServiceBus.SqlServer/issues/1145
         public bool SupportsDtc => false;
-#endif
         public bool SupportsCrossQueueTransactions => true;
         public bool SupportsNativePubSub => true;
         public bool SupportsDelayedDelivery => true;

src/NServiceBus.Transport.SqlServer.AcceptanceTests/TimeToBeReceived/When_queue_contains_expired_messages.cs

@@ -20,14 +20,18 @@ public class When_queue_contains_expired_messages : NServiceBusAcceptanceTest
         public void SetUpConnectionString() =>
             connectionString = Environment.GetEnvironmentVariable("SqlServerTransportConnectionString") ?? @"Data Source=.\SQLEXPRESS;Initial Catalog=nservicebus;Integrated Security=True";
 
-#if NETFRAMEWORK
-        [TestCase(TransportTransactionMode.TransactionScope)]
-#endif
+        //TODO: Enable once scopes work with DTC on .NET - https://github.com/Particular/NServiceBus.SqlServer/issues/1145
+        ///[TestCase(TransportTransactionMode.TransactionScope)]
         [TestCase(TransportTransactionMode.SendsAtomicWithReceive)]
         [TestCase(TransportTransactionMode.ReceiveOnly)]
         [TestCase(TransportTransactionMode.None)]
         public Task Should_remove_expired_messages_from_queue(TransportTransactionMode transactionMode)
         {
+            if (transactionMode == TransportTransactionMode.TransactionScope && !OperatingSystem.IsWindows())
+            {
+                Assert.Ignore("Transaction scope mode is only supported on windows");
+            }
+
             return Scenario.Define<Context>()
                 .WithEndpoint<Endpoint>(b =>
                 {

src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_a_corrupted_message_is_received.cs

@@ -23,14 +23,18 @@ public class When_a_corrupted_message_is_received : NServiceBusAcceptanceTest
         public void SetConnectionString() =>
             connectionString = Environment.GetEnvironmentVariable("SqlServerTransportConnectionString") ?? @"Data Source=.\SQLEXPRESS;Initial Catalog=nservicebus;Integrated Security=True";
 
-#if NETFRAMEWORK
-        [TestCase(TransportTransactionMode.TransactionScope)]
-#endif
+        //TODO: Enable once scopes work with DTC on .NET - https://github.com/Particular/NServiceBus.SqlServer/issues/1145
+        ///[TestCase(TransportTransactionMode.TransactionScope)]
         [TestCase(TransportTransactionMode.SendsAtomicWithReceive)]
         [TestCase(TransportTransactionMode.ReceiveOnly)]
         [TestCase(TransportTransactionMode.None)]
         public async Task Should_move_it_to_the_error_queue_when_headers_corrupted(TransportTransactionMode txMode)
         {
+            if (txMode == TransportTransactionMode.TransactionScope && !OperatingSystem.IsWindows())
+            {
+                Assert.Ignore("Transaction scope mode is only supported on windows");
+            }
+
             PurgeQueues(connectionString);
             try
             {

src/NServiceBus.Transport.SqlServer.CompatibilityTests/NServiceBus.Transport.SqlServer.CompatibilityTests.csproj

@@ -1,9 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <!--<SignAssembly>true</SignAssembly>-->
-    <!--<AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>-->
+    <TargetFramework>net8.0</TargetFramework>
     <NoWarn>PS0018</NoWarn>
   </PropertyGroup>
 
@@ -16,11 +14,11 @@
     <PackageReference Include="Compatibility.NServiceBus.TestRunner" Version="0-*" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
     <PackageReference Include="NuGet.Protocol" Version="6.7.0" />
-    <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" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-    <PackageReference Include="MinVer" Version="4.3.0"/>
+    <PackageReference Include="MinVer" Version="4.3.0" />
   </ItemGroup>
 
 </Project>