diff options
Diffstat (limited to 'MediaBrowser.ServerApplication')
7 files changed, 41 insertions, 75 deletions
diff --git a/MediaBrowser.ServerApplication/App.config b/MediaBrowser.ServerApplication/App.config index fae013d6e1..d7f4380c4c 100644 --- a/MediaBrowser.ServerApplication/App.config +++ b/MediaBrowser.ServerApplication/App.config @@ -49,7 +49,7 @@ </dependentAssembly> <dependentAssembly> <assemblyIdentity name="SimpleInjector" publicKeyToken="984cb50dea722e99" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-3.3.2.0" newVersion="3.3.2.0" /> + <bindingRedirect oldVersion="0.0.0.0-4.0.7.0" newVersion="4.0.7.0" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> diff --git a/MediaBrowser.ServerApplication/ImageEncoderHelper.cs b/MediaBrowser.ServerApplication/ImageEncoderHelper.cs index b8fa097d64..a6651ea40d 100644 --- a/MediaBrowser.ServerApplication/ImageEncoderHelper.cs +++ b/MediaBrowser.ServerApplication/ImageEncoderHelper.cs @@ -1,6 +1,5 @@ using System; using Emby.Drawing; -using Emby.Drawing.Net; using Emby.Drawing.ImageMagick; using Emby.Drawing.Skia; using Emby.Server.Core; @@ -22,34 +21,22 @@ namespace MediaBrowser.Server.Startup.Common Func<IHttpClient> httpClient, IApplicationPaths appPaths) { - if (!startupOptions.ContainsOption("-enablegdi")) + try { - try - { - return new SkiaEncoder(logManager.GetLogger("Skia"), appPaths, httpClient, fileSystem); - } - catch - { - logger.Error("Error loading Skia. Will revert to ImageMagick."); - } - - try - { - return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem); - } - catch - { - logger.Error("Error loading ImageMagick. Will revert to GDI."); - } + return new SkiaEncoder(logManager.GetLogger("Skia"), appPaths, httpClient, fileSystem); + } + catch + { + logger.Error("Error loading Skia. Will revert to ImageMagick."); } try { - return new GDIImageEncoder(fileSystem, logManager.GetLogger("GDI")); + return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem); } catch { - logger.Error("Error loading GDI. Will revert to NullImageEncoder."); + logger.Error("Error loading ImageMagick. Will revert to GDI."); } return new NullImageEncoder(); diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs index 37c71545a4..a0494b3e5c 100644 --- a/MediaBrowser.ServerApplication/MainStartup.cs +++ b/MediaBrowser.ServerApplication/MainStartup.cs @@ -21,9 +21,10 @@ using Emby.Common.Implementations.EnvironmentInfo; using Emby.Common.Implementations.IO; using Emby.Common.Implementations.Logging; using Emby.Common.Implementations.Networking; -using Emby.Common.Implementations.Security; +using Emby.Server.Core.Cryptography; using Emby.Drawing; using Emby.Server.Core; +using Emby.Server.Core.IO; using Emby.Server.Core.Logging; using Emby.Server.Implementations; using Emby.Server.Implementations.Browser; @@ -32,7 +33,6 @@ using Emby.Server.Implementations.Logging; using ImageMagickSharp; using MediaBrowser.Common.Net; using MediaBrowser.Model.IO; -using MediaBrowser.Server.Startup.Common.IO; namespace MediaBrowser.ServerApplication { diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index d632007d20..637474380b 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -64,18 +64,12 @@ <Prefer32Bit>true</Prefer32Bit> </PropertyGroup> <ItemGroup> - <Reference Include="Emby.Common.Implementations"> - <HintPath>..\ThirdParty\emby\Emby.Common.Implementations.dll</HintPath> - </Reference> <Reference Include="Emby.Server.CinemaMode"> <HintPath>..\ThirdParty\emby\Emby.Server.CinemaMode.dll</HintPath> </Reference> <Reference Include="Emby.Server.Connect"> <HintPath>..\ThirdParty\emby\Emby.Server.Connect.dll</HintPath> </Reference> - <Reference Include="Emby.Server.Core"> - <HintPath>..\ThirdParty\emby\Emby.Server.Core.dll</HintPath> - </Reference> <Reference Include="Emby.Server.Sync"> <HintPath>..\ThirdParty\emby\Emby.Server.Sync.dll</HintPath> </Reference> @@ -84,24 +78,22 @@ <HintPath>..\packages\ImageMagickSharp.1.0.0.18\lib\net45\ImageMagickSharp.dll</HintPath> </Reference> <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> - <HintPath>..\packages\NLog.4.4.3\lib\net45\NLog.dll</HintPath> - <Private>True</Private> + <HintPath>..\packages\NLog.4.4.9\lib\net45\NLog.dll</HintPath> </Reference> - <Reference Include="ServiceStack.Text, Version=4.5.4.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\ServiceStack.Text.4.5.4\lib\net45\ServiceStack.Text.dll</HintPath> + <Reference Include="ServiceStack.Text, Version=4.5.8.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="SharpCompress, Version=0.14.0.0, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\packages\SharpCompress.0.14.0\lib\net45\SharpCompress.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="SimpleInjector, Version=3.3.2.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL"> - <HintPath>..\packages\SimpleInjector.3.3.2\lib\net45\SimpleInjector.dll</HintPath> + <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> - <Reference Include="SkiaSharp, Version=1.57.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL"> - <HintPath>..\packages\SkiaSharp.1.57.1\lib\net45\SkiaSharp.dll</HintPath> - <Private>True</Private> + <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> </Reference> <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL"> <HintPath>..\packages\SQLitePCLRaw.core.1.1.5\lib\net45\SQLitePCLRaw.core.dll</HintPath> @@ -119,9 +111,7 @@ <Reference Include="System.IO.Compression" /> <Reference Include="System.Management" /> <Reference Include="System.Runtime.Serialization" /> - <Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceProcess" /> - <Reference Include="System.Transactions" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Data.DataSetExtensions" /> @@ -189,14 +179,6 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> - <Content Include="..\packages\SkiaSharp.1.57.1\runtimes\win7-x64\native\libSkiaSharp.dll"> - <Link>x64\libSkiaSharp.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> - <Content Include="..\packages\SkiaSharp.1.57.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> @@ -644,6 +626,9 @@ <Content Include="x64\IM_MOD_RL_yuv_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="x64\libSkiaSharp.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="x64\sqlite3.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> @@ -1087,6 +1072,9 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> <Content Include="Resources\Images\mb3logo800.png" /> + <Content Include="x86\libSkiaSharp.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="x86\sqlite3.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> @@ -1100,6 +1088,10 @@ <Project>{713f42b5-878e-499d-a878-e4c652b1d5e8}</Project> <Name>DvdLib</Name> </ProjectReference> + <ProjectReference Include="..\Emby.Common.Implementations\Emby.Common.Implementations.csproj"> + <Project>{1e37a338-9f57-4b70-bd6d-bb9c591e319b}</Project> + <Name>Emby.Common.Implementations</Name> + </ProjectReference> <ProjectReference Include="..\Emby.Dlna\Emby.Dlna.csproj"> <Project>{805844ab-e92f-45e6-9d99-4f6d48d129a5}</Project> <Name>Emby.Dlna</Name> @@ -1108,10 +1100,6 @@ <Project>{6cfee013-6e7c-432b-ac37-cabf0880c69a}</Project> <Name>Emby.Drawing.ImageMagick</Name> </ProjectReference> - <ProjectReference Include="..\Emby.Drawing.Net\Emby.Drawing.Net.csproj"> - <Project>{c97a239e-a96c-4d64-a844-ccf8cc30aecb}</Project> - <Name>Emby.Drawing.Net</Name> - </ProjectReference> <ProjectReference Include="..\Emby.Drawing.Skia\Emby.Drawing.Skia.csproj"> <Project>{2312da6d-ff86-4597-9777-bceec32d96dd}</Project> <Name>Emby.Drawing.Skia</Name> @@ -1124,6 +1112,10 @@ <Project>{89ab4548-770d-41fd-a891-8daff44f452c}</Project> <Name>Emby.Photos</Name> </ProjectReference> + <ProjectReference Include="..\Emby.Server.Core\Emby.Server.Core.csproj"> + <Project>{776b9f0c-5195-45e3-9a36-1cc1f0d8e0b0}</Project> + <Name>Emby.Server.Core</Name> + </ProjectReference> <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj"> <Project>{e383961b-9356-4d5d-8233-9a1079d03055}</Project> <Name>Emby.Server.Implementations</Name> @@ -1160,10 +1152,6 @@ <Project>{2e781478-814d-4a48-9d80-bff206441a65}</Project> <Name>MediaBrowser.Server.Implementations</Name> </ProjectReference> - <ProjectReference Include="..\MediaBrowser.Server.Startup.Common\MediaBrowser.Server.Startup.Common.csproj"> - <Project>{b90ab8f2-1bff-4568-a3fd-2a338a435a75}</Project> - <Name>MediaBrowser.Server.Startup.Common</Name> - </ProjectReference> <ProjectReference Include="..\MediaBrowser.WebDashboard\MediaBrowser.WebDashboard.csproj"> <Project>{5624b7b5-b5a7-41d8-9f10-cc5611109619}</Project> <Name>MediaBrowser.WebDashboard</Name> @@ -1172,6 +1160,10 @@ <Project>{23499896-b135-4527-8574-c26e926ea99e}</Project> <Name>MediaBrowser.XbmcMetadata</Name> </ProjectReference> + <ProjectReference Include="..\Mono.Nat\Mono.Nat.csproj"> + <Project>{cb7f2326-6497-4a3d-ba03-48513b17a7be}</Project> + <Name>Mono.Nat</Name> + </ProjectReference> <ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj"> <Project>{4a4402d4-e910-443b-b8fc-2c18286a2ca0}</Project> <Name>OpenSubtitlesHandler</Name> @@ -1180,10 +1172,6 @@ <Project>{21002819-c39a-4d3e-be83-2a276a77fb1f}</Project> <Name>RSSDP</Name> </ProjectReference> - <ProjectReference Include="..\SocketHttpListener.Portable\SocketHttpListener.Portable.csproj"> - <Project>{4f26d5d8-a7b0-42b3-ba42-7cb7d245934e}</Project> - <Name>SocketHttpListener.Portable</Name> - </ProjectReference> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <PropertyGroup> diff --git a/MediaBrowser.ServerApplication/WindowsAppHost.cs b/MediaBrowser.ServerApplication/WindowsAppHost.cs index 537c8b323c..7a35c56147 100644 --- a/MediaBrowser.ServerApplication/WindowsAppHost.cs +++ b/MediaBrowser.ServerApplication/WindowsAppHost.cs @@ -55,20 +55,10 @@ namespace MediaBrowser.ServerApplication LoopUtil.Run(appName); } - public override PackageVersionClass SystemUpdateLevel - { - get { return UpdateLevelHelper.GetSystemUpdateLevel(ConfigurationManager); } - } - protected override List<Assembly> GetAssembliesWithPartsInternal() { var list = new List<Assembly>(); - if (!Environment.Is64BitProcess) - { - //list.Add(typeof(PismoIsoManager).Assembly); - } - list.Add(typeof(DefaultIntroProvider).Assembly); list.Add(typeof(ConnectManager).Assembly); list.Add(typeof(SyncManager).Assembly); diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index 2d4ba61707..4d4bde09f9 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="ImageMagickSharp" version="1.0.0.18" targetFramework="net45" /> - <package id="NLog" version="4.4.3" targetFramework="net462" /> - <package id="ServiceStack.Text" version="4.5.4" targetFramework="net462" /> + <package id="NLog" version="4.4.9" targetFramework="net462" /> + <package id="ServiceStack.Text" version="4.5.8" targetFramework="net462" /> <package id="SharpCompress" version="0.14.0" targetFramework="net462" /> - <package id="SimpleInjector" version="3.3.2" targetFramework="net462" /> - <package id="SkiaSharp" version="1.57.1" targetFramework="net462" /> + <package id="SimpleInjector" version="4.0.7" targetFramework="net462" /> + <package id="SkiaSharp" version="1.58.0" targetFramework="net462" /> <package id="SQLitePCLRaw.core" version="1.1.5" targetFramework="net462" /> <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.5" 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 new file mode 100644 index 0000000000..4027f61a08 --- /dev/null +++ b/MediaBrowser.ServerApplication/x64/libSkiaSharp.dll.REMOVED.git-id @@ -0,0 +1 @@ +20e469be83c5d41bb44d085c36550780e788a8ef
\ No newline at end of file |