Merge branch 'nsb9' of https://github.com/Particular/NServiceBus into…

… nsb9

src/NServiceBus.AcceptanceTesting/AcceptanceTestingPersistence/SubscriptionStorage/AcceptanceTestingSubscriptionPersistence.cs

@@ -8,9 +8,7 @@ class AcceptanceTestingSubscriptionPersistence : Feature
     {
         public AcceptanceTestingSubscriptionPersistence()
         {
-#pragma warning disable CS0618
-            DependsOn<MessageDrivenSubscriptions>();
-#pragma warning restore CS0618
+            DependsOn("MessageDrivenSubscriptions");
         }
 
         protected internal override void Setup(FeatureConfigurationContext context)

src/NServiceBus.Core/Routing/MessageDrivenSubscriptions/MessageDrivenSubscriptions.cs

@@ -8,11 +8,11 @@ namespace NServiceBus.Features
 
     /// <summary>
     /// Allows subscribers to register by sending a subscription message to this endpoint.
-    /// ---
-    /// The goal is to remove feature classes that implemented functionality far beyond what features are "supposed" to be.
-    /// Many of those features have been moved into components instead. Now that this class is internal in V8 that
-    /// refactoring can occur.
     /// </summary>
+
+    // The goal is to remove feature classes that implement functionality far beyond what features are "supposed" to be.
+    // Many of those features have been moved into components instead.
+    // The ObsoleteEx attribute is here so that when it's time to 'RemoveInVersion', the class should not be deleted, but made internal. Once it's internal, refactoring can occur.
     [ObsoleteEx(
         Message = "It's not recommended to disable the MessageDrivenSubscriptions feature and this option will be removed in future versions. Use 'TransportExtensions<T>.DisablePublishing()' to avoid the need for a subscription storage if this endpoint does not publish events.",
         RemoveInVersion = "10",