From b00481435160fced281a8e0c6b3d9cf70b38dcfb Mon Sep 17 00:00:00 2001
From: danielmarbach <daniel.marbach@openplace.net>
Date: Tue, 18 Dec 2018 18:41:51 +0100
Subject: [PATCH 1/2] Upgrade the ASB transport package

---
 ...ntrol.Monitoring.SmokeTests.LegacyAzureServiceBus.csproj | 6 +++---
 .../packages.config                                         | 4 ++--
 .../ServiceControl.Transports.LegacyAzureServiceBus.csproj  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus.csproj b/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus.csproj
index e8b6019..b6a49c7 100644
--- a/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus.csproj
+++ b/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus.csproj
@@ -45,7 +45,7 @@
       <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.8\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.ServiceBus, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\WindowsAzure.ServiceBus.4.1.11\lib\net45\Microsoft.ServiceBus.dll</HintPath>
+      <HintPath>..\packages\WindowsAzure.ServiceBus.5.0.2\lib\net46\Microsoft.ServiceBus.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -53,8 +53,8 @@
     <Reference Include="NServiceBus.AcceptanceTesting, Version=7.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
       <HintPath>..\packages\NServiceBus.AcceptanceTesting.7.1.4\lib\net452\NServiceBus.AcceptanceTesting.dll</HintPath>
     </Reference>
-    <Reference Include="NServiceBus.Azure.Transports.WindowsAzureServiceBus, Version=8.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NServiceBus.Azure.Transports.WindowsAzureServiceBus.8.0.6\lib\net452\NServiceBus.Azure.Transports.WindowsAzureServiceBus.dll</HintPath>
+    <Reference Include="NServiceBus.Azure.Transports.WindowsAzureServiceBus, Version=9.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NServiceBus.Azure.Transports.WindowsAzureServiceBus.9.1.0\lib\net46\NServiceBus.Azure.Transports.WindowsAzureServiceBus.dll</HintPath>
     </Reference>
     <Reference Include="NServiceBus.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
       <HintPath>..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll</HintPath>
diff --git a/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/packages.config b/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/packages.config
index 338b40b..22d53cd 100644
--- a/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/packages.config
+++ b/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/packages.config
@@ -5,11 +5,11 @@
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
   <package id="NServiceBus" version="7.1.4" targetFramework="net46" />
   <package id="NServiceBus.AcceptanceTesting" version="7.1.4" targetFramework="net46" />
-  <package id="NServiceBus.Azure.Transports.WindowsAzureServiceBus" version="8.0.6" targetFramework="net46" />
+  <package id="NServiceBus.Azure.Transports.WindowsAzureServiceBus" version="9.1.0" targetFramework="net461" />
   <package id="NServiceBus.Metrics" version="3.0.0" targetFramework="net46" />
   <package id="NServiceBus.Metrics.ServiceControl" version="3.0.2" targetFramework="net46" />
   <package id="NServiceBus.Newtonsoft.Json" version="2.1.0" targetFramework="net46" />
   <package id="NUnit" version="3.10.1" targetFramework="net46" />
   <package id="System.IdentityModel.Tokens.Jwt" version="4.0.4.403061554" targetFramework="net46" />
-  <package id="WindowsAzure.ServiceBus" version="4.1.11" targetFramework="net46" />
+  <package id="WindowsAzure.ServiceBus" version="5.0.2" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/src/ServiceControl.Transports.LegacyAzureServiceBus/ServiceControl.Transports.LegacyAzureServiceBus.csproj b/src/ServiceControl.Transports.LegacyAzureServiceBus/ServiceControl.Transports.LegacyAzureServiceBus.csproj
index d59ea8b..011184c 100644
--- a/src/ServiceControl.Transports.LegacyAzureServiceBus/ServiceControl.Transports.LegacyAzureServiceBus.csproj
+++ b/src/ServiceControl.Transports.LegacyAzureServiceBus/ServiceControl.Transports.LegacyAzureServiceBus.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.Azure.Transports.WindowsAzureServiceBus" Version="8.0.6" />
+    <PackageReference Include="NServiceBus.Azure.Transports.WindowsAzureServiceBus" Version="9.1.0" />
   </ItemGroup>
 
 </Project>

From 36618fbb99258a8bcbca7be69551e9e0d9ded181 Mon Sep 17 00:00:00 2001
From: danielmarbach <daniel.marbach@openplace.net>
Date: Tue, 18 Dec 2018 18:42:03 +0100
Subject: [PATCH 2/2] Enable migration mode

---
 .../EndpointOrientedTopologyAzureServiceBusTransport.cs        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ServiceControl.Transports.LegacyAzureServiceBus/EndpointOrientedTopologyAzureServiceBusTransport.cs b/src/ServiceControl.Transports.LegacyAzureServiceBus/EndpointOrientedTopologyAzureServiceBusTransport.cs
index 59dcd72..6649fe3 100644
--- a/src/ServiceControl.Transports.LegacyAzureServiceBus/EndpointOrientedTopologyAzureServiceBusTransport.cs
+++ b/src/ServiceControl.Transports.LegacyAzureServiceBus/EndpointOrientedTopologyAzureServiceBusTransport.cs
@@ -9,7 +9,8 @@ public class EndpointOrientedTopologyAzureServiceBusTransport : AzureServiceBusT
         public override TransportInfrastructure Initialize(SettingsHolder settings, string connectionString)
         {
             var extensions = new TransportExtensions<AzureServiceBusTransport>(settings);
-            extensions.UseEndpointOrientedTopology();
+            var topology = extensions.UseEndpointOrientedTopology();
+            topology.EnableMigrationToForwardingTopology();
 
             return base.Initialize(settings, connectionString);
         }