Upgraded to Owin 2.1.0

src/NzbDrone.Console/NzbDrone.Console.csproj

@@ -63,14 +63,16 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Hosting, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="Microsoft.Owin">
-      <HintPath>..\packages\Microsoft.Owin.1.1.0-beta2\lib\net40\Microsoft.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Hosting">
-      <HintPath>..\packages\Microsoft.Owin.Hosting.1.1.0-beta2\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>

src/NzbDrone.Console/app.config

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration />

src/NzbDrone.Console/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Owin" version="1.1.0-beta2" targetFramework="net40" />
+  <package id="Microsoft.Owin" version="2.1.0" targetFramework="net40" />
-  <package id="Microsoft.Owin.Hosting" version="1.1.0-beta2" targetFramework="net40" />
+  <package id="Microsoft.Owin.Hosting" version="2.1.0" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net40" />
   <package id="NLog" version="2.1.0" targetFramework="net40" />
   <package id="Owin" version="1.0" targetFramework="net40" />

src/NzbDrone.Host/NzbDrone.Host.csproj

@@ -57,6 +57,18 @@
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Owin.Host.HttpListener.2.1.0\lib\net40\Microsoft.Owin.Host.HttpListener.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Hosting, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
+    </Reference>
     <Reference Include="Nancy, Version=0.23.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Nancy.0.23.2\lib\net40\Nancy.dll</HintPath>
@@ -72,15 +84,6 @@
       <HintPath>..\Libraries\Interop.NetFwTypeLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Microsoft.Owin">
-      <HintPath>..\packages\Microsoft.Owin.1.1.0-beta2\lib\net40\Microsoft.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Host.HttpListener">
-      <HintPath>..\packages\Microsoft.Owin.Host.HttpListener.1.1.0-beta2\lib\net40\Microsoft.Owin.Host.HttpListener.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Hosting">
-      <HintPath>..\packages\Microsoft.Owin.Hosting.1.1.0-beta2\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>

src/NzbDrone.Host/Owin/MiddleWare/NzbDroneVersionMiddleWare.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Microsoft.Owin;
 using NzbDrone.Common.EnvironmentInfo;
 using Owin;
@@ -11,7 +12,7 @@ public class NzbDroneVersionMiddleWare : IOwinMiddleWare
 
         public void Attach(IAppBuilder appBuilder)
         {
-            appBuilder.Use(typeof (AddApplicationVersionHeader));
+            appBuilder.Use(typeof(AddApplicationVersionHeader));
         }
     }
 
@@ -21,12 +22,10 @@ public AddApplicationVersionHeader(OwinMiddleware next)
             : base(next)
         {
         }
-
+        public override Task Invoke(IOwinContext context)
-        public override Task Invoke(OwinRequest request, OwinResponse response)
         {
-            response.AddHeader("X-ApplicationVersion", BuildInfo.Version.ToString());
+            context.Response.Headers.Add("X-ApplicationVersion", new string[] { BuildInfo.Version.ToString() });
-
+            return Next.Invoke(context);
-            return Next.Invoke(request, response);
         }
     }
 }

src/NzbDrone.Host/Owin/OwinHostController.cs

@@ -1,40 +1,30 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Reflection;
-using Microsoft.Owin.Hosting;
 using NLog;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Security;
-using NzbDrone.Core.Configuration;
 using NzbDrone.Host.AccessControl;
-using NzbDrone.Host.Owin.MiddleWare;
-using Owin;
 
 namespace NzbDrone.Host.Owin
 {
     public class OwinHostController : IHostController
     {
-        private readonly IConfigFileProvider _configFileProvider;
+        private readonly IOwinAppFactory _owinAppFactory;
-        private readonly IEnumerable<IOwinMiddleWare> _owinMiddleWares;
         private readonly IRuntimeInfo _runtimeInfo;
         private readonly IUrlAclAdapter _urlAclAdapter;
         private readonly IFirewallAdapter _firewallAdapter;
         private readonly ISslAdapter _sslAdapter;
         private readonly Logger _logger;
-        private IDisposable _host;
+        private IDisposable _owinApp;
 
-        public OwinHostController(IConfigFileProvider configFileProvider,
+        public OwinHostController(
-                                  IEnumerable<IOwinMiddleWare> owinMiddleWares,
+                                  IOwinAppFactory owinAppFactory,
                                   IRuntimeInfo runtimeInfo,
                                   IUrlAclAdapter urlAclAdapter,
                                   IFirewallAdapter firewallAdapter,
                                   ISslAdapter sslAdapter,
                                   Logger logger)
         {
-            _configFileProvider = configFileProvider;
+            _owinAppFactory = owinAppFactory;
-            _owinMiddleWares = owinMiddleWares;
             _runtimeInfo = runtimeInfo;
             _urlAclAdapter = urlAclAdapter;
             _firewallAdapter = firewallAdapter;
@@ -57,60 +47,27 @@ public void StartServer()
 
             _urlAclAdapter.ConfigureUrl();
 
-            var options = new StartOptions()
-                {
-                    ServerFactory = "Microsoft.Owin.Host.HttpListener"
-                };
-
-            _urlAclAdapter.Urls.ForEach(options.Urls.Add);
-
             _logger.Info("Listening on the following URLs:");
-            foreach (var url in options.Urls)
+            foreach (var url in _urlAclAdapter.Urls)
             {
                 _logger.Info("  {0}", url);
             }
 
-            try
+            _owinApp = _owinAppFactory.CreateApp(_urlAclAdapter.Urls);
-            {
-                _host = WebApp.Start(OwinServiceProviderFactory.Create(), options, BuildApp);
-            }
-            catch (TargetInvocationException ex)
-            {
-                if (ex.InnerException == null)
-                {
-                    throw;
-                }
-
-                if (ex.InnerException is HttpListenerException)
-                {
-                    throw new PortInUseException("Port {0} is already in use, please ensure NzbDrone is not already running.",
-                             ex,
-                             _configFileProvider.Port);
-                }
-
-                throw ex.InnerException;
-            }
         }
 
-        private void BuildApp(IAppBuilder appBuilder)
-        {
-            appBuilder.Properties["host.AppName"] = "NzbDrone";
-
-            foreach (var middleWare in _owinMiddleWares.OrderBy(c => c.Order))
-            {
-                _logger.Debug("Attaching {0} to host", middleWare.GetType().Name);
-                middleWare.Attach(appBuilder);
-            }
-        }
 
         public void StopServer()
         {
-            if (_host == null) return;
+            if (_owinApp == null) return;
 
-            _logger.Info("Attempting to stop Nancy host");
+            _logger.Info("Attempting to stop OWIN host");
-            _host.Dispose();
+            _owinApp.Dispose();
-            _host = null;
+            _owinApp = null;
             _logger.Info("Host has stopped");
         }
+
+
+
     }
 }

src/NzbDrone.Host/Owin/OwinServiceProvider.cs

@@ -1,14 +1,89 @@
-using Microsoft.Owin.Hosting.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Reflection;
+using Microsoft.Owin.Hosting;
+using Microsoft.Owin.Hosting.Engine;
+using Microsoft.Owin.Hosting.Services;
 using Microsoft.Owin.Hosting.Tracing;
+using NLog;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Host.Owin.MiddleWare;
+using Owin;
 
 namespace NzbDrone.Host.Owin
 {
-    public static class OwinServiceProviderFactory
+    public interface IOwinAppFactory
     {
-        public static ServiceProvider Create()
+        IDisposable CreateApp(List<string> urls);
+    }
+
+    public class OwinAppFactory : IOwinAppFactory
+    {
+        private readonly IEnumerable<IOwinMiddleWare> _owinMiddleWares;
+        private readonly IConfigFileProvider _configFileProvider;
+        private readonly Logger _logger;
+
+        public OwinAppFactory(IEnumerable<IOwinMiddleWare> owinMiddleWares, IConfigFileProvider configFileProvider, Logger logger)
         {
-           var  provider = (ServiceProvider)ServicesFactory.Create();
+            _owinMiddleWares = owinMiddleWares;
-           provider.Add(typeof(ITraceOutputFactory), typeof(OwinTraceOutputFactory));
+            _configFileProvider = configFileProvider;
+            _logger = logger;
+        }
+
+        public IDisposable CreateApp(List<string> urls)
+        {
+            var services = CreateServiceFactory();
+            var engine = services.GetService<IHostingEngine>();
+
+            var options = new StartOptions()
+            {
+                ServerFactory = "Microsoft.Owin.Host.HttpListener"
+            };
+
+            urls.ForEach(options.Urls.Add);
+
+            var context = new StartContext(options) { Startup = BuildApp };
+
+
+            try
+            {
+                return engine.Start(context);
+            }
+            catch (TargetInvocationException ex)
+            {
+                if (ex.InnerException == null)
+                {
+                    throw;
+                }
+
+                if (ex.InnerException is HttpListenerException)
+                {
+                    throw new PortInUseException("Port {0} is already in use, please ensure NzbDrone is not already running.", ex, _configFileProvider.Port);
+                }
+
+                throw ex.InnerException;
+            }
+        }
+
+
+        private void BuildApp(IAppBuilder appBuilder)
+        {
+            appBuilder.Properties["host.AppName"] = "NzbDrone";
+
+            foreach (var middleWare in _owinMiddleWares.OrderBy(c => c.Order))
+            {
+                _logger.Debug("Attaching {0} to host", middleWare.GetType().Name);
+                middleWare.Attach(appBuilder);
+            }
+        }
+
+
+        private IServiceProvider CreateServiceFactory()
+        {
+            var provider = (ServiceProvider)ServicesFactory.Create();
+            provider.Add(typeof(ITraceOutputFactory), typeof(OwinTraceOutputFactory));
 
             return provider;
         }

src/NzbDrone.Host/app.config

@@ -28,6 +28,10 @@
         <assemblyIdentity name="FluentMigrator" publicKeyToken="aacfc7de5acabf05" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.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>

src/NzbDrone.Host/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Owin" version="1.1.0-beta2" targetFramework="net40" />
+  <package id="Microsoft.Owin" version="2.1.0" targetFramework="net40" />
-  <package id="Microsoft.Owin.Host.HttpListener" version="1.1.0-beta2" targetFramework="net40" />
+  <package id="Microsoft.Owin.Host.HttpListener" version="2.1.0" targetFramework="net40" />
-  <package id="Microsoft.Owin.Hosting" version="1.1.0-beta2" targetFramework="net40" />
+  <package id="Microsoft.Owin.Hosting" version="2.1.0" targetFramework="net40" />
   <package id="Nancy" version="0.23.2" targetFramework="net40" />
   <package id="Nancy.Owin" version="0.23.2" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net40" />

src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj

@@ -38,6 +38,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Host.HttpListener">
+      <HintPath>..\packages\Microsoft.Owin.Host.HttpListener.2.1.0\lib\net40\Microsoft.Owin.Host.HttpListener.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Hosting, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
+    </Reference>
     <Reference Include="Nancy, Version=0.23.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Nancy.0.23.2\lib\net40\Nancy.dll</HintPath>
@@ -62,15 +73,6 @@
     <Reference Include="Microsoft.AspNet.SignalR.Client">
       <HintPath>..\packages\Microsoft.AspNet.SignalR.Client.1.1.3\lib\net40\Microsoft.AspNet.SignalR.Client.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin">
-      <HintPath>..\packages\Microsoft.Owin.1.1.0-beta2\lib\net40\Microsoft.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Host.HttpListener">
-      <HintPath>..\packages\Microsoft.Owin.Host.HttpListener.1.1.0-beta2\lib\net40\Microsoft.Owin.Host.HttpListener.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Hosting">
-      <HintPath>..\packages\Microsoft.Owin.Hosting.1.1.0-beta2\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
-    </Reference>
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
     </Reference>

src/NzbDrone.Integration.Test/app.config

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration />

src/NzbDrone.Integration.Test/packages.config

@@ -3,9 +3,9 @@
   <package id="FluentAssertions" version="2.1.0.0" targetFramework="net40" />
   <package id="FluentValidation" version="5.0.0.1" targetFramework="net40" />
   <package id="Microsoft.AspNet.SignalR.Client" version="1.1.3" targetFramework="net40" />
-  <package id="Microsoft.Owin" version="1.1.0-beta2" targetFramework="net40" />
+  <package id="Microsoft.Owin" version="2.1.0" targetFramework="net40" />
-  <package id="Microsoft.Owin.Host.HttpListener" version="1.1.0-beta2" targetFramework="net40" />
+  <package id="Microsoft.Owin.Host.HttpListener" version="2.1.0" targetFramework="net40" />
-  <package id="Microsoft.Owin.Hosting" version="1.1.0-beta2" targetFramework="net40" />
+  <package id="Microsoft.Owin.Hosting" version="2.1.0" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" targetFramework="net40" />
   <package id="Nancy" version="0.23.2" targetFramework="net40" />
   <package id="Nancy.Owin" version="0.23.2" targetFramework="net40" />

src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj

@@ -72,6 +72,7 @@
     <Compile Include="ServiceFactoryFixture.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

src/NzbDrone.Mono.Test/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <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>

src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj

@@ -99,6 +99,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

src/NzbDrone.Windows.Test/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <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>

src/NzbDrone/NzbDrone.csproj

@@ -63,16 +63,18 @@
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Hosting, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="Microsoft.Owin">
-      <HintPath>..\packages\Microsoft.Owin.1.1.0-beta2\lib\net40\Microsoft.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Hosting">
-      <HintPath>..\packages\Microsoft.Owin.Hosting.1.1.0-beta2\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>

src/NzbDrone/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Owin" version="1.1.0-beta2" targetFramework="net40" />
+  <package id="Microsoft.Owin" version="2.1.0" targetFramework="net40" />
-  <package id="Microsoft.Owin.Hosting" version="1.1.0-beta2" targetFramework="net40" />
+  <package id="Microsoft.Owin.Hosting" version="2.1.0" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net40" />
   <package id="NLog" version="2.1.0" targetFramework="net40" />
   <package id="Owin" version="1.0" targetFramework="net40" />