From 3320171d6f852e5107a956d1e21be3d1e7121c05 Mon Sep 17 00:00:00 2001 From: Ramon Smits Date: Mon, 25 Nov 2024 12:43:07 +0100 Subject: [PATCH 1/5] Updated to make use new constructor to disable delayed delivery --- src/Directory.Packages.props | 2 +- .../SQSTransportCustomization.cs | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 19496f4e7d..2685317ad0 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -30,7 +30,7 @@ - + diff --git a/src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs b/src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs index 052f76db39..f0ceab971a 100644 --- a/src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs +++ b/src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs @@ -71,7 +71,9 @@ protected override SqsTransport CreateTransport(TransportSettings transportSetti snsClient = new AmazonSimpleNotificationServiceClient(); } - var transport = new SqsTransport(sqsClient, snsClient); +#pragma warning disable NSBSQSEXP0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. + var transport = new SqsTransport(sqsClient, snsClient, enableDelayedDelivery: false); +#pragma warning enalbe NSBSQSEXP0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. if (!string.IsNullOrEmpty(builder.QueueNamePrefix)) { @@ -109,14 +111,10 @@ protected override SqsTransport CreateTransport(TransportSettings transportSetti transport.DoNotWrapOutgoingMessages = builder.DoNotWrapOutgoingMessages; transport.TransportTransactionMode = transport.GetSupportedTransactionModes().Contains(preferredTransactionMode) ? preferredTransactionMode : TransportTransactionMode.ReceiveOnly; - DisableDelayedDelivery(transport) = true; return transport; } - [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "k__BackingField")] - static extern ref bool DisableDelayedDelivery(SqsTransport transport); - static void PromoteEnvironmentVariableFromConnectionString(string value, string environmentVariableName) => Environment.SetEnvironmentVariable(environmentVariableName, value, EnvironmentVariableTarget.Process); From da56659d22cfbc4dc53283aaee39f286e20166d0 Mon Sep 17 00:00:00 2001 From: Ramon Smits Date: Mon, 25 Nov 2024 12:45:27 +0100 Subject: [PATCH 2/5] Cleanup --- .../SQSTransportCustomization.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs b/src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs index f0ceab971a..814eeab79f 100644 --- a/src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs +++ b/src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs @@ -71,9 +71,9 @@ protected override SqsTransport CreateTransport(TransportSettings transportSetti snsClient = new AmazonSimpleNotificationServiceClient(); } -#pragma warning disable NSBSQSEXP0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. +#pragma warning disable NSBSQSEXP0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. var transport = new SqsTransport(sqsClient, snsClient, enableDelayedDelivery: false); -#pragma warning enalbe NSBSQSEXP0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. +#pragma warning enable NSBSQSEXP0001 if (!string.IsNullOrEmpty(builder.QueueNamePrefix)) { From 98bd07afc27d352eedcb402727604c3f67320d5b Mon Sep 17 00:00:00 2001 From: Ramon Smits Date: Mon, 25 Nov 2024 15:21:19 +0100 Subject: [PATCH 3/5] NServiceBus.AmazonSQS 7.1.0-alpha.1 --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 2685317ad0..5bf252c5b6 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -30,7 +30,7 @@ - + From 9629a3c496e2fa5db31c909b334077cd3791ae45 Mon Sep 17 00:00:00 2001 From: Ramon Smits Date: Mon, 25 Nov 2024 15:22:33 +0100 Subject: [PATCH 4/5] typo --- src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs b/src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs index 814eeab79f..7d07fb54a1 100644 --- a/src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs +++ b/src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs @@ -73,7 +73,7 @@ protected override SqsTransport CreateTransport(TransportSettings transportSetti #pragma warning disable NSBSQSEXP0001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. var transport = new SqsTransport(sqsClient, snsClient, enableDelayedDelivery: false); -#pragma warning enable NSBSQSEXP0001 +#pragma warning restore NSBSQSEXP0001 if (!string.IsNullOrEmpty(builder.QueueNamePrefix)) { From 27fa4e53a1ce234048618bd4e73c3ec243a1d9b5 Mon Sep 17 00:00:00 2001 From: Ramon Smits Date: Mon, 25 Nov 2024 15:41:02 +0100 Subject: [PATCH 5/5] NServiceBus.AmazonSQS 7.1.0 --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 5bf252c5b6..66a7e66b61 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -30,7 +30,7 @@ - +