diff --git a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs index 5da1ae2dc..ad6e35700 100644 --- a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs +++ b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; @@ -75,6 +76,14 @@ namespace Emby.Common.Implementations.EnvironmentInfo } } + public char PathSeparator + { + get + { + return Path.PathSeparator; + } + } + public MediaBrowser.Model.System.Architecture SystemArchitecture { get diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs index bbae918a1..fde03e1f2 100644 --- a/MediaBrowser.Api/UserService.cs +++ b/MediaBrowser.Api/UserService.cs @@ -461,7 +461,7 @@ namespace MediaBrowser.Api { var success = await _userManager.AuthenticateUser(user.Name, request.CurrentPassword, Request.RemoteIp).ConfigureAwait(false); - if (success != null) + if (success == null) { throw new ArgumentException("Invalid user or password entered."); } diff --git a/MediaBrowser.Model/System/IEnvironmentInfo.cs b/MediaBrowser.Model/System/IEnvironmentInfo.cs index 2c57df97c..4430bfe07 100644 --- a/MediaBrowser.Model/System/IEnvironmentInfo.cs +++ b/MediaBrowser.Model/System/IEnvironmentInfo.cs @@ -11,6 +11,7 @@ namespace MediaBrowser.Model.System void SetProcessEnvironmentVariable(string name, string value); string GetUserId(); string StackTrace { get; } + char PathSeparator { get; } } public enum OperatingSystem diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index bb67a9e36..834220f9c 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -734,6 +734,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\globalize.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\homesections.js + Resources\dashboard-ui\bower_components\emby-webcomponents\idb.js diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index 54133b718..20681b317 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.697 + 3.0.698 Emby.Common Emby Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index e59460c94..7b5f348c8 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.697 + 3.0.698 Emby.Server.Core Emby Team ebr,Luke,scottisafool diff --git a/SharedVersion.cs b/SharedVersion.cs index ec6a055e8..3daabe507 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.11.1")] +[assembly: AssemblyVersion("3.2.12.1")]