From 1e3c2b6542ffe4b51e4d38d141abce71127296d6 Mon Sep 17 00:00:00 2001 From: Particular Bot Date: Thu, 7 May 2026 10:48:31 -0500 Subject: [PATCH 1/9] Update NServiceBus packages to 10.2.0-alpha.8 (src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj) --- ...ServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj b/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj index 0e72071..87e6f7e 100644 --- a/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj +++ b/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj @@ -11,7 +11,7 @@ - + From afa1d7e42f2d8707c1a219d4297d824ffa5feaaa Mon Sep 17 00:00:00 2001 From: Particular Bot Date: Thu, 7 May 2026 10:48:32 -0500 Subject: [PATCH 2/9] Update NServiceBus packages to 10.2.0-alpha.8 (src/MessageProperty/NServiceBus.Encryption.MessageProperty.csproj) --- .../NServiceBus.Encryption.MessageProperty.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MessageProperty/NServiceBus.Encryption.MessageProperty.csproj b/src/MessageProperty/NServiceBus.Encryption.MessageProperty.csproj index 5335561..8460735 100644 --- a/src/MessageProperty/NServiceBus.Encryption.MessageProperty.csproj +++ b/src/MessageProperty/NServiceBus.Encryption.MessageProperty.csproj @@ -1,4 +1,4 @@ - + net10.0 @@ -8,7 +8,7 @@ - + From 82395829a2052db859644f1a7401c66ad84138de Mon Sep 17 00:00:00 2001 From: Matt Mercurio Date: Mon, 11 May 2026 15:08:51 -0500 Subject: [PATCH 3/9] Remove obsolete ScenarioContext RegisterComponents from acceptance DefaultServer --- src/AcceptanceTests/Infrastructure/DefaultServer.cs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/AcceptanceTests/Infrastructure/DefaultServer.cs b/src/AcceptanceTests/Infrastructure/DefaultServer.cs index 5e1d852..af334a2 100644 --- a/src/AcceptanceTests/Infrastructure/DefaultServer.cs +++ b/src/AcceptanceTests/Infrastructure/DefaultServer.cs @@ -5,7 +5,6 @@ using AcceptanceTesting.Customization; using AcceptanceTesting.Support; using Configuration.AdvancedExtensibility; - using Microsoft.Extensions.DependencyInjection; public class DefaultServer : IEndpointSetupTemplate { @@ -22,16 +21,6 @@ public async Task GetConfiguration(RunDescriptor runDescr configuration.UseTransport(new LearningTransport()); - configuration.RegisterComponents(r => - { - var type = runDescriptor.ScenarioContext.GetType(); - while (type != typeof(object)) - { - r.AddSingleton(type, runDescriptor.ScenarioContext); - type = type.BaseType; - } - }); - configuration.UsePersistence(); configuration.GetSettings().SetDefault("ScaleOut.UseSingleBrokerQueue", true); From 1548265b0af14424dc0916b05bf8f519de530fc3 Mon Sep 17 00:00:00 2001 From: Matt Mercurio Date: Mon, 11 May 2026 15:11:20 -0500 Subject: [PATCH 4/9] Revert "Update NServiceBus packages to 10.2.0-alpha.8 (src/MessageProperty/NServiceBus.Encryption.MessageProperty.csproj)" This reverts commit afa1d7e42f2d8707c1a219d4297d824ffa5feaaa. --- .../NServiceBus.Encryption.MessageProperty.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MessageProperty/NServiceBus.Encryption.MessageProperty.csproj b/src/MessageProperty/NServiceBus.Encryption.MessageProperty.csproj index 8460735..5335561 100644 --- a/src/MessageProperty/NServiceBus.Encryption.MessageProperty.csproj +++ b/src/MessageProperty/NServiceBus.Encryption.MessageProperty.csproj @@ -1,4 +1,4 @@ - + net10.0 @@ -8,7 +8,7 @@ - + From a9c74b4955289e483229f2bab023e7fd57eb7161 Mon Sep 17 00:00:00 2001 From: Matt Mercurio Date: Mon, 11 May 2026 15:11:26 -0500 Subject: [PATCH 5/9] Revert "Update NServiceBus packages to 10.2.0-alpha.8 (src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj)" This reverts commit 1e3c2b6542ffe4b51e4d38d141abce71127296d6. --- ...ServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj b/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj index 87e6f7e..0e72071 100644 --- a/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj +++ b/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj @@ -11,7 +11,7 @@ - + From 25cf2c7bd8e76625e32f31cfe77249f47452fd24 Mon Sep 17 00:00:00 2001 From: Matt Mercurio Date: Mon, 11 May 2026 15:29:57 -0500 Subject: [PATCH 6/9] Migrate acceptance tests to NServiceBus.AcceptanceTests.Sources and remove custom infrastructure --- src/AcceptanceTests/GlobalUsings.cs | 2 ++ .../Infrastructure/DefaultServer.cs | 34 ------------------ .../NServiceBusAcceptanceTest.cs | 35 ------------------- ...ion.MessageProperty.AcceptanceTests.csproj | 6 ++++ src/AcceptanceTests/TestSuiteConstraints.cs | 24 +++++++++++++ 5 files changed, 32 insertions(+), 69 deletions(-) create mode 100644 src/AcceptanceTests/GlobalUsings.cs delete mode 100644 src/AcceptanceTests/Infrastructure/DefaultServer.cs delete mode 100644 src/AcceptanceTests/Infrastructure/NServiceBusAcceptanceTest.cs create mode 100644 src/AcceptanceTests/TestSuiteConstraints.cs diff --git a/src/AcceptanceTests/GlobalUsings.cs b/src/AcceptanceTests/GlobalUsings.cs new file mode 100644 index 0000000..4260cfc --- /dev/null +++ b/src/AcceptanceTests/GlobalUsings.cs @@ -0,0 +1,2 @@ +global using NServiceBus.AcceptanceTests; +global using NServiceBus.AcceptanceTests.EndpointTemplates; diff --git a/src/AcceptanceTests/Infrastructure/DefaultServer.cs b/src/AcceptanceTests/Infrastructure/DefaultServer.cs deleted file mode 100644 index af334a2..0000000 --- a/src/AcceptanceTests/Infrastructure/DefaultServer.cs +++ /dev/null @@ -1,34 +0,0 @@ -namespace NServiceBus.Encryption.MessageProperty.AcceptanceTests -{ - using System; - using System.Threading.Tasks; - using AcceptanceTesting.Customization; - using AcceptanceTesting.Support; - using Configuration.AdvancedExtensibility; - - public class DefaultServer : IEndpointSetupTemplate - { - public async Task GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Func configurationBuilderCustomization) - { - var configuration = new EndpointConfiguration(endpointConfiguration.EndpointName); - configuration.UseSerialization(); - - configuration.EnableInstallers(); - - var recoverability = configuration.Recoverability(); - recoverability.Delayed(delayed => delayed.NumberOfRetries(0)); - recoverability.Immediate(immediate => immediate.NumberOfRetries(0)); - - configuration.UseTransport(new LearningTransport()); - - configuration.UsePersistence(); - - configuration.GetSettings().SetDefault("ScaleOut.UseSingleBrokerQueue", true); - await configurationBuilderCustomization(configuration); - - configuration.ScanTypesForTest(endpointConfiguration); - - return configuration; - } - } -} diff --git a/src/AcceptanceTests/Infrastructure/NServiceBusAcceptanceTest.cs b/src/AcceptanceTests/Infrastructure/NServiceBusAcceptanceTest.cs deleted file mode 100644 index 066ef1a..0000000 --- a/src/AcceptanceTests/Infrastructure/NServiceBusAcceptanceTest.cs +++ /dev/null @@ -1,35 +0,0 @@ -namespace NServiceBus.Encryption.MessageProperty.AcceptanceTests -{ - using System.Linq; - using System.Threading; - using AcceptanceTesting.Customization; - using NUnit.Framework; - - /// - /// Base class for all the NSB test that sets up our conventions - /// - [TestFixture] - public abstract partial class NServiceBusAcceptanceTest - { - [SetUp] - public void SetUp() - { - Conventions.EndpointNamingConvention = t => - { - var classAndEndpoint = t.FullName.Split('.').Last(); - - var testName = classAndEndpoint.Split('+').First(); - - testName = testName.Replace("When_", ""); - - var endpointBuilder = classAndEndpoint.Split('+').Last(); - - testName = Thread.CurrentThread.CurrentCulture.TextInfo.ToTitleCase(testName); - - testName = testName.Replace("_", ""); - - return testName + "." + endpointBuilder; - }; - } - } -} diff --git a/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj b/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj index 0e72071..16b4e42 100644 --- a/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj +++ b/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj @@ -11,10 +11,16 @@ + + + + + + diff --git a/src/AcceptanceTests/TestSuiteConstraints.cs b/src/AcceptanceTests/TestSuiteConstraints.cs new file mode 100644 index 0000000..3e1823f --- /dev/null +++ b/src/AcceptanceTests/TestSuiteConstraints.cs @@ -0,0 +1,24 @@ +namespace NServiceBus.AcceptanceTests; + +using AcceptanceTesting.Support; + +public partial class TestSuiteConstraints +{ + public bool SupportsDtc => false; + + public bool SupportsCrossQueueTransactions => true; + + public bool SupportsNativePubSub => true; + + public bool SupportsDelayedDelivery => true; + + public bool SupportsOutbox => false; + + public bool SupportsPurgeOnStartup => true; + + public IConfigureEndpointTestExecution CreateTransportConfiguration() => + new ConfigureEndpointAcceptanceTestingTransport(SupportsNativePubSub, SupportsDelayedDelivery); + + public IConfigureEndpointTestExecution CreatePersistenceConfiguration() => + new ConfigureEndpointAcceptanceTestingPersistence(); +} From 510fca6d228e848c17c118baed70e8a8fee6ed9b Mon Sep 17 00:00:00 2001 From: Matt Mercurio Date: Mon, 11 May 2026 15:34:37 -0500 Subject: [PATCH 7/9] Fix package ordering --- ...ServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj b/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj index 16b4e42..2434594 100644 --- a/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj +++ b/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj @@ -11,8 +11,8 @@ - + From 27a72aa8a53e4aa6567091628635eb10340ba4e2 Mon Sep 17 00:00:00 2001 From: Matt Mercurio Date: Tue, 12 May 2026 18:02:45 -0500 Subject: [PATCH 8/9] ItemGroup organization --- ...ceBus.Encryption.MessageProperty.AcceptanceTests.csproj | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj b/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj index 2434594..0229cec 100644 --- a/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj +++ b/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj @@ -11,12 +11,15 @@ - - + + + + + From f078a281061ab92dd665c60040ba631bccff95e1 Mon Sep 17 00:00:00 2001 From: Daniel Marbach Date: Wed, 13 May 2026 08:11:45 +0200 Subject: [PATCH 9/9] Refactor Compile items in project file --- ...ceBus.Encryption.MessageProperty.AcceptanceTests.csproj | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj b/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj index 0229cec..3efb8ce 100644 --- a/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj +++ b/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj @@ -22,8 +22,11 @@ - - + + + + +