diff --git a/src/NServiceBus.AcceptanceTesting/AcceptanceTestingPersistence/SagaPersister/AcceptanceTestingSagaPersister.cs b/src/NServiceBus.AcceptanceTesting/AcceptanceTestingPersistence/SagaPersister/AcceptanceTestingSagaPersister.cs index 0020fb1698..7c2a9b719e 100644 --- a/src/NServiceBus.AcceptanceTesting/AcceptanceTestingPersistence/SagaPersister/AcceptanceTestingSagaPersister.cs +++ b/src/NServiceBus.AcceptanceTesting/AcceptanceTestingPersistence/SagaPersister/AcceptanceTestingSagaPersister.cs @@ -114,7 +114,7 @@ static void SetEntry(ContextBag context, Guid sagaId, Entry value) { if (context.TryGet(ContextKey, out Dictionary entries) == false) { - entries = new Dictionary(); + entries = []; context.Set(ContextKey, entries); } entries[sagaId] = value; diff --git a/src/NServiceBus.AcceptanceTesting/Support/EndpointBehavior.cs b/src/NServiceBus.AcceptanceTesting/Support/EndpointBehavior.cs index fda5f44330..2cf1d23c89 100644 --- a/src/NServiceBus.AcceptanceTesting/Support/EndpointBehavior.cs +++ b/src/NServiceBus.AcceptanceTesting/Support/EndpointBehavior.cs @@ -11,7 +11,7 @@ public class EndpointBehavior : IComponentBehavior public EndpointBehavior(IEndpointConfigurationFactory endpointBuilder) { EndpointBuilder = endpointBuilder; - CustomConfig = new List>(); + CustomConfig = []; ConfigureHowToCreateInstance(config => Endpoint.Create(config), startable => startable.Start()); } diff --git a/src/NServiceBus.AcceptanceTesting/Support/FeatureStartupTaskRunner.cs b/src/NServiceBus.AcceptanceTesting/Support/FeatureStartupTaskRunner.cs index 77aa90da8a..f85c19d4aa 100644 --- a/src/NServiceBus.AcceptanceTesting/Support/FeatureStartupTaskRunner.cs +++ b/src/NServiceBus.AcceptanceTesting/Support/FeatureStartupTaskRunner.cs @@ -53,7 +53,7 @@ static List> GetStartupTaskRegistrati { if (!endpointConfiguration.Settings.TryGet>>(FeatureStartupTaskRunner.ConfigKey, out var startupTasks)) { - startupTasks = new List>(); + startupTasks = []; endpointConfiguration.Settings.Set(FeatureStartupTaskRunner.ConfigKey, startupTasks); } 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 index f198d87fe3..84eacc54ab 100644 --- 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 @@ -32,7 +32,7 @@ class Context : ScenarioContext { public Context() { - EventsSubscribedTo = new List(); + EventsSubscribedTo = []; } public List EventsSubscribedTo { get; } diff --git a/src/NServiceBus.AcceptanceTests/Core/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga.cs b/src/NServiceBus.AcceptanceTests/Core/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga.cs index 01f40cdae0..3d64d7e77b 100644 --- a/src/NServiceBus.AcceptanceTests/Core/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga.cs +++ b/src/NServiceBus.AcceptanceTests/Core/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga.cs @@ -27,7 +27,7 @@ class Context : ScenarioContext { public Context() { - EventsSubscribedTo = new List(); + EventsSubscribedTo = []; } public List EventsSubscribedTo { get; } diff --git a/src/NServiceBus.AcceptanceTests/Core/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga_autosubscribe_disabled.cs b/src/NServiceBus.AcceptanceTests/Core/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga_autosubscribe_disabled.cs index 5c52d131de..497779bc07 100644 --- a/src/NServiceBus.AcceptanceTests/Core/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga_autosubscribe_disabled.cs +++ b/src/NServiceBus.AcceptanceTests/Core/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga_autosubscribe_disabled.cs @@ -27,7 +27,7 @@ class Context : ScenarioContext { public Context() { - EventsSubscribedTo = new List(); + EventsSubscribedTo = []; } public List EventsSubscribedTo { get; } diff --git a/src/NServiceBus.AcceptanceTests/Core/AutomaticSubscriptions/When_starting_an_endpoint_with_autosubscribe.cs b/src/NServiceBus.AcceptanceTests/Core/AutomaticSubscriptions/When_starting_an_endpoint_with_autosubscribe.cs index bb50f915fc..adb3833c10 100644 --- a/src/NServiceBus.AcceptanceTests/Core/AutomaticSubscriptions/When_starting_an_endpoint_with_autosubscribe.cs +++ b/src/NServiceBus.AcceptanceTests/Core/AutomaticSubscriptions/When_starting_an_endpoint_with_autosubscribe.cs @@ -32,7 +32,7 @@ class Context : ScenarioContext { public Context() { - EventsSubscribedTo = new List(); + EventsSubscribedTo = []; } public List EventsSubscribedTo { get; } diff --git a/src/NServiceBus.Core.Tests/Pipeline/BehaviorRegistrationsCoordinatorTests.cs b/src/NServiceBus.Core.Tests/Pipeline/BehaviorRegistrationsCoordinatorTests.cs index 2638cbab69..5caa442d6f 100644 --- a/src/NServiceBus.Core.Tests/Pipeline/BehaviorRegistrationsCoordinatorTests.cs +++ b/src/NServiceBus.Core.Tests/Pipeline/BehaviorRegistrationsCoordinatorTests.cs @@ -17,8 +17,8 @@ class BehaviorRegistrationsCoordinatorTests [SetUp] public void Setup() { - replacements = new List(); - addOrReplacements = new List(); + replacements = []; + addOrReplacements = []; coordinator = new StepRegistrationsCoordinator(replacements, addOrReplacements); } diff --git a/src/NServiceBus.Core.Tests/Serializers/XML/Pull_819.cs b/src/NServiceBus.Core.Tests/Serializers/XML/Pull_819.cs index ac509e2287..3d18e99223 100644 --- a/src/NServiceBus.Core.Tests/Serializers/XML/Pull_819.cs +++ b/src/NServiceBus.Core.Tests/Serializers/XML/Pull_819.cs @@ -18,7 +18,7 @@ public void Should_check_for_ignore_attribute_before_checking_type() #pragma warning disable DE0006 m3.List = new ArrayList(); #pragma warning restore DE0006 - m3.GenericList = new List(); + m3.GenericList = []; }); Assert.AreEqual("John", result.FirstName); diff --git a/src/NServiceBus.Core.Tests/Serializers/XML/SerializerTests.cs b/src/NServiceBus.Core.Tests/Serializers/XML/SerializerTests.cs index ecab080ba4..eddef7b130 100644 --- a/src/NServiceBus.Core.Tests/Serializers/XML/SerializerTests.cs +++ b/src/NServiceBus.Core.Tests/Serializers/XML/SerializerTests.cs @@ -716,7 +716,7 @@ public void TestInterfaces() Accuracy = 0.314M }; - o.Names = new List(); + o.Names = []; for (var i = 0; i < number; i++) { var firstMessage = mapper.CreateInstance(); @@ -822,13 +822,13 @@ public void SerializeLists() var serializer = SerializerFactory.Create(); var msg = mapper.CreateInstance(); - msg.Items = new List - { + msg.Items = + [ new MessageWithListItem { Data = "Hello" } - }; + ]; using (var stream = new MemoryStream()) { @@ -848,13 +848,13 @@ public void SerializeClosedGenericListsInAlternateNamespace() var serializer = SerializerFactory.Create(); var msg = mapper.CreateInstance(); - msg.Items = new AlternateItemList - { + msg.Items = + [ new MessageWithListItemAlternate { Data = "Hello" } - }; + ]; using (var stream = new MemoryStream()) { @@ -874,13 +874,13 @@ public void SerializeClosedGenericListsInAlternateNamespaceMultipleIEnumerableIm var serializer = SerializerFactory.Create(); var msg = mapper.CreateInstance(); - msg.Items = new AlternateItemListMultipleIEnumerableImplementations - { + msg.Items = + [ new MessageWithListItemAlternate { Data = "Hello" } - }; + ]; using (var stream = new MemoryStream()) { @@ -900,13 +900,13 @@ public void SerializeClosedGenericListsInAlternateNamespaceMultipleIListImplemen var serializer = SerializerFactory.Create(); var msg = mapper.CreateInstance(); - msg.Items = new AlternateItemListMultipleIListImplementations - { + msg.Items = + [ new MessageWithListItemAlternate { Data = "Hello" } - }; + ]; using (var stream = new MemoryStream()) { @@ -926,13 +926,13 @@ public void SerializeClosedGenericListsInSameNamespace() var serializer = SerializerFactory.Create(); var msg = mapper.CreateInstance(); - msg.Items = new ItemList - { + msg.Items = + [ new MessageWithListItem { Data = "Hello" } - }; + ]; using (var stream = new MemoryStream()) { @@ -952,7 +952,7 @@ public void SerializeEmptyLists() var serializer = SerializerFactory.Create(); var msg = mapper.CreateInstance(); - msg.Items = new List(); + msg.Items = []; using (var stream = new MemoryStream()) { diff --git a/src/NServiceBus.Core/Audit/AuditContext.cs b/src/NServiceBus.Core/Audit/AuditContext.cs index 9c0ed13249..7fd9a24b4f 100644 --- a/src/NServiceBus.Core/Audit/AuditContext.cs +++ b/src/NServiceBus.Core/Audit/AuditContext.cs @@ -16,7 +16,7 @@ public AuditContext(OutgoingMessage message, string auditAddress, TimeSpan? time Message = message; AuditAddress = auditAddress; TimeToBeReceived = timeToBeReceived; - AuditMetadata = new Dictionary(); + AuditMetadata = []; AuditAction = RouteToAudit.Instance; } diff --git a/src/NServiceBus.Core/Extensibility/ExtendableOptions.cs b/src/NServiceBus.Core/Extensibility/ExtendableOptions.cs index a15595e0ce..332c6310a5 100644 --- a/src/NServiceBus.Core/Extensibility/ExtendableOptions.cs +++ b/src/NServiceBus.Core/Extensibility/ExtendableOptions.cs @@ -19,7 +19,7 @@ public abstract class ExtendableOptions protected ExtendableOptions() { Context = new ContextBag(); - OutgoingHeaders = new Dictionary(); + OutgoingHeaders = []; } internal DispatchProperties DispatchProperties { get; } = new DispatchProperties(); diff --git a/src/NServiceBus.Core/Features/Feature.cs b/src/NServiceBus.Core/Features/Feature.cs index 9f20c27b57..f3dc837eff 100644 --- a/src/NServiceBus.Core/Features/Feature.cs +++ b/src/NServiceBus.Core/Features/Feature.cs @@ -15,7 +15,7 @@ public abstract class Feature /// protected Feature() { - Dependencies = new List>(); + Dependencies = []; Name = GetFeatureName(GetType()); } diff --git a/src/NServiceBus.Core/Features/FeatureConfigurationContext.cs b/src/NServiceBus.Core/Features/FeatureConfigurationContext.cs index b10ee6a4bd..7d1b777bd8 100644 --- a/src/NServiceBus.Core/Features/FeatureConfigurationContext.cs +++ b/src/NServiceBus.Core/Features/FeatureConfigurationContext.cs @@ -25,7 +25,7 @@ internal FeatureConfigurationContext( Routing = routing; this.receiveConfiguration = receiveConfiguration; - TaskControllers = new List(); + TaskControllers = []; } /// diff --git a/src/NServiceBus.Core/Features/PrerequisiteStatus.cs b/src/NServiceBus.Core/Features/PrerequisiteStatus.cs index ad581800d5..6afe3562f5 100644 --- a/src/NServiceBus.Core/Features/PrerequisiteStatus.cs +++ b/src/NServiceBus.Core/Features/PrerequisiteStatus.cs @@ -6,7 +6,7 @@ class PrerequisiteStatus { internal PrerequisiteStatus() { - Reasons = new List(); + Reasons = []; IsSatisfied = true; } diff --git a/src/NServiceBus.Core/Hosting/Helpers/AssemblyScannerResults.cs b/src/NServiceBus.Core/Hosting/Helpers/AssemblyScannerResults.cs index 0ad9482131..24cea5f256 100644 --- a/src/NServiceBus.Core/Hosting/Helpers/AssemblyScannerResults.cs +++ b/src/NServiceBus.Core/Hosting/Helpers/AssemblyScannerResults.cs @@ -16,9 +16,9 @@ public class AssemblyScannerResults /// public AssemblyScannerResults() { - Assemblies = new List(); - Types = new List(); - SkippedFiles = new List(); + Assemblies = []; + Types = []; + SkippedFiles = []; } /// diff --git a/src/NServiceBus.Core/Hosting/Helpers/AssemblyScanningComponent.cs b/src/NServiceBus.Core/Hosting/Helpers/AssemblyScanningComponent.cs index 573d11a29c..0cf9340e1a 100644 --- a/src/NServiceBus.Core/Hosting/Helpers/AssemblyScanningComponent.cs +++ b/src/NServiceBus.Core/Hosting/Helpers/AssemblyScanningComponent.cs @@ -21,7 +21,7 @@ public static AssemblyScanningComponent Initialize(Configuration configuration, var directoryToScan = AppDomain.CurrentDomain.RelativeSearchPath ?? AppDomain.CurrentDomain.BaseDirectory; assemblyScanner = new AssemblyScanner(directoryToScan); - availableTypes = new List(); + availableTypes = []; } else { diff --git a/src/NServiceBus.Core/Persistence/PersistenceExtensions.cs b/src/NServiceBus.Core/Persistence/PersistenceExtensions.cs index 9f091d6485..d77d44e556 100644 --- a/src/NServiceBus.Core/Persistence/PersistenceExtensions.cs +++ b/src/NServiceBus.Core/Persistence/PersistenceExtensions.cs @@ -60,7 +60,7 @@ public PersistenceExtensions(Type definitionType, SettingsHolder settings, Type { if (!Settings.TryGet("PersistenceDefinitions", out List definitions)) { - definitions = new List(); + definitions = []; Settings.Set("PersistenceDefinitions", definitions); } diff --git a/src/NServiceBus.Core/Pipeline/Outgoing/RoutingContextExtensions.cs b/src/NServiceBus.Core/Pipeline/Outgoing/RoutingContextExtensions.cs index 3fcb435da1..d04c6d479f 100644 --- a/src/NServiceBus.Core/Pipeline/Outgoing/RoutingContextExtensions.cs +++ b/src/NServiceBus.Core/Pipeline/Outgoing/RoutingContextExtensions.cs @@ -13,7 +13,7 @@ public static TransportOperation ToTransportOperation(this IRoutingContext conte if (!context.Extensions.TryGet(out DispatchProperties dispatchProperties)) { - dispatchProperties = new DispatchProperties(); + dispatchProperties = []; } var transportOperation = new TransportOperation(message, addressLabel, dispatchProperties, dispatchConsistency); diff --git a/src/NServiceBus.Core/Pipeline/Pipeline.cs b/src/NServiceBus.Core/Pipeline/Pipeline.cs index 09fda1f975..5e058556c9 100644 --- a/src/NServiceBus.Core/Pipeline/Pipeline.cs +++ b/src/NServiceBus.Core/Pipeline/Pipeline.cs @@ -29,7 +29,7 @@ public Pipeline(IServiceProvider builder, PipelineModifications pipelineModifica List expressions = null; if (Logger.IsDebugEnabled) { - expressions = new List(); + expressions = []; } pipeline = behaviors.CreatePipelineExecutionFuncFor(expressions); diff --git a/src/NServiceBus.Core/Receiving/ReceiveComponent.Configuration.cs b/src/NServiceBus.Core/Receiving/ReceiveComponent.Configuration.cs index 69910d8c1c..96ca077e41 100644 --- a/src/NServiceBus.Core/Receiving/ReceiveComponent.Configuration.cs +++ b/src/NServiceBus.Core/Receiving/ReceiveComponent.Configuration.cs @@ -73,7 +73,7 @@ public Configuration(string queueNameBase, IsSendOnlyEndpoint = isSendOnlyEndpoint; PipelineCompletedSubscribers = pipelineCompletedSubscribers; ExecuteTheseHandlersFirst = executeTheseHandlersFirst; - satelliteDefinitions = new List(); + satelliteDefinitions = []; this.messageHandlerRegistry = messageHandlerRegistry; CreateQueues = createQueues; Conventions = conventions; diff --git a/src/NServiceBus.Core/Recoverability/RecoverabilitySettingsExtensions.cs b/src/NServiceBus.Core/Recoverability/RecoverabilitySettingsExtensions.cs index be65bb2816..5eec0d1ece 100644 --- a/src/NServiceBus.Core/Recoverability/RecoverabilitySettingsExtensions.cs +++ b/src/NServiceBus.Core/Recoverability/RecoverabilitySettingsExtensions.cs @@ -26,7 +26,7 @@ public static void AddUnrecoverableException(this SettingsHolder settings, Type if (!settings.TryGet(RecoverabilityComponent.UnrecoverableExceptions, out HashSet unrecoverableExceptions)) { - unrecoverableExceptions = new HashSet(); + unrecoverableExceptions = []; settings.Set(RecoverabilityComponent.UnrecoverableExceptions, unrecoverableExceptions); } diff --git a/src/NServiceBus.Core/Routing/EndpointInstances.cs b/src/NServiceBus.Core/Routing/EndpointInstances.cs index 94cb1687c2..efc08d3a49 100644 --- a/src/NServiceBus.Core/Routing/EndpointInstances.cs +++ b/src/NServiceBus.Core/Routing/EndpointInstances.cs @@ -44,7 +44,7 @@ public void AddOrReplaceInstances(string sourceKey, IList endp { if (!newCache.TryGetValue(instance.Endpoint, out var instanceSet)) { - instanceSet = new HashSet(); + instanceSet = []; newCache[instance.Endpoint] = instanceSet; } instanceSet.Add(instance); diff --git a/src/NServiceBus.Core/Routing/MessageDrivenSubscriptions/Publishers.cs b/src/NServiceBus.Core/Routing/MessageDrivenSubscriptions/Publishers.cs index 2e25daaa43..787ce1403b 100644 --- a/src/NServiceBus.Core/Routing/MessageDrivenSubscriptions/Publishers.cs +++ b/src/NServiceBus.Core/Routing/MessageDrivenSubscriptions/Publishers.cs @@ -35,7 +35,7 @@ public void AddOrReplacePublishers(string sourceKey, IList { if (!newRouteTable.TryGetValue(entry.EventType, out var publishersOfThisEvent)) { - publishersOfThisEvent = new HashSet(); + publishersOfThisEvent = []; newRouteTable[entry.EventType] = publishersOfThisEvent; } publishersOfThisEvent.Add(entry.Address); diff --git a/src/NServiceBus.Core/Routing/UnicastPublishRouter.cs b/src/NServiceBus.Core/Routing/UnicastPublishRouter.cs index 1adbba4d9c..aa930b9c3f 100644 --- a/src/NServiceBus.Core/Routing/UnicastPublishRouter.cs +++ b/src/NServiceBus.Core/Routing/UnicastPublishRouter.cs @@ -69,7 +69,7 @@ Dictionary.ValueCollection SelectDestinationsFor } else { - groups[subscriber.Endpoint] = new List { subscriber.TransportAddress }; + groups[subscriber.Endpoint] = [subscriber.TransportAddress]; } } diff --git a/src/NServiceBus.Core/Sagas/SagaMetadata.cs b/src/NServiceBus.Core/Sagas/SagaMetadata.cs index 8aaa3da63a..71a1bf2889 100644 --- a/src/NServiceBus.Core/Sagas/SagaMetadata.cs +++ b/src/NServiceBus.Core/Sagas/SagaMetadata.cs @@ -48,14 +48,14 @@ public SagaMetadata(string name, Type sagaType, string entityName, Type sagaEnti } } - associatedMessages = new Dictionary(); + associatedMessages = []; foreach (var sagaMessage in messages) { associatedMessages[sagaMessage.MessageTypeName] = sagaMessage; } - sagaFinders = new Dictionary(); + sagaFinders = []; foreach (var finder in finders) { diff --git a/src/NServiceBus.Core/Serialization/SerializationSettingsExtensions.cs b/src/NServiceBus.Core/Serialization/SerializationSettingsExtensions.cs index 1106c85a2e..4b659d262c 100644 --- a/src/NServiceBus.Core/Serialization/SerializationSettingsExtensions.cs +++ b/src/NServiceBus.Core/Serialization/SerializationSettingsExtensions.cs @@ -16,7 +16,7 @@ public static List> GetAdditional { if (!settings.TryGet(AdditionalSerializersSettingsKey, out List> deserializers)) { - deserializers = new List>(); + deserializers = []; settings.Set(AdditionalSerializersSettingsKey, deserializers); } return deserializers; diff --git a/src/NServiceBus.Core/StaticHeaders/StaticHeadersConfigExtensions.cs b/src/NServiceBus.Core/StaticHeaders/StaticHeadersConfigExtensions.cs index 7694b91eda..d8c9712a74 100644 --- a/src/NServiceBus.Core/StaticHeaders/StaticHeadersConfigExtensions.cs +++ b/src/NServiceBus.Core/StaticHeaders/StaticHeadersConfigExtensions.cs @@ -20,7 +20,7 @@ public static void AddHeaderToAllOutgoingMessages(this EndpointConfiguration con if (!config.Settings.TryGet(out CurrentStaticHeaders headers)) { - headers = new CurrentStaticHeaders(); + headers = []; config.Settings.Set(headers); } diff --git a/src/NServiceBus.TransportTests/NServiceBusTransportTest.cs b/src/NServiceBus.TransportTests/NServiceBusTransportTest.cs index ee7afdb36e..8a0155af62 100644 --- a/src/NServiceBus.TransportTests/NServiceBusTransportTest.cs +++ b/src/NServiceBus.TransportTests/NServiceBusTransportTest.cs @@ -31,7 +31,7 @@ public void SetUp() configurer = null; testCancellationTokenSource = Debugger.IsAttached ? new CancellationTokenSource() : new CancellationTokenSource(TestTimeout); receiver = null; - registrations = new List(); + registrations = []; } protected static IConfigureTransportInfrastructure CreateConfigurer() {