prepare-for-core-upgrade

src/Directory.Packages.props

@@ -34,11 +34,10 @@
     <PackageVersion Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
     <PackageVersion Include="Mindscape.Raygun4Net.NetCore" Version="11.2.5" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="6.1.3" />
-    <PackageVersion Include="NServiceBus" Version="10.1.4" />
-    <PackageVersion Include="NServiceBus.AcceptanceTesting" Version="10.1.4" />
+    <PackageVersion Include="NServiceBus" Version="10.2.0-alpha.10" />
+    <PackageVersion Include="NServiceBus.AcceptanceTesting" Version="10.2.0-alpha.10" />
     <PackageVersion Include="NServiceBus.AmazonSQS" Version="9.0.1" />
     <PackageVersion Include="NServiceBus.CustomChecks" Version="6.0.1" />
-    <PackageVersion Include="NServiceBus.Extensions.Hosting" Version="4.0.1" />
     <PackageVersion Include="NServiceBus.Extensions.Logging" Version="4.0.1" />
     <PackageVersion Include="NServiceBus.Heartbeat" Version="6.0.0" />
     <PackageVersion Include="NServiceBus.Metrics" Version="6.0.1" />
@@ -52,7 +51,7 @@
     <PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="4.0.1" />
     <PackageVersion Include="NServiceBus.Transport.PostgreSql" Version="9.0.1" />
     <PackageVersion Include="NServiceBus.Transport.SqlServer" Version="9.0.1" />
-    <PackageVersion Include="NServiceBus.Transport.IBMMQ" Version="1.0.1"/>
+    <PackageVersion Include="NServiceBus.Transport.IBMMQ" Version="1.0.1" />
     <PackageVersion Include="NuGet.Versioning" Version="7.3.1" />
     <PackageVersion Include="NUnit" Version="4.6.0" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.13.0" />
@@ -94,4 +93,4 @@
     <GlobalPackageReference Include="Microsoft.Build.CopyOnWrite" Version="1.0.334" />
     <GlobalPackageReference Include="Particular.Packaging" Version="4.5.0" />
   </ItemGroup>
-</Project>
+</Project>

src/ServiceControl.AcceptanceTesting/EndpointConfigurationExtensions.cs

@@ -6,7 +6,6 @@
     using System.Reflection;
     using System.Threading.Tasks;
     using InfrastructureConfig;
-    using Microsoft.Extensions.DependencyInjection;
     using NServiceBus;
     using NServiceBus.AcceptanceTesting.Customization;
     using NServiceBus.AcceptanceTesting.Support;
@@ -62,19 +61,6 @@ public static async Task DefinePersistence(this EndpointConfiguration config, Ru
             runDescriptor.OnTestCompleted(_ => persistenceConfiguration.Cleanup());
         }
 
-        public static void RegisterComponentsAndInheritanceHierarchy(this EndpointConfiguration builder, RunDescriptor runDescriptor) => builder.RegisterComponents(services => { RegisterInheritanceHierarchyOfContextOnContainer(runDescriptor, services); });
-
-        static void RegisterInheritanceHierarchyOfContextOnContainer(RunDescriptor runDescriptor,
-            IServiceCollection services)
-        {
-            var type = runDescriptor.ScenarioContext.GetType();
-            while (type != typeof(object))
-            {
-                services.AddSingleton(type, runDescriptor.ScenarioContext);
-                type = type.BaseType;
-            }
-        }
-
         public static void NoImmediateRetries(this EndpointConfiguration configuration)
             => configuration.Recoverability().Immediate(x => x.NumberOfRetries(0));
 

src/ServiceControl.AcceptanceTesting/EndpointTemplates/DefaultServerBase.cs

@@ -30,7 +30,6 @@ public virtual async Task<EndpointConfiguration> GetConfiguration(RunDescriptor
             await endpointTestExecutionConfiguration.Configure(endpointCustomizations.EndpointName, endpointConfiguration, runDescriptor.Settings, endpointCustomizations.PublisherMetadata);
             runDescriptor.OnTestCompleted(_ => endpointTestExecutionConfiguration.Cleanup());
 
-            endpointConfiguration.RegisterComponentsAndInheritanceHierarchy(runDescriptor);
             await endpointConfiguration.DefinePersistence(runDescriptor, endpointCustomizations);
 
             endpointConfiguration.UseSerialization<SystemJsonSerializer>();

src/ServiceControl.AcceptanceTesting/NServiceBusAcceptanceTest.cs

@@ -17,10 +17,7 @@
     public abstract partial class NServiceBusAcceptanceTest
     {
         [SetUp]
-        public void SetUp()
-        {
-            LogManager.Use<DefaultFactory>(); // Ensures that every test the log manager is 'reset' as log manager can otherwise point to disposed resources. For example, when a test uses NServiceBus hosting
-
+        public void SetUp() =>
             Conventions.EndpointNamingConvention = t =>
             {
                 var classAndEndpoint = t.FullName.Split('.').Last();
@@ -37,7 +34,6 @@ public void SetUp()
 
                 return testName + "." + endpointBuilder;
             };
-        }
 
         [TearDown]
         public void TearDown()

src/ServiceControl.AcceptanceTesting/TraceIncomingBehavior.cs

@@ -8,16 +8,11 @@ namespace ServiceControl.AcceptanceTesting
     using NServiceBus.Pipeline;
     using NServiceBus.Settings;
 
-    public class TraceIncomingBehavior : IBehavior<IIncomingLogicalMessageContext, IIncomingLogicalMessageContext>
+    public class TraceIncomingBehavior(IReadOnlySettings settings) : IBehavior<IIncomingLogicalMessageContext, IIncomingLogicalMessageContext>
     {
-        public TraceIncomingBehavior(ScenarioContext scenarioContext, IReadOnlySettings settings)
-        {
-            this.scenarioContext = scenarioContext;
-            this.settings = settings;
-        }
-
         public Task Invoke(IIncomingLogicalMessageContext context, Func<IIncomingLogicalMessageContext, Task> next)
         {
+            var scenarioContext = settings.Get<ScenarioContext>();
             scenarioContext.Logs.Enqueue(new ScenarioContext.LogItem
             {
                 Endpoint = settings.EndpointName(),
@@ -28,15 +23,6 @@ public Task Invoke(IIncomingLogicalMessageContext context, Func<IIncomingLogical
             return next(context);
         }
 
-        ScenarioContext scenarioContext;
-        IReadOnlySettings settings;
-
-        public class Registration : RegisterStep
-        {
-            public Registration()
-                : base("TraceIncomingBehavior", typeof(TraceIncomingBehavior), "Adds incoming messages to the acceptance test trace")
-            {
-            }
-        }
+        public class Registration() : RegisterStep("TraceIncomingBehavior", typeof(TraceIncomingBehavior), "Adds incoming messages to the acceptance test trace");
     }
 }

src/ServiceControl.AcceptanceTesting/TraceOutgoingBehavior.cs

@@ -8,16 +8,11 @@ namespace ServiceControl.AcceptanceTesting
     using NServiceBus.Pipeline;
     using NServiceBus.Settings;
 
-    public class TraceOutgoingBehavior : IBehavior<IOutgoingLogicalMessageContext, IOutgoingLogicalMessageContext>
+    public class TraceOutgoingBehavior(IReadOnlySettings settings) : IBehavior<IOutgoingLogicalMessageContext, IOutgoingLogicalMessageContext>
     {
-        public TraceOutgoingBehavior(ScenarioContext scenarioContext, IReadOnlySettings settings)
-        {
-            this.scenarioContext = scenarioContext;
-            this.settings = settings;
-        }
-
         public Task Invoke(IOutgoingLogicalMessageContext context, Func<IOutgoingLogicalMessageContext, Task> next)
         {
+            var scenarioContext = settings.Get<ScenarioContext>();
             scenarioContext.Logs.Enqueue(new ScenarioContext.LogItem
             {
                 Endpoint = settings.EndpointName(),
@@ -28,15 +23,6 @@ public Task Invoke(IOutgoingLogicalMessageContext context, Func<IOutgoingLogical
             return next(context);
         }
 
-        ScenarioContext scenarioContext;
-        IReadOnlySettings settings;
-
-        public class Registration : RegisterStep
-        {
-            public Registration()
-                : base("TraceOutgoingBehavior", typeof(TraceOutgoingBehavior), "Adds outgoing messages to the acceptance test trace")
-            {
-            }
-        }
+        public class Registration() : RegisterStep("TraceOutgoingBehavior", typeof(TraceOutgoingBehavior), "Adds outgoing messages to the acceptance test trace");
     }
 }

src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_encountered_an_error.cs

@@ -28,6 +28,8 @@ public async Task Should_restart_dispatch_thread()
         {
             var externalProcessorSubscribed = false;
 
+            CustomizeHostBuilder = builder => builder.Services.AddSingleton<IEventPublisher, FaultyPublisher>();
+
             CustomConfiguration = config =>
             {
                 config.OnEndpointSubscribed<MyContext>((s, ctx) =>
@@ -37,8 +39,6 @@ public async Task Should_restart_dispatch_thread()
                         externalProcessorSubscribed = true;
                     }
                 });
-
-                config.RegisterComponents(services => services.AddSingleton<IEventPublisher, FaultyPublisher>());
             };
 
             ExecuteWhen(() => externalProcessorSubscribed, domainEvents => domainEvents.Raise(new EndpointFailedToHeartbeat

src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_errors_with_same_uniqueid_are_imported.cs

@@ -24,15 +24,15 @@ public async Task The_import_should_deduplicate_on_TimeOfFailure()
         {
             var criticalErrorExecuted = false;
 
-            SetSettings = settings => { settings.MaximumConcurrencyLevel = 10; };
+            SetSettings = settings => settings.MaximumConcurrencyLevel = 10;
+            CustomizeHostBuilder = builder => builder.Services.AddSingleton<CounterEnricher>();
             CustomConfiguration = config =>
             {
-                config.DefineCriticalErrorAction((_, __) =>
+                config.DefineCriticalErrorAction((_, _) =>
                 {
                     criticalErrorExecuted = true;
                     return Task.CompletedTask;
                 });
-                config.RegisterComponents(services => services.AddSingleton<CounterEnricher>());
             };
 
             FailedMessage failure = null;

src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_without_a_correlationid_header_is_retried.cs

@@ -64,7 +64,7 @@ public Receiver() =>
                 EndpointSetup<DefaultServerWithoutAudit>(c =>
                 {
                     c.NoRetries();
-                    c.RegisterComponents(services => services.AddSingleton<CorrelationIdRemover>());
+                    c.RegisterMessageMutator(new CorrelationIdRemover());
                 });
 
             public class MyMessageHandler(MyContext testContext, IReadOnlySettings settings)

src/ServiceControl.AcceptanceTests/Recoverability/When_single_message_fails_in_batch.cs

@@ -24,14 +24,11 @@ class When_single_message_fails_in_batch : AcceptanceTest
         public async Task Should_import_all_messages()
         {
             //Make sure the error import attempt fails
-            CustomConfiguration = config => { config.RegisterComponents(services => services.AddSingleton<FailOnceEnricher>()); };
+            CustomizeHostBuilder = builder => builder.Services.AddSingleton<FailOnceEnricher>();
 
             var maximumConcurrencyLevel = 5;
 
-            SetSettings = settings =>
-            {
-                settings.MaximumConcurrencyLevel = maximumConcurrencyLevel;
-            };
+            SetSettings = settings => settings.MaximumConcurrencyLevel = maximumConcurrencyLevel;
 
             await Define<MyContext>(ctx =>
                 {

src/ServiceControl.AcceptanceTests/TestSupport/EndpointConfigurationExtensions.cs

@@ -1,10 +1,9 @@
 namespace ServiceControl.AcceptanceTests.TestSupport
 {
-    using System.IO;
     using AcceptanceTesting;
-    using Microsoft.Extensions.DependencyInjection;
     using NServiceBus;
     using NServiceBus.AcceptanceTesting;
+    using NServiceBus.AcceptanceTesting.Customization;
     using NServiceBus.Configuration.AdvancedExtensibility;
 
     public static class EndpointConfigurationExtensions
@@ -17,21 +16,14 @@ public static void ReportSuccessfulRetriesToServiceControl(this EndpointConfigur
         public static void CustomizeServiceControlEndpointTesting(this EndpointConfiguration configuration, ScenarioContext context)
         {
             configuration.GetSettings().Set("SC.ScenarioContext", context);
-            configuration.GetSettings().Set(context);
-
-            configuration.RegisterComponents(r =>
-            {
-                r.AddSingleton(context.GetType(), context);
-                r.AddSingleton(typeof(ScenarioContext), context);
-            });
+            configuration.RegisterScenarioContext(context);
 
             configuration.Pipeline.Register<TraceIncomingBehavior.Registration>();
             configuration.Pipeline.Register<TraceOutgoingBehavior.Registration>();
             configuration.Pipeline.Register(new StampDispatchBehavior(context), "Stamps outgoing messages with session ID");
             configuration.Pipeline.Register(new DiscardMessagesBehavior(context), "Discards messages based on session ID");
 
-            var assemblyScanner = configuration.AssemblyScanner();
-            assemblyScanner.ExcludeAssemblies(Path.GetFileName(typeof(ServiceControlComponentRunner).Assembly.Location));
+            configuration.AssemblyScanner().Disable = true;
         }
     }
 }

src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs

@@ -21,6 +21,7 @@
     using Microsoft.Extensions.Logging;
     using NServiceBus;
     using NServiceBus.AcceptanceTesting;
+    using NServiceBus.AcceptanceTesting.Customization;
     using NServiceBus.AcceptanceTesting.Support;
     using Particular.ServiceControl;
     using Particular.ServiceControl.Hosting;
@@ -122,6 +123,8 @@ async Task InitializeServiceControl(ScenarioContext context)
                     // Force the DI container to run the dependency resolution check to verify all dependencies can be resolved
                     EnvironmentName = Environments.Development
                 });
+
+                hostBuilder.Services.AddScenarioContext(context);
                 hostBuilder.AddServiceControlAuthentication(settings.OpenIdConnectSettings);
                 hostBuilder.AddServiceControl(settings, configuration);
                 hostBuilder.AddServiceControlHttps(settings.HttpsSettings);

src/ServiceControl.AcceptanceTests/TestSupport/WebApplicationBuilderExtensions.cs

@@ -13,7 +13,6 @@ public static void AddServiceControlTesting(this WebApplicationBuilder hostBuild
     {
         // Do not register additional test controllers or hosted services here. Instead, in the test that needs them, use (for example):
         // CustomizeHostBuilder = builder => builder.ConfigureServices((hostContext, services) => services.AddHostedService<SetupNotificationSettings>());
-        hostBuilder.Logging.AddScenarioContextLogging();
 
         hostBuilder.WebHost.UseTestServer(options => options.BaseAddress = new Uri(settings.RootUrl));