Update NServiceBus Core to 10.0.0-alpha.7 (#2910)

dependencyupdates[bot] · web-flow · commit 7504f9e0e10f · 2025-11-05T14:53:32.000Z
Co-authored-by: dependencyupdates[bot] &lt;218638057+dependencyupdates[bot]@users.noreply.github.com&gt;
diff --git a/src/NServiceBus.Transport.SQS.AcceptanceTests/NServiceBus.Transport.SQS.AcceptanceTests.csproj b/src/NServiceBus.Transport.SQS.AcceptanceTests/NServiceBus.Transport.SQS.AcceptanceTests.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.6" GeneratePathProperty="true" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.10" GeneratePathProperty="true" />
     <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.11.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
diff --git a/src/NServiceBus.Transport.SQS.AcceptanceTests/Sending/When_sending_control_messages_without_body.cs b/src/NServiceBus.Transport.SQS.AcceptanceTests/Sending/When_sending_control_messages_without_body.cs
@@ -34,12 +34,14 @@ public async Task Can_be_sent_and_processed()
 
     class Sender : EndpointConfigurationBuilder
     {
-        public Sender() => EndpointSetup<DefaultServer>(cfg => cfg.ConfigureSqsTransport().DoNotWrapOutgoingMessages = true);
+        public Sender() => EndpointSetup<DefaultServer>(cfg =>
+        {
+            cfg.EnableFeature<DispatchControlMessageAtStartup>();
+            cfg.ConfigureSqsTransport().DoNotWrapOutgoingMessages = true;
+        });
 
         class DispatchControlMessageAtStartup : Feature
         {
-            public DispatchControlMessageAtStartup() => EnableByDefault();
-
             protected override void Setup(FeatureConfigurationContext context) =>
                 context.RegisterStartupTask(sp => new Startup(
                     sp.GetRequiredService<IMessageDispatcher>(),
diff --git a/src/NServiceBus.Transport.SQS.AcceptanceTests/Sending/When_sending_messages_with_invalid_sqs_chars.cs b/src/NServiceBus.Transport.SQS.AcceptanceTests/Sending/When_sending_messages_with_invalid_sqs_chars.cs
@@ -36,12 +36,14 @@ public async Task Can_be_sent_and_processed()
 
     class Sender : EndpointConfigurationBuilder
     {
-        public Sender() => EndpointSetup<DefaultServer>(cfg => cfg.ConfigureSqsTransport().DoNotWrapOutgoingMessages = true);
+        public Sender() => EndpointSetup<DefaultServer>(cfg =>
+        {
+            cfg.EnableFeature<DispatchControlMessageAtStartup>();
+            cfg.ConfigureSqsTransport().DoNotWrapOutgoingMessages = true;
+        });
 
         class DispatchControlMessageAtStartup : Feature
         {
-            public DispatchControlMessageAtStartup() => EnableByDefault();
-
             protected override void Setup(FeatureConfigurationContext context) =>
                 context.RegisterStartupTask(sp => new Startup(
                     sp.GetRequiredService<IMessageDispatcher>(),
diff --git a/src/NServiceBus.Transport.SQS.AcceptanceTests/TestingInMemoryPersistence.cs b/src/NServiceBus.Transport.SQS.AcceptanceTests/TestingInMemoryPersistence.cs
@@ -15,23 +15,16 @@
 using Unicast.Subscriptions;
 using Unicast.Subscriptions.MessageDrivenSubscriptions;
 
-public class TestingInMemoryPersistence : PersistenceDefinition
+public class TestingInMemoryPersistence : PersistenceDefinition, IPersistenceDefinitionFactory<TestingInMemoryPersistence>
 {
-    internal TestingInMemoryPersistence()
-    {
-        Supports<StorageType.Subscriptions>(s =>
-        {
-            s.EnableFeatureByDefault<TestingInMemorySubscriptionPersistence>();
-        });
-    }
+    TestingInMemoryPersistence() => Supports<StorageType.Subscriptions, TestingInMemorySubscriptionPersistence>();
+
+    public static TestingInMemoryPersistence Create() => new();
 }
 
 public static class InMemoryPersistenceExtensions
 {
-    public static void UseStorage(this PersistenceExtensions<TestingInMemoryPersistence> extensions, TestingInMemorySubscriptionStorage storageInstance)
-    {
-        extensions.GetSettings().Set("InMemoryPersistence.StorageInstance", storageInstance);
-    }
+    public static void UseStorage(this PersistenceExtensions<TestingInMemoryPersistence> extensions, TestingInMemorySubscriptionStorage storageInstance) => extensions.GetSettings().Set("InMemoryPersistence.StorageInstance", storageInstance);
 }
 
 public class TestingInMemorySubscriptionPersistence : Features.Feature
@@ -57,29 +50,31 @@ public Task Subscribe(Subscriber subscriber, MessageType messageType, ContextBag
         return Task.FromResult(true);
     }
 
-    static string BuildKey(Subscriber subscriber)
-    {
-        return $"{subscriber.TransportAddress ?? ""}_{subscriber.Endpoint ?? ""}";
-    }
+    static string BuildKey(Subscriber subscriber) => $"{subscriber.TransportAddress ?? ""}_{subscriber.Endpoint ?? ""}";
 
     public Task Unsubscribe(Subscriber subscriber, MessageType messageType, ContextBag context, CancellationToken cancellationToken)
     {
         if (storage.TryGetValue(messageType, out var dict))
         {
             dict.TryRemove(BuildKey(subscriber), out var _);
         }
+
         return Task.FromResult(true);
     }
 
     public Task<IEnumerable<Subscriber>> GetSubscriberAddressesForMessage(IEnumerable<MessageType> messageTypes, ContextBag context, CancellationToken cancellationToken)
     {
         var subscribers = messageTypes
             .SelectMany(msgType => storage.TryGetValue(msgType, out var subs) ? subs.Values : [])
-            .GroupBy(s => new { s.TransportAddress, s.Endpoint }) // Subscriber does not implement IEquatable<T>
+            .GroupBy(s => new
+            {
+                s.TransportAddress,
+                s.Endpoint
+            }) // Subscriber does not implement IEquatable<T>
             .Select(g => g.First());
 
         return Task.FromResult(subscribers);
     }
 
-    ConcurrentDictionary<MessageType, ConcurrentDictionary<string, Subscriber>> storage = new ConcurrentDictionary<MessageType, ConcurrentDictionary<string, Subscriber>>();
+    readonly ConcurrentDictionary<MessageType, ConcurrentDictionary<string, Subscriber>> storage = new();
 }
diff --git a/src/NServiceBus.Transport.SQS.TransportTests.DoNotWrapOutgoingMessages/NServiceBus.Transport.SQS.TransportTests.DoNotWrapOutgoingMessages.csproj b/src/NServiceBus.Transport.SQS.TransportTests.DoNotWrapOutgoingMessages/NServiceBus.Transport.SQS.TransportTests.DoNotWrapOutgoingMessages.csproj
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
-    <PackageReference Include="NServiceBus.TransportTests.Sources" Version="10.0.0-alpha.6" GeneratePathProperty="true" />
+    <PackageReference Include="NServiceBus.TransportTests.Sources" Version="10.0.0-alpha.10" GeneratePathProperty="true" />
     <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.11.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
diff --git a/src/NServiceBus.Transport.SQS.TransportTests/NServiceBus.Transport.SQS.TransportTests.csproj b/src/NServiceBus.Transport.SQS.TransportTests/NServiceBus.Transport.SQS.TransportTests.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
-    <PackageReference Include="NServiceBus.TransportTests.Sources" Version="10.0.0-alpha.6" GeneratePathProperty="true" />
+    <PackageReference Include="NServiceBus.TransportTests.Sources" Version="10.0.0-alpha.10" GeneratePathProperty="true" />
     <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.11.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
diff --git a/src/NServiceBus.Transport.SQS/NServiceBus.Transport.SQS.csproj b/src/NServiceBus.Transport.SQS/NServiceBus.Transport.SQS.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="AWSSDK.SimpleNotificationService" Version="4.0.2.2" />
     <PackageReference Include="AWSSDK.SQS" Version="4.0.2" />
     <PackageReference Include="BitFaster.Caching" Version="2.5.4" />
-    <PackageReference Include="NServiceBus" Version="10.0.0-alpha.6" />
+    <PackageReference Include="NServiceBus" Version="10.0.0-alpha.10" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -15,23 +15,16 @@`
`15`	`15`	`using Unicast.Subscriptions;`
`16`	`16`	`using Unicast.Subscriptions.MessageDrivenSubscriptions;`
`17`	`17`
`18`		`-public class TestingInMemoryPersistence : PersistenceDefinition`
	`18`	`+public class TestingInMemoryPersistence : PersistenceDefinition, IPersistenceDefinitionFactory<TestingInMemoryPersistence>`
`19`	`19`	`{`
`20`		`- internal TestingInMemoryPersistence()`
`21`		`- {`
`22`		`- Supports<StorageType.Subscriptions>(s =>`
`23`		`- {`
`24`		`- s.EnableFeatureByDefault<TestingInMemorySubscriptionPersistence>();`
`25`		`- });`
`26`		`- }`
	`20`	`+ TestingInMemoryPersistence() => Supports<StorageType.Subscriptions, TestingInMemorySubscriptionPersistence>();`
	`21`	`+`
	`22`	`+ public static TestingInMemoryPersistence Create() => new();`
`27`	`23`	`}`
`28`	`24`
`29`	`25`	`public static class InMemoryPersistenceExtensions`
`30`	`26`	`{`
`31`		`- public static void UseStorage(this PersistenceExtensions<TestingInMemoryPersistence> extensions, TestingInMemorySubscriptionStorage storageInstance)`
`32`		`- {`
`33`		`- extensions.GetSettings().Set("InMemoryPersistence.StorageInstance", storageInstance);`
`34`		`- }`
	`27`	`+ public static void UseStorage(this PersistenceExtensions<TestingInMemoryPersistence> extensions, TestingInMemorySubscriptionStorage storageInstance) => extensions.GetSettings().Set("InMemoryPersistence.StorageInstance", storageInstance);`
`35`	`28`	`}`
`36`	`29`
`37`	`30`	`public class TestingInMemorySubscriptionPersistence : Features.Feature`
`@@ -57,29 +50,31 @@ public Task Subscribe(Subscriber subscriber, MessageType messageType, ContextBag`
`57`	`50`	`return Task.FromResult(true);`
`58`	`51`	`}`
`59`	`52`
`60`		`- static string BuildKey(Subscriber subscriber)`
`61`		`- {`
`62`		`- return $"{subscriber.TransportAddress ?? ""}_{subscriber.Endpoint ?? ""}";`
`63`		`- }`
	`53`	`+ static string BuildKey(Subscriber subscriber) => $"{subscriber.TransportAddress ?? ""}_{subscriber.Endpoint ?? ""}";`
`64`	`54`
`65`	`55`	`public Task Unsubscribe(Subscriber subscriber, MessageType messageType, ContextBag context, CancellationToken cancellationToken)`
`66`	`56`	`{`
`67`	`57`	`if (storage.TryGetValue(messageType, out var dict))`
`68`	`58`	`{`
`69`	`59`	`dict.TryRemove(BuildKey(subscriber), out var _);`
`70`	`60`	`}`
	`61`	`+`
`71`	`62`	`return Task.FromResult(true);`
`72`	`63`	`}`
`73`	`64`
`74`	`65`	`public Task<IEnumerable<Subscriber>> GetSubscriberAddressesForMessage(IEnumerable<MessageType> messageTypes, ContextBag context, CancellationToken cancellationToken)`
`75`	`66`	`{`
`76`	`67`	`var subscribers = messageTypes`
`77`	`68`	`.SelectMany(msgType => storage.TryGetValue(msgType, out var subs) ? subs.Values : [])`
`78`		`- .GroupBy(s => new { s.TransportAddress, s.Endpoint }) // Subscriber does not implement IEquatable<T>`
	`69`	`+ .GroupBy(s => new`
	`70`	`+ {`
	`71`	`+ s.TransportAddress,`
	`72`	`+ s.Endpoint`
	`73`	`+ }) // Subscriber does not implement IEquatable<T>`
`79`	`74`	`.Select(g => g.First());`
`80`	`75`
`81`	`76`	`return Task.FromResult(subscribers);`
`82`	`77`	`}`
`83`	`78`
`84`		`- ConcurrentDictionary<MessageType, ConcurrentDictionary<string, Subscriber>> storage = new ConcurrentDictionary<MessageType, ConcurrentDictionary<string, Subscriber>>();`
	`79`	`+ readonly ConcurrentDictionary<MessageType, ConcurrentDictionary<string, Subscriber>> storage = new();`
`85`	`80`	`}`