diff options
Diffstat (limited to 'MediaBrowser.ServerApplication')
4 files changed, 21 insertions, 10 deletions
diff --git a/MediaBrowser.ServerApplication/App.config b/MediaBrowser.ServerApplication/App.config index 4bac6bb70..fae013d6e 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-2.3.6.0" newVersion="2.3.6.0" /> + <bindingRedirect oldVersion="0.0.0.0-3.3.2.0" newVersion="3.3.2.0" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 656b295c2..50b0aa21f 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -73,12 +73,15 @@ <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> <Reference Include="ImageMagickSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <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.0-betaV15\lib\net45\NLog.dll</HintPath> + <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"> @@ -89,16 +92,16 @@ <HintPath>..\packages\SharpCompress.0.14.0\lib\net45\SharpCompress.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="SimpleInjector, Version=3.2.4.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL"> - <HintPath>..\packages\SimpleInjector.3.2.4\lib\net45\SimpleInjector.dll</HintPath> + <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> <Private>True</Private> </Reference> <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL"> - <HintPath>..\packages\SQLitePCLRaw.core.1.1.1\lib\net45\SQLitePCLRaw.core.dll</HintPath> + <HintPath>..\packages\SQLitePCLRaw.core.1.1.2\lib\net45\SQLitePCLRaw.core.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="SQLitePCLRaw.provider.sqlite3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=62684c7b4f184e3f, processorArchitecture=MSIL"> - <HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath> + <HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.2\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="System" /> diff --git a/MediaBrowser.ServerApplication/WindowsAppHost.cs b/MediaBrowser.ServerApplication/WindowsAppHost.cs index d4753f57a..9f11dc322 100644 --- a/MediaBrowser.ServerApplication/WindowsAppHost.cs +++ b/MediaBrowser.ServerApplication/WindowsAppHost.cs @@ -9,7 +9,9 @@ using Emby.Server.Core; using Emby.Server.Implementations; using Emby.Server.Implementations.EntryPoints; using Emby.Server.Implementations.FFMpeg; +using Emby.Server.Sync; using MediaBrowser.Controller.Connect; +using MediaBrowser.Controller.Sync; using MediaBrowser.Model.IO; using MediaBrowser.Model.Logging; using MediaBrowser.Model.System; @@ -34,6 +36,11 @@ namespace MediaBrowser.ServerApplication return new ConnectManager(); } + protected override ISyncManager CreateSyncManager() + { + return new SyncManager(); + } + protected override void RestartInternal() { MainStartup.Restart(); @@ -49,6 +56,7 @@ namespace MediaBrowser.ServerApplication } list.Add(typeof(ConnectManager).Assembly); + list.Add(typeof(SyncManager).Assembly); list.Add(GetType().Assembly); return list; diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index 2cebb9aea..68d0a7fda 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="ImageMagickSharp" version="1.0.0.18" targetFramework="net45" /> - <package id="NLog" version="4.4.0-betaV15" targetFramework="net462" /> + <package id="NLog" version="4.4.3" targetFramework="net462" /> <package id="ServiceStack.Text" version="4.5.4" targetFramework="net462" /> <package id="SharpCompress" version="0.14.0" targetFramework="net462" /> - <package id="SimpleInjector" version="3.2.4" targetFramework="net462" /> - <package id="SQLitePCLRaw.core" version="1.1.1" targetFramework="net462" /> - <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.1" targetFramework="net462" /> + <package id="SimpleInjector" version="3.3.2" targetFramework="net462" /> + <package id="SQLitePCLRaw.core" version="1.1.2" targetFramework="net462" /> + <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.2" targetFramework="net462" /> </packages>
\ No newline at end of file |