diff options
Diffstat (limited to 'MediaBrowser.ServerApplication')
4 files changed, 21 insertions, 23 deletions
diff --git a/MediaBrowser.ServerApplication/App.config b/MediaBrowser.ServerApplication/App.config index fae013d6e..d7f4380c4 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/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs index 37c71545a..a0494b3e5 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 eb8cd9bcb..e4a526613 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> @@ -87,16 +81,16 @@ <HintPath>..\packages\NLog.4.4.3\lib\net45\NLog.dll</HintPath> <Private>True</Private> </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"> @@ -1098,6 +1092,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> @@ -1118,6 +1116,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> @@ -1154,10 +1156,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> @@ -1166,6 +1164,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> @@ -1174,10 +1176,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/packages.config b/MediaBrowser.ServerApplication/packages.config index 2d4ba6170..2a0cbd150 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -2,9 +2,9 @@ <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="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="SimpleInjector" version="4.0.7" targetFramework="net462" /> <package id="SkiaSharp" version="1.57.1" targetFramework="net462" /> <package id="SQLitePCLRaw.core" version="1.1.5" targetFramework="net462" /> <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.5" targetFramework="net462" /> |