diff --git a/src/Particular.LicensingComponent.UnitTests/API/APIApprovals.cs b/src/Particular.LicensingComponent.UnitTests/API/APIApprovals.cs index cd8d0be70b..bcb6291125 100644 --- a/src/Particular.LicensingComponent.UnitTests/API/APIApprovals.cs +++ b/src/Particular.LicensingComponent.UnitTests/API/APIApprovals.cs @@ -39,7 +39,7 @@ public void HttpApiRoutes() return new { MethodSignature = methodSignature, - HttpMethods = string.Join("/", httpMethods), + HttpMethods = string.Join('/', httpMethods), Route = route.Template }; }) diff --git a/src/ServiceControl.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs b/src/ServiceControl.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs index 3ae09a7470..219b6fedce 100644 --- a/src/ServiceControl.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs +++ b/src/ServiceControl.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs @@ -21,7 +21,7 @@ public void EndpointName_should_not_exceed_maximum_length() .Where(t => Conventions.EndpointNamingConvention(t).Length > endpointNameMaxLength) .ToList(); - Assert.That(violators, Is.Empty, string.Join(",", violators)); + Assert.That(violators, Is.Empty, string.Join(',', violators)); } static bool IsEndpointClass(Type t) => endpointConfigurationBuilderType.IsAssignableFrom(t); diff --git a/src/ServiceControl.Audit.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs b/src/ServiceControl.Audit.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs index 6913d8c187..8e0eb3cf94 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs @@ -21,7 +21,7 @@ public void EndpointName_should_not_exceed_maximum_length() .Where(t => Conventions.EndpointNamingConvention(t).Length > endpointNameMaxLength) .ToList(); - Assert.That(violators, Is.Empty, string.Join(",", violators)); + Assert.That(violators, Is.Empty, string.Join(',', violators)); } static bool IsEndpointClass(Type t) => endpointConfigurationBuilderType.IsAssignableFrom(t); diff --git a/src/ServiceControl.Audit.Persistence.RavenDB/Indexes/MessagesViewIndex.cs b/src/ServiceControl.Audit.Persistence.RavenDB/Indexes/MessagesViewIndex.cs index 6e348f08c4..54ac4f63dd 100644 --- a/src/ServiceControl.Audit.Persistence.RavenDB/Indexes/MessagesViewIndex.cs +++ b/src/ServiceControl.Audit.Persistence.RavenDB/Indexes/MessagesViewIndex.cs @@ -26,7 +26,7 @@ from message in messages DeliveryTime = (TimeSpan?)message.MessageMetadata["DeliveryTime"], Query = message.MessageMetadata.Select(_ => _.Value.ToString()).Union(new[] { - string.Join(" ", message.Headers.Select(x => x.Value)) + string.Join(' ', message.Headers.Select(x => x.Value)) }).ToArray(), ConversationId = (string)message.MessageMetadata["ConversationId"] }; diff --git a/src/ServiceControl.Audit.Persistence.RavenDB/Indexes/MessagesViewIndexWithFullTextSearch.cs b/src/ServiceControl.Audit.Persistence.RavenDB/Indexes/MessagesViewIndexWithFullTextSearch.cs index 9eb433d6e0..799666d58b 100644 --- a/src/ServiceControl.Audit.Persistence.RavenDB/Indexes/MessagesViewIndexWithFullTextSearch.cs +++ b/src/ServiceControl.Audit.Persistence.RavenDB/Indexes/MessagesViewIndexWithFullTextSearch.cs @@ -26,7 +26,7 @@ from message in messages DeliveryTime = (TimeSpan?)message.MessageMetadata["DeliveryTime"], Query = message.MessageMetadata.Select(_ => _.Value.ToString()).Union(new[] { - string.Join(" ", message.Headers.Select(x => x.Value)), + string.Join(' ', message.Headers.Select(x => x.Value)), LoadAttachment(message, "body").GetContentAsString() }).ToArray(), ConversationId = (string)message.MessageMetadata["ConversationId"] diff --git a/src/ServiceControl.Audit.UnitTests/API/APIApprovals.cs b/src/ServiceControl.Audit.UnitTests/API/APIApprovals.cs index 69bfd4550d..60663693db 100644 --- a/src/ServiceControl.Audit.UnitTests/API/APIApprovals.cs +++ b/src/ServiceControl.Audit.UnitTests/API/APIApprovals.cs @@ -64,7 +64,7 @@ public void HttpApiRoutes() return new { MethodSignature = methodSignature, - HttpMethods = string.Join("/", httpMethods), + HttpMethods = string.Join('/', httpMethods), Route = route.Template }; }) diff --git a/src/ServiceControl.Audit/Infrastructure/FullTypeNameOnlyBehavior.cs b/src/ServiceControl.Audit/Infrastructure/FullTypeNameOnlyBehavior.cs index 65f114bbd1..2b44487789 100644 --- a/src/ServiceControl.Audit/Infrastructure/FullTypeNameOnlyBehavior.cs +++ b/src/ServiceControl.Audit/Infrastructure/FullTypeNameOnlyBehavior.cs @@ -16,7 +16,7 @@ public Task Invoke(IOutgoingPhysicalMessageContext context, Func MonitoringInstancePortAvailable( public static IRuleBuilderOptions ValidPath(this IRuleBuilder rulebuilder) { return rulebuilder.Must((t, path) => { return path != null && !path.Intersect(ILLEGAL_PATH_CHARS).Any(); }) - .WithMessage(string.Format(MSG_ILLEGAL_PATH_CHAR, string.Join(" ", ILLEGAL_PATH_CHARS))); + .WithMessage(string.Format(MSG_ILLEGAL_PATH_CHAR, string.Join(' ', ILLEGAL_PATH_CHARS))); } public static IRuleBuilderOptions MustNotBeIn(this IRuleBuilder ruleBuilder, Func> list) where TProperty : class diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/ConventionEnforcementTests.cs b/src/ServiceControl.Monitoring.AcceptanceTests/ConventionEnforcementTests.cs index 7db99abfad..ca56d22cec 100644 --- a/src/ServiceControl.Monitoring.AcceptanceTests/ConventionEnforcementTests.cs +++ b/src/ServiceControl.Monitoring.AcceptanceTests/ConventionEnforcementTests.cs @@ -20,7 +20,7 @@ public void Ensure_all_tests_derive_from_a_common_base_class() .Where(t => t.BaseType == null || !typeof(NServiceBusAcceptanceTest).IsAssignableFrom(t)) .ToList(); - Assert.That(missingBaseClass, Is.Empty, string.Join(",", missingBaseClass)); + Assert.That(missingBaseClass, Is.Empty, string.Join(',', missingBaseClass)); } [Test] @@ -33,7 +33,7 @@ public void Ensure_all_sagadatas_are_public() .Where(t => typeof(IContainSagaData).IsAssignableFrom(t)) .ToList(); - Assert.That(sagaDatas, Is.Empty, string.Join(",", sagaDatas)); + Assert.That(sagaDatas, Is.Empty, string.Join(',', sagaDatas)); } static bool HasTestMethod(Type t) diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs b/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs index 1f428277dd..0385a8478a 100644 --- a/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs +++ b/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs @@ -21,7 +21,7 @@ public void EndpointName_should_not_exceed_maximum_length() .Where(t => Conventions.EndpointNamingConvention(t).Length > endpointNameMaxLength) .ToList(); - Assert.That(violators, Is.Empty, string.Join(",", violators)); + Assert.That(violators, Is.Empty, string.Join(',', violators)); } static bool IsEndpointClass(Type t) => endpointConfigurationBuilderType.IsAssignableFrom(t); diff --git a/src/ServiceControl.Monitoring.UnitTests/API/APIApprovals.cs b/src/ServiceControl.Monitoring.UnitTests/API/APIApprovals.cs index 55bb521311..19dd4ce5f5 100644 --- a/src/ServiceControl.Monitoring.UnitTests/API/APIApprovals.cs +++ b/src/ServiceControl.Monitoring.UnitTests/API/APIApprovals.cs @@ -41,7 +41,7 @@ public void HttpApiRoutes() return new { MethodSignature = methodSignature, - HttpMethods = string.Join("/", httpMethods), + HttpMethods = string.Join('/', httpMethods), Route = route.Template }; }) diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs index 7ee984202d..17984ebc20 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/TestSupport/SelfVerification/EndpointNameEnforcementTests.cs @@ -21,7 +21,7 @@ public void EndpointName_should_not_exceed_maximum_length() .Where(t => Conventions.EndpointNamingConvention(t).Length > endpointNameMaxLength) .ToList(); - Assert.That(violators, Is.Empty, string.Join(",", violators)); + Assert.That(violators, Is.Empty, string.Join(',', violators)); } static bool IsEndpointClass(Type t) => endpointConfigurationBuilderType.IsAssignableFrom(t); diff --git a/src/ServiceControl.Persistence.RavenDB/Indexes/MessagesViewIndex.cs b/src/ServiceControl.Persistence.RavenDB/Indexes/MessagesViewIndex.cs index aff8883bc6..fa67ab6600 100644 --- a/src/ServiceControl.Persistence.RavenDB/Indexes/MessagesViewIndex.cs +++ b/src/ServiceControl.Persistence.RavenDB/Indexes/MessagesViewIndex.cs @@ -32,7 +32,7 @@ from message in messages CriticalTime = (TimeSpan?)last.MessageMetadata["CriticalTime"], ProcessingTime = (TimeSpan?)last.MessageMetadata["ProcessingTime"], DeliveryTime = (TimeSpan?)last.MessageMetadata["DeliveryTime"], - Query = last.MessageMetadata.Select(_ => _.Value.ToString()).Union(new[] { string.Join(" ", last.Headers.Select(x => x.Value)) }).ToArray(), + Query = last.MessageMetadata.Select(_ => _.Value.ToString()).Union(new[] { string.Join(' ', last.Headers.Select(x => x.Value)) }).ToArray(), ConversationId = (string)last.MessageMetadata["ConversationId"] }; diff --git a/src/ServiceControl.Persistence/RetryHistory.cs b/src/ServiceControl.Persistence/RetryHistory.cs index fcaf1c167d..995c9875fb 100644 --- a/src/ServiceControl.Persistence/RetryHistory.cs +++ b/src/ServiceControl.Persistence/RetryHistory.cs @@ -38,7 +38,7 @@ public void AddToHistory(HistoricRetryOperation historicOperation, int historyDe public string GetHistoryOperationsUniqueIdentifier() { - return string.Join(",", HistoricOperations.Select(x => x.RequestId)); + return string.Join(',', HistoricOperations.Select(x => x.RequestId)); } public void AddToUnacknowledged(UnacknowledgedRetryOperation unacknowledgedRetryOperation) diff --git a/src/ServiceControl.Transports.ASQ/ConnectionStringExtensions.cs b/src/ServiceControl.Transports.ASQ/ConnectionStringExtensions.cs index e0dd30ff8f..14cd07dd2d 100644 --- a/src/ServiceControl.Transports.ASQ/ConnectionStringExtensions.cs +++ b/src/ServiceControl.Transports.ASQ/ConnectionStringExtensions.cs @@ -24,11 +24,9 @@ public static string RemoveCustomConnectionStringParts(this string connectionStr break; } } - return string.Join(";", parts); + return string.Join(';', parts); } - - const string SubscriptionsTableName = "Subscriptions Table"; static readonly Regex ConnectionStringRegex = diff --git a/src/ServiceControl.UnitTests/API/APIApprovals.cs b/src/ServiceControl.UnitTests/API/APIApprovals.cs index af4da85885..4d0e1536c9 100644 --- a/src/ServiceControl.UnitTests/API/APIApprovals.cs +++ b/src/ServiceControl.UnitTests/API/APIApprovals.cs @@ -74,7 +74,7 @@ public void HttpApiRoutes() return new { MethodSignature = methodSignature, - HttpMethods = string.Join("/", httpMethods), + HttpMethods = string.Join('/', httpMethods), Route = route.Template }; }) diff --git a/src/ServiceControl/ExternalIntegrations/RemoveVersionInformationBehavior.cs b/src/ServiceControl/ExternalIntegrations/RemoveVersionInformationBehavior.cs index 0c1035b7f6..94c8a2b1a8 100644 --- a/src/ServiceControl/ExternalIntegrations/RemoveVersionInformationBehavior.cs +++ b/src/ServiceControl/ExternalIntegrations/RemoveVersionInformationBehavior.cs @@ -13,7 +13,7 @@ public override Task Invoke(IOutgoingPhysicalMessageContext context, Func { var types = typeHeader.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); - var typesWithoutVersionInfo = string.Join(";", types.Select(x => RemoveVersionAndKeyInformation(x))); + var typesWithoutVersionInfo = string.Join(';', types.Select(x => RemoveVersionAndKeyInformation(x))); context.Headers[NServiceBus.Headers.EnclosedMessageTypes] = typesWithoutVersionInfo; } diff --git a/src/ServiceControlInstaller.Packaging.UnitTests/AuditDeploymentPackageTests.cs b/src/ServiceControlInstaller.Packaging.UnitTests/AuditDeploymentPackageTests.cs index b6aaad15a3..d6f319cacc 100644 --- a/src/ServiceControlInstaller.Packaging.UnitTests/AuditDeploymentPackageTests.cs +++ b/src/ServiceControlInstaller.Packaging.UnitTests/AuditDeploymentPackageTests.cs @@ -22,7 +22,7 @@ public void Should_package_storages_individually() var persisters = deploymentPackage.DeploymentUnits.Where(u => u.Category == "Persisters"); - Assert.That(persisters.Select(d => d.Name), Is.EquivalentTo(expectedPersisters), $"Expected Persisters folder to contain {string.Join(",", expectedPersisters)}"); + Assert.That(persisters.Select(d => d.Name), Is.EquivalentTo(expectedPersisters), $"Expected Persisters folder to contain {string.Join(',', expectedPersisters)}"); foreach (var persister in persisters) { diff --git a/src/ServiceControlInstaller.Packaging.UnitTests/DeploymentPackageTests.cs b/src/ServiceControlInstaller.Packaging.UnitTests/DeploymentPackageTests.cs index d2111f730f..2a9390c7a3 100644 --- a/src/ServiceControlInstaller.Packaging.UnitTests/DeploymentPackageTests.cs +++ b/src/ServiceControlInstaller.Packaging.UnitTests/DeploymentPackageTests.cs @@ -94,7 +94,7 @@ public void Should_package_all_transports() .Where(u => u.Category == "Transports") .Select(u => u.Name); - Assert.That(bundledTransports, Is.EquivalentTo(allTransports), $"Expected transports folder to contain {string.Join(",", allTransports)}"); + Assert.That(bundledTransports, Is.EquivalentTo(allTransports), $"Expected transports folder to contain {string.Join(',', allTransports)}"); } readonly DeploymentPackage deploymentPackage; diff --git a/src/ServiceControlInstaller.Packaging.UnitTests/PrimaryDeploymentPackageTests.cs b/src/ServiceControlInstaller.Packaging.UnitTests/PrimaryDeploymentPackageTests.cs index e4e80cf6a7..b4d5461092 100644 --- a/src/ServiceControlInstaller.Packaging.UnitTests/PrimaryDeploymentPackageTests.cs +++ b/src/ServiceControlInstaller.Packaging.UnitTests/PrimaryDeploymentPackageTests.cs @@ -21,7 +21,7 @@ public void Should_package_storages_individually() var persisters = deploymentPackage.DeploymentUnits.Where(u => u.Category == "Persisters"); - Assert.That(persisters.Select(d => d.Name), Is.EquivalentTo(expectedPersisters), $"Expected Persisters folder to contain {string.Join(",", expectedPersisters)}"); + Assert.That(persisters.Select(d => d.Name), Is.EquivalentTo(expectedPersisters), $"Expected Persisters folder to contain {string.Join(',', expectedPersisters)}"); foreach (var persister in persisters) {