Merge pull request #26 from NzbDrone/nzbdrone.host

Nzbdrone.host

NzbDrone.App.Test/ContainerFixture.cs

@@ -7,6 +7,7 @@
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Lifecycle;
+using NzbDrone.Host;
 using NzbDrone.Test.Common;
 using FluentAssertions;
 using System.Linq;

NzbDrone.App.Test/MonitoringProviderTest.cs

@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Common.Model;
+using NzbDrone.Host;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.App.Test

NzbDrone.App.Test/NzbDrone.App.Test.ncrunchproject

@@ -1,22 +0,0 @@
-<ProjectConfiguration>
-  <CopyReferencedAssembliesToWorkspace>false</CopyReferencedAssembliesToWorkspace>
-  <ConsiderInconclusiveTestsAsPassing>true</ConsiderInconclusiveTestsAsPassing>
-  <PreloadReferencedAssemblies>false</PreloadReferencedAssemblies>
-  <AllowDynamicCodeContractChecking>true</AllowDynamicCodeContractChecking>
-  <AllowStaticCodeContractChecking>false</AllowStaticCodeContractChecking>
-  <IgnoreThisComponentCompletely>false</IgnoreThisComponentCompletely>
-  <RunPreBuildEvents>false</RunPreBuildEvents>
-  <RunPostBuildEvents>false</RunPostBuildEvents>
-  <PreviouslyBuiltSuccessfully>true</PreviouslyBuiltSuccessfully>
-  <InstrumentAssembly>true</InstrumentAssembly>
-  <PreventSigningOfAssembly>false</PreventSigningOfAssembly>
-  <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
-  <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
-  <DefaultTestTimeout>60000</DefaultTestTimeout>
-  <UseBuildConfiguration></UseBuildConfiguration>
-  <UseBuildPlatform />
-  <ProxyProcessPath></ProxyProcessPath>
-  <UseCPUArchitecture>AutoDetect</UseCPUArchitecture>
-  <MSTestThreadApartmentState>STA</MSTestThreadApartmentState>
-  <BuildProcessArchitecture>x86</BuildProcessArchitecture>
-</ProjectConfiguration>

NzbDrone.App.Test/NzbDrone.Host.Test.csproj

@@ -79,14 +79,14 @@
       <Project>{ff5ee3b6-913b-47ce-9ceb-11c51b4e1205}</Project>
       <Name>NzbDrone.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
+      <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
+      <Name>NzbDrone.Host</Name>
+    </ProjectReference>
     <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
       <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
       <Name>NzbDrone.Test.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NzbDrone\NzbDrone.csproj">
-      <Project>{D12F7F2F-8A3C-415F-88FA-6DD061A84869}</Project>
-      <Name>NzbDrone</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\Libraries\Sqlite\sqlite3.dll">

NzbDrone.App.Test/RouterTest.cs

@@ -3,6 +3,7 @@
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Host;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.App.Test
@@ -51,13 +52,13 @@ public void Route_should_call_console_service_when_application_mode_is_console()
             Mocker.GetMock<IRuntimeInfo>().SetupGet(c => c.IsUserInteractive).Returns(true);
             Mocker.GetMock<IConsoleService>().SetupGet(c => c.IsConsoleApplication).Returns(true);
 
-            Subject.Route(ApplicationModes.Console);
+            Subject.Route(ApplicationModes.Interactive);
 
             Mocker.GetMock<IConsoleService>().Verify(c => c.WaitForClose(), Times.Once());
             Mocker.GetMock<INzbDroneServiceFactory>().Verify(c => c.Start(), Times.Once());
         }
 
-        [TestCase(ApplicationModes.Console)]
+        [TestCase(ApplicationModes.Interactive)]
         [TestCase(ApplicationModes.InstallService)]
         [TestCase(ApplicationModes.UninstallService)]
         [TestCase(ApplicationModes.Help)]

NzbDrone.Common.Test/NzbDrone.Common.Test.csproj

@@ -92,6 +92,10 @@
       <Project>{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}</Project>
       <Name>NzbDrone.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
+      <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
+      <Name>NzbDrone.Host</Name>
+    </ProjectReference>
     <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
       <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
       <Name>NzbDrone.Test.Common</Name>

NzbDrone.Common.Test/ServiceFactoryFixture.cs

@@ -3,6 +3,7 @@
 using NUnit.Framework;
 using NzbDrone.Common.Messaging;
 using NzbDrone.Core.Lifecycle;
+using NzbDrone.Host;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.Common.Test

NzbDrone.Common/ProcessProvider.cs

@@ -1,5 +1,8 @@
-using System.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Model;
@@ -17,6 +20,7 @@ public interface IProcessProvider
         void KillAll(string processName);
         bool Exists(string processName);
         ProcessPriorityClass GetCurrentProcessPriority();
+        Process ShellExecute(string path, string args = null, Action<string> onOutputDataReceived = null, Action<string> onErrorDataReceived = null);
     }
 
     public class ProcessProvider : IProcessProvider
@@ -77,6 +81,54 @@ public Process Start(string path)
             return Start(new ProcessStartInfo(path));
         }
 
+        public Process ShellExecute(string path, string args = null, Action<string> onOutputDataReceived = null, Action<string> onErrorDataReceived = null)
+        {
+            var logger = LogManager.GetLogger(new FileInfo(path).Name);
+
+            var startInfo = new ProcessStartInfo(path, args)
+            {
+                CreateNoWindow = true,
+                UseShellExecute = false,
+                RedirectStandardError = true,
+                RedirectStandardOutput = true,
+            };
+
+
+            logger.Info("Starting {0} {1}", path, args);
+
+            var process = Process.Start(startInfo);
+
+            process.OutputDataReceived += (sender, eventArgs) =>
+            {
+                if (string.IsNullOrWhiteSpace(eventArgs.Data)) return;
+
+                logger.Debug(eventArgs.Data);
+
+                if (onOutputDataReceived != null)
+                {
+                    onOutputDataReceived(eventArgs.Data);
+                }
+            };
+
+            process.ErrorDataReceived += (sender, eventArgs) =>
+            {
+                if (string.IsNullOrWhiteSpace(eventArgs.Data)) return;
+
+                logger.Error(eventArgs.Data);
+
+                if (onErrorDataReceived != null)
+                {
+                    onErrorDataReceived(eventArgs.Data);
+                }
+            };
+
+            process.BeginErrorReadLine();
+            process.BeginOutputReadLine();
+            process.Start();
+
+            return process;
+        }
+
         public Process Start(ProcessStartInfo startInfo)
         {
             Logger.Info("Starting process. [{0}]", startInfo.FileName);

NzbDrone.Console/ConsoleApp.cs

@@ -2,17 +2,15 @@
 
 namespace NzbDrone.Console
 {
-    public static class AppMain
+    public static class ConsoleApp
     {
         public static void Main(string[] args)
         {
             try
             {
-
+                Host.Bootstrap.Start(args);
-                NzbDrone.AppMain.Main(args);
-
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 System.Console.WriteLine(e.ToString());
             }

NzbDrone.Console/NzbDrone.Console.csproj

@@ -54,23 +54,15 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>..\NzbDrone\NzbDrone.ico</ApplicationIcon>
+    <ApplicationIcon>..\NzbDrone.Host\NzbDrone.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>NzbDrone.Console.AppMain</StartupObject>
+    <StartupObject>NzbDrone.Console.ConsoleApp</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=2.0.1.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NLog.2.0.1.2\lib\net40\NLog.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
@@ -78,22 +70,9 @@
     <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="AppMain.cs" />
+    <Compile Include="ConsoleApp.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\NzbDrone\app.config">
-      <Link>app.config</Link>
-    </None>
-    <None Include="..\NzbDrone\NLog.config">
-      <Link>NLog.config</Link>
-    </None>
-    <None Include="..\NzbDrone\NLog.xsd">
-      <Link>NLog.xsd</Link>
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">
       <Visible>False</Visible>
@@ -117,15 +96,14 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NzbDrone\NzbDrone.csproj">
+    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
-      <Project>{d12f7f2f-8a3c-415f-88fa-6dd061a84869}</Project>
+      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
-      <Name>NzbDrone</Name>
+      <Name>NzbDrone.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
+      <Project>{95c11a9e-56ed-456a-8447-2c89c1139266}</Project>
+      <Name>NzbDrone.Host</Name>
     </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\NzbDrone\NzbDrone.ico">
-      <Link>NzbDrone.ico</Link>
-    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

NzbDrone.Console/Properties/AssemblyInfo.cs

@@ -5,7 +5,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("NzbDrone.exe")]
+[assembly: AssemblyTitle("NzbDrone.Host")]
 [assembly: Guid("67AADCD9-89AA-4D95-8281-3193740E70E5")]
 
 // You can specify all the values or you can default the Build and Revision Numbers 

NzbDrone.Console/packages.config

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Nancy" version="0.16.1" targetFramework="net40" />
-  <package id="Nancy.Authentication.Basic" version="0.16.1" targetFramework="net40" />
-  <package id="NLog" version="2.0.1.2" targetFramework="net40" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
-</packages>

NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs

@@ -103,10 +103,8 @@ public void should_start_update_client()
         {
             Subject.Execute(new ApplicationUpdateCommand());
 
-            Mocker.GetMock<IProcessProvider>().Verify(
+            Mocker.GetMock<IProcessProvider>()
-               c => c.Start(It.Is<ProcessStartInfo>(p =>
+                .Verify(c => c.ShellExecute(It.IsAny<string>(), "12", null, null), Times.Once());
-                       !string.IsNullOrWhiteSpace(p.FileName) &&
-                       p.Arguments == "12")));
         }
 
         [Test]

NzbDrone.Core/Update/InstallUpdateService.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.IO;
 using NLog;
 using NzbDrone.Common;
@@ -71,14 +70,9 @@ private void InstallUpdate(UpdatePackage updatePackage)
                 _diskProvider.MoveFolder(_appFolderInfo.GetUpdateClientFolder(),
                                             updateSandboxFolder);
 
-                _logger.Info("Starting update client");
+                _logger.Info("Starting update client {0}", _appFolderInfo.GetUpdateClientExePath());
-                var startInfo = new ProcessStartInfo
-                {
-                    FileName = _appFolderInfo.GetUpdateClientExePath(),
-                    Arguments = _processProvider.GetCurrentProcess().Id.ToString()
-                };
 
-                var process = _processProvider.Start(startInfo);
+                var process = _processProvider.ShellExecute(_appFolderInfo.GetUpdateClientExePath(), _processProvider.GetCurrentProcess().Id.ToString());
 
                 _processProvider.WaitForExit(process);
 

NzbDrone.Host/AccessControl/FirewallAdapter.cs

@@ -1,14 +1,13 @@
 using System;
-using NLog;
 using NetFwTypeLib;
+using NLog;
 using NzbDrone.Core.Configuration;
 
-namespace NzbDrone.Host
+namespace NzbDrone.Host.AccessControl
 {
     public interface IFirewallAdapter
     {
         void MakeAccessible();
-        bool IsNzbDronePortOpen();
     }
 
     public class FirewallAdapter : IFirewallAdapter
@@ -24,8 +23,6 @@ public FirewallAdapter(IConfigFileProvider configFileProvider, Logger logger)
 
         public void MakeAccessible()
         {
-            int port = 0;
-
             if (IsFirewallEnabled())
             {
                 if (IsNzbDronePortOpen())
@@ -42,7 +39,7 @@ public void MakeAccessible()
         }
 
 
-        public bool IsNzbDronePortOpen()
+        private bool IsNzbDronePortOpen()
         {
             try
             {
@@ -75,7 +72,7 @@ private void OpenFirewallPort(int portNumber)
             try
             {
                 var type = Type.GetTypeFromProgID("HNetCfg.FWOpenPort", false);
-                var port = Activator.CreateInstance(type) as INetFwOpenPort;
+                var port = (INetFwOpenPort)Activator.CreateInstance(type);
 
                 port.Port = portNumber;
                 port.Name = "NzbDrone";
@@ -94,7 +91,7 @@ private void OpenFirewallPort(int portNumber)
             }
         }
 
-        private int CloseFirewallPort()
+        private void CloseFirewallPort()
         {
             try
             {
@@ -116,14 +113,12 @@ private int CloseFirewallPort()
                 if (portNumber != _configFileProvider.Port)
                 {
                     ports.Remove(portNumber, NET_FW_IP_PROTOCOL_.NET_FW_IP_PROTOCOL_TCP);
-                    return portNumber;
                 }
             }
             catch (Exception ex)
             {
                 _logger.WarnException("Failed to close port in firewall for NzbDrone", ex);
             }
-            return 0;
         }
 
         private bool IsFirewallEnabled()

NzbDrone.Host/AccessControl/UrlAclAdapter.cs

@@ -1,11 +1,10 @@
 using System;
-using System.Diagnostics;
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Configuration;
 
-namespace NzbDrone.Host
+namespace NzbDrone.Host.AccessControl
 {
     public interface IUrlAclAdapter
     {
@@ -40,28 +39,17 @@ private void RegisterUrl(int portNumber)
             RunNetsh(arguments);
         }
 
-        private string RunNetsh(string arguments)
+        private void RunNetsh(string arguments)
         {
             try
             {
-                var startInfo = new ProcessStartInfo()
+                var process = _processProvider.ShellExecute("netsh.exe", arguments);
-                    {
-                        RedirectStandardOutput = true,
-                        UseShellExecute = false,
-                        FileName = "netsh.exe",
-                        Arguments = arguments
-                    };
-
-                var process = _processProvider.Start(startInfo);
                 process.WaitForExit(5000);
-                return process.StandardOutput.ReadToEnd();
             }
             catch (Exception ex)
             {
                 _logger.WarnException("Error executing netsh with arguments: " + arguments, ex);
             }
-
-            return null;
         }
     }
 }

NzbDrone.Host/ApplicationModes.cs

@@ -1,8 +1,8 @@
-namespace NzbDrone
+namespace NzbDrone.Host
 {
     public enum ApplicationModes
     {
-        Console,
+        Interactive,
         Help,
         InstallService,
         UninstallService,

NzbDrone.Host/ApplicationServer.cs

@@ -4,10 +4,10 @@
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Host;
+using NzbDrone.Host.AccessControl;
-using NzbDrone.Owin;
+using NzbDrone.Host.Owin;
 
-namespace NzbDrone
+namespace NzbDrone.Host
 {
     public interface INzbDroneServiceFactory
     {
@@ -49,11 +49,10 @@ protected override void OnStart(string[] args)
 
         public void Start()
         {
-            if (_runtimeInfo.IsAdmin)
+            if (OsInfo.IsWindows && _runtimeInfo.IsAdmin)
             {
                 _urlAclAdapter.RefreshRegistration();
                 _firewallAdapter.MakeAccessible();
-
             }
             _hostController.StartServer();
 

NzbDrone.Host/Bootstrap.cs

@@ -2,18 +2,19 @@
 using System.Diagnostics;
 using System.Reflection;
 using NLog;
+using NzbDrone.Common.Composition;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Common.Security;
 using NzbDrone.Core.Datastore;
 
-namespace NzbDrone
+namespace NzbDrone.Host
 {
-    public static class AppMain
+    public static class Bootstrap
     {
         private static readonly Logger Logger = LogManager.GetLogger("AppMain");
 
 
-        public static void Main(string[] args)
+        public static IContainer Start(string[] args)
         {
             try
             {
@@ -42,19 +43,21 @@ public static void Main(string[] args)
                         Console.ReadLine();
                     }
 
-                    return;
+                    return null;
                 }
 
                 var container = MainAppContainerBuilder.BuildContainer(args);
 
                 DbFactory.RegisterDatabase(container);
                 container.Resolve<Router>().Route();
+
+                return container;
             }
             catch (Exception e)
             {
                 Logger.FatalException("Epic Fail " + e.Message, e);
+                throw;
             }
         }
-
     }
 }

NzbDrone.Host/MainAppContainerBuilder.cs

@@ -7,7 +7,7 @@
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.RootFolders;
 
-namespace NzbDrone
+namespace NzbDrone.Host
 {
     public class MainAppContainerBuilder : ContainerBuilderBase
     {
@@ -17,7 +17,7 @@ public static IContainer BuildContainer(string[] args)
         }
 
         private MainAppContainerBuilder(string[] args)
-            : base("NzbDrone", "NzbDrone.Common", "NzbDrone.Core", "NzbDrone.Api")
+            : base("NzbDrone.Host", "NzbDrone.Common", "NzbDrone.Core", "NzbDrone.Api")
         {
             AutoRegisterImplementations<NzbDronePersistentConnection>();
 

NzbDrone.Host/NzbDrone.Host.csproj

@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95C11A9E-56ED-456A-8447-2C89C1139266}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NzbDrone.Host</RootNamespace>
+    <AssemblyName>NzbDrone.Host</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\_output\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>true</UseVSHostingProcess>
+    <CodeAnalysisRuleSet>BasicCorrectnessRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\_output\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>
+    </ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Interop.NetFwTypeLib">
+      <HintPath>..\Libraries\Interop.NetFwTypeLib.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.1.2\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.SignalR.Owin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.SignalR.Owin.1.1.2\lib\net40\Microsoft.AspNet.SignalR.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.1.1.0-beta2\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
+    </Reference>
+    <Reference Include="Nancy">
+      <HintPath>..\packages\Nancy.0.16.1\lib\net40\Nancy.dll</HintPath>
+    </Reference>
+    <Reference Include="Nancy.Owin, Version=0.16.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Nancy.Owin.0.16.1\lib\net40\Nancy.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog, Version=2.0.1.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NLog.2.0.1.2\lib\net40\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.ServiceProcess" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="ApplicationServer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AccessControl\FirewallAdapter.cs" />
+    <Compile Include="AccessControl\UrlAclAdapter.cs" />
+    <Compile Include="MainAppContainerBuilder.cs" />
+    <Compile Include="ApplicationModes.cs" />
+    <Compile Include="Bootstrap.cs" />
+    <Compile Include="Owin\MiddleWare\NancyMiddleWare.cs" />
+    <Compile Include="Owin\IHostController.cs" />
+    <Compile Include="Owin\MiddleWare\IOwinMiddleWare.cs" />
+    <Compile Include="Owin\MiddleWare\SignalRMiddleWare.cs" />
+    <Compile Include="Owin\OwinHostController.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PriorityMonitor.cs" />
+    <Compile Include="Router.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <Content Include="NLog.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </Content>
+    <None Include="NLog.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="NzbDrone.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\NzbDrone.Api\NzbDrone.Api.csproj">
+      <Project>{FD286DF8-2D3A-4394-8AD5-443FADE55FB2}</Project>
+      <Name>NzbDrone.Api</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
+      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
+      <Name>NzbDrone.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
+      <Project>{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}</Project>
+      <Name>NzbDrone.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\*.*"   "$(TargetDir)"</PostBuildEvent>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

NzbDrone.Host/Owin/IHostController.cs

@@ -1,4 +1,4 @@
-namespace NzbDrone.Owin
+namespace NzbDrone.Host.Owin
 {
     public interface IHostController
     {

NzbDrone.Host/Owin/MiddleWare/IOwinMiddleWare.cs

@@ -1,6 +1,6 @@
 using Owin;
 
-namespace NzbDrone.Owin.MiddleWare
+namespace NzbDrone.Host.Owin.MiddleWare
 {
     public interface IOwinMiddleWare
     {

NzbDrone.Host/Owin/MiddleWare/NancyMiddleWare.cs

@@ -5,7 +5,7 @@
 using Nancy.Owin;
 using Owin;
 
-namespace NzbDrone.Owin.MiddleWare
+namespace NzbDrone.Host.Owin.MiddleWare
 {
     public class NancyMiddleWare : IOwinMiddleWare
     {

NzbDrone.Host/Owin/MiddleWare/SignalRMiddleWare.cs

@@ -4,7 +4,7 @@
 using NzbDrone.Common.Composition;
 using Owin;
 
-namespace NzbDrone.Owin.MiddleWare
+namespace NzbDrone.Host.Owin.MiddleWare
 {
     public class SignalRMiddleWare : IOwinMiddleWare
     {

NzbDrone.Host/Owin/OwinHostController.cs

@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.Owin.Hosting;
 using NLog;
 using NzbDrone.Common.Security;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Owin.MiddleWare;
+using NzbDrone.Host.Owin.MiddleWare;
 using Owin;
-using System.Linq;
 
-namespace NzbDrone.Owin
+namespace NzbDrone.Host.Owin
 {
     public class OwinHostController : IHostController
     {

NzbDrone.Host/PriorityMonitor.cs

@@ -4,7 +4,7 @@
 using NLog;
 using NzbDrone.Common;
 
-namespace NzbDrone
+namespace NzbDrone.Host
 {
     public class PriorityMonitor
     {

NzbDrone.Host/Properties/AssemblyInfo.cs

@@ -0,0 +1,16 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly: AssemblyTitle("NzbDrone.exe")]
+[assembly: Guid("C2172AF4-F9A6-4D91-BAEE-C2E4EE680613")]
+
+
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("10.0.0.*")]
+[assembly: AssemblyFileVersion("10.0.0.*")]

NzbDrone.Host/Router.cs

@@ -1,10 +1,8 @@
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
-using NzbDrone.SysTray;
-using IServiceProvider = NzbDrone.Common.IServiceProvider;
 
-namespace NzbDrone
+namespace NzbDrone.Host
 {
     public class Router
     {
@@ -13,18 +11,16 @@ public class Router
         private readonly StartupArguments _startupArguments;
         private readonly IConsoleService _consoleService;
         private readonly IRuntimeInfo _runtimeInfo;
-        private readonly ISystemTrayApp _systemTrayProvider;
         private readonly Logger _logger;
 
         public Router(INzbDroneServiceFactory nzbDroneServiceFactory, IServiceProvider serviceProvider, StartupArguments startupArguments,
-                        IConsoleService consoleService, IRuntimeInfo runtimeInfo, ISystemTrayApp systemTrayProvider, Logger logger)
+                        IConsoleService consoleService, IRuntimeInfo runtimeInfo, Logger logger)
         {
             _nzbDroneServiceFactory = nzbDroneServiceFactory;
             _serviceProvider = serviceProvider;
             _startupArguments = startupArguments;
             _consoleService = consoleService;
             _runtimeInfo = runtimeInfo;
-            _systemTrayProvider = systemTrayProvider;
             _logger = logger;
         }
 
@@ -52,7 +48,7 @@ public void Route(ApplicationModes applicationModes)
                         break;
                     }
 
-                case ApplicationModes.Console:
+                case ApplicationModes.Interactive:
                     {
                         _logger.Trace("Console selected");
                         _nzbDroneServiceFactory.Start();
@@ -60,10 +56,6 @@ public void Route(ApplicationModes applicationModes)
                         {
                             _consoleService.WaitForClose();
                         }
-                        else
-                        {
-                            _systemTrayProvider.Start();
-                        }
 
                         break;
                     }
@@ -120,7 +112,7 @@ private ApplicationModes GetApplicationMode()
                 return ApplicationModes.UninstallService;
             }
 
-            return ApplicationModes.Console;
+            return ApplicationModes.Interactive;
         }
     }
 }

NzbDrone.Host/packages.config

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentMigrator" version="1.1.1.0" targetFramework="net40" />
   <package id="Microsoft.AspNet.SignalR.Core" version="1.1.2" targetFramework="net40" />
   <package id="Microsoft.AspNet.SignalR.Owin" version="1.1.2" targetFramework="net40" />
   <package id="Microsoft.Owin" version="1.1.0-beta2" targetFramework="net40" />
@@ -8,10 +7,8 @@
   <package id="Microsoft.Owin.Hosting" version="1.1.0-beta2" targetFramework="net40" />
   <package id="Nancy" version="0.16.1" targetFramework="net40" />
   <package id="Nancy.Owin" version="0.16.1" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net40" />
   <package id="NLog" version="2.0.1.2" targetFramework="net40" />
   <package id="NLog.Config" version="2.0.1.2" targetFramework="net40" />
   <package id="NLog.Schema" version="2.0.1.2" targetFramework="net40" />
   <package id="Owin" version="1.0" targetFramework="net40" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
 </packages>

NzbDrone.Integration.Test/IntegrationTest.cs

@@ -12,9 +12,10 @@
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Jobs;
+using NzbDrone.Host;
+using NzbDrone.Host.Owin;
+using NzbDrone.Host.Owin.MiddleWare;
 using NzbDrone.Integration.Test.Client;
-using NzbDrone.Owin;
-using NzbDrone.Owin.MiddleWare;
 using NzbDrone.Test.Common.Categories;
 using RestSharp;
 

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

@@ -121,14 +121,14 @@
       <Project>{ff5ee3b6-913b-47ce-9ceb-11c51b4e1205}</Project>
       <Name>NzbDrone.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
+      <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
+      <Name>NzbDrone.Host</Name>
+    </ProjectReference>
     <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
       <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
       <Name>NzbDrone.Test.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NzbDrone\NzbDrone.csproj">
-      <Project>{d12f7f2f-8a3c-415f-88fa-6dd061a84869}</Project>
-      <Name>NzbDrone</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\Libraries\Sqlite\sqlite3.dll">

NzbDrone.sln

@@ -15,7 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Core", "NzbDrone.C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Core.Test", "NzbDrone.Core.Test\NzbDrone.Core.Test.csproj", "{193ADD3B-792B-4173-8E4C-5A3F8F0237F0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.App.Test", "NzbDrone.App.Test\NzbDrone.App.Test.csproj", "{C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Host.Test", "NzbDrone.App.Test\NzbDrone.Host.Test.csproj", "{C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Test.Dummy", "NzbDrone.Test.Dummy\NzbDrone.Test.Dummy.csproj", "{FAFB5948-A222-4CF6-AD14-026BE7564802}"
 EndProject
@@ -52,6 +52,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Integration.Test",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptron.Client", "Exceptron.Client\Exceptron.Client.csproj", "{B1784698-592E-4132-BDFA-9817409E3A96}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Host", "NzbDrone.Host\NzbDrone.Host.csproj", "{95C11A9E-56ED-456A-8447-2C89C1139266}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Host", "Host", "{486ADF86-DD89-4E19-B805-9D94F19800D9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -134,6 +138,10 @@ Global
 		{B1784698-592E-4132-BDFA-9817409E3A96}.Debug|x86.Build.0 = Debug|x86
 		{B1784698-592E-4132-BDFA-9817409E3A96}.Release|x86.ActiveCfg = Release|x86
 		{B1784698-592E-4132-BDFA-9817409E3A96}.Release|x86.Build.0 = Release|x86
+		{95C11A9E-56ED-456A-8447-2C89C1139266}.Debug|x86.ActiveCfg = Debug|x86
+		{95C11A9E-56ED-456A-8447-2C89C1139266}.Debug|x86.Build.0 = Debug|x86
+		{95C11A9E-56ED-456A-8447-2C89C1139266}.Release|x86.ActiveCfg = Release|x86
+		{95C11A9E-56ED-456A-8447-2C89C1139266}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -151,6 +159,9 @@ Global
 		{CADDFCE0-7509-4430-8364-2074E1EEFCA2} = {47697CDB-27B6-4B05-B4F8-0CBE6F6EDF97}
 		{6BCE712F-846D-4846-9D1B-A66B858DA755} = {F9E67978-5CD6-4A5F-827B-4249711C0B02}
 		{700D0B95-95CD-43F3-B6C9-FAA0FC1358D4} = {F9E67978-5CD6-4A5F-827B-4249711C0B02}
+		{D12F7F2F-8A3C-415F-88FA-6DD061A84869} = {486ADF86-DD89-4E19-B805-9D94F19800D9}
+		{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976} = {486ADF86-DD89-4E19-B805-9D94F19800D9}
+		{95C11A9E-56ED-456A-8447-2C89C1139266} = {486ADF86-DD89-4E19-B805-9D94F19800D9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35

NzbDrone/NzbDrone.csproj

@@ -54,114 +54,35 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>NzbDrone.ico</ApplicationIcon>
+    <ApplicationIcon>..\NzbDrone.Host\NzbDrone.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>NzbDrone.AppMain</StartupObject>
+    <StartupObject>NzbDrone.WindowsApp</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FluentMigrator, Version=1.1.1.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FluentMigrator.1.1.1.0\lib\40\FluentMigrator.dll</HintPath>
-    </Reference>
-    <Reference Include="FluentMigrator.Runner, Version=1.1.0.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FluentMigrator.1.1.1.0\tools\FluentMigrator.Runner.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-    <Reference Include="Interop.NetFwTypeLib">
-      <HintPath>..\Libraries\Interop.NetFwTypeLib.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.1.2\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.AspNet.SignalR.Owin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.SignalR.Owin.1.1.2\lib\net40\Microsoft.AspNet.SignalR.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <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, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Owin.Host.HttpListener.1.1.0-beta2\lib\net40\Microsoft.Owin.Host.HttpListener.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.1.1.0-beta2\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
-    </Reference>
-    <Reference Include="Nancy">
-      <HintPath>..\packages\Nancy.0.16.1\lib\net40\Nancy.dll</HintPath>
-    </Reference>
-    <Reference Include="Nancy.Owin, Version=0.16.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Nancy.Owin.0.16.1\lib\net40\Nancy.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=2.0.1.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NLog.2.0.1.2\lib\net40\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="ApplicationServer.cs">
+    <Compile Include="Properties\Resources.Designer.cs">
-      <SubType>Component</SubType>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="Host\FirewallAdapter.cs" />
+    <Compile Include="WindowsApp.cs" />
-    <Compile Include="Host\UrlAclAdapter.cs" />
-    <Compile Include="MainAppContainerBuilder.cs" />
-    <Compile Include="ApplicationModes.cs" />
-    <Compile Include="AppMain.cs" />
-    <Compile Include="Owin\MiddleWare\NancyMiddleWare.cs" />
-    <Compile Include="Owin\IHostController.cs" />
-    <Compile Include="Owin\MiddleWare\IOwinMiddleWare.cs" />
-    <Compile Include="Owin\MiddleWare\SignalRMiddleWare.cs" />
-    <Compile Include="Owin\OwinHostController.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PriorityMonitor.cs" />
-    <Compile Include="Router.cs" />
     <Compile Include="SysTray\SysTrayApp.cs">
       <SubType>Form</SubType>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <Content Include="NLog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </Content>
-    <None Include="NLog.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="NzbDrone.ico" />
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">
       <Visible>False</Visible>
@@ -185,19 +106,21 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NzbDrone.Api\NzbDrone.Api.csproj">
-      <Project>{FD286DF8-2D3A-4394-8AD5-443FADE55FB2}</Project>
-      <Name>NzbDrone.Api</Name>
-    </ProjectReference>
     <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
       <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
       <Name>NzbDrone.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
+    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
-      <Project>{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}</Project>
+      <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
-      <Name>NzbDrone.Core</Name>
+      <Name>NzbDrone.Host</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

NzbDrone/Properties/Resources.Designer.cs

@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.32559
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace NzbDrone.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NzbDrone.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon NzbDroneIcon {
+            get {
+                object obj = ResourceManager.GetObject("NzbDroneIcon", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+    }
+}

NzbDrone/Properties/Resources.resx

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="NzbDroneIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\..\nzbdrone.host\nzbdrone.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>

NzbDrone/SysTray/SysTrayApp.cs

@@ -1,12 +1,9 @@
 using System;
 using System.ComponentModel;
-using System.Drawing;
-using System.Reflection;
-using System.Threading;
 using System.Windows.Forms;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
-using NzbDrone.Owin;
+using NzbDrone.Host.Owin;
 
 namespace NzbDrone.SysTray
 {
@@ -32,15 +29,15 @@ public SystemTrayApp(IProcessProvider processProvider, IHostController hostContr
 
         public void Start()
         {
-            Application.ThreadException += new ThreadExceptionEventHandler(OnThreadException);
+            Application.ThreadException += OnThreadException;
-            Application.ApplicationExit += new EventHandler(OnApplicationExit);
+            Application.ApplicationExit += OnApplicationExit;
 
             _trayMenu.MenuItems.Add("Launch Browser", LaunchBrowser);
             _trayMenu.MenuItems.Add("-");
             _trayMenu.MenuItems.Add("Exit", OnExit);
 
             _trayIcon.Text = String.Format("NzbDrone - {0}", BuildInfo.Version);
-            _trayIcon.Icon = new Icon(Assembly.GetEntryAssembly().GetManifestResourceStream("NzbDrone.NzbDrone.ico"));
+            _trayIcon.Icon = Properties.Resources.NzbDroneIcon;
 
             _trayIcon.ContextMenu = _trayMenu;
             _trayIcon.Visible = true;
@@ -84,9 +81,16 @@ private void OnExit(object sender, EventArgs e)
         }
 
         private void LaunchBrowser(object sender, EventArgs e)
+        {
+            try
             {
                 _processProvider.Start(_hostController.AppUrl);
             }
+            catch (Exception)
+            {
+
+            }
+        }
 
         private void OnApplicationExit(object sender, EventArgs e)
         {
@@ -99,11 +103,18 @@ private void OnThreadException(object sender, EventArgs e)
         }
 
         private void DisposeTrayIcon()
+        {
+            try
             {
                 _trayIcon.Visible = false;
                 _trayIcon.Icon = null;
                 _trayIcon.Visible = false;
                 _trayIcon.Dispose();
             }
+            catch (Exception e)
+            {
+
+            }
+        }
     }
 }

NzbDrone/WindowsApp.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Windows.Forms;
+using NzbDrone.SysTray;
+
+namespace NzbDrone
+{
+    public static class WindowsApp
+    {
+        public static void Main(string[] args)
+        {
+            try
+            {
+                var container = Host.Bootstrap.Start(args);
+                container.Register<ISystemTrayApp, SystemTrayApp>();
+                container.Resolve<ISystemTrayApp>().Start();
+            }
+            catch (Exception e)
+            {
+                var message = string.Format("{0}: {1}", e.GetType().Name, e.Message);
+                MessageBox.Show(text: message, buttons: MessageBoxButtons.OK, icon: MessageBoxIcon.Error, caption: "Epic Fail!");
+            }
+        }
+    }
+}