Prepare RTM (#1297)

* Remove Preview from workflows * Update NSB references to 9.0.0 * Remove Guard * Code cleanup * Change to ArgumentOutOfRangeException * Remove purge on startup for transport tests * Bump to preview SqlClient * Move token and circuit breaker initialization to StartReceive * Tweaks --------- Co-authored-by: Brandon Ording <[email protected]>
Particular · Feb 29, 2024 · 7054177 · 7054177
1 parent 089a511
commit 7054177
Show file tree

Hide file tree

Showing 53 changed files with 109 additions and 299 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,6 @@ jobs:
         uses: actions/[email protected]
         with:
           dotnet-version: 8.0.x
-          dotnet-quality: 'preview'
       - name: Build
         run: dotnet build src --configuration Release
       - name: Upload packages

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,6 @@ jobs:
         uses: actions/[email protected]
         with:
           dotnet-version: 8.0.x
-          dotnet-quality: 'preview'
       - name: Build
         run: dotnet build src --configuration Release
       - name: Sign NuGet packages

diff --git a/nugets/.gitkeep b/nugets/.gitkeep
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/ConfigureEndpointSqlServerTransport.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/ConfigureEndpointSqlServerTransport.cs
@@ -1,12 +1,8 @@
 using System;
-#if SYSTEMDATASQLCLIENT
-using System.Data.SqlClient;
-#else
-using Microsoft.Data.SqlClient;
-#endif
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
 using NServiceBus;
 using NServiceBus.AcceptanceTesting.Support;
 

diff --git a/...ServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/MultiCatalogAcceptanceTest.cs b/...ServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/MultiCatalogAcceptanceTest.cs
@@ -1,11 +1,7 @@
 namespace NServiceBus.Transport.SqlServer.AcceptanceTests.MultiCatalog
 {
     using System;
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
     using Microsoft.Data.SqlClient;
-#endif
     using NServiceBus.AcceptanceTests;
 
     public class MultiCatalogAcceptanceTest : NServiceBusAcceptanceTest

diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/SqlUtilities.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/SqlUtilities.cs
@@ -1,22 +1,18 @@
 namespace NServiceBus.Transport.SqlServer.AcceptanceTests.MultiCatalog
 {
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
-    using Microsoft.Data.SqlClient;
-#endif
     using System;
-    using System.Threading.Tasks;
     using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.Data.SqlClient;
 
     public static class SqlUtilities
     {
         public static Task<bool> CheckIfTableExists(string catalogName, string schemaName, string tableName, SqlConnection connection, CancellationToken cancellationToken = default)
         {
-            Guard.AgainstNull("catalogName", catalogName);
-            Guard.AgainstNull("schemaName", schemaName);
-            Guard.AgainstNull("tableName", tableName);
-            Guard.AgainstNull("connection", connection);
+            ArgumentNullException.ThrowIfNull(catalogName);
+            ArgumentNullException.ThrowIfNull(schemaName);
+            ArgumentNullException.ThrowIfNull(tableName);
+            ArgumentNullException.ThrowIfNull(connection);
 
             return RunCommand(connection, async (command, token) =>
             {
@@ -31,10 +27,10 @@ public static Task<bool> CheckIfTableExists(string catalogName, string schemaNam
 
         public static Task DropTable(string catalogName, string schemaName, string tableName, SqlConnection connection, CancellationToken cancellationToken = default)
         {
-            Guard.AgainstNull("catalogName", catalogName);
-            Guard.AgainstNull("schemaName", schemaName);
-            Guard.AgainstNull("tableName", tableName);
-            Guard.AgainstNull("connection", connection);
+            ArgumentNullException.ThrowIfNull(catalogName);
+            ArgumentNullException.ThrowIfNull(schemaName);
+            ArgumentNullException.ThrowIfNull(tableName);
+            ArgumentNullException.ThrowIfNull(connection);
 
             return RunCommand(connection, async (command, token) =>
             {
@@ -49,8 +45,8 @@ public static Task DropTable(string catalogName, string schemaName, string table
 
         static async Task<T> RunCommand<T>(SqlConnection connection, Func<SqlCommand, CancellationToken, Task<T>> action, CancellationToken cancellationToken)
         {
-            Guard.AgainstNull("connetion", connection);
-            Guard.AgainstNull("action", action);
+            ArgumentNullException.ThrowIfNull(connection);
+            ArgumentNullException.ThrowIfNull(action);
 
             bool weOpenedTheConnection = false;
 
@@ -62,10 +58,9 @@ static async Task<T> RunCommand<T>(SqlConnection connection, Func<SqlCommand, Ca
                     weOpenedTheConnection = true;
                 }
 
-                using (var command = connection.CreateCommand())
-                {
-                    return await action(command, cancellationToken);
-                }
+                using var command = connection.CreateCommand();
+
+                return await action(command, cancellationToken);
             }
             finally
             {

diff --git a/...rt.SqlServer.AcceptanceTests/MultiCatalog/When_default_catalog_configured_for_endpoint.cs b/...rt.SqlServer.AcceptanceTests/MultiCatalog/When_default_catalog_configured_for_endpoint.cs
@@ -1,12 +1,8 @@
 namespace NServiceBus.Transport.SqlServer.AcceptanceTests.MultiCatalog
 {
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
-    using Microsoft.Data.SqlClient;
-#endif
     using System.Threading.Tasks;
     using AcceptanceTesting;
+    using Microsoft.Data.SqlClient;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
 

diff --git a/...ransport.SqlServer.AcceptanceTests/NServiceBus.Transport.SqlServer.AcceptanceTests.csproj b/...ransport.SqlServer.AcceptanceTests/NServiceBus.Transport.SqlServer.AcceptanceTests.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.0.0-alpha.9" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.0.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>

diff --git a/...er.AcceptanceTests/NativeTimeouts/When_configured_to_purge_expired_messages_at_startup.cs b/...er.AcceptanceTests/NativeTimeouts/When_configured_to_purge_expired_messages_at_startup.cs
@@ -4,11 +4,7 @@
     using System.Collections.Generic;
     using System.Data.Common;
     using System.Threading.Tasks;
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
     using Microsoft.Data.SqlClient;
-#endif
     using NServiceBus.AcceptanceTesting;
     using NServiceBus.AcceptanceTesting.Customization;
     using NServiceBus.AcceptanceTests;

diff --git a/...nsport.SqlServer.AcceptanceTests/TimeToBeReceived/When_queue_contains_expired_messages.cs b/...nsport.SqlServer.AcceptanceTests/TimeToBeReceived/When_queue_contains_expired_messages.cs
@@ -1,15 +1,11 @@
 namespace NServiceBus.Transport.SqlServer.AcceptanceTests.TimeToBeReceived
 {
     using System;
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
-    using Microsoft.Data.SqlClient;
-#endif
     using System.Threading.Tasks;
     using AcceptanceTesting;
     using AcceptanceTesting.Customization;
     using Configuration.AdvancedExtensibility;
+    using Microsoft.Data.SqlClient;
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;

diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_a_corrupted_message_is_received.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_a_corrupted_message_is_received.cs
@@ -2,17 +2,13 @@
 {
     using System;
     using System.Data;
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
-    using Microsoft.Data.SqlClient;
-#endif
     using System.Linq;
     using System.Text;
     using System.Threading.Tasks;
     using AcceptanceTesting;
     using AcceptanceTesting.Customization;
     using Logging;
+    using Microsoft.Data.SqlClient;
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;

diff --git a/....Transport.SqlServer.AcceptanceTests/When_passing_custom_connection_in_receive_context.cs b/....Transport.SqlServer.AcceptanceTests/When_passing_custom_connection_in_receive_context.cs
@@ -1,14 +1,10 @@
 namespace NServiceBus.Transport.SqlServer.AcceptanceTests
 {
     using System;
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
-    using Microsoft.Data.SqlClient;
-#endif
     using System.Threading.Tasks;
     using System.Transactions;
     using AcceptanceTesting;
+    using Microsoft.Data.SqlClient;
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;

diff --git a/...sport.SqlServer.AcceptanceTests/When_passing_custom_connection_outside_receive_context.cs b/...sport.SqlServer.AcceptanceTests/When_passing_custom_connection_outside_receive_context.cs
@@ -1,14 +1,10 @@
 namespace NServiceBus.Transport.SqlServer.AcceptanceTests
 {
     using System;
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
-    using Microsoft.Data.SqlClient;
-#endif
     using System.Threading.Tasks;
     using System.Transactions;
     using AcceptanceTesting;
+    using Microsoft.Data.SqlClient;
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;

diff --git a/...Transport.SqlServer.AcceptanceTests/When_passing_custom_transaction_in_receive_context.cs b/...Transport.SqlServer.AcceptanceTests/When_passing_custom_transaction_in_receive_context.cs
@@ -1,14 +1,10 @@
 namespace NServiceBus.Transport.SqlServer.AcceptanceTests
 {
     using System;
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
-    using Microsoft.Data.SqlClient;
-#endif
     using System.Threading.Tasks;
     using System.Transactions;
     using AcceptanceTesting;
+    using Microsoft.Data.SqlClient;
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;

diff --git a/...port.SqlServer.AcceptanceTests/When_passing_custom_transaction_outside_receive_context.cs b/...port.SqlServer.AcceptanceTests/When_passing_custom_transaction_outside_receive_context.cs
@@ -1,13 +1,9 @@
 namespace NServiceBus.Transport.SqlServer.AcceptanceTests
 {
     using System;
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
-    using Microsoft.Data.SqlClient;
-#endif
     using System.Threading.Tasks;
     using AcceptanceTesting;
+    using Microsoft.Data.SqlClient;
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;

diff --git a/...NServiceBus.Transport.SqlServer.AcceptanceTests/When_using_column_encrypted_connection.cs b/...NServiceBus.Transport.SqlServer.AcceptanceTests/When_using_column_encrypted_connection.cs
@@ -1,14 +1,10 @@
 namespace NServiceBus.Transport.SqlServer.AcceptanceTests
 {
     using System;
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
-    using Microsoft.Data.SqlClient;
-#endif
     using System.Threading.Tasks;
     using AcceptanceTesting;
     using AcceptanceTesting.Customization;
+    using Microsoft.Data.SqlClient;
     using NServiceBus.AcceptanceTests;
     using NUnit.Framework;
 
@@ -17,9 +13,6 @@ public class When_using_column_encrypted_connection : NServiceBusAcceptanceTest
         [Test]
         public async Task Should_work()
         {
-#if SYSTEMDATASQLCLIENT && NET
-            Assert.Ignore("System.Data.SqlClient doesn't support this setting on .NET (works on .NET Framework)");
-#endif
             var ctx = await Scenario.Define<Context>()
                 .WithEndpoint<Endpoint>(b => b.When((bus, c) => bus.SendLocal(new Message())))
                 .Done(c => c.MessageReceived)

diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_using_custom_connection_factory.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_using_custom_connection_factory.cs
@@ -1,14 +1,10 @@
 namespace NServiceBus.Transport.SqlServer.AcceptanceTests
 {
     using System;
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
-    using Microsoft.Data.SqlClient;
-#endif
     using System.Threading.Tasks;
     using AcceptanceTesting;
     using AcceptanceTesting.Customization;
+    using Microsoft.Data.SqlClient;
     using NServiceBus.AcceptanceTests;
     using NUnit.Framework;
 

diff --git a/...nsport.SqlServer.IntegrationTests/NServiceBus.Transport.SqlServer.IntegrationTests.csproj b/...nsport.SqlServer.IntegrationTests/NServiceBus.Transport.SqlServer.IntegrationTests.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="NServiceBus" Version="9.0.0-alpha.9" />
+    <PackageReference Include="NServiceBus" Version="9.0.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>

diff --git a/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_dispatching_messages.cs b/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_dispatching_messages.cs
@@ -2,19 +2,15 @@
 {
     using System;
     using System.Collections.Generic;
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
-    using Microsoft.Data.SqlClient;
-#endif
+    using System.Threading;
     using System.Threading.Tasks;
     using Extensibility;
+    using Microsoft.Data.SqlClient;
     using NUnit.Framework;
     using Routing;
-    using Transport;
     using SqlServer;
+    using Transport;
     using Unicast.Queuing;
-    using System.Threading;
 
     public class When_dispatching_messages
     {

diff --git a/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_receiving_messages.cs b/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_receiving_messages.cs
@@ -2,16 +2,12 @@
 {
     using System;
     using System.Linq;
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
-    using Microsoft.Data.SqlClient;
-#endif
     using System.Threading;
     using System.Threading.Tasks;
+    using Microsoft.Data.SqlClient;
     using NUnit.Framework;
-    using Transport;
     using SqlServer;
+    using Transport;
 
     public class When_receiving_messages
     {

diff --git a/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_recoverable_column_is_removed.cs b/src/NServiceBus.Transport.SqlServer.IntegrationTests/When_recoverable_column_is_removed.cs
@@ -2,18 +2,14 @@
 {
     using System;
     using System.Collections.Generic;
-#if SYSTEMDATASQLCLIENT
-    using System.Data.SqlClient;
-#else
-    using Microsoft.Data.SqlClient;
-#endif
+    using System.Threading;
     using System.Threading.Tasks;
     using Extensibility;
+    using Microsoft.Data.SqlClient;
     using NUnit.Framework;
     using Routing;
-    using Transport;
     using SqlServer;
-    using System.Threading;
+    using Transport;
 
     public class When_recoverable_column_is_removed
     {

diff --git a/...erviceBus.Transport.SqlServer.TransportTests/ConfigureSqlServerTransportInfrastructure.cs b/...erviceBus.Transport.SqlServer.TransportTests/ConfigureSqlServerTransportInfrastructure.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Threading;
-#if SYSTEMDATASQLCLIENT
-using System.Data.SqlClient;
-#else
-using Microsoft.Data.SqlClient;
-#endif
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
 using NServiceBus;
 using NServiceBus.Transport;
 using NServiceBus.TransportTests;
@@ -41,7 +37,7 @@ public async Task<TransportInfrastructure> Configure(TransportDefinition transpo
                 "mainReceiver",
                 queueAddress,
                 transportDefinition.SupportsPublishSubscribe,
-                true,
+                false,
                 errorQueueName)
         };