From 7c7ac73a07c410addc44ffece4602b0a3d84d8e0 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 22 Jun 2017 01:51:57 -0400
Subject: [PATCH 1/2] update skia reference

---
 MediaBrowser.Server.Mac/MacAppHost.cs                    | 7 +++++--
 MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj | 6 ++++++
 MediaBrowser.Server.Mono/MonoAppHost.cs                  | 2 +-
 MediaBrowser.Server.Mono/packages.config                 | 1 +
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/MediaBrowser.Server.Mac/MacAppHost.cs b/MediaBrowser.Server.Mac/MacAppHost.cs
index 4b29ba3a7..2f8ee983c 100644
--- a/MediaBrowser.Server.Mac/MacAppHost.cs
+++ b/MediaBrowser.Server.Mac/MacAppHost.cs
@@ -13,6 +13,7 @@ using MediaBrowser.Controller.Connect;
 using Emby.Server.Connect;
 using Emby.Server.Sync;
 using MediaBrowser.Controller.Sync;
+using Emby.Server.CinemaMode;
 
 namespace MediaBrowser.Server.Mac
 {
@@ -66,8 +67,10 @@ namespace MediaBrowser.Server.Mac
             var list = new List<Assembly>();
 
             list.Add(GetType().Assembly);
-			list.Add(typeof(ConnectManager).Assembly);
-			list.Add(typeof(SyncManager).Assembly);
+			list.Add(typeof(DefaultIntroProvider).Assembly);
+            list.Add(typeof(ConnectManager).Assembly);
+            list.Add(typeof(SyncManager).Assembly);
+
 
             return list;
         }
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
index 722d7c450..be928319f 100644
--- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
+++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
@@ -13,6 +13,8 @@
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -64,6 +66,10 @@
     <Reference Include="SimpleInjector, Version=4.0.8.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
       <HintPath>..\packages\SimpleInjector.4.0.8\lib\net45\SimpleInjector.dll</HintPath>
     </Reference>
+    <Reference Include="SkiaSharp, Version=1.58.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\SkiaSharp.1.58.0\lib\net45\SkiaSharp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
       <HintPath>..\packages\SQLitePCLRaw.core.1.1.6\lib\net45\SQLitePCLRaw.core.dll</HintPath>
       <Private>True</Private>
diff --git a/MediaBrowser.Server.Mono/MonoAppHost.cs b/MediaBrowser.Server.Mono/MonoAppHost.cs
index 6f438cb72..1153d0f7d 100644
--- a/MediaBrowser.Server.Mono/MonoAppHost.cs
+++ b/MediaBrowser.Server.Mono/MonoAppHost.cs
@@ -62,9 +62,9 @@ namespace MediaBrowser.Server.Mono
             var list = new List<Assembly>();
 
             list.Add(typeof(DefaultIntroProvider).Assembly);
-            list.Add(typeof(LinuxIsoManager).Assembly);
             list.Add(typeof(ConnectManager).Assembly);
             list.Add(typeof(SyncManager).Assembly);
+            list.Add(typeof(LinuxIsoManager).Assembly);
 
             return list;
         }
diff --git a/MediaBrowser.Server.Mono/packages.config b/MediaBrowser.Server.Mono/packages.config
index 3eea8d674..f1de00589 100644
--- a/MediaBrowser.Server.Mono/packages.config
+++ b/MediaBrowser.Server.Mono/packages.config
@@ -5,6 +5,7 @@
   <package id="ServiceStack.Text" version="4.5.8" targetFramework="net46" />
   <package id="SharpCompress" version="0.14.0" targetFramework="net46" />
   <package id="SimpleInjector" version="4.0.8" targetFramework="net46" />
+  <package id="SkiaSharp" version="1.58.0" targetFramework="net46" />
   <package id="SQLitePCLRaw.core" version="1.1.6" targetFramework="net46" />
   <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.6" targetFramework="net46" />
 </packages>
\ No newline at end of file

From e7706fa8a3c16b3196cdc8e170f5d66aba471a77 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 22 Jun 2017 01:52:26 -0400
Subject: [PATCH 2/2] 3.2.20.10

---
 SharedVersion.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SharedVersion.cs b/SharedVersion.cs
index 0cfd063cf..7df961c8d 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.20.9")]
+[assembly: AssemblyVersion("3.2.20.10")]