Merge pull request #4375 from Particular/5.6.1

cherrypick changes for 5.6.1

src/Directory.Packages.props

@@ -1,10 +1,8 @@
 <Project>
-
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
-
   <ItemGroup Label="Versions for direct package references">
     <PackageVersion Include="Autofac" Version="8.0.0" />
     <PackageVersion Include="AWSSDK.CloudWatch" Version="3.7.401.2" />
@@ -45,7 +43,7 @@
     <PackageVersion Include="NServiceBus.RabbitMQ" Version="9.1.0" />
     <PackageVersion Include="NServiceBus.SagaAudit" Version="5.0.0" />
     <PackageVersion Include="NServiceBus.Testing" Version="9.0.0" />
-    <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="4.0.1" />
+    <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="4.2.0" />
     <PackageVersion Include="NServiceBus.Transport.AzureStorageQueues" Version="13.0.0" />
     <PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="3.0.1" />
     <PackageVersion Include="NServiceBus.Transport.SqlServer" Version="8.1.3" />
@@ -73,7 +71,6 @@
     <PackageVersion Include="Validar.Fody" Version="1.9.0" />
     <PackageVersion Include="Yarp.ReverseProxy" Version="2.1.0" />
   </ItemGroup>
-
   <ItemGroup Label="Versions to pin transitive references">
     <PackageVersion Include="System.Drawing.Common" Version="8.0.7" />
     <PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
@@ -85,11 +82,9 @@
     <PackageVersion Include="System.Text.Json" Version="8.0.4" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
-
   <ItemGroup>
     <GlobalPackageReference Include="Microsoft.Build.Artifacts" Version="6.1.30" />
     <GlobalPackageReference Include="Microsoft.Build.CopyOnWrite" Version="1.0.315" />
     <GlobalPackageReference Include="Particular.Packaging" Version="4.1.0" />
   </ItemGroup>
-
 </Project>

src/ServiceControl.AcceptanceTests.RavenDB/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# Justification: Test project
+dotnet_diagnostic.CA2007.severity = none

src/ServiceControl.Monitoring/Infrastructure/Api/EndpointMetricsApi.cs

@@ -221,7 +221,9 @@ static MonitoredMetric<BreakdownT> CreateMetric<BreakdownT, StoreT>(string name,
 
         static MonitoredEndpointMessageType[] GetMonitoredMessageTypes(IEnumerable<EndpointMessageType> messageTypes)
         {
-            return messageTypes.Select(mt => MonitoredEndpointMessageTypeParser.Parse(mt.MessageType))
+            return messageTypes
+                .Where(mt => !string.IsNullOrEmpty(mt.MessageType))
+                .Select(mt => MonitoredEndpointMessageTypeParser.Parse(mt.MessageType))
                 .ToArray();
         }
 

src/ServiceControl.Monitoring/Infrastructure/EndpointMessageType.cs

@@ -4,7 +4,7 @@ public readonly struct EndpointMessageType
     {
         public EndpointMessageType(string endpointName, string enclosedMessageTypes)
         {
-            var index = enclosedMessageTypes.IndexOf(';');
+            var index = (enclosedMessageTypes ?? "").IndexOf(';');
 
             var firstType = index != -1
                 ? enclosedMessageTypes.Substring(0, index)

src/ServiceControl.Transports.ASBS.Tests/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# Justification: Test project
+dotnet_diagnostic.CA2007.severity = none

src/ServiceControl.Transports.ASQ.Tests/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# Justification: Test project
+dotnet_diagnostic.CA2007.severity = none

src/ServiceControl.Transports.Msmq.Tests/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# Justification: Test project
+dotnet_diagnostic.CA2007.severity = none

src/ServiceControl.Transports.RabbitMQClassicConventionalRouting.Tests/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# Justification: Test project
+dotnet_diagnostic.CA2007.severity = none

src/ServiceControl.Transports.RabbitMQClassicDirectRouting.Tests/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# Justification: Test project
+dotnet_diagnostic.CA2007.severity = none

src/ServiceControl.Transports.RabbitMQQuorumConventionalRouting.Tests/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# Justification: Test project
+dotnet_diagnostic.CA2007.severity = none

src/ServiceControl.Transports.RabbitMQQuorumDirectRouting.Tests/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# Justification: Test project
+dotnet_diagnostic.CA2007.severity = none

src/ServiceControl.Transports.SQS.Tests/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# Justification: Test project
+dotnet_diagnostic.CA2007.severity = none

src/ServiceControl.Transports.SqlServer.Tests/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# Justification: Test project
+dotnet_diagnostic.CA2007.severity = none

src/ServiceControl.Transports.Tests/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# Justification: Test project
+dotnet_diagnostic.CA2007.severity = none

src/ServiceControlInstaller.Engine.UnitTests/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# Justification: Test project
+dotnet_diagnostic.CA2007.severity = none

src/ServiceControlInstaller.Packaging.UnitTests/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# Justification: Test project
+dotnet_diagnostic.CA2007.severity = none

src/TestHelper/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# Justification: Test project
+dotnet_diagnostic.CA2007.severity = none