Update NServiceBus Core to 10.0.0-alpha.5 (#1806)

dependencyupdates[bot] · danielmarbach · web-flow · commit 16804c0a8f92 · 2025-09-06T16:04:00.000Z
* Update NServiceBus Core to 10.0.0-alpha.5

* Implement IAsyncDisposable

* Cleanup

* Async

---------

Co-authored-by: dependencyupdates[bot] &lt;218638057+dependencyupdates[bot]@users.noreply.github.com&gt;
Co-authored-by: Daniel Marbach &lt;danielmarbach@users.noreply.github.com&gt;
diff --git a/src/MsSqlMicrosoftDataClientAcceptanceTests/MsSqlMicrosoftDataClientAcceptanceTests.csproj b/src/MsSqlMicrosoftDataClientAcceptanceTests/MsSqlMicrosoftDataClientAcceptanceTests.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.4" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.5" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
   </ItemGroup>
 
diff --git a/src/MsSqlMicrosoftDataClientSqlTransportAcceptanceTests/MsSqlMicrosoftDataClientSqlTransportAcceptanceTests.csproj b/src/MsSqlMicrosoftDataClientSqlTransportAcceptanceTests/MsSqlMicrosoftDataClientSqlTransportAcceptanceTests.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.4" GeneratePathProperty="true" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.5" GeneratePathProperty="true" />
     <PackageReference Include="NServiceBus.Transport.SqlServer" Version="9.0.0-alpha.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
   </ItemGroup>
diff --git a/src/MySqlAcceptanceTests/MySqlAcceptanceTests.csproj b/src/MySqlAcceptanceTests/MySqlAcceptanceTests.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.4" GeneratePathProperty="true" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.5" GeneratePathProperty="true" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
   </ItemGroup>
 
diff --git a/src/OracleAcceptanceTests/OracleAcceptanceTests.csproj b/src/OracleAcceptanceTests/OracleAcceptanceTests.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.4" GeneratePathProperty="true" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.5" GeneratePathProperty="true" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
   </ItemGroup>
 
diff --git a/src/PostgreSqlAcceptanceTests/PostgreSqlAcceptanceTests.csproj b/src/PostgreSqlAcceptanceTests/PostgreSqlAcceptanceTests.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.4" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.5" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
   </ItemGroup>
 
diff --git a/src/PostgreSqlTransportAcceptanceTests/PostgreSqlTransportAcceptanceTests.csproj b/src/PostgreSqlTransportAcceptanceTests/PostgreSqlTransportAcceptanceTests.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.4" GeneratePathProperty="true" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.5" GeneratePathProperty="true" />
     <PackageReference Include="NServiceBus.Transport.PostgreSql" Version="9.0.0-alpha.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
   </ItemGroup>
diff --git a/src/SqlPersistence.PersistenceTests/SqlPersistence.PersistenceTests.csproj b/src/SqlPersistence.PersistenceTests/SqlPersistence.PersistenceTests.csproj
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="NServiceBus.PersistenceTests.Sources" Version="10.0.0-alpha.4" GeneratePathProperty="true" />
+    <PackageReference Include="NServiceBus.PersistenceTests.Sources" Version="10.0.0-alpha.5" GeneratePathProperty="true" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
   </ItemGroup>
 
diff --git a/src/SqlPersistence/Outbox/AdoNetSqlOutboxTransaction.cs b/src/SqlPersistence/Outbox/AdoNetSqlOutboxTransaction.cs
@@ -5,20 +5,12 @@
 using NServiceBus.Extensibility;
 using NServiceBus.Outbox;
 
-class AdoNetSqlOutboxTransaction : ISqlOutboxTransaction
+sealed class AdoNetSqlOutboxTransaction(
+    ConcurrencyControlStrategy concurrencyControlStrategy,
+    IConnectionManager connectionManager,
+    IsolationLevel isolationLevel)
+    : ISqlOutboxTransaction
 {
-    IConnectionManager connectionManager;
-    IsolationLevel isolationLevel;
-    ConcurrencyControlStrategy concurrencyControlStrategy;
-
-    public AdoNetSqlOutboxTransaction(ConcurrencyControlStrategy concurrencyControlStrategy,
-        IConnectionManager connectionManager, IsolationLevel isolationLevel)
-    {
-        this.connectionManager = connectionManager;
-        this.isolationLevel = isolationLevel;
-        this.concurrencyControlStrategy = concurrencyControlStrategy;
-    }
-
     public DbTransaction Transaction { get; private set; }
     public DbConnection Connection { get; private set; }
 
@@ -31,7 +23,7 @@ public async Task Begin(ContextBag context, CancellationToken cancellationToken
     {
         var incomingMessage = context.GetIncomingMessage();
         Connection = await connectionManager.OpenConnection(incomingMessage, cancellationToken).ConfigureAwait(false);
-        Transaction = Connection.BeginTransaction(isolationLevel);
+        Transaction = await Connection.BeginTransactionAsync(isolationLevel, cancellationToken).ConfigureAwait(false);
         await concurrencyControlStrategy.Begin(incomingMessage.MessageId, Connection, Transaction, cancellationToken).ConfigureAwait(false);
     }
 
@@ -42,6 +34,25 @@ public void Dispose()
     {
         Transaction?.Dispose();
         Connection?.Dispose();
+
+        Transaction = null;
+        Connection = null;
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        if (Transaction is not null)
+        {
+            await Transaction.DisposeAsync().ConfigureAwait(false);
+        }
+
+        if (Connection is not null)
+        {
+            await Connection.DisposeAsync().ConfigureAwait(false);
+        }
+
+        Transaction = null;
+        Connection = null;
     }
 
     public Task Commit(CancellationToken cancellationToken = default)
diff --git a/src/SqlPersistence/Outbox/TransactionScopeSqlOutboxTransaction.cs b/src/SqlPersistence/Outbox/TransactionScopeSqlOutboxTransaction.cs
@@ -6,23 +6,15 @@
 using NServiceBus.Extensibility;
 using NServiceBus.Outbox;
 
-class TransactionScopeSqlOutboxTransaction : ISqlOutboxTransaction
+sealed class TransactionScopeSqlOutboxTransaction(
+    ConcurrencyControlStrategy concurrencyControlStrategy,
+    IConnectionManager connectionManager,
+    IsolationLevel isolationLevel,
+    TimeSpan transactionTimeout)
+    : ISqlOutboxTransaction
 {
-    IConnectionManager connectionManager;
-    IsolationLevel isolationLevel;
-    ConcurrencyControlStrategy concurrencyControlStrategy;
     TransactionScope transactionScope;
     Transaction ambientTransaction;
-    TimeSpan transactionTimeout;
-
-    public TransactionScopeSqlOutboxTransaction(ConcurrencyControlStrategy concurrencyControlStrategy,
-        IConnectionManager connectionManager, IsolationLevel isolationLevel, TimeSpan transactionTimeout)
-    {
-        this.connectionManager = connectionManager;
-        this.isolationLevel = isolationLevel;
-        this.concurrencyControlStrategy = concurrencyControlStrategy;
-        this.transactionTimeout = transactionTimeout;
-    }
 
     public DbTransaction Transaction => null;
     public DbConnection Connection { get; private set; }
@@ -55,14 +47,30 @@ public void Dispose()
     {
         transactionScope?.Dispose();
         Connection?.Dispose();
+
+        transactionScope = null;
+        ambientTransaction = null;
+        Connection = null;
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        transactionScope?.Dispose();
+
+        if (Connection is not null)
+        {
+            await Connection.DisposeAsync().ConfigureAwait(false);
+        }
+
         transactionScope = null;
         ambientTransaction = null;
+        Connection = null;
     }
 
     public Task Commit(CancellationToken cancellationToken = default)
     {
         transactionScope?.Complete();
-        // we need to dispose it after completion in order to execute the transaction after marking it as completed
+        // we need to dispose it after completion to execute the transaction after marking it as completed
         transactionScope?.Dispose();
         return Task.CompletedTask;
     }
diff --git a/src/SqlPersistence/SqlPersistence.csproj b/src/SqlPersistence/SqlPersistence.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NServiceBus" Version="10.0.0-alpha.4" />
+    <PackageReference Include="NServiceBus" Version="10.0.0-alpha.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/TransactionalSession.MsSqlMicrosoftDataClient.AcceptanceTests/TransactionalSession.MsSqlMicrosoftDataClient.AcceptanceTests.csproj b/src/TransactionalSession.MsSqlMicrosoftDataClient.AcceptanceTests/TransactionalSession.MsSqlMicrosoftDataClient.AcceptanceTests.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="10.0.0-alpha.4" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="10.0.0-alpha.5" />
     <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.10.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
diff --git a/src/VBTestCode/VBTestCode.vbproj b/src/VBTestCode/VBTestCode.vbproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="10.0.0-alpha.4" />
+    <PackageReference Include="NServiceBus" Version="10.0.0-alpha.5" />
   </ItemGroup>
 
 </Project>
