From ba57bb3ba87f834e6751887135ee1d6b00df93f2 Mon Sep 17 00:00:00 2001 From: Phil Bastian Date: Wed, 14 Aug 2024 12:33:05 +0800 Subject: [PATCH 1/3] update NServiceBus.Transport.AzureServiceBus version to address issue processing large batch sizes (cherry picked from commit 0cad776c0f155e661b2ebf6864a04cf2c8cb0df7) (cherry picked from commit d713581a3f8e9a283421bcad4db511bc26a11d2e) --- src/Directory.Packages.props | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index ed1ff52582..3bb759db7f 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -1,10 +1,8 @@ - true true - @@ -45,7 +43,7 @@ - + @@ -73,7 +71,6 @@ - @@ -85,11 +82,9 @@ - - \ No newline at end of file From 0ae2a9cad5f2ade0be52b1ca7fd5a1c268b6d8f6 Mon Sep 17 00:00:00 2001 From: Phil Bastian <155411597+PhilBastian@users.noreply.github.com> Date: Wed, 14 Aug 2024 16:46:28 +0800 Subject: [PATCH 2/3] Merge pull request #4365 from Particular/1290_null_messagetype handle messagetype being null (cherry picked from commit 14a3a86488d38c1bc2680f6643853b7bbe9fe1d1) --- .../Infrastructure/Api/EndpointMetricsApi.cs | 4 +++- .../Infrastructure/EndpointMessageType.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ServiceControl.Monitoring/Infrastructure/Api/EndpointMetricsApi.cs b/src/ServiceControl.Monitoring/Infrastructure/Api/EndpointMetricsApi.cs index e8bec35a9d..4ec8e32e9c 100644 --- a/src/ServiceControl.Monitoring/Infrastructure/Api/EndpointMetricsApi.cs +++ b/src/ServiceControl.Monitoring/Infrastructure/Api/EndpointMetricsApi.cs @@ -221,7 +221,9 @@ static MonitoredMetric CreateMetric(string name, static MonitoredEndpointMessageType[] GetMonitoredMessageTypes(IEnumerable messageTypes) { - return messageTypes.Select(mt => MonitoredEndpointMessageTypeParser.Parse(mt.MessageType)) + return messageTypes + .Where(mt => !string.IsNullOrEmpty(mt.MessageType)) + .Select(mt => MonitoredEndpointMessageTypeParser.Parse(mt.MessageType)) .ToArray(); } diff --git a/src/ServiceControl.Monitoring/Infrastructure/EndpointMessageType.cs b/src/ServiceControl.Monitoring/Infrastructure/EndpointMessageType.cs index 847647f2e0..105dd849ab 100644 --- a/src/ServiceControl.Monitoring/Infrastructure/EndpointMessageType.cs +++ b/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) From 96cb82928c609220df0c30027960be0a96587414 Mon Sep 17 00:00:00 2001 From: Phil Bastian <155411597+PhilBastian@users.noreply.github.com> Date: Wed, 14 Aug 2024 15:39:47 +0800 Subject: [PATCH 3/3] Merge pull request #4373 from Particular/add_ca2007_ignore_for_tests ignore ca2007 for tests (cherry picked from commit 9553f52e6dd803fb6019180e8dec3f3a3b94ead1) --- src/ServiceControl.AcceptanceTests.RavenDB/.editorconfig | 4 ++++ src/ServiceControl.Transports.ASBS.Tests/.editorconfig | 4 ++++ src/ServiceControl.Transports.ASQ.Tests/.editorconfig | 4 ++++ src/ServiceControl.Transports.Msmq.Tests/.editorconfig | 4 ++++ .../.editorconfig | 4 ++++ .../.editorconfig | 4 ++++ .../.editorconfig | 4 ++++ .../.editorconfig | 4 ++++ src/ServiceControl.Transports.SQS.Tests/.editorconfig | 4 ++++ src/ServiceControl.Transports.SqlServer.Tests/.editorconfig | 4 ++++ src/ServiceControl.Transports.Tests/.editorconfig | 4 ++++ src/ServiceControlInstaller.Engine.UnitTests/.editorconfig | 4 ++++ src/ServiceControlInstaller.Packaging.UnitTests/.editorconfig | 4 ++++ src/TestHelper/.editorconfig | 4 ++++ 14 files changed, 56 insertions(+) create mode 100644 src/ServiceControl.AcceptanceTests.RavenDB/.editorconfig create mode 100644 src/ServiceControl.Transports.ASBS.Tests/.editorconfig create mode 100644 src/ServiceControl.Transports.ASQ.Tests/.editorconfig create mode 100644 src/ServiceControl.Transports.Msmq.Tests/.editorconfig create mode 100644 src/ServiceControl.Transports.RabbitMQClassicConventionalRouting.Tests/.editorconfig create mode 100644 src/ServiceControl.Transports.RabbitMQClassicDirectRouting.Tests/.editorconfig create mode 100644 src/ServiceControl.Transports.RabbitMQQuorumConventionalRouting.Tests/.editorconfig create mode 100644 src/ServiceControl.Transports.RabbitMQQuorumDirectRouting.Tests/.editorconfig create mode 100644 src/ServiceControl.Transports.SQS.Tests/.editorconfig create mode 100644 src/ServiceControl.Transports.SqlServer.Tests/.editorconfig create mode 100644 src/ServiceControl.Transports.Tests/.editorconfig create mode 100644 src/ServiceControlInstaller.Engine.UnitTests/.editorconfig create mode 100644 src/ServiceControlInstaller.Packaging.UnitTests/.editorconfig create mode 100644 src/TestHelper/.editorconfig diff --git a/src/ServiceControl.AcceptanceTests.RavenDB/.editorconfig b/src/ServiceControl.AcceptanceTests.RavenDB/.editorconfig new file mode 100644 index 0000000000..0279bdc2db --- /dev/null +++ b/src/ServiceControl.AcceptanceTests.RavenDB/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# Justification: Test project +dotnet_diagnostic.CA2007.severity = none \ No newline at end of file diff --git a/src/ServiceControl.Transports.ASBS.Tests/.editorconfig b/src/ServiceControl.Transports.ASBS.Tests/.editorconfig new file mode 100644 index 0000000000..0279bdc2db --- /dev/null +++ b/src/ServiceControl.Transports.ASBS.Tests/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# Justification: Test project +dotnet_diagnostic.CA2007.severity = none \ No newline at end of file diff --git a/src/ServiceControl.Transports.ASQ.Tests/.editorconfig b/src/ServiceControl.Transports.ASQ.Tests/.editorconfig new file mode 100644 index 0000000000..0279bdc2db --- /dev/null +++ b/src/ServiceControl.Transports.ASQ.Tests/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# Justification: Test project +dotnet_diagnostic.CA2007.severity = none \ No newline at end of file diff --git a/src/ServiceControl.Transports.Msmq.Tests/.editorconfig b/src/ServiceControl.Transports.Msmq.Tests/.editorconfig new file mode 100644 index 0000000000..0279bdc2db --- /dev/null +++ b/src/ServiceControl.Transports.Msmq.Tests/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# Justification: Test project +dotnet_diagnostic.CA2007.severity = none \ No newline at end of file diff --git a/src/ServiceControl.Transports.RabbitMQClassicConventionalRouting.Tests/.editorconfig b/src/ServiceControl.Transports.RabbitMQClassicConventionalRouting.Tests/.editorconfig new file mode 100644 index 0000000000..0279bdc2db --- /dev/null +++ b/src/ServiceControl.Transports.RabbitMQClassicConventionalRouting.Tests/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# Justification: Test project +dotnet_diagnostic.CA2007.severity = none \ No newline at end of file diff --git a/src/ServiceControl.Transports.RabbitMQClassicDirectRouting.Tests/.editorconfig b/src/ServiceControl.Transports.RabbitMQClassicDirectRouting.Tests/.editorconfig new file mode 100644 index 0000000000..0279bdc2db --- /dev/null +++ b/src/ServiceControl.Transports.RabbitMQClassicDirectRouting.Tests/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# Justification: Test project +dotnet_diagnostic.CA2007.severity = none \ No newline at end of file diff --git a/src/ServiceControl.Transports.RabbitMQQuorumConventionalRouting.Tests/.editorconfig b/src/ServiceControl.Transports.RabbitMQQuorumConventionalRouting.Tests/.editorconfig new file mode 100644 index 0000000000..0279bdc2db --- /dev/null +++ b/src/ServiceControl.Transports.RabbitMQQuorumConventionalRouting.Tests/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# Justification: Test project +dotnet_diagnostic.CA2007.severity = none \ No newline at end of file diff --git a/src/ServiceControl.Transports.RabbitMQQuorumDirectRouting.Tests/.editorconfig b/src/ServiceControl.Transports.RabbitMQQuorumDirectRouting.Tests/.editorconfig new file mode 100644 index 0000000000..0279bdc2db --- /dev/null +++ b/src/ServiceControl.Transports.RabbitMQQuorumDirectRouting.Tests/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# Justification: Test project +dotnet_diagnostic.CA2007.severity = none \ No newline at end of file diff --git a/src/ServiceControl.Transports.SQS.Tests/.editorconfig b/src/ServiceControl.Transports.SQS.Tests/.editorconfig new file mode 100644 index 0000000000..0279bdc2db --- /dev/null +++ b/src/ServiceControl.Transports.SQS.Tests/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# Justification: Test project +dotnet_diagnostic.CA2007.severity = none \ No newline at end of file diff --git a/src/ServiceControl.Transports.SqlServer.Tests/.editorconfig b/src/ServiceControl.Transports.SqlServer.Tests/.editorconfig new file mode 100644 index 0000000000..0279bdc2db --- /dev/null +++ b/src/ServiceControl.Transports.SqlServer.Tests/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# Justification: Test project +dotnet_diagnostic.CA2007.severity = none \ No newline at end of file diff --git a/src/ServiceControl.Transports.Tests/.editorconfig b/src/ServiceControl.Transports.Tests/.editorconfig new file mode 100644 index 0000000000..0279bdc2db --- /dev/null +++ b/src/ServiceControl.Transports.Tests/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# Justification: Test project +dotnet_diagnostic.CA2007.severity = none \ No newline at end of file diff --git a/src/ServiceControlInstaller.Engine.UnitTests/.editorconfig b/src/ServiceControlInstaller.Engine.UnitTests/.editorconfig new file mode 100644 index 0000000000..0279bdc2db --- /dev/null +++ b/src/ServiceControlInstaller.Engine.UnitTests/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# Justification: Test project +dotnet_diagnostic.CA2007.severity = none \ No newline at end of file diff --git a/src/ServiceControlInstaller.Packaging.UnitTests/.editorconfig b/src/ServiceControlInstaller.Packaging.UnitTests/.editorconfig new file mode 100644 index 0000000000..0279bdc2db --- /dev/null +++ b/src/ServiceControlInstaller.Packaging.UnitTests/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# Justification: Test project +dotnet_diagnostic.CA2007.severity = none \ No newline at end of file diff --git a/src/TestHelper/.editorconfig b/src/TestHelper/.editorconfig new file mode 100644 index 0000000000..0279bdc2db --- /dev/null +++ b/src/TestHelper/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# Justification: Test project +dotnet_diagnostic.CA2007.severity = none \ No newline at end of file