From b0e5320879d0910af0d187885cc12e8ae4c85108 Mon Sep 17 00:00:00 2001
From: Daniel Marbach <daniel.marbach@openplace.net>
Date: Fri, 10 Jan 2025 08:44:24 +0100
Subject: [PATCH 1/2] Use 9.2.4-alpha.1

---
 .../NServiceBus.Transport.SQS.AcceptanceTests.csproj            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NServiceBus.Transport.SQS.AcceptanceTests/NServiceBus.Transport.SQS.AcceptanceTests.csproj b/src/NServiceBus.Transport.SQS.AcceptanceTests/NServiceBus.Transport.SQS.AcceptanceTests.csproj
index 3af590a2e..79b5fb4cd 100644
--- a/src/NServiceBus.Transport.SQS.AcceptanceTests/NServiceBus.Transport.SQS.AcceptanceTests.csproj
+++ b/src/NServiceBus.Transport.SQS.AcceptanceTests/NServiceBus.Transport.SQS.AcceptanceTests.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.2.3" GeneratePathProperty="true" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.2.4-alpha.1" GeneratePathProperty="true" />
     <PackageReference Include="NUnit" Version="4.3.2" />
     <PackageReference Include="NUnit.Analyzers" Version="4.6.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />

From 79eebe975b16992ebd4fc57f1217b9b979ed6031 Mon Sep 17 00:00:00 2001
From: Daniel Marbach <daniel.marbach@openplace.net>
Date: Fri, 10 Jan 2025 08:52:41 +0100
Subject: [PATCH 2/2] Make things compile

---
 .../ConfigureEndpointSqsTransport.cs                  | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/NServiceBus.Transport.SQS.AcceptanceTests/ConfigureEndpointSqsTransport.cs b/src/NServiceBus.Transport.SQS.AcceptanceTests/ConfigureEndpointSqsTransport.cs
index b098f99d3..c73ba8ee9 100644
--- a/src/NServiceBus.Transport.SQS.AcceptanceTests/ConfigureEndpointSqsTransport.cs
+++ b/src/NServiceBus.Transport.SQS.AcceptanceTests/ConfigureEndpointSqsTransport.cs
@@ -25,8 +25,6 @@ public ConfigureEndpointSqsTransport(bool supportsPublishSubscribe = true)
 
         public Task Configure(string endpointName, EndpointConfiguration configuration, RunSettings settings, PublisherMetadata publisherMetadata)
         {
-            PreventInconclusiveTestsFromRunning(endpointName);
-
             var transport = PrepareSqsTransport(supportsPublishSubscribe);
             configuration.UseTransport(transport);
 
@@ -68,6 +66,7 @@ public static SqsTransport PrepareSqsTransport(bool supportsPublishSubscribe = t
 
         static void ApplyMappingsToSupportMultipleInheritance(string endpointName, SqsTransport transportConfig)
         {
+            // TODO: This can probably be simplified now with the publisher mapping
             if (endpointName == Conventions.EndpointNamingConvention(typeof(MultiSubscribeToPolymorphicEvent.Subscriber)))
             {
                 transportConfig.MapEvent<MultiSubscribeToPolymorphicEvent.IMyEvent, MultiSubscribeToPolymorphicEvent.MyEvent1>();
@@ -99,13 +98,5 @@ static void ApplyMappingsToSupportMultipleInheritance(string endpointName, SqsTr
         public Task Cleanup() =>
             // Queues are cleaned up once, globally, in SetupFixture.
             Task.CompletedTask;
-
-        static void PreventInconclusiveTestsFromRunning(string endpointName)
-        {
-            if (endpointName == Conventions.EndpointNamingConvention(typeof(MessageDriven.Pub_from_sendonly.SendOnlyPublisher)))
-            {
-                Assert.Inconclusive("Test is not using endpoint naming conventions in hardcoded subscription storage. Should be fixed in core vNext.");
-            }
-        }
     }
 }
\ No newline at end of file