From 5b6356e7795cfeadcb86ba731658733b494a9e8b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 4 Jun 2017 14:31:40 -0400
Subject: remove ImageMagick from Windows

---
 Emby.Common.Implementations/Emby.Common.Implementations.csproj | 5 ++---
 Emby.Common.Implementations/packages.config                    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'Emby.Common.Implementations')

diff --git a/Emby.Common.Implementations/Emby.Common.Implementations.csproj b/Emby.Common.Implementations/Emby.Common.Implementations.csproj
index 567f295261..50d0d05ec4 100644
--- a/Emby.Common.Implementations/Emby.Common.Implementations.csproj
+++ b/Emby.Common.Implementations/Emby.Common.Implementations.csproj
@@ -42,9 +42,8 @@
       <HintPath>..\packages\SharpCompress.0.14.0\lib\net45\SharpCompress.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SimpleInjector, Version=4.0.7.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
-      <HintPath>..\packages\SimpleInjector.4.0.7\lib\net45\SimpleInjector.dll</HintPath>
-      <Private>True</Private>
+    <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="System" />
     <Reference Include="System.Core" />
diff --git a/Emby.Common.Implementations/packages.config b/Emby.Common.Implementations/packages.config
index 9cc054db07..1e6b10c018 100644
--- a/Emby.Common.Implementations/packages.config
+++ b/Emby.Common.Implementations/packages.config
@@ -3,5 +3,5 @@
   <package id="NLog" version="4.4.10" targetFramework="net46" />
   <package id="ServiceStack.Text" version="4.5.8" targetFramework="net462" />
   <package id="SharpCompress" version="0.14.0" targetFramework="net462" />
-  <package id="SimpleInjector" version="4.0.7" targetFramework="net462" />
+  <package id="SimpleInjector" version="4.0.8" targetFramework="net46" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3


From 3a9360dd6b6538b5d1f17f25d48748f7423d97d2 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 4 Jun 2017 16:27:57 -0400
Subject: update bulgarian decoding

---
 Emby.Common.Implementations/TextEncoding/TextEncoding.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Emby.Common.Implementations')

diff --git a/Emby.Common.Implementations/TextEncoding/TextEncoding.cs b/Emby.Common.Implementations/TextEncoding/TextEncoding.cs
index f47b88fb5f..49b424d5f0 100644
--- a/Emby.Common.Implementations/TextEncoding/TextEncoding.cs
+++ b/Emby.Common.Implementations/TextEncoding/TextEncoding.cs
@@ -157,6 +157,7 @@ namespace Emby.Common.Implementations.TextEncoding
                 case "ota":
                 case "tur":
                     return "windows-1254";
+                case "bgr":
                 case "rus":
                     return "windows-1251";
                 case "vie":
-- 
cgit v1.2.3