diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 5812e0a930..715e512064 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -34,8 +34,8 @@
-
-
+
+
@@ -52,7 +52,7 @@
-
+
@@ -94,4 +94,4 @@
-
+
\ No newline at end of file
diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_encountered_an_error.cs b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_encountered_an_error.cs
index c4401d3d3d..a50af7fb49 100644
--- a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_encountered_an_error.cs
+++ b/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();
+
CustomConfiguration = config =>
{
config.OnEndpointSubscribed((s, ctx) =>
@@ -37,8 +39,6 @@ public async Task Should_restart_dispatch_thread()
externalProcessorSubscribed = true;
}
});
-
- config.RegisterComponents(services => services.AddSingleton());
};
ExecuteWhen(() => externalProcessorSubscribed, domainEvents => domainEvents.Raise(new EndpointFailedToHeartbeat
diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_requesting_a_message_body.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_requesting_a_message_body.cs
index f38e5f3414..7a8df6b7de 100644
--- a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_requesting_a_message_body.cs
+++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_requesting_a_message_body.cs
@@ -92,14 +92,10 @@ class MyMessage : ICommand
class RemoteEndpoint : EndpointConfigurationBuilder
{
- public RemoteEndpoint() => EndpointSetup(c => c.RegisterComponents(services => services.AddSingleton()));
+ public RemoteEndpoint() => EndpointSetup((c, context) => c.RegisterMessageMutator(new MessageBodySpy(context)));
- public class MessageBodySpy : IMutateIncomingTransportMessages
+ public class MessageBodySpy(MyContext testContext) : IMutateIncomingTransportMessages
{
- readonly MyContext testContext;
-
- public MessageBodySpy(MyContext testContext) => this.testContext = testContext;
-
public Task MutateIncoming(MutateIncomingTransportMessageContext context)
{
testContext.MessageContentType = context.Headers[Headers.ContentType];
diff --git a/src/ServiceControl.Transports.Tests/BasicEndpointSetup.cs b/src/ServiceControl.Transports.Tests/BasicEndpointSetup.cs
index 95bda2b31b..f31fe1a75e 100644
--- a/src/ServiceControl.Transports.Tests/BasicEndpointSetup.cs
+++ b/src/ServiceControl.Transports.Tests/BasicEndpointSetup.cs
@@ -15,7 +15,6 @@ public async Task GetConfiguration(RunDescriptor runDescr
var endpointConfiguration = new EndpointConfiguration(endpointCustomization.EndpointName);
endpointConfiguration.UseSerialization();
- endpointConfiguration.RegisterComponentsAndInheritanceHierarchy(runDescriptor);
var recoverability = endpointConfiguration.Recoverability();
recoverability.Immediate(c => c.NumberOfRetries(3));
diff --git a/src/ServiceControl.Transports.Tests/EndpointTestExtensions.cs b/src/ServiceControl.Transports.Tests/EndpointTestExtensions.cs
deleted file mode 100644
index 828d187339..0000000000
--- a/src/ServiceControl.Transports.Tests/EndpointTestExtensions.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace ServiceControl.Transport.Tests
-{
- using System;
- using Microsoft.Extensions.DependencyInjection;
- using NServiceBus;
- using NServiceBus.AcceptanceTesting.Support;
-
- public static class EndpointTestExtensions
- {
- public static void RegisterComponentsAndInheritanceHierarchy(this EndpointConfiguration builder, RunDescriptor runDescriptor) => builder.RegisterComponents(
- services => { RegisterInheritanceHierarchyOfContextOnContainer(runDescriptor, services); });
-
- static void RegisterInheritanceHierarchyOfContextOnContainer(RunDescriptor runDescriptor,
- IServiceCollection services)
- {
- Type type = runDescriptor.ScenarioContext.GetType();
- while (type != typeof(object))
- {
- services.AddSingleton(type, runDescriptor.ScenarioContext);
- type = type.BaseType;
- }
- }
- }
-}
\ No newline at end of file