From 973749bb99954c106382b29efea73b49706aa683 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 15 Dec 2016 22:15:34 -0500 Subject: [PATCH 1/4] update components --- .../Emby.Server.Implementations.csproj | 4 ++-- Emby.Server.Implementations/packages.config | 2 +- MediaBrowser.Api/UserLibrary/UserViewsService.cs | 2 ++ .../MediaBrowser.Server.Startup.Common.csproj | 2 +- MediaBrowser.Server.Startup.Common/packages.config | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index df0301fc35..d773fbbf73 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -308,8 +308,8 @@ {4f26d5d8-a7b0-42b3-ba42-7cb7d245934e} SocketHttpListener.Portable - - ..\packages\Emby.XmlTv.1.0.2\lib\portable-net45+win8\Emby.XmlTv.dll + + ..\packages\Emby.XmlTv.1.0.3\lib\portable-net45+win8\Emby.XmlTv.dll True diff --git a/Emby.Server.Implementations/packages.config b/Emby.Server.Implementations/packages.config index 225d88dd12..09b0af8981 100644 --- a/Emby.Server.Implementations/packages.config +++ b/Emby.Server.Implementations/packages.config @@ -1,6 +1,6 @@  - + diff --git a/MediaBrowser.Api/UserLibrary/UserViewsService.cs b/MediaBrowser.Api/UserLibrary/UserViewsService.cs index 22fd6f4a9a..715745a7dc 100644 --- a/MediaBrowser.Api/UserLibrary/UserViewsService.cs +++ b/MediaBrowser.Api/UserLibrary/UserViewsService.cs @@ -97,6 +97,8 @@ namespace MediaBrowser.Api.UserLibrary var dtoOptions = GetDtoOptions(_authContext, request); dtoOptions.Fields.Add(ItemFields.PrimaryImageAspectRatio); dtoOptions.Fields.Add(ItemFields.DisplayPreferencesId); + dtoOptions.Fields.Remove(ItemFields.SyncInfo); + dtoOptions.Fields.Remove(ItemFields.BasicSyncInfo); var user = _userManager.GetUserById(request.UserId); diff --git a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj index e64a7d87c4..a1bca62e03 100644 --- a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj +++ b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj @@ -42,7 +42,7 @@ True - ..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.0\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll + ..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.1\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll True diff --git a/MediaBrowser.Server.Startup.Common/packages.config b/MediaBrowser.Server.Startup.Common/packages.config index 983063269d..b12895000b 100644 --- a/MediaBrowser.Server.Startup.Common/packages.config +++ b/MediaBrowser.Server.Startup.Common/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file From 0091d2c51ec0e099a6a87f587fea6e87567dd3e4 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 15 Dec 2016 23:02:52 -0500 Subject: [PATCH 2/4] update components --- Emby.Common.Implementations/project.json | 32 ++++++++++++------------ Emby.Server.Core/project.json | 12 ++++----- Mono.Nat/project.json | 4 +-- src/Emby.Server/project.json | 8 +++--- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Emby.Common.Implementations/project.json b/Emby.Common.Implementations/project.json index 409687ea16..674101e8a7 100644 --- a/Emby.Common.Implementations/project.json +++ b/Emby.Common.Implementations/project.json @@ -38,22 +38,22 @@ "netstandard1.6": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0", - "System.IO.FileSystem.DriveInfo": "4.0.0", - "System.Diagnostics.Process": "4.1.0", - "System.Threading.Timer": "4.0.1", - "System.Net.Requests": "4.0.11", - "System.Xml.ReaderWriter": "4.0.11", - "System.Xml.XmlSerializer": "4.0.11", - "System.Net.Http": "4.1.0", - "System.Net.Primitives": "4.0.11", - "System.Net.Sockets": "4.1.0", - "System.Net.NetworkInformation": "4.1.0", - "System.Net.NameResolution": "4.0.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0", - "System.Reflection": "4.1.0", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime.Loader": "4.0.0", + "NETStandard.Library": "1.6.1", + "System.IO.FileSystem.DriveInfo": "4.3.0", + "System.Diagnostics.Process": "4.3.0", + "System.Threading.Timer": "4.3.0", + "System.Net.Requests": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XmlSerializer": "4.3.0", + "System.Net.Http": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Net.Sockets": "4.3.0", + "System.Net.NetworkInformation": "4.3.0", + "System.Net.NameResolution": "4.3.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime.Loader": "4.3.0", "SimpleInjector": "3.2.4", "ServiceStack.Text.Core": "1.0.27", "NLog": "4.4.0-betaV15", diff --git a/Emby.Server.Core/project.json b/Emby.Server.Core/project.json index 1a8e3432cc..e987da6aa9 100644 --- a/Emby.Server.Core/project.json +++ b/Emby.Server.Core/project.json @@ -67,13 +67,13 @@ "netstandard1.6": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0", + "NETStandard.Library": "1.6.1", "System.AppDomain": "2.0.11", - "System.Globalization.Extensions": "4.0.1", - "System.IO.FileSystem.Watcher": "4.0.0", - "System.Net.Security": "4.0.0", - "System.Security.Cryptography.X509Certificates": "4.1.0", - "System.Runtime.Extensions": "4.1.0", + "System.Globalization.Extensions": "4.3.0", + "System.IO.FileSystem.Watcher": "4.3.0", + "System.Net.Security": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Runtime.Extensions": "4.3.0", "MediaBrowser.Model": { "target": "project" }, diff --git a/Mono.Nat/project.json b/Mono.Nat/project.json index 9f1c3247f9..3c38a62e13 100644 --- a/Mono.Nat/project.json +++ b/Mono.Nat/project.json @@ -27,14 +27,14 @@ "netstandard1.6": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0", + "NETStandard.Library": "1.6.1", "MediaBrowser.Common": { "target": "project" }, "MediaBrowser.Model": { "target": "project" }, - "System.Net.NetworkInformation": "4.1.0" + "System.Net.NetworkInformation": "4.3.0" } } } diff --git a/src/Emby.Server/project.json b/src/Emby.Server/project.json index 852c7d519d..8ca59f8f2e 100644 --- a/src/Emby.Server/project.json +++ b/src/Emby.Server/project.json @@ -12,10 +12,10 @@ "version": "1.1.0" }, "Mono.Nat": "1.0.0-*", - "Microsoft.Win32.Registry": "4.0.0", - "System.Runtime.Extensions": "4.1.0", - "System.Diagnostics.Process": "4.1.0", - "SQLitePCLRaw.provider.sqlite3.netstandard11": "1.1.1-pre20161109081005" + "Microsoft.Win32.Registry": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Diagnostics.Process": "4.3.0", + "SQLitePCLRaw.provider.sqlite3.netstandard11": "1.1.1" }, "runtimes": { From 7c6ebe9b218040ed55e07f9c287a1925a4e7a97a Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 15 Dec 2016 23:05:22 -0500 Subject: [PATCH 3/4] update components --- src/Emby.Server/project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Emby.Server/project.json b/src/Emby.Server/project.json index 8ca59f8f2e..e77506e927 100644 --- a/src/Emby.Server/project.json +++ b/src/Emby.Server/project.json @@ -12,9 +12,9 @@ "version": "1.1.0" }, "Mono.Nat": "1.0.0-*", - "Microsoft.Win32.Registry": "4.3.0", "System.Runtime.Extensions": "4.3.0", "System.Diagnostics.Process": "4.3.0", + "Microsoft.Win32.Registry": "4.3.0", "SQLitePCLRaw.provider.sqlite3.netstandard11": "1.1.1" }, From ef490818d7246aec127bfb7722c23c2103f4bf5f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 16 Dec 2016 00:24:33 -0500 Subject: [PATCH 4/4] update dlna default user --- Emby.Dlna/ContentDirectory/ContentDirectory.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Emby.Dlna/ContentDirectory/ContentDirectory.cs b/Emby.Dlna/ContentDirectory/ContentDirectory.cs index d9da7c81b4..4a36a16eb6 100644 --- a/Emby.Dlna/ContentDirectory/ContentDirectory.cs +++ b/Emby.Dlna/ContentDirectory/ContentDirectory.cs @@ -126,7 +126,8 @@ namespace Emby.Dlna.ContentDirectory } // No configuration so it's going to be pretty arbitrary - return _userManager.Users.First(); + return _userManager.Users.FirstOrDefault(i => i.Policy.IsAdministrator) ?? + _userManager.Users.First(); } public void Dispose()