Merge pull request #1094 from Particular/reintroduce-hybrid

Reintroduce hybrid mode
Particular · Nov 11, 2022 · 0574216 · 0574216
2 parents 301a44a + b6e87a7
commit 0574216
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/NServiceBus.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt b/src/NServiceBus.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt
@@ -18,9 +18,6 @@ namespace NServiceBus
     public static class MessageDrivenPubSubCompatibilityModeConfiguration
     {
         public static NServiceBus.SubscriptionMigrationModeSettings EnableMessageDrivenPubSubCompatibilityMode(this NServiceBus.RoutingSettings routingSettings) { }
-        [System.Obsolete("Native publish/subscribe is always enabled in version 7. All endpoints must be up" +
-            "dated to use native publish/subscribe before updating to this version. Will be r" +
-            "emoved in version 8.0.0.", true)]
         public static NServiceBus.SubscriptionMigrationModeSettings EnableMessageDrivenPubSubCompatibilityMode(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
     }
     public static class PublishOptionsExtensions

diff --git a/...NServiceBus.Transport.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt b/...NServiceBus.Transport.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt
@@ -18,9 +18,6 @@ namespace NServiceBus
     public static class MessageDrivenPubSubCompatibilityModeConfiguration
     {
         public static NServiceBus.SubscriptionMigrationModeSettings EnableMessageDrivenPubSubCompatibilityMode(this NServiceBus.RoutingSettings routingSettings) { }
-        [System.Obsolete("Native publish/subscribe is always enabled in version 7. All endpoints must be up" +
-            "dated to use native publish/subscribe before updating to this version. Will be r" +
-            "emoved in version 8.0.0.", true)]
         public static NServiceBus.SubscriptionMigrationModeSettings EnableMessageDrivenPubSubCompatibilityMode(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
     }
     public static class PublishOptionsExtensions

diff --git a/src/NServiceBus.Transport.SqlServer/Configuration/SqlServerTransportSettingsExtensions.cs b/src/NServiceBus.Transport.SqlServer/Configuration/SqlServerTransportSettingsExtensions.cs
@@ -327,9 +327,10 @@ public static partial class MessageDrivenPubSubCompatibilityModeConfiguration
         /// Enables compatibility with endpoints running on message-driven pub-sub
         /// </summary>
         /// <param name="transportExtensions">The transport to enable pub-sub compatibility on</param>
-        [ObsoleteEx(Message = "Native publish/subscribe is always enabled in version 7. All endpoints must be updated to use native publish/subscribe before updating to this version.",
-            TreatAsErrorFromVersion = "7",
-            RemoveInVersion = "8")]
+        [PreObsolete(Message = "Native publish/subscribe is always enabled in version 7. All endpoints should be updated to use native publish/subscribe before updating to this version.",
+            TreatAsErrorFromVersion = "8",
+            RemoveInVersion = "9",
+            Note = "As long as core supports message-driven publish/subscribe migration mode, then the transports must continue to support it too. Keep bumping the versions when working on a new major until core no longer supports message-driven publish/subscribe migration mode.")]
         public static SubscriptionMigrationModeSettings EnableMessageDrivenPubSubCompatibilityMode(
             this TransportExtensions<SqlServerTransport> transportExtensions)
         {