From 1358ea2ca4b4b87640eb0c08bc3f6f1abba0238a Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 30 Oct 2017 00:55:11 -0400 Subject: [PATCH 1/2] update SimpleInjector --- .../Emby.Server.Implementations.csproj | 4 ++-- Emby.Server.Implementations/packages.config | 2 +- MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj | 4 ++-- MediaBrowser.Server.Mono/packages.config | 2 +- .../MediaBrowser.ServerApplication.csproj | 4 ++-- MediaBrowser.ServerApplication/packages.config | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index 1ecbabf2f4..8ff1b63c03 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -651,8 +651,8 @@ ..\packages\SharpCompress.0.18.2\lib\net45\SharpCompress.dll - - ..\packages\SimpleInjector.4.0.8\lib\net45\SimpleInjector.dll + + ..\packages\SimpleInjector.4.0.12\lib\net45\SimpleInjector.dll ..\packages\SQLitePCL.pretty.1.1.0\lib\portable-net45+netcore45+wpa81+wp8\SQLitePCL.pretty.dll diff --git a/Emby.Server.Implementations/packages.config b/Emby.Server.Implementations/packages.config index d27722fef8..6e68810d8f 100644 --- a/Emby.Server.Implementations/packages.config +++ b/Emby.Server.Implementations/packages.config @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index 365977530e..dfd0714471 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -58,8 +58,8 @@ ..\packages\SharpCompress.0.18.2\lib\net45\SharpCompress.dll - - ..\packages\SimpleInjector.4.0.8\lib\net45\SimpleInjector.dll + + ..\packages\SimpleInjector.4.0.12\lib\net45\SimpleInjector.dll ..\packages\SkiaSharp.1.58.1\lib\net45\SkiaSharp.dll diff --git a/MediaBrowser.Server.Mono/packages.config b/MediaBrowser.Server.Mono/packages.config index dfa3dc75d3..e7aec97b6c 100644 --- a/MediaBrowser.Server.Mono/packages.config +++ b/MediaBrowser.Server.Mono/packages.config @@ -3,7 +3,7 @@ - + diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 9e4f524898..f479db46fb 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -80,8 +80,8 @@ ..\packages\SharpCompress.0.18.2\lib\net45\SharpCompress.dll - - ..\packages\SimpleInjector.4.0.8\lib\net45\SimpleInjector.dll + + ..\packages\SimpleInjector.4.0.12\lib\net45\SimpleInjector.dll ..\packages\SkiaSharp.1.58.1\lib\net45\SkiaSharp.dll diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index c7b98700e8..e40a3ab15c 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -2,7 +2,7 @@ - + From ccda4bd62928466badcd0787eaedc79dc318a80b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 30 Oct 2017 01:26:19 -0400 Subject: [PATCH 2/2] update to skia 1.59.2 --- Emby.Drawing.Skia/Emby.Drawing.Skia.csproj | 4 ++-- Emby.Drawing.Skia/packages.config | 2 +- MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj | 4 ++-- MediaBrowser.Server.Mono/packages.config | 2 +- .../MediaBrowser.ServerApplication.csproj | 8 ++++---- MediaBrowser.ServerApplication/packages.config | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj index f2b32d52cb..6024c3d2c0 100644 --- a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj +++ b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj @@ -63,8 +63,8 @@ - - ..\packages\SkiaSharp.1.58.1\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.dll + + ..\packages\SkiaSharp.1.59.2\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.dll diff --git a/Emby.Drawing.Skia/packages.config b/Emby.Drawing.Skia/packages.config index 2b9b0aee43..1aa3653cd7 100644 --- a/Emby.Drawing.Skia/packages.config +++ b/Emby.Drawing.Skia/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index dfd0714471..a9e5d3ca57 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -61,8 +61,8 @@ ..\packages\SimpleInjector.4.0.12\lib\net45\SimpleInjector.dll - - ..\packages\SkiaSharp.1.58.1\lib\net45\SkiaSharp.dll + + ..\packages\SkiaSharp.1.59.2\lib\net45\SkiaSharp.dll ..\packages\SQLitePCLRaw.core.1.1.8\lib\net45\SQLitePCLRaw.core.dll diff --git a/MediaBrowser.Server.Mono/packages.config b/MediaBrowser.Server.Mono/packages.config index e7aec97b6c..4f2324c21b 100644 --- a/MediaBrowser.Server.Mono/packages.config +++ b/MediaBrowser.Server.Mono/packages.config @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index f479db46fb..33f858b004 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -83,8 +83,8 @@ ..\packages\SimpleInjector.4.0.12\lib\net45\SimpleInjector.dll - - ..\packages\SkiaSharp.1.58.1\lib\net45\SkiaSharp.dll + + ..\packages\SkiaSharp.1.59.2\lib\net45\SkiaSharp.dll ..\packages\SQLitePCLRaw.core.1.1.8\lib\net45\SQLitePCLRaw.core.dll @@ -161,11 +161,11 @@ - + x64\libSkiaSharp.dll PreserveNewest - + x86\libSkiaSharp.dll PreserveNewest diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index e40a3ab15c..805c7af62e 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -3,7 +3,7 @@ - + \ No newline at end of file