diff --git a/BDInfo/BDInfo.csproj b/BDInfo/BDInfo.csproj index f518b912af..c598f0f3d8 100644 --- a/BDInfo/BDInfo.csproj +++ b/BDInfo/BDInfo.csproj @@ -34,10 +34,10 @@ - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll diff --git a/BDInfo/packages.config b/BDInfo/packages.config index e29f986bab..3585af4ad8 100644 --- a/BDInfo/packages.config +++ b/BDInfo/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/DvdLib/DvdLib.csproj b/DvdLib/DvdLib.csproj index a940d90800..65626b1eac 100644 --- a/DvdLib/DvdLib.csproj +++ b/DvdLib/DvdLib.csproj @@ -49,10 +49,10 @@ - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll diff --git a/DvdLib/packages.config b/DvdLib/packages.config index e29f986bab..3585af4ad8 100644 --- a/DvdLib/packages.config +++ b/DvdLib/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Emby.Dlna/Didl/DidlBuilder.cs b/Emby.Dlna/Didl/DidlBuilder.cs index 6951eee149..0cd544aeae 100644 --- a/Emby.Dlna/Didl/DidlBuilder.cs +++ b/Emby.Dlna/Didl/DidlBuilder.cs @@ -212,6 +212,12 @@ private void AddVideoResource(DlnaOptions options, XmlWriter writer, BaseItem vi }); } + if (string.Equals(Path.GetExtension(video.Path), ".m2ts", StringComparison.OrdinalIgnoreCase)) + { + var a = 1; + var b = a; + } + var targetWidth = streamInfo.TargetWidth; var targetHeight = streamInfo.TargetHeight; diff --git a/Emby.Dlna/Emby.Dlna.csproj b/Emby.Dlna/Emby.Dlna.csproj index ed71406c37..c3dc19a500 100644 --- a/Emby.Dlna/Emby.Dlna.csproj +++ b/Emby.Dlna/Emby.Dlna.csproj @@ -174,13 +174,13 @@ - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll + ..\packages\MediaBrowser.Server.Core.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Controller.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll diff --git a/Emby.Dlna/packages.config b/Emby.Dlna/packages.config index 753f901d6c..fc087e29c3 100644 --- a/Emby.Dlna/packages.config +++ b/Emby.Dlna/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj b/Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj index abcaf38f76..c7c10016ad 100644 --- a/Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj +++ b/Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj @@ -35,13 +35,13 @@ ..\packages\ImageMagickSharp.1.0.0.19\lib\net45\ImageMagickSharp.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll + ..\packages\MediaBrowser.Server.Core.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Controller.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll diff --git a/Emby.Drawing.ImageMagick/packages.config b/Emby.Drawing.ImageMagick/packages.config index ba0aa9ce85..2b23a5e0bd 100644 --- a/Emby.Drawing.ImageMagick/packages.config +++ b/Emby.Drawing.ImageMagick/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj index 1f696455f3..405e2a658f 100644 --- a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj +++ b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj @@ -43,13 +43,13 @@ - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll + ..\packages\MediaBrowser.Server.Core.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Controller.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll diff --git a/Emby.Drawing.Skia/packages.config b/Emby.Drawing.Skia/packages.config index 42e0cc6bcf..5eb4c5824a 100644 --- a/Emby.Drawing.Skia/packages.config +++ b/Emby.Drawing.Skia/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/Emby.Drawing/Emby.Drawing.csproj b/Emby.Drawing/Emby.Drawing.csproj index 8f4d735ac2..74a7d4dfea 100644 --- a/Emby.Drawing/Emby.Drawing.csproj +++ b/Emby.Drawing/Emby.Drawing.csproj @@ -41,13 +41,13 @@ - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll + ..\packages\MediaBrowser.Server.Core.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Controller.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll diff --git a/Emby.Drawing/packages.config b/Emby.Drawing/packages.config index 01403e3e51..7be57463d7 100644 --- a/Emby.Drawing/packages.config +++ b/Emby.Drawing/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Emby.Photos/Emby.Photos.csproj b/Emby.Photos/Emby.Photos.csproj index b7206246ac..471bc3db9f 100644 --- a/Emby.Photos/Emby.Photos.csproj +++ b/Emby.Photos/Emby.Photos.csproj @@ -32,13 +32,13 @@ - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll + ..\packages\MediaBrowser.Server.Core.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Controller.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll ..\ThirdParty\taglib\TagLib.Portable.dll diff --git a/Emby.Photos/packages.config b/Emby.Photos/packages.config index 01403e3e51..7be57463d7 100644 --- a/Emby.Photos/packages.config +++ b/Emby.Photos/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index a041d27a70..45f421676e 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -978,7 +978,16 @@ protected void RegisterResources() CertificateInfo = GetCertificateInfo(true); Certificate = GetCertificate(CertificateInfo); - HttpServer = CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, streamHelper, "Emby", "web/index.html", TextEncoding, SocketFactory, CryptographyProvider, JsonSerializer, XmlSerializer, EnvironmentInfo, Certificate, FileSystemManager, SupportsDualModeSockets); + HttpServer = new HttpListenerHost(this, + LogManager.GetLogger("HttpServer"), + ServerConfigurationManager, + "web/index.html", + NetworkManager, + TextEncoding, + JsonSerializer, + XmlSerializer, + GetParseFn); + HttpServer.GlobalResponse = LocalizationManager.GetLocalizedString("StartupEmbyServerIsLoading"); RegisterSingleInstance(HttpServer); @@ -1082,44 +1091,6 @@ protected void RegisterResources() ((UserManager)UserManager).Initialize(); } - public static IHttpServer CreateServer(IServerApplicationHost applicationHost, - ILogManager logManager, - IServerConfigurationManager config, - INetworkManager networkmanager, - IStreamHelper streamProvider, - string serverName, - string defaultRedirectpath, - ITextEncoding textEncoding, - ISocketFactory socketFactory, - ICryptoProvider cryptoProvider, - IJsonSerializer json, - IXmlSerializer xml, - IEnvironmentInfo environment, - X509Certificate certificate, - IFileSystem fileSystem, - bool enableDualModeSockets) - { - var logger = logManager.GetLogger("HttpServer"); - - return new HttpListenerHost(applicationHost, - logger, - config, - serverName, - defaultRedirectpath, - networkmanager, - streamProvider, - textEncoding, - socketFactory, - cryptoProvider, - json, - xml, - environment, - certificate, - GetParseFn, - enableDualModeSockets, - fileSystem); - } - private static Func GetParseFn(Type propertyType) { return s => JsvReader.GetParseFn(propertyType)(s); diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index d0922efdeb..62fec369da 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -614,13 +614,13 @@ ..\packages\Emby.XmlTv.1.0.14\lib\portable-net45+netstandard2.0+win8\Emby.XmlTv.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll + ..\packages\MediaBrowser.Server.Core.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Controller.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs index c6533327f4..0693d918a4 100644 --- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -44,21 +44,14 @@ public class HttpListenerHost : IHttpServer, IDisposable private readonly IServerConfigurationManager _config; private readonly INetworkManager _networkManager; - private readonly IStreamHelper _streamHelper; private readonly IServerApplicationHost _appHost; private readonly ITextEncoding _textEncoding; - private readonly ISocketFactory _socketFactory; - private readonly ICryptoProvider _cryptoProvider; - private readonly IFileSystem _fileSystem; private readonly IJsonSerializer _jsonSerializer; private readonly IXmlSerializer _xmlSerializer; - private readonly X509Certificate _certificate; - private readonly IEnvironmentInfo _environment; private readonly Func> _funcParseFn; - private readonly bool _enableDualModeSockets; public Action[] ResponseFilters { get; set; } @@ -71,28 +64,20 @@ public class HttpListenerHost : IHttpServer, IDisposable public HttpListenerHost(IServerApplicationHost applicationHost, ILogger logger, IServerConfigurationManager config, - string serviceName, - string defaultRedirectPath, INetworkManager networkManager, IStreamHelper streamHelper, ITextEncoding textEncoding, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer, IEnvironmentInfo environment, X509Certificate certificate, Func> funcParseFn, bool enableDualModeSockets, IFileSystem fileSystem) + string defaultRedirectPath, INetworkManager networkManager, ITextEncoding textEncoding, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer, Func> funcParseFn) { Instance = this; _appHost = applicationHost; DefaultRedirectPath = defaultRedirectPath; _networkManager = networkManager; - _streamHelper = streamHelper; _textEncoding = textEncoding; - _socketFactory = socketFactory; - _cryptoProvider = cryptoProvider; _jsonSerializer = jsonSerializer; _xmlSerializer = xmlSerializer; - _environment = environment; - _certificate = certificate; - _funcParseFn = funcParseFn; - _enableDualModeSockets = enableDualModeSockets; - _fileSystem = fileSystem; _config = config; _logger = logger; + _funcParseFn = funcParseFn; ResponseFilters = new Action[] { }; } diff --git a/Emby.Server.Implementations/packages.config b/Emby.Server.Implementations/packages.config index 54e38606b4..311ce4c313 100644 --- a/Emby.Server.Implementations/packages.config +++ b/Emby.Server.Implementations/packages.config @@ -1,9 +1,9 @@  - + - + diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj index 67be65a5d5..5ac75805b9 100644 --- a/MediaBrowser.Api/MediaBrowser.Api.csproj +++ b/MediaBrowser.Api/MediaBrowser.Api.csproj @@ -102,17 +102,16 @@ - - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll + ..\packages\MediaBrowser.Server.Core.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Controller.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs index 2d30625a98..ff57b4dd15 100644 --- a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs +++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs @@ -33,8 +33,8 @@ protected override string Name /// /// Initializes a new instance of the class. /// - public ScheduledTasksWebSocketListener(ILogger logger, ITaskManager taskManager, ITimerFactory timerFactory) - : base(logger, timerFactory) + public ScheduledTasksWebSocketListener(ILogger logger, ITaskManager taskManager) + : base(logger) { TaskManager = taskManager; @@ -72,14 +72,6 @@ protected override Task> GetDataToSend(WebSocketListenerSt .Where(i => !i.IsHidden)); } - protected override bool SendOnTimer - { - get - { - return false; - } - } - protected override void Dispose(bool dispose) { TaskManager.TaskExecuting -= TaskManager_TaskExecuting; diff --git a/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs b/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs index 841f87c17a..355699c718 100644 --- a/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs +++ b/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs @@ -33,8 +33,8 @@ protected override string Name /// /// Initializes a new instance of the class. /// - public SessionInfoWebSocketListener(ILogger logger, ISessionManager sessionManager, ITimerFactory timerFactory) - : base(logger, timerFactory) + public SessionInfoWebSocketListener(ILogger logger, ISessionManager sessionManager) + : base(logger) { _sessionManager = sessionManager; @@ -92,14 +92,6 @@ protected override Task> GetDataToSend(WebSocketList return Task.FromResult(_sessionManager.Sessions.Select(_sessionManager.GetSessionInfoDto)); } - protected override bool SendOnTimer - { - get - { - return false; - } - } - protected override void Dispose(bool dispose) { _sessionManager.SessionStarted -= _sessionManager_SessionStarted; diff --git a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs index f9cac7389d..6991244c6c 100644 --- a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs +++ b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using MediaBrowser.Controller.Net; -using MediaBrowser.Model.Threading; using System.Threading; namespace MediaBrowser.Api.System @@ -28,7 +27,7 @@ protected override string Name /// private readonly IActivityManager _activityManager; - public ActivityLogWebSocketListener(ILogger logger, ITimerFactory timerFactory, IActivityManager activityManager) : base(logger, timerFactory) + public ActivityLogWebSocketListener(ILogger logger, IActivityManager activityManager) : base(logger) { _activityManager = activityManager; _activityManager.EntryCreated += _activityManager_EntryCreated; @@ -48,14 +47,7 @@ protected override Task> GetDataToSend(WebSocketListenerS { return Task.FromResult(new List()); } - - protected override bool SendOnTimer - { - get - { - return false; - } - } + protected override void Dispose(bool dispose) { diff --git a/MediaBrowser.Api/System/SystemInfoWebSocketListener.cs b/MediaBrowser.Api/System/SystemInfoWebSocketListener.cs deleted file mode 100644 index 63847f2b52..0000000000 --- a/MediaBrowser.Api/System/SystemInfoWebSocketListener.cs +++ /dev/null @@ -1,49 +0,0 @@ -using MediaBrowser.Controller; -using MediaBrowser.Controller.Net; -using MediaBrowser.Model.Logging; -using MediaBrowser.Model.System; -using System.Threading.Tasks; -using MediaBrowser.Model.Threading; -using System.Threading; - -namespace MediaBrowser.Api.System -{ - /// - /// Class SystemInfoWebSocketListener - /// - public class SystemInfoWebSocketListener : BasePeriodicWebSocketListener - { - /// - /// Gets the name. - /// - /// The name. - protected override string Name - { - get { return "SystemInfo"; } - } - - /// - /// The _kernel - /// - private readonly IServerApplicationHost _appHost; - - /// - /// Initializes a new instance of the class. - /// - public SystemInfoWebSocketListener(ILogger logger, IServerApplicationHost appHost, ITimerFactory timerFactory) - : base(logger, timerFactory) - { - _appHost = appHost; - } - - /// - /// Gets the data to send. - /// - /// The state. - /// Task{SystemInfo}. - protected override Task GetDataToSend(WebSocketListenerState state, CancellationToken cancellationToken) - { - return _appHost.GetSystemInfo(cancellationToken); - } - } -} diff --git a/MediaBrowser.Api/packages.config b/MediaBrowser.Api/packages.config index 01403e3e51..7be57463d7 100644 --- a/MediaBrowser.Api/packages.config +++ b/MediaBrowser.Api/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj index e00700cba6..021f5fd3c7 100644 --- a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj +++ b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj @@ -57,13 +57,13 @@ - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll + ..\packages\MediaBrowser.Server.Core.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Controller.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll diff --git a/MediaBrowser.LocalMetadata/packages.config b/MediaBrowser.LocalMetadata/packages.config index 01403e3e51..7be57463d7 100644 --- a/MediaBrowser.LocalMetadata/packages.config +++ b/MediaBrowser.LocalMetadata/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj index b0bc3a243d..fe00cfb45b 100644 --- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj +++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj @@ -140,13 +140,13 @@ - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll + ..\packages\MediaBrowser.Server.Core.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Controller.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll diff --git a/MediaBrowser.Providers/packages.config b/MediaBrowser.Providers/packages.config index 5a7538a92d..13d21165a7 100644 --- a/MediaBrowser.Providers/packages.config +++ b/MediaBrowser.Providers/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index 1bc07531fa..57bb823d66 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -51,13 +51,13 @@ ..\packages\Emby.XmlTv.1.0.14\lib\portable-net45+netstandard2.0+win8\Emby.XmlTv.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll + ..\packages\MediaBrowser.Server.Core.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Controller.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll ..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll diff --git a/MediaBrowser.Server.Mono/packages.config b/MediaBrowser.Server.Mono/packages.config index 081d0b4304..349d991244 100644 --- a/MediaBrowser.Server.Mono/packages.config +++ b/MediaBrowser.Server.Mono/packages.config @@ -1,8 +1,8 @@  - - + + diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index bf7727684d..5784929296 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -77,13 +77,13 @@ ..\packages\Emby.XmlTv.1.0.14\lib\portable-net45+netstandard2.0+win8\Emby.XmlTv.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll + ..\packages\MediaBrowser.Server.Core.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Controller.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll ..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index 222bc8c29c..07d6588607 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -1,8 +1,8 @@  - - + + diff --git a/MediaBrowser.Tests/MediaBrowser.Tests.csproj b/MediaBrowser.Tests/MediaBrowser.Tests.csproj index 38d8a7aafa..0de45edda4 100644 --- a/MediaBrowser.Tests/MediaBrowser.Tests.csproj +++ b/MediaBrowser.Tests/MediaBrowser.Tests.csproj @@ -41,13 +41,13 @@ ..\ThirdParty\emby\Emby.Server.MediaEncoding.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll + ..\packages\MediaBrowser.Server.Core.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Controller.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll diff --git a/MediaBrowser.Tests/packages.config b/MediaBrowser.Tests/packages.config index 01403e3e51..7be57463d7 100644 --- a/MediaBrowser.Tests/packages.config +++ b/MediaBrowser.Tests/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index f67143d780..34fa9b1961 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -46,13 +46,13 @@ - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll + ..\packages\MediaBrowser.Server.Core.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Controller.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config index 01403e3e51..7be57463d7 100644 --- a/MediaBrowser.WebDashboard/packages.config +++ b/MediaBrowser.WebDashboard/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj b/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj index d1422d1f09..bc1798be40 100644 --- a/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj +++ b/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj @@ -61,13 +61,13 @@ - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Server.Core.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Controller.dll + ..\packages\MediaBrowser.Server.Core.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Controller.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll diff --git a/MediaBrowser.XbmcMetadata/packages.config b/MediaBrowser.XbmcMetadata/packages.config index 01403e3e51..7be57463d7 100644 --- a/MediaBrowser.XbmcMetadata/packages.config +++ b/MediaBrowser.XbmcMetadata/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Mono.Nat/Mono.Nat.csproj b/Mono.Nat/Mono.Nat.csproj index ad36fa8e54..fe27272d21 100644 --- a/Mono.Nat/Mono.Nat.csproj +++ b/Mono.Nat/Mono.Nat.csproj @@ -32,10 +32,10 @@ - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll diff --git a/Mono.Nat/packages.config b/Mono.Nat/packages.config index e29f986bab..3585af4ad8 100644 --- a/Mono.Nat/packages.config +++ b/Mono.Nat/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/RSSDP/RSSDP.csproj b/RSSDP/RSSDP.csproj index bda64f9544..656b4dfe07 100644 --- a/RSSDP/RSSDP.csproj +++ b/RSSDP/RSSDP.csproj @@ -58,10 +58,10 @@ - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll diff --git a/RSSDP/packages.config b/RSSDP/packages.config index e29f986bab..3585af4ad8 100644 --- a/RSSDP/packages.config +++ b/RSSDP/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/SharedVersion.cs b/SharedVersion.cs index ebaf03fd64..e3d43594b1 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.4.1.12")] +[assembly: AssemblyVersion("3.4.1.13")] diff --git a/SocketHttpListener/SocketHttpListener.csproj b/SocketHttpListener/SocketHttpListener.csproj index 09989ee8ff..558d9de2c4 100644 --- a/SocketHttpListener/SocketHttpListener.csproj +++ b/SocketHttpListener/SocketHttpListener.csproj @@ -36,10 +36,10 @@ - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Common.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Common.dll - ..\packages\MediaBrowser.Common.3.3.46-beta\lib\netstandard2.0\MediaBrowser.Model.dll + ..\packages\MediaBrowser.Common.3.3.47-beta\lib\netstandard2.0\MediaBrowser.Model.dll diff --git a/SocketHttpListener/packages.config b/SocketHttpListener/packages.config index e29f986bab..3585af4ad8 100644 --- a/SocketHttpListener/packages.config +++ b/SocketHttpListener/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/ThirdParty/emby/Emby.Server.Connect.dll b/ThirdParty/emby/Emby.Server.Connect.dll index 535130cbee..c6792103d4 100644 Binary files a/ThirdParty/emby/Emby.Server.Connect.dll and b/ThirdParty/emby/Emby.Server.Connect.dll differ diff --git a/ThirdParty/emby/Emby.Server.MediaEncoding.dll b/ThirdParty/emby/Emby.Server.MediaEncoding.dll index d5143a1656..fbcf1c438e 100644 Binary files a/ThirdParty/emby/Emby.Server.MediaEncoding.dll and b/ThirdParty/emby/Emby.Server.MediaEncoding.dll differ diff --git a/ThirdParty/emby/Emby.Server.Sync.dll b/ThirdParty/emby/Emby.Server.Sync.dll index 5cc3347343..ef239a665b 100644 Binary files a/ThirdParty/emby/Emby.Server.Sync.dll and b/ThirdParty/emby/Emby.Server.Sync.dll differ diff --git a/packages/MediaBrowser.Common.3.3.46-beta/MediaBrowser.Common.3.3.46-beta.nupkg b/packages/MediaBrowser.Common.3.3.46-beta/MediaBrowser.Common.3.3.46-beta.nupkg deleted file mode 100644 index e2eda44d41..0000000000 Binary files a/packages/MediaBrowser.Common.3.3.46-beta/MediaBrowser.Common.3.3.46-beta.nupkg and /dev/null differ diff --git a/packages/MediaBrowser.Common.3.3.47-beta/MediaBrowser.Common.3.3.47-beta.nupkg b/packages/MediaBrowser.Common.3.3.47-beta/MediaBrowser.Common.3.3.47-beta.nupkg new file mode 100644 index 0000000000..ccd7b17ee1 Binary files /dev/null and b/packages/MediaBrowser.Common.3.3.47-beta/MediaBrowser.Common.3.3.47-beta.nupkg differ diff --git a/packages/MediaBrowser.Common.3.3.46-beta/lib/netstandard2.0/MediaBrowser.Common.dll b/packages/MediaBrowser.Common.3.3.47-beta/lib/netstandard2.0/MediaBrowser.Common.dll similarity index 100% rename from packages/MediaBrowser.Common.3.3.46-beta/lib/netstandard2.0/MediaBrowser.Common.dll rename to packages/MediaBrowser.Common.3.3.47-beta/lib/netstandard2.0/MediaBrowser.Common.dll diff --git a/packages/MediaBrowser.Common.3.3.46-beta/lib/netstandard2.0/MediaBrowser.Model.dll b/packages/MediaBrowser.Common.3.3.47-beta/lib/netstandard2.0/MediaBrowser.Model.dll similarity index 84% rename from packages/MediaBrowser.Common.3.3.46-beta/lib/netstandard2.0/MediaBrowser.Model.dll rename to packages/MediaBrowser.Common.3.3.47-beta/lib/netstandard2.0/MediaBrowser.Model.dll index e2295fba7a..22842bc4eb 100644 Binary files a/packages/MediaBrowser.Common.3.3.46-beta/lib/netstandard2.0/MediaBrowser.Model.dll and b/packages/MediaBrowser.Common.3.3.47-beta/lib/netstandard2.0/MediaBrowser.Model.dll differ diff --git a/packages/MediaBrowser.Server.Core.3.3.46-beta/MediaBrowser.Server.Core.3.3.46-beta.nupkg b/packages/MediaBrowser.Server.Core.3.3.46-beta/MediaBrowser.Server.Core.3.3.46-beta.nupkg deleted file mode 100644 index 2b1908a0fd..0000000000 Binary files a/packages/MediaBrowser.Server.Core.3.3.46-beta/MediaBrowser.Server.Core.3.3.46-beta.nupkg and /dev/null differ diff --git a/packages/MediaBrowser.Server.Core.3.3.47-beta/MediaBrowser.Server.Core.3.3.47-beta.nupkg b/packages/MediaBrowser.Server.Core.3.3.47-beta/MediaBrowser.Server.Core.3.3.47-beta.nupkg new file mode 100644 index 0000000000..2cbbd7e8e4 Binary files /dev/null and b/packages/MediaBrowser.Server.Core.3.3.47-beta/MediaBrowser.Server.Core.3.3.47-beta.nupkg differ diff --git a/packages/MediaBrowser.Server.Core.3.3.46-beta/lib/netstandard2.0/MediaBrowser.Controller.dll b/packages/MediaBrowser.Server.Core.3.3.47-beta/lib/netstandard2.0/MediaBrowser.Controller.dll similarity index 94% rename from packages/MediaBrowser.Server.Core.3.3.46-beta/lib/netstandard2.0/MediaBrowser.Controller.dll rename to packages/MediaBrowser.Server.Core.3.3.47-beta/lib/netstandard2.0/MediaBrowser.Controller.dll index d6be9f0d72..8c20a70f08 100644 Binary files a/packages/MediaBrowser.Server.Core.3.3.46-beta/lib/netstandard2.0/MediaBrowser.Controller.dll and b/packages/MediaBrowser.Server.Core.3.3.47-beta/lib/netstandard2.0/MediaBrowser.Controller.dll differ