diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-09-01 15:26:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 15:26:02 -0400 |
| commit | 03b93e02b986af5610fa2cd2b848bdf32f9d20d7 (patch) | |
| tree | e99f1c3e83354de8edc8b739c84a7e82731df081 /MediaBrowser.ServerApplication | |
| parent | 00cb873164fb1619a2291e79bb53f3edcedcd731 (diff) | |
| parent | ac904c8ed0f79f63b61bdd0460a9f5a3b9ced65d (diff) | |
Merge pull request #2857 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.ServerApplication')
3 files changed, 10 insertions, 9 deletions
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 15abaaa62..23db82cf1 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -85,7 +85,7 @@ <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> + <HintPath>..\packages\SkiaSharp.1.58.1\lib\net45\SkiaSharp.dll</HintPath> </Reference> <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL"> <HintPath>..\packages\SQLitePCLRaw.core.1.1.8\lib\net45\SQLitePCLRaw.core.dll</HintPath> @@ -162,6 +162,14 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> + <Content Include="..\packages\SkiaSharp.1.58.1\runtimes\win7-x64\native\libSkiaSharp.dll"> + <Link>x64\libSkiaSharp.dll</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Content Include="..\packages\SkiaSharp.1.58.1\runtimes\win7-x86\native\libSkiaSharp.dll"> + <Link>x86\libSkiaSharp.dll</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="..\Tools\Installation\MediaBrowser.InstallUtil.dll"> <Link>MediaBrowser.InstallUtil.dll</Link> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> @@ -174,17 +182,11 @@ <Link>MediaBrowser.Updater.exe</Link> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> - <Content Include="x64\libSkiaSharp.dll"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> <Content Include="x64\sqlite3.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> <EmbeddedResource Include="Icon.ico" /> <Content Include="Resources\Images\mb3logo800.png" /> - <Content Include="x86\libSkiaSharp.dll"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> <Content Include="x86\sqlite3.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index 3af1bcf4d..85d2613bb 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -3,7 +3,7 @@ <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.8" targetFramework="net462" /> - <package id="SkiaSharp" version="1.58.0" targetFramework="net462" /> + <package id="SkiaSharp" version="1.58.1" targetFramework="net462" /> <package id="SQLitePCLRaw.core" version="1.1.8" targetFramework="net462" /> <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.8" targetFramework="net462" /> </packages>
\ No newline at end of file diff --git a/MediaBrowser.ServerApplication/x64/libSkiaSharp.dll.REMOVED.git-id b/MediaBrowser.ServerApplication/x64/libSkiaSharp.dll.REMOVED.git-id deleted file mode 100644 index 4027f61a0..000000000 --- a/MediaBrowser.ServerApplication/x64/libSkiaSharp.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -20e469be83c5d41bb44d085c36550780e788a8ef
\ No newline at end of file |