Update analysis level (#7594)

bording · web-flow · commit 4576f8959ead · 2026-01-14T12:25:00.000-05:00
* Update AnalysisLevel

* Fix CA2263

* Fix CA2264
diff --git a/src/Custom.Build.props b/src/Custom.Build.props
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AnalyzerTargetFramework>netstandard2.0</AnalyzerTargetFramework>
-    <AnalysisLevel>8.0-minimum</AnalysisLevel>
+    <AnalysisLevel>10.0-minimum</AnalysisLevel>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/NServiceBus.AcceptanceTesting/Support/SubscriptionBehavior.cs b/src/NServiceBus.AcceptanceTesting/Support/SubscriptionBehavior.cs
@@ -29,7 +29,7 @@ public async Task Invoke(ITransportReceiveContext context, Func<ITransportReceiv
                 endpointName = string.Empty;
             }
 
-            var intent = (MessageIntent)Enum.Parse(typeof(MessageIntent), context.Message.Headers[Headers.MessageIntent], true);
+            var intent = Enum.Parse<MessageIntent>(context.Message.Headers[Headers.MessageIntent], true);
             if (intent != intentToHandle)
             {
                 return;
diff --git a/src/NServiceBus.AcceptanceTests/Core/AutomaticSubscriptions/When_excluding_event_type_from_autosubscribe.cs b/src/NServiceBus.AcceptanceTests/Core/AutomaticSubscriptions/When_excluding_event_type_from_autosubscribe.cs
@@ -40,7 +40,7 @@ public Subscriber() =>
                 {
                     c.Pipeline.Register("SubscriptionSpy", new SubscriptionSpy((Context)r.ScenarioContext), "Spies on subscriptions made");
                     c.AutoSubscribe().DisableFor<EventToExclude>();
-                    c.AutoSubscribe().DisableFor(typeof(EventWithNoPublisher));
+                    c.AutoSubscribe().DisableFor<EventWithNoPublisher>();
                 },
                 metadata =>
                 {
diff --git a/src/NServiceBus.AcceptanceTests/Core/Recoverability/When_configuring_unrecoverable_exception.cs b/src/NServiceBus.AcceptanceTests/Core/Recoverability/When_configuring_unrecoverable_exception.cs
@@ -49,7 +49,7 @@ public EndpointWithFailingHandler()
         {
             EndpointSetup<DefaultServer>((config, context) =>
             {
-                config.Recoverability().AddUnrecoverableException(typeof(CustomException));
+                config.Recoverability().AddUnrecoverableException<CustomException>();
                 config.Recoverability().Immediate(i => i.NumberOfRetries(2));
                 config.Recoverability().Delayed(d => d.NumberOfRetries(2));
             });
diff --git a/src/NServiceBus.AcceptanceTests/Core/Sagas/When_using_ReplyToOriginator.cs b/src/NServiceBus.AcceptanceTests/Core/Sagas/When_using_ReplyToOriginator.cs
@@ -79,7 +79,7 @@ class MyReplyToOriginatorHandler(Context testContext) : IHandleMessages<MyReplyT
         {
             public Task Handle(MyReplyToOriginator message, IMessageHandlerContext context)
             {
-                testContext.Intent = (MessageIntent)Enum.Parse(typeof(MessageIntent), context.MessageHeaders[Headers.MessageIntent]);
+                testContext.Intent = Enum.Parse<MessageIntent>(context.MessageHeaders[Headers.MessageIntent]);
                 testContext.CorrelationIdOnReply = context.MessageHeaders[Headers.CorrelationId];
                 return Task.CompletedTask;
             }
diff --git a/src/NServiceBus.ContainerTests/When_building_components.cs b/src/NServiceBus.ContainerTests/When_building_components.cs
@@ -91,7 +91,7 @@ public void Resolving_all_components_of_unregistered_types_should_give_empty_lis
         InitializeServices(serviceCollection);
         using var serviceProvider = serviceCollection.BuildServiceProvider();
 
-        Assert.That(serviceProvider.GetServices(typeof(UnregisteredComponent)), Is.Empty);
+        Assert.That(serviceProvider.GetServices<UnregisteredComponent>(), Is.Empty);
     }
 
     [Test]
@@ -112,9 +112,9 @@ public void Resolving_recursive_types_does_not_stack_overflow()
 
     static void InitializeServices(IServiceCollection serviceCollection)
     {
-        serviceCollection.AddSingleton(typeof(SingletonComponent));
-        serviceCollection.AddTransient(typeof(TransientComponent));
-        serviceCollection.AddScoped(typeof(ScopedComponent));
+        serviceCollection.AddSingleton<SingletonComponent>();
+        serviceCollection.AddTransient<TransientComponent>();
+        serviceCollection.AddScoped<ScopedComponent>();
         serviceCollection.AddSingleton(_ => new SingletonLambdaComponent());
         serviceCollection.AddTransient(_ => new TransientLambdaComponent());
         serviceCollection.AddScoped(_ => new ScopedLambdaComponent());
diff --git a/src/NServiceBus.ContainerTests/When_disposing_the_builder.cs b/src/NServiceBus.ContainerTests/When_disposing_the_builder.cs
@@ -14,8 +14,8 @@ public void Should_dispose_all_IDisposable_components()
         DisposableComponent.DisposeCalled = false;
         AnotherSingletonComponent.DisposeCalled = false;
 
-        serviceCollection.AddSingleton(typeof(DisposableComponent));
-        serviceCollection.AddSingleton(typeof(AnotherSingletonComponent), new AnotherSingletonComponent());
+        serviceCollection.AddSingleton<DisposableComponent>();
+        serviceCollection.AddSingleton(new AnotherSingletonComponent());
 
         using var serviceProvider = serviceCollection.BuildServiceProvider();
         serviceProvider.GetService(typeof(DisposableComponent));
diff --git a/src/NServiceBus.ContainerTests/When_querying_for_registered_components.cs b/src/NServiceBus.ContainerTests/When_querying_for_registered_components.cs
@@ -36,8 +36,8 @@ public void Builders_should_not_determine_existence_by_building_components()
 
     static void InitializeBuilder(IServiceCollection c)
     {
-        c.AddTransient(typeof(ExistingComponent));
-        c.AddTransient(typeof(ExistingComponentWithUnsatisfiedDependency));
+        c.AddTransient<ExistingComponent>();
+        c.AddTransient<ExistingComponentWithUnsatisfiedDependency>();
     }
 
     public class NonExistingComponent
diff --git a/src/NServiceBus.ContainerTests/When_registering_components.cs b/src/NServiceBus.ContainerTests/When_registering_components.cs
@@ -14,11 +14,11 @@ public class When_registering_components
     public void Multiple_registrations_of_the_same_component_should_be_allowed()
     {
         var serviceCollection = new ServiceCollection();
-        serviceCollection.AddTransient(typeof(DuplicateClass));
-        serviceCollection.AddTransient(typeof(DuplicateClass));
+        serviceCollection.AddTransient<DuplicateClass>();
+        serviceCollection.AddTransient<DuplicateClass>();
 
         using var serviceProvider = serviceCollection.BuildServiceProvider();
-        Assert.That(serviceProvider.GetServices(typeof(DuplicateClass)).Count(), Is.EqualTo(2));
+        Assert.That(serviceProvider.GetServices<DuplicateClass>().Count(), Is.EqualTo(2));
     }
 
     [Test]
@@ -36,8 +36,8 @@ public void Should_support_lambdas_that_uses_other_components_registered_later()
     public void A_registration_should_be_allowed_to_be_updated()
     {
         var serviceCollection = new ServiceCollection();
-        serviceCollection.AddSingleton(typeof(ISingletonComponent), new SingletonComponent());
-        serviceCollection.AddSingleton(typeof(ISingletonComponent), new AnotherSingletonComponent());
+        serviceCollection.AddSingleton<ISingletonComponent>(new SingletonComponent());
+        serviceCollection.AddSingleton<ISingletonComponent>(new AnotherSingletonComponent());
 
         using var serviceProvider = serviceCollection.BuildServiceProvider();
         Assert.That(serviceProvider.GetService(typeof(ISingletonComponent)), Is.InstanceOf<AnotherSingletonComponent>());
@@ -48,8 +48,8 @@ public void Register_singleton_should_be_supported()
     {
         var singleton = new SingletonComponent();
         var serviceCollection = new ServiceCollection();
-        serviceCollection.AddSingleton(typeof(ISingletonComponent), singleton);
-        serviceCollection.AddSingleton(typeof(SingletonComponent), singleton);
+        serviceCollection.AddSingleton<ISingletonComponent>(singleton);
+        serviceCollection.AddSingleton(singleton);
 
         using var serviceProvider = serviceCollection.BuildServiceProvider();
         Assert.That(singleton, Is.EqualTo(serviceProvider.GetService(typeof(SingletonComponent))));
@@ -61,9 +61,9 @@ public void Registering_the_same_singleton_for_different_interfaces_should_be_su
     {
         var serviceCollection = new ServiceCollection();
         var singleton = new SingletonThatImplementsToInterfaces();
-        serviceCollection.AddSingleton(typeof(ISingleton1), singleton);
-        serviceCollection.AddSingleton(typeof(ISingleton2), singleton);
-        serviceCollection.AddTransient(typeof(ComponentThatDependsOnMultiSingletons));
+        serviceCollection.AddSingleton<ISingleton1>(singleton);
+        serviceCollection.AddSingleton<ISingleton2>(singleton);
+        serviceCollection.AddTransient<ComponentThatDependsOnMultiSingletons>();
 
         using var serviceProvider = serviceCollection.BuildServiceProvider();
         var dependency = (ComponentThatDependsOnMultiSingletons)serviceProvider.GetService(typeof(ComponentThatDependsOnMultiSingletons));
@@ -83,7 +83,7 @@ public void Given_lookupType_should_be_used_as_service_in_the_registration_when_
     {
         var serviceCollection = new ServiceCollection();
         var expected = new InheritedFromSomeClass();
-        serviceCollection.AddSingleton(typeof(SomeClass), expected);
+        serviceCollection.AddSingleton<SomeClass>(expected);
 
         using var serviceProvider = serviceCollection.BuildServiceProvider();
         Assert.That(serviceProvider.GetService(typeof(SomeClass)), Is.EqualTo(expected));
diff --git a/src/NServiceBus.ContainerTests/When_using_nested_containers.cs b/src/NServiceBus.ContainerTests/When_using_nested_containers.cs
@@ -11,7 +11,7 @@ public class When_using_nested_containers
     public async Task Scoped__components_should_be_disposed_when_the_child_container_is_disposed()
     {
         var serviceCollection = new ServiceCollection();
-        serviceCollection.AddScoped(typeof(ScopedComponent));
+        serviceCollection.AddScoped<ScopedComponent>();
 
         var serviceProvider = serviceCollection.BuildServiceProvider();
         await using (serviceProvider.ConfigureAwait(false))
@@ -30,7 +30,7 @@ public async Task Scoped__components_should_be_disposed_when_the_child_container
     public void Scoped_components_should_yield_different_instances_between_parent_and_child_containers()
     {
         var serviceCollection = new ServiceCollection();
-        serviceCollection.AddScoped(typeof(ScopedComponent));
+        serviceCollection.AddScoped<ScopedComponent>();
 
         using var serviceProvider = serviceCollection.BuildServiceProvider();
 
@@ -47,7 +47,7 @@ public void Scoped_components_should_yield_different_instances_between_parent_an
     public void Scoped_components_should_yield_different_instances_between_different_instances_of_child_containers()
     {
         var serviceCollection = new ServiceCollection();
-        serviceCollection.AddScoped(typeof(ScopedComponent));
+        serviceCollection.AddScoped<ScopedComponent>();
 
         using var serviceProvider = serviceCollection.BuildServiceProvider();
 
@@ -69,7 +69,7 @@ public void Scoped_components_should_yield_different_instances_between_different
     public void Transient_components_should_not_be_shared_across_child_containers()
     {
         var serviceCollection = new ServiceCollection();
-        serviceCollection.AddTransient(typeof(TransientComponent));
+        serviceCollection.AddTransient<TransientComponent>();
 
         using var serviceProvider = serviceCollection.BuildServiceProvider();
 
@@ -92,7 +92,7 @@ public void Transient_components_should_not_be_shared_across_child_containers()
     public void Scoped_components_in_the_parent_container_should_be_singletons_in_the_same_child_container()
     {
         var serviceCollection = new ServiceCollection();
-        serviceCollection.AddScoped(typeof(ScopedComponent));
+        serviceCollection.AddScoped<ScopedComponent>();
 
         using var serviceProvider = serviceCollection.BuildServiceProvider();
 
@@ -109,7 +109,7 @@ public void Scoped_components_in_the_parent_container_should_be_singletons_in_th
     public void Scoped_components_built_on_root_container_should_be_singletons_even_with_child_builder_present()
     {
         var serviceCollection = new ServiceCollection();
-        serviceCollection.AddScoped(typeof(ScopedComponent));
+        serviceCollection.AddScoped<ScopedComponent>();
 
         using var serviceProvider = serviceCollection.BuildServiceProvider();
 
@@ -128,8 +128,8 @@ public void Should_not_dispose_singletons_when_container_goes_out_of_scope()
     {
         var serviceCollection = new ServiceCollection();
         var singletonInMainContainer = new SingletonComponent();
-        serviceCollection.AddSingleton(typeof(ISingletonComponent), singletonInMainContainer);
-        serviceCollection.AddScoped(typeof(ComponentThatDependsOfSingleton));
+        serviceCollection.AddSingleton<ISingletonComponent>(singletonInMainContainer);
+        serviceCollection.AddScoped<ComponentThatDependsOfSingleton>();
 
         using var serviceProvider = serviceCollection.BuildServiceProvider();
 
@@ -146,8 +146,8 @@ public void Should_dispose_all_non_singleton_IDisposable_components_in_child_con
         var serviceCollection = new ServiceCollection();
         DisposableComponent.DisposeCalled = false;
         AnotherDisposableComponent.DisposeCalled = false;
-        serviceCollection.AddSingleton(typeof(AnotherDisposableComponent), new AnotherDisposableComponent());
-        serviceCollection.AddScoped(typeof(DisposableComponent));
+        serviceCollection.AddSingleton(new AnotherDisposableComponent());
+        serviceCollection.AddScoped<DisposableComponent>();
 
 
         using (var serviceProvider = serviceCollection.BuildServiceProvider())
diff --git a/src/NServiceBus.Core.Tests/Serializers/SystemTextJson/SystemJsonSerializerTests.cs b/src/NServiceBus.Core.Tests/Serializers/SystemTextJson/SystemJsonSerializerTests.cs
@@ -94,7 +94,7 @@ public void Test()
 
         Assert.DoesNotThrow(() => output.Position = 0, "Stream should still be open");
 
-        Assert.That(result[0], Is.TypeOf(typeof(A)));
+        Assert.That(result[0], Is.TypeOf<A>());
         var a = (A)result[0];
 
         using (Assert.EnterMultipleScope())
@@ -108,7 +108,7 @@ public void Test()
             Assert.That(a.DateTimeLocal, Is.EqualTo(expectedDateLocal));
             Assert.That(a.DateTimeUtc.Kind, Is.EqualTo(expectedDateUtc.Kind));
             Assert.That(a.DateTimeUtc, Is.EqualTo(expectedDateUtc));
-            Assert.That(a.Bs[0].C, Is.TypeOf(typeof(JsonElement)));
+            Assert.That(a.Bs[0].C, Is.TypeOf<JsonElement>());
             Assert.That(((JsonElement)a.Bs[0].C).GetProperty("Cstr").GetString(), Is.EqualTo("ccc"));
 
             Assert.That(a.AGuid, Is.EqualTo(expectedGuid));
@@ -168,7 +168,7 @@ public void TestInterfaces()
         Assert.That(result, Is.Not.Empty);
         Assert.That(result, Has.Length.EqualTo(1));
 
-        Assert.That(result[0], Is.AssignableTo(typeof(IA)));
+        Assert.That(result[0], Is.AssignableTo<IA>());
         var a = (IA)result[0];
 
         using (Assert.EnterMultipleScope())
@@ -181,7 +181,7 @@ public void TestInterfaces()
         using (Assert.EnterMultipleScope())
         {
             Assert.That(a.B.BString, Is.EqualTo("BOO"));
-            Assert.That(a.B.C, Is.TypeOf(typeof(JsonElement)));
+            Assert.That(a.B.C, Is.TypeOf<JsonElement>());
             Assert.That(((JsonElement)a.B.C).GetProperty("Cstr").GetString(), Is.EqualTo("COO"));
         }
 
diff --git a/src/NServiceBus.Core.Tests/Serializers/XML/SerializingArrayTests.cs b/src/NServiceBus.Core.Tests/Serializers/XML/SerializingArrayTests.cs
@@ -59,7 +59,7 @@ public void CanDeserializeXmlWithWhitespace()
         Assert.That(messages, Is.Not.Null);
         Assert.That(messages, Has.Length.EqualTo(1));
 
-        Assert.That(messages[0], Is.TypeOf(typeof(MessageWithArray)));
+        Assert.That(messages[0], Is.TypeOf<MessageWithArray>());
         var m = (MessageWithArray)messages[0];
 
         Assert.That(m.SomeInts, Is.Not.Null);
diff --git a/src/NServiceBus.Core/EndpointCreator.cs b/src/NServiceBus.Core/EndpointCreator.cs
@@ -75,7 +75,7 @@ void Configure()
 
         var pipelineSettings = settings.Get<PipelineSettings>();
 
-        hostingConfiguration.Services.AddSingleton(typeof(IReadOnlySettings), settings);
+        hostingConfiguration.Services.AddSingleton<IReadOnlySettings>(settings);
 
         var featureSettings = settings.Get<FeatureComponent.Settings>();
 
diff --git a/src/NServiceBus.Core/Hosting/HostInfoSettings.cs b/src/NServiceBus.Core/Hosting/HostInfoSettings.cs
@@ -36,7 +36,6 @@ public HostInfoSettings UsingInstalledFilePath() =>
     /// </remarks>
     public HostInfoSettings UsingCustomIdentifier(Guid id)
     {
-        ArgumentNullException.ThrowIfNull(id);
         config.Settings.Get<HostingComponent.Settings>().HostId = id;
         return this;
     }
diff --git a/src/NServiceBus.Core/MessageInterfaces/MessageMapper/Reflection/MessageMapper.cs b/src/NServiceBus.Core/MessageInterfaces/MessageMapper/Reflection/MessageMapper.cs
@@ -84,7 +84,7 @@ public void Initialize(IEnumerable<Type>? types)
     /// </summary>
     public T CreateInstance<T>(Action<T> action)
     {
-        var result = (T)CreateInstance(typeof(T));
+        var result = CreateInstance<T>();
 
         action(result);
 
diff --git a/src/NServiceBus.Core/MessageMutators/MutateTransportMessage/MutateIncomingTransportMessageContext.cs b/src/NServiceBus.Core/MessageMutators/MutateTransportMessage/MutateIncomingTransportMessageContext.cs
@@ -17,7 +17,6 @@ public class MutateIncomingTransportMessageContext : ICancellableContext
     public MutateIncomingTransportMessageContext(ReadOnlyMemory<byte> body, Dictionary<string, string> headers, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(headers);
-        ArgumentNullException.ThrowIfNull(body);
         Headers = headers;
 
         // Intentionally assign to field to not set the MessageBodyChanged flag.
@@ -37,7 +36,6 @@ public ReadOnlyMemory<byte> Body
         }
         set
         {
-            ArgumentNullException.ThrowIfNull(value);
             MessageBodyChanged = true;
             body = value;
         }
diff --git a/src/NServiceBus.Core/MessageMutators/MutateTransportMessage/MutateOutgoingTransportMessageContext.cs b/src/NServiceBus.Core/MessageMutators/MutateTransportMessage/MutateOutgoingTransportMessageContext.cs
@@ -18,7 +18,6 @@ public class MutateOutgoingTransportMessageContext : ICancellableContext
     public MutateOutgoingTransportMessageContext(ReadOnlyMemory<byte> outgoingBody, object outgoingMessage, Dictionary<string, string> outgoingHeaders, object? incomingMessage, IReadOnlyDictionary<string, string>? incomingHeaders, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(outgoingHeaders);
-        ArgumentNullException.ThrowIfNull(outgoingBody);
         ArgumentNullException.ThrowIfNull(outgoingMessage);
 
         OutgoingHeaders = outgoingHeaders;
@@ -44,7 +43,6 @@ public ReadOnlyMemory<byte> OutgoingBody
         get => outgoingBody;
         set
         {
-            ArgumentNullException.ThrowIfNull(value);
             MessageBodyChanged = true;
             outgoingBody = value;
         }
diff --git a/src/NServiceBus.Core/Persistence/PersistenceComponent.cs b/src/NServiceBus.Core/Persistence/PersistenceComponent.cs
@@ -47,7 +47,7 @@ public Configuration Initialize(SettingsHolder settings)
         return new Configuration(settings, persistenceSettings.Enabled, resultingSupportedStorages);
     }
 
-    static readonly ILog Logger = LogManager.GetLogger(typeof(PersistenceComponent));
+    static readonly ILog Logger = LogManager.GetLogger<PersistenceComponent>();
 
     public class Settings
     {
diff --git a/src/NServiceBus.Core/Pipeline/ConnectorContextExtensions.cs b/src/NServiceBus.Core/Pipeline/ConnectorContextExtensions.cs
@@ -198,7 +198,6 @@ public static IOutgoingLogicalMessageContext CreateOutgoingLogicalMessageContext
     /// </summary>
     public static IOutgoingPhysicalMessageContext CreateOutgoingPhysicalMessageContext(this StageConnector<IOutgoingLogicalMessageContext, IOutgoingPhysicalMessageContext> stageConnector, ReadOnlyMemory<byte> messageBody, IReadOnlyCollection<RoutingStrategy> routingStrategies, IOutgoingLogicalMessageContext sourceContext)
     {
-        ArgumentNullException.ThrowIfNull(messageBody);
         ArgumentNullException.ThrowIfNull(routingStrategies);
         ArgumentNullException.ThrowIfNull(sourceContext);
 
diff --git a/src/NServiceBus.Core/Pipeline/Incoming/ReceivePipelineCompleted.cs b/src/NServiceBus.Core/Pipeline/Incoming/ReceivePipelineCompleted.cs
@@ -16,8 +16,6 @@ public class ReceivePipelineCompleted
     public ReceivePipelineCompleted(IncomingMessage processedMessage, DateTimeOffset startedAt, DateTimeOffset completedAt)
     {
         ArgumentNullException.ThrowIfNull(processedMessage);
-        ArgumentNullException.ThrowIfNull(startedAt);
-        ArgumentNullException.ThrowIfNull(completedAt);
 
         ProcessedMessage = processedMessage;
         StartedAt = startedAt;
diff --git a/src/NServiceBus.Core/Recoverability/Faults/FailedMessage.cs b/src/NServiceBus.Core/Recoverability/Faults/FailedMessage.cs
@@ -20,7 +20,6 @@ public FailedMessage(string messageId, Dictionary<string, string> headers, ReadO
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(messageId);
         ArgumentNullException.ThrowIfNull(headers);
-        ArgumentNullException.ThrowIfNull(body);
         ArgumentNullException.ThrowIfNull(exception);
         ArgumentException.ThrowIfNullOrWhiteSpace(errorQueue);
 
diff --git a/src/NServiceBus.Core/Recoverability/ImmediateRetries/ImmediateRetryMessage.cs b/src/NServiceBus.Core/Recoverability/ImmediateRetries/ImmediateRetryMessage.cs
@@ -22,7 +22,6 @@ public ImmediateRetryMessage(string messageId, Dictionary<string, string> header
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(messageId);
         ArgumentNullException.ThrowIfNull(headers);
-        ArgumentNullException.ThrowIfNull(body);
         ArgumentNullException.ThrowIfNull(exception);
 
         MessageId = messageId;
diff --git a/src/NServiceBus.Core/Serialization/SerializationConfigExtensions.cs b/src/NServiceBus.Core/Serialization/SerializationConfigExtensions.cs
@@ -18,7 +18,7 @@ public static class SerializationConfigExtensions
     public static SerializationExtensions<T> UseSerialization<T>(this EndpointConfiguration config) where T : SerializationDefinition, new()
     {
         ArgumentNullException.ThrowIfNull(config);
-        var definition = (T)Activator.CreateInstance(typeof(T));
+        var definition = Activator.CreateInstance<T>();
 
         return UseSerialization(config, definition);
     }
@@ -47,7 +47,7 @@ public static SerializationExtensions<T> UseSerialization<T>(this EndpointConfig
     public static SerializationExtensions<T> AddDeserializer<T>(this EndpointConfiguration config) where T : SerializationDefinition, new()
     {
         ArgumentNullException.ThrowIfNull(config);
-        var definition = (T)Activator.CreateInstance(typeof(T));
+        var definition = Activator.CreateInstance<T>();
 
         return AddDeserializer(config, definition);
     }
diff --git a/src/NServiceBus.Core/Transports/IncomingMessage.cs b/src/NServiceBus.Core/Transports/IncomingMessage.cs
diff --git a/src/NServiceBus.Core/Transports/MessageContext.cs b/src/NServiceBus.Core/Transports/MessageContext.cs

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public async Task Invoke(ITransportReceiveContext context, Func<ITransportReceiv`
`29`	`29`	`endpointName = string.Empty;`
`30`	`30`	`}`
`31`	`31`
`32`		`- var intent = (MessageIntent)Enum.Parse(typeof(MessageIntent), context.Message.Headers[Headers.MessageIntent], true);`
	`32`	`+ var intent = Enum.Parse<MessageIntent>(context.Message.Headers[Headers.MessageIntent], true);`
`33`	`33`	`if (intent != intentToHandle)`
`34`	`34`	`{`
`35`	`35`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public Subscriber() =>`
`40`	`40`	`{`
`41`	`41`	`c.Pipeline.Register("SubscriptionSpy", new SubscriptionSpy((Context)r.ScenarioContext), "Spies on subscriptions made");`
`42`	`42`	`c.AutoSubscribe().DisableFor<EventToExclude>();`
`43`		`- c.AutoSubscribe().DisableFor(typeof(EventWithNoPublisher));`
	`43`	`+ c.AutoSubscribe().DisableFor<EventWithNoPublisher>();`
`44`	`44`	`},`
`45`	`45`	`metadata =>`
`46`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public EndpointWithFailingHandler()`
`49`	`49`	`{`
`50`	`50`	`EndpointSetup<DefaultServer>((config, context) =>`
`51`	`51`	`{`
`52`		`- config.Recoverability().AddUnrecoverableException(typeof(CustomException));`
	`52`	`+ config.Recoverability().AddUnrecoverableException<CustomException>();`
`53`	`53`	`config.Recoverability().Immediate(i => i.NumberOfRetries(2));`
`54`	`54`	`config.Recoverability().Delayed(d => d.NumberOfRetries(2));`
`55`	`55`	`});`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class MyReplyToOriginatorHandler(Context testContext) : IHandleMessages<MyReplyT`
`79`	`79`	`{`
`80`	`80`	`public Task Handle(MyReplyToOriginator message, IMessageHandlerContext context)`
`81`	`81`	`{`
`82`		`- testContext.Intent = (MessageIntent)Enum.Parse(typeof(MessageIntent), context.MessageHeaders[Headers.MessageIntent]);`
	`82`	`+ testContext.Intent = Enum.Parse<MessageIntent>(context.MessageHeaders[Headers.MessageIntent]);`
`83`	`83`	`testContext.CorrelationIdOnReply = context.MessageHeaders[Headers.CorrelationId];`
`84`	`84`	`return Task.CompletedTask;`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ public void Builders_should_not_determine_existence_by_building_components()`
`36`	`36`
`37`	`37`	`static void InitializeBuilder(IServiceCollection c)`
`38`	`38`	`{`
`39`		`- c.AddTransient(typeof(ExistingComponent));`
`40`		`- c.AddTransient(typeof(ExistingComponentWithUnsatisfiedDependency));`
	`39`	`+ c.AddTransient<ExistingComponent>();`
	`40`	`+ c.AddTransient<ExistingComponentWithUnsatisfiedDependency>();`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public class NonExistingComponent`