From b1807fd395d0458440acc289f8a98742b8fa8e3b Mon Sep 17 00:00:00 2001
From: Bob Langley <bob.langley@particular.net>
Date: Wed, 11 May 2016 15:07:36 -0700
Subject: [PATCH 01/12] Update Newtonsoft.Json

---
 .../ServiceControlInstaller.Packaging.csproj  |  5 ++--
 .../app.config                                | 27 ++++++++++++++++++
 .../packages.config                           |  2 +-
 src/ServiceControl.AcceptanceTests/App.config | 20 +++++++++++++
 .../ServiceControl.AcceptanceTests.csproj     |  4 +--
 .../packages.config                           |  2 +-
 src/ServiceControl.UnitTests/App.config       |  4 +++
 .../ServiceControl.UnitTests.csproj           |  4 +--
 src/ServiceControl.UnitTests/packages.config  |  2 +-
 src/ServiceControl/App.config                 | 28 +++++++++++++++++--
 src/ServiceControl/ServiceControl.csproj      |  4 +--
 src/ServiceControl/packages.config            |  2 +-
 12 files changed, 89 insertions(+), 15 deletions(-)
 create mode 100644 src/ServicControlInstaller.Packaging/app.config

diff --git a/src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj b/src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj
index 24d8dada25..3c580bcb03 100644
--- a/src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj
+++ b/src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj
@@ -62,8 +62,8 @@
       <HintPath>..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NServiceBus.Azure.Transports.WindowsAzureServiceBus, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
@@ -105,6 +105,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/ServicControlInstaller.Packaging/app.config b/src/ServicControlInstaller.Packaging/app.config
new file mode 100644
index 0000000000..632c3c164a
--- /dev/null
+++ b/src/ServicControlInstaller.Packaging/app.config
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="RabbitMQ.Client" publicKeyToken="89e7d7c5feba84ce" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.4.0" newVersion="3.5.4.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/ServicControlInstaller.Packaging/packages.config b/src/ServicControlInstaller.Packaging/packages.config
index 67625b0da1..25ca7c2095 100644
--- a/src/ServicControlInstaller.Packaging/packages.config
+++ b/src/ServicControlInstaller.Packaging/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
   <package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="NServiceBus" version="5.2.14" targetFramework="net45" />
   <package id="NServiceBus.Azure.Transports.WindowsAzureServiceBus" version="6.4.0" targetFramework="net45" />
   <package id="NServiceBus.Azure.Transports.WindowsAzureStorageQueues" version="6.2.1" targetFramework="net45" />
diff --git a/src/ServiceControl.AcceptanceTests/App.config b/src/ServiceControl.AcceptanceTests/App.config
index 11e4872ac8..1bac3c9dc0 100644
--- a/src/ServiceControl.AcceptanceTests/App.config
+++ b/src/ServiceControl.AcceptanceTests/App.config
@@ -11,6 +11,26 @@
         <assemblyIdentity name="RabbitMQ.Client" publicKeyToken="89e7d7c5feba84ce" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.5.4.0" newVersion="3.5.4.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj b/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj
index 5502d16d23..122f803977 100644
--- a/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj
+++ b/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj
@@ -72,8 +72,8 @@
       <HintPath>..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
diff --git a/src/ServiceControl.AcceptanceTests/packages.config b/src/ServiceControl.AcceptanceTests/packages.config
index 4ca4fd5aae..7835fefebe 100644
--- a/src/ServiceControl.AcceptanceTests/packages.config
+++ b/src/ServiceControl.AcceptanceTests/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net451" />
   <package id="Microsoft.Owin.Host.HttpListener" version="2.0.0" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net451" />
-  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net451" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="NLog" version="4.0.1" targetFramework="net451" />
   <package id="NServiceBus" version="5.2.14" targetFramework="net451" />
   <package id="NServiceBus.Autofac" version="5.0.0" targetFramework="net451" />
diff --git a/src/ServiceControl.UnitTests/App.config b/src/ServiceControl.UnitTests/App.config
index 04e604cb5a..49e071e89f 100644
--- a/src/ServiceControl.UnitTests/App.config
+++ b/src/ServiceControl.UnitTests/App.config
@@ -22,6 +22,10 @@
         <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/src/ServiceControl.UnitTests/ServiceControl.UnitTests.csproj b/src/ServiceControl.UnitTests/ServiceControl.UnitTests.csproj
index a1870e788f..fe70b2d976 100644
--- a/src/ServiceControl.UnitTests/ServiceControl.UnitTests.csproj
+++ b/src/ServiceControl.UnitTests/ServiceControl.UnitTests.csproj
@@ -72,8 +72,8 @@
       <HintPath>..\packages\Nancy.1.2.0\lib\net40\Nancy.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NServiceBus.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
diff --git a/src/ServiceControl.UnitTests/packages.config b/src/ServiceControl.UnitTests/packages.config
index 5967fe344f..6f76e5a90f 100644
--- a/src/ServiceControl.UnitTests/packages.config
+++ b/src/ServiceControl.UnitTests/packages.config
@@ -8,7 +8,7 @@
   <package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
   <package id="Nancy" version="1.2.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="NServiceBus" version="5.2.14" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
   <package id="RavenDB.Client" version="2.5.2996" targetFramework="net45" />
diff --git a/src/ServiceControl/App.config b/src/ServiceControl/App.config
index 095bb1e485..059d9afcb7 100644
--- a/src/ServiceControl/App.config
+++ b/src/ServiceControl/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 NOTE: Any settings in this file are not kept as part of packaging ServiceControl for a release.
 These settings are only here so that we can debug ServiceControl while developing it.
@@ -6,13 +6,35 @@ These settings are only here so that we can debug ServiceControl while developin
 
 <configuration>
   <appSettings>
-    <add key="ServiceControl/ForwardAuditMessages" value="false"/>
-    <add key="ServiceControl/ForwardErrorMessages" value="false"/>
+    <add key="ServiceControl/ForwardAuditMessages" value="false" />
+    <add key="ServiceControl/ForwardErrorMessages" value="false" />
     <add key="Raven/Esent/MaxVerPages" value="4096" />
     <add key="ServiceControl/ErrorRetentionPeriod" value="10.00:00:00" />
     <add key="ServiceControl/AuditRetentionPeriod" value="10.00:00:00" />
   </appSettings>
   <runtime>
     <gcServer enabled="true" />
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/src/ServiceControl/ServiceControl.csproj b/src/ServiceControl/ServiceControl.csproj
index c9c8fd780e..4a7c721f4f 100644
--- a/src/ServiceControl/ServiceControl.csproj
+++ b/src/ServiceControl/ServiceControl.csproj
@@ -123,8 +123,8 @@
       <HintPath>..\packages\Nancy.Owin.1.2.0\lib\net40\Nancy.Owin.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog">
diff --git a/src/ServiceControl/packages.config b/src/ServiceControl/packages.config
index be26757995..388c76106a 100644
--- a/src/ServiceControl/packages.config
+++ b/src/ServiceControl/packages.config
@@ -16,7 +16,7 @@
   <package id="Nancy" version="1.2.0" targetFramework="net45" />
   <package id="Nancy.Bootstrappers.Autofac" version="1.2.0" targetFramework="net45" />
   <package id="Nancy.Owin" version="1.2.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="NLog" version="4.0.1" targetFramework="net45" />
   <package id="NServiceBus" version="5.2.14" targetFramework="net45" />
   <package id="NServiceBus.Autofac" version="5.0.0" targetFramework="net45" />

From 8ced7501ec3c73f047cf4b089d1eff51477250e6 Mon Sep 17 00:00:00 2001
From: Bob Langley <bob.langley@particular.net>
Date: Wed, 11 May 2016 15:13:06 -0700
Subject: [PATCH 02/12] Update SignalR client version to 2.2.0

---
 .../ServiceControl.AcceptanceTests.csproj                    | 5 +++--
 src/ServiceControl.AcceptanceTests/packages.config           | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj b/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj
index 122f803977..071b669086 100644
--- a/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj
+++ b/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj
@@ -41,8 +41,9 @@
       <HintPath>..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.AspNet.SignalR.Client">
-      <HintPath>..\packages\Microsoft.AspNet.SignalR.Client.1.1.3\lib\net45\Microsoft.AspNet.SignalR.Client.dll</HintPath>
+    <Reference Include="Microsoft.AspNet.SignalR.Client, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.SignalR.Client.2.2.0\lib\net45\Microsoft.AspNet.SignalR.Client.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/src/ServiceControl.AcceptanceTests/packages.config b/src/ServiceControl.AcceptanceTests/packages.config
index 7835fefebe..1b5bfb89d6 100644
--- a/src/ServiceControl.AcceptanceTests/packages.config
+++ b/src/ServiceControl.AcceptanceTests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="3.5.2" targetFramework="net451" />
-  <package id="Microsoft.AspNet.SignalR.Client" version="1.1.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.SignalR.Client" version="2.2.0" targetFramework="net45" />
   <package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net451" />
   <package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net451" />
   <package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net451" />

From 1600e2237b76a41f897a403b745417191d3b8739 Mon Sep 17 00:00:00 2001
From: Bob Langley <bob.langley@particular.net>
Date: Wed, 11 May 2016 15:22:10 -0700
Subject: [PATCH 03/12] Update SignalR Server packages to 2.2.0

---
 src/ServiceControl.AcceptanceTests/App.config |  8 ++++++++
 src/ServiceControl.UnitTests/App.config       |  8 ++++++++
 src/ServiceControl/App.config                 |  8 ++++++++
 src/ServiceControl/ServiceControl.csproj      | 14 ++++++++++----
 src/ServiceControl/packages.config            |  5 +++--
 5 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/ServiceControl.AcceptanceTests/App.config b/src/ServiceControl.AcceptanceTests/App.config
index 1bac3c9dc0..560faa3e61 100644
--- a/src/ServiceControl.AcceptanceTests/App.config
+++ b/src/ServiceControl.AcceptanceTests/App.config
@@ -31,6 +31,14 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNet.SignalR.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/src/ServiceControl.UnitTests/App.config b/src/ServiceControl.UnitTests/App.config
index 49e071e89f..1cbdc889c9 100644
--- a/src/ServiceControl.UnitTests/App.config
+++ b/src/ServiceControl.UnitTests/App.config
@@ -26,6 +26,14 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNet.SignalR.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/src/ServiceControl/App.config b/src/ServiceControl/App.config
index 059d9afcb7..bd19fa36c7 100644
--- a/src/ServiceControl/App.config
+++ b/src/ServiceControl/App.config
@@ -35,6 +35,14 @@ These settings are only here so that we can debug ServiceControl while developin
         <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNet.SignalR.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/src/ServiceControl/ServiceControl.csproj b/src/ServiceControl/ServiceControl.csproj
index 4a7c721f4f..2f81fb3e62 100644
--- a/src/ServiceControl/ServiceControl.csproj
+++ b/src/ServiceControl/ServiceControl.csproj
@@ -68,8 +68,9 @@
     <Reference Include="Lucene.Net">
       <HintPath>..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNet.SignalR.Core">
-      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.1.3\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
+    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.2.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.AspNet.SignalR.Owin">
       <HintPath>..\packages\Microsoft.AspNet.SignalR.Owin.1.1.3\lib\net45\Microsoft.AspNet.SignalR.Owin.dll</HintPath>
@@ -87,8 +88,9 @@
       <HintPath>..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Owin">
-      <HintPath>..\packages\Microsoft.Owin.2.0.0\lib\net45\Microsoft.Owin.dll</HintPath>
+    <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Owin.Diagnostics">
       <HintPath>..\packages\Microsoft.Owin.Diagnostics.2.0.0\lib\net40\Microsoft.Owin.Diagnostics.dll</HintPath>
@@ -99,6 +101,10 @@
     <Reference Include="Microsoft.Owin.Hosting">
       <HintPath>..\packages\Microsoft.Owin.Hosting.2.0.0\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Owin.Security, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.2.1.0\lib\net45\Microsoft.Owin.Security.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.ServiceBus, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\WindowsAzure.ServiceBus.2.6.0\lib\net40-full\Microsoft.ServiceBus.dll</HintPath>
       <Private>True</Private>
diff --git a/src/ServiceControl/packages.config b/src/ServiceControl/packages.config
index 388c76106a..180902dfd4 100644
--- a/src/ServiceControl/packages.config
+++ b/src/ServiceControl/packages.config
@@ -3,15 +3,16 @@
   <package id="Autofac" version="3.5.2" targetFramework="net45" />
   <package id="GitVersionTask" version="2.0.1" targetFramework="net45" developmentDependency="true" />
   <package id="Lucene.Net" version="3.0.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.SignalR.Core" version="1.1.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.SignalR.Core" version="2.2.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.SignalR.Owin" version="1.1.3" targetFramework="net45" />
   <package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
   <package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
   <package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
-  <package id="Microsoft.Owin" version="2.0.0" targetFramework="net45" />
+  <package id="Microsoft.Owin" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Diagnostics" version="2.0.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Host.HttpListener" version="2.0.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Hosting" version="2.0.0" targetFramework="net45" />
+  <package id="Microsoft.Owin.Security" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
   <package id="Nancy" version="1.2.0" targetFramework="net45" />
   <package id="Nancy.Bootstrappers.Autofac" version="1.2.0" targetFramework="net45" />

From 99c7e1077c69b44390966b738a4c97241932e6ca Mon Sep 17 00:00:00 2001
From: Bob Langley <bob.langley@particular.net>
Date: Wed, 11 May 2016 15:22:59 -0700
Subject: [PATCH 04/12] Update serializer to SignalR 2.2.0 way of doing things

---
 src/ServiceControl/Infrastructure/OWIN/Startup.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ServiceControl/Infrastructure/OWIN/Startup.cs b/src/ServiceControl/Infrastructure/OWIN/Startup.cs
index 99c6b4abc3..f47be51cc3 100644
--- a/src/ServiceControl/Infrastructure/OWIN/Startup.cs
+++ b/src/ServiceControl/Infrastructure/OWIN/Startup.cs
@@ -10,9 +10,8 @@
     using Particular.ServiceControl;
     using ServiceControl.Infrastructure.SignalR;
     using Autofac;
-    using Microsoft.AspNet.SignalR.Json;
+    using Newtonsoft.Json;
     using ServiceControl.Infrastructure.OWIN;
-    using JsonNetSerializer = Microsoft.AspNet.SignalR.Json.JsonNetSerializer;
 
     public class Startup
     {
@@ -50,8 +49,8 @@ private static void ConfigureSignalR(IAppBuilder app)
 
             GlobalHost.DependencyResolver = resolver;
 
-            var jsonSerializer = new JsonNetSerializer(SerializationSettingsFactoryForSignalR.CreateDefault());
-            GlobalHost.DependencyResolver.Register(typeof(IJsonSerializer), () => jsonSerializer);
+            var jsonSerializer = new JsonSerializer();
+            GlobalHost.DependencyResolver.Register(typeof(JsonSerializer), () => jsonSerializer);
 
             GlobalEventHandler.SignalrIsReady = true;
         }

From 3a6621f01d466fe9258990f5a54c431e372103c6 Mon Sep 17 00:00:00 2001
From: Bob Langley <bob.langley@particular.net>
Date: Wed, 11 May 2016 15:23:18 -0700
Subject: [PATCH 05/12] Start SignalR the 2.2.0 way

---
 src/ServiceControl/Infrastructure/OWIN/Startup.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/ServiceControl/Infrastructure/OWIN/Startup.cs b/src/ServiceControl/Infrastructure/OWIN/Startup.cs
index f47be51cc3..039d5fc4e3 100644
--- a/src/ServiceControl/Infrastructure/OWIN/Startup.cs
+++ b/src/ServiceControl/Infrastructure/OWIN/Startup.cs
@@ -40,12 +40,15 @@ private static void ConfigureSignalR(IAppBuilder app)
         {
             var resolver = new AutofacDependencyResolver();
 
-            app.MapConnection<MessageStreamerConnection>("/messagestream",
-                new ConnectionConfiguration
-                {
-                    EnableCrossDomain = true,
-                    Resolver = resolver
-                });
+            app.Map("/messagestream", map =>
+            {
+                map.RunSignalR<MessageStreamerConnection>(
+                    new ConnectionConfiguration
+                    {
+                        EnableJSONP = true,
+                        Resolver = resolver
+                    });
+            });
 
             GlobalHost.DependencyResolver = resolver;
 

From 9a913fed873a53f39c67f6b0e5f4f48b336b218d Mon Sep 17 00:00:00 2001
From: Bob Langley <bob.langley@particular.net>
Date: Wed, 11 May 2016 15:38:27 -0700
Subject: [PATCH 06/12] Re-enable CORS support

---
 src/ServiceControl.AcceptanceTests/App.config     |  2 +-
 src/ServiceControl.UnitTests/App.config           |  2 +-
 src/ServiceControl/App.config                     |  2 +-
 src/ServiceControl/Infrastructure/OWIN/Startup.cs |  2 ++
 src/ServiceControl/ServiceControl.csproj          | 12 ++++++++++--
 src/ServiceControl/packages.config                |  4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/ServiceControl.AcceptanceTests/App.config b/src/ServiceControl.AcceptanceTests/App.config
index 560faa3e61..1965c7e4be 100644
--- a/src/ServiceControl.AcceptanceTests/App.config
+++ b/src/ServiceControl.AcceptanceTests/App.config
@@ -37,7 +37,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/ServiceControl.UnitTests/App.config b/src/ServiceControl.UnitTests/App.config
index 1cbdc889c9..85bf2fc22f 100644
--- a/src/ServiceControl.UnitTests/App.config
+++ b/src/ServiceControl.UnitTests/App.config
@@ -32,7 +32,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/ServiceControl/App.config b/src/ServiceControl/App.config
index bd19fa36c7..5ec99fb2d6 100644
--- a/src/ServiceControl/App.config
+++ b/src/ServiceControl/App.config
@@ -41,7 +41,7 @@ These settings are only here so that we can debug ServiceControl while developin
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/ServiceControl/Infrastructure/OWIN/Startup.cs b/src/ServiceControl/Infrastructure/OWIN/Startup.cs
index 039d5fc4e3..50aec5479b 100644
--- a/src/ServiceControl/Infrastructure/OWIN/Startup.cs
+++ b/src/ServiceControl/Infrastructure/OWIN/Startup.cs
@@ -10,6 +10,7 @@
     using Particular.ServiceControl;
     using ServiceControl.Infrastructure.SignalR;
     using Autofac;
+    using Microsoft.Owin.Cors;
     using Newtonsoft.Json;
     using ServiceControl.Infrastructure.OWIN;
 
@@ -42,6 +43,7 @@ private static void ConfigureSignalR(IAppBuilder app)
 
             app.Map("/messagestream", map =>
             {
+                map.UseCors(CorsOptions.AllowAll);
                 map.RunSignalR<MessageStreamerConnection>(
                     new ConnectionConfiguration
                     {
diff --git a/src/ServiceControl/ServiceControl.csproj b/src/ServiceControl/ServiceControl.csproj
index 2f81fb3e62..87c198a214 100644
--- a/src/ServiceControl/ServiceControl.csproj
+++ b/src/ServiceControl/ServiceControl.csproj
@@ -88,8 +88,12 @@
       <HintPath>..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
+    <Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Cors, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Cors.3.0.1\lib\net45\Microsoft.Owin.Cors.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Owin.Diagnostics">
@@ -202,6 +206,10 @@
       <HintPath>..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Web.Cors, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Cors.5.0.0\lib\net45\System.Web.Cors.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
diff --git a/src/ServiceControl/packages.config b/src/ServiceControl/packages.config
index 180902dfd4..80836e042b 100644
--- a/src/ServiceControl/packages.config
+++ b/src/ServiceControl/packages.config
@@ -3,12 +3,14 @@
   <package id="Autofac" version="3.5.2" targetFramework="net45" />
   <package id="GitVersionTask" version="2.0.1" targetFramework="net45" developmentDependency="true" />
   <package id="Lucene.Net" version="3.0.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Cors" version="5.0.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.SignalR.Core" version="2.2.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.SignalR.Owin" version="1.1.3" targetFramework="net45" />
   <package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
   <package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
   <package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
-  <package id="Microsoft.Owin" version="2.1.0" targetFramework="net45" />
+  <package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
+  <package id="Microsoft.Owin.Cors" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Diagnostics" version="2.0.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Host.HttpListener" version="2.0.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Hosting" version="2.0.0" targetFramework="net45" />

From 53aa5933d763820f3fe6d547ba7f4cad2fe08d26 Mon Sep 17 00:00:00 2001
From: Bob Langley <bob.langley@particular.net>
Date: Wed, 11 May 2016 16:55:43 -0700
Subject: [PATCH 07/12] Use correct serialization initialization

---
 src/ServiceControl/Infrastructure/OWIN/Startup.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ServiceControl/Infrastructure/OWIN/Startup.cs b/src/ServiceControl/Infrastructure/OWIN/Startup.cs
index 50aec5479b..15520fddbf 100644
--- a/src/ServiceControl/Infrastructure/OWIN/Startup.cs
+++ b/src/ServiceControl/Infrastructure/OWIN/Startup.cs
@@ -54,7 +54,7 @@ private static void ConfigureSignalR(IAppBuilder app)
 
             GlobalHost.DependencyResolver = resolver;
 
-            var jsonSerializer = new JsonSerializer();
+            var jsonSerializer = JsonSerializer.Create(SerializationSettingsFactoryForSignalR.CreateDefault());
             GlobalHost.DependencyResolver.Register(typeof(JsonSerializer), () => jsonSerializer);
 
             GlobalEventHandler.SignalrIsReady = true;

From 43daf83d5d8558bd8e7c49b66ef89d0b6474ec35 Mon Sep 17 00:00:00 2001
From: John Simons <john.simons@nservicebus.com>
Date: Thu, 12 May 2016 11:14:50 +1000
Subject: [PATCH 08/12] No need for binding redirects

---
 .../ServiceControlInstaller.Packaging.csproj  |  1 -
 .../app.config                                | 27 -----------------
 src/ServiceControl/App.config                 | 30 -------------------
 3 files changed, 58 deletions(-)
 delete mode 100644 src/ServicControlInstaller.Packaging/app.config

diff --git a/src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj b/src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj
index 3c580bcb03..33b705e1b1 100644
--- a/src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj
+++ b/src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj
@@ -105,7 +105,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/ServicControlInstaller.Packaging/app.config b/src/ServicControlInstaller.Packaging/app.config
deleted file mode 100644
index 632c3c164a..0000000000
--- a/src/ServicControlInstaller.Packaging/app.config
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="RabbitMQ.Client" publicKeyToken="89e7d7c5feba84ce" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.5.4.0" newVersion="3.5.4.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/src/ServiceControl/App.config b/src/ServiceControl/App.config
index 5ec99fb2d6..d786a629b8 100644
--- a/src/ServiceControl/App.config
+++ b/src/ServiceControl/App.config
@@ -14,35 +14,5 @@ These settings are only here so that we can debug ServiceControl while developin
   </appSettings>
   <runtime>
     <gcServer enabled="true" />
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.AspNet.SignalR.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-      </dependentAssembly>
-    </assemblyBinding>
   </runtime>
 </configuration>

From 3e78bbe274026dae00231ae0a9920a0c09596020 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Thu, 12 May 2016 14:31:07 +1000
Subject: [PATCH 09/12] move to c#6

---
 src/ServiceControl.sln.DotSettings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ServiceControl.sln.DotSettings b/src/ServiceControl.sln.DotSettings
index ddb3398e68..74e5dcebb2 100644
--- a/src/ServiceControl.sln.DotSettings
+++ b/src/ServiceControl.sln.DotSettings
@@ -1,7 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=ServiceControl_002EConfig_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
 	
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp50</s:String>
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String>
 	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/AutoCompleteBasicCompletion/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/IntelliSenseCompletingCharacters/IntelliSenseCompletingCharactersSettingCSharp/UpgradedFromVSSettings/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/LookupWindow/ShowSummary/@EntryValue">True</s:Boolean>

From 1d0331ac02c7c0e7333dae26d76231c03c76d169 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Thu, 12 May 2016 14:36:16 +1000
Subject: [PATCH 10/12] Revert "move to c#6"

This reverts commit 3e78bbe274026dae00231ae0a9920a0c09596020.
---
 src/ServiceControl.sln.DotSettings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ServiceControl.sln.DotSettings b/src/ServiceControl.sln.DotSettings
index 74e5dcebb2..ddb3398e68 100644
--- a/src/ServiceControl.sln.DotSettings
+++ b/src/ServiceControl.sln.DotSettings
@@ -1,7 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=ServiceControl_002EConfig_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
 	
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String>
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp50</s:String>
 	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/AutoCompleteBasicCompletion/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/IntelliSenseCompletingCharacters/IntelliSenseCompletingCharactersSettingCSharp/UpgradedFromVSSettings/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/LookupWindow/ShowSummary/@EntryValue">True</s:Boolean>

From 0fb928d3641342d22beb88ee409ca758e61893ec Mon Sep 17 00:00:00 2001
From: WilliamBZA <william.brander@gmail.com>
Date: Thu, 12 May 2016 08:53:17 +0200
Subject: [PATCH 11/12] Changed to C#6

---
 src/ServiceControl.sln.DotSettings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ServiceControl.sln.DotSettings b/src/ServiceControl.sln.DotSettings
index ddb3398e68..74e5dcebb2 100644
--- a/src/ServiceControl.sln.DotSettings
+++ b/src/ServiceControl.sln.DotSettings
@@ -1,7 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=ServiceControl_002EConfig_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
 	
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp50</s:String>
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String>
 	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/AutoCompleteBasicCompletion/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/IntelliSenseCompletingCharacters/IntelliSenseCompletingCharactersSettingCSharp/UpgradedFromVSSettings/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/LookupWindow/ShowSummary/@EntryValue">True</s:Boolean>

From 0b3a99ef00700c30e37f25f93eb398084ffc2214 Mon Sep 17 00:00:00 2001
From: John Simons <john.simons@nservicebus.com>
Date: Thu, 12 May 2016 17:06:19 +1000
Subject: [PATCH 12/12] static analysis

---
 .../Infrastructure/TransportMessageExtensionsTests.cs       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ServiceControl.UnitTests/Infrastructure/TransportMessageExtensionsTests.cs b/src/ServiceControl.UnitTests/Infrastructure/TransportMessageExtensionsTests.cs
index 21b9d5920b..0e4082b1a5 100644
--- a/src/ServiceControl.UnitTests/Infrastructure/TransportMessageExtensionsTests.cs
+++ b/src/ServiceControl.UnitTests/Infrastructure/TransportMessageExtensionsTests.cs
@@ -50,8 +50,10 @@ public void With_FailedQ_header_should_return_FailedQ()
         [Test]
         public void With_ReplyToAddress_should_return_ReplyToAddress()
         {
-           var headers = new Dictionary<string, string>();
-            headers[Headers.ReplyToAddress] = new Address("TheEndpoint", "").ToString();
+            var headers = new Dictionary<string, string>
+            {
+                [Headers.ReplyToAddress] = new Address("TheEndpoint", "").ToString()
+            };
             var message = new TransportMessage(null, headers);
             Assert.AreEqual("TheEndpoint",message.ProcessingEndpointName());
         }