From 1823b4a6746670e310dac1ad431b741010f3616d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 22 Mar 2017 14:37:04 -0400
Subject: [PATCH] 3.2.8.9

---
 Emby.Server.Core/ApplicationHost.cs                        | 7 +------
 .../Emby.Server.Implementations.csproj                     | 1 -
 .../MediaBrowser.ServerApplication.csproj                  | 1 +
 .../Native}/LoopUtil.cs                                    | 5 ++++-
 MediaBrowser.ServerApplication/WindowsAppHost.cs           | 6 +++++-
 SharedVersion.cs                                           | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)
 rename {Emby.Server.Implementations/Windows => MediaBrowser.ServerApplication/Native}/LoopUtil.cs (98%)

diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index 971378ea7d..50c572b8c7 100644
--- a/Emby.Server.Core/ApplicationHost.cs
+++ b/Emby.Server.Core/ApplicationHost.cs
@@ -107,7 +107,6 @@ using Emby.Server.Implementations.Playlists;
 using Emby.Server.Implementations;
 using Emby.Server.Implementations.ServerManager;
 using Emby.Server.Implementations.Session;
-using Emby.Server.Implementations.Windows;
 using Emby.Server.Implementations.TV;
 using Emby.Server.Implementations.Updates;
 using MediaBrowser.Model.Activity;
@@ -1743,12 +1742,8 @@ namespace Emby.Server.Core
             ((IProcess)sender).Dispose();
         }
 
-        public void EnableLoopback(string appName)
+        public virtual void EnableLoopback(string appName)
         {
-            if (EnvironmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows)
-            {
-                LoopUtil.Run(appName);
-            }
         }
 
         private void RegisterModules()
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index afd437fe83..670acd37f5 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -267,7 +267,6 @@
     <Compile Include="Updates\InstallationManager.cs" />
     <Compile Include="UserViews\CollectionFolderImageProvider.cs" />
     <Compile Include="UserViews\DynamicImageProvider.cs" />
-    <Compile Include="Windows\LoopUtil.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Localization\iso6392.txt" />
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 63e10df769..b968c2fb62 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -142,6 +142,7 @@
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="MainStartup.cs" />
+    <Compile Include="Native\LoopUtil.cs" />
     <Compile Include="Native\PowerManagement.cs" />
     <Compile Include="Native\Standby.cs" />
     <Compile Include="Native\ServerAuthorization.cs" />
diff --git a/Emby.Server.Implementations/Windows/LoopUtil.cs b/MediaBrowser.ServerApplication/Native/LoopUtil.cs
similarity index 98%
rename from Emby.Server.Implementations/Windows/LoopUtil.cs
rename to MediaBrowser.ServerApplication/Native/LoopUtil.cs
index 6eded2cecb..6160f853f4 100644
--- a/Emby.Server.Implementations/Windows/LoopUtil.cs
+++ b/MediaBrowser.ServerApplication/Native/LoopUtil.cs
@@ -5,7 +5,10 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Emby.Server.Implementations.Windows
+/*
+ * Important - Even though this will compile in the shared projects, it will cause build failures within the mono runtime
+ */
+namespace MediaBrowser.ServerApplication.Native
 {
     /// <summary>
     /// http://blogs.msdn.com/b/fiddler/archive/2011/12/10/fiddler-windows-8-apps-enable-LoopUtil-network-isolation-exemption.aspx
diff --git a/MediaBrowser.ServerApplication/WindowsAppHost.cs b/MediaBrowser.ServerApplication/WindowsAppHost.cs
index 2d3d8a85b7..8f1a88a743 100644
--- a/MediaBrowser.ServerApplication/WindowsAppHost.cs
+++ b/MediaBrowser.ServerApplication/WindowsAppHost.cs
@@ -11,7 +11,6 @@ using Emby.Server.Core;
 using Emby.Server.Implementations;
 using Emby.Server.Implementations.EntryPoints;
 using Emby.Server.Implementations.FFMpeg;
-using Emby.Server.Implementations.Windows;
 using Emby.Server.Sync;
 using MediaBrowser.Controller.Connect;
 using MediaBrowser.Controller.Sync;
@@ -49,6 +48,11 @@ namespace MediaBrowser.ServerApplication
             MainStartup.Restart();
         }
 
+        public override void EnableLoopback(string appName)
+        {
+            LoopUtil.Run(appName);
+        }
+
         protected override List<Assembly> GetAssembliesWithPartsInternal()
         {
             var list = new List<Assembly>();
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 28e89a6833..3087dc4975 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.8.8")]
+[assembly: AssemblyVersion("3.2.8.9")]