From b275cb2451253de07f548ae33e324bf5e2aea733 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 29 Apr 2017 13:30:28 -0400 Subject: [PATCH] 3.2.13.7 --- .../EnvironmentInfo/EnvironmentInfo.cs | 42 +++++++++++++++---- Emby.Common.Implementations/project.json | 1 - .../MediaBrowser.Server.Mono.csproj | 4 -- MediaBrowser.Server.Mono/packages.config | 1 - .../MediaBrowser.ServerApplication.csproj | 4 -- .../packages.config | 1 - SharedVersion.cs | 2 +- 7 files changed, 34 insertions(+), 21 deletions(-) diff --git a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs index a9debe8d20..27fc642f14 100644 --- a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs +++ b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs @@ -22,19 +22,30 @@ namespace Emby.Common.Implementations.EnvironmentInfo return CustomOperatingSystem.Value; } +#if NET46 + switch (Environment.OSVersion.Platform) + { + case PlatformID.MacOSX: + return MediaBrowser.Model.System.OperatingSystem.OSX; + case PlatformID.Win32NT: + return MediaBrowser.Model.System.OperatingSystem.Windows; + case PlatformID.Unix: + return MediaBrowser.Model.System.OperatingSystem.Linux; + } +#elif NETSTANDARD1_6 if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) { - return MediaBrowser.Model.System.OperatingSystem.OSX; + return OperatingSystem.OSX; } if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - return MediaBrowser.Model.System.OperatingSystem.Windows; + return OperatingSystem.Windows; } if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) { - return MediaBrowser.Model.System.OperatingSystem.Linux; + return OperatingSystem.Linux; } - +#endif return MediaBrowser.Model.System.OperatingSystem.Windows; } } @@ -43,7 +54,12 @@ namespace Emby.Common.Implementations.EnvironmentInfo { get { - return System.Runtime.InteropServices.RuntimeInformation.OSDescription; +#if NET46 + return Environment.OSVersion.Platform.ToString(); +#elif NETSTANDARD1_6 + return System.Runtime.InteropServices.RuntimeInformation.OSDescription; +#endif + return "Operating System"; } } @@ -51,7 +67,12 @@ namespace Emby.Common.Implementations.EnvironmentInfo { get { - return System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription; +#if NET46 + return Environment.OSVersion.Version.ToString() + " " + Environment.OSVersion.ServicePack.ToString(); +#elif NETSTANDARD1_6 + return System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription; +#endif + return "1.0"; } } @@ -71,8 +92,10 @@ namespace Emby.Common.Implementations.EnvironmentInfo { return CustomArchitecture.Value; } - - switch (System.Runtime.InteropServices.RuntimeInformation.OSArchitecture) +#if NET46 + return Environment.Is64BitOperatingSystem ? MediaBrowser.Model.System.Architecture.X64 : MediaBrowser.Model.System.Architecture.X86; +#elif NETSTANDARD1_6 + switch(System.Runtime.InteropServices.RuntimeInformation.OSArchitecture) { case System.Runtime.InteropServices.Architecture.Arm: return MediaBrowser.Model.System.Architecture.Arm; @@ -83,6 +106,7 @@ namespace Emby.Common.Implementations.EnvironmentInfo case System.Runtime.InteropServices.Architecture.X86: return MediaBrowser.Model.System.Architecture.X86; } +#endif return MediaBrowser.Model.System.Architecture.X64; } } @@ -107,4 +131,4 @@ namespace Emby.Common.Implementations.EnvironmentInfo Environment.SetEnvironmentVariable(name, value); } } -} +} \ No newline at end of file diff --git a/Emby.Common.Implementations/project.json b/Emby.Common.Implementations/project.json index dcd4085b94..674101e8a7 100644 --- a/Emby.Common.Implementations/project.json +++ b/Emby.Common.Implementations/project.json @@ -23,7 +23,6 @@ "System.Xml.ReaderWriter": "4.0.0" }, "dependencies": { - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", "SimpleInjector": "3.2.4", "ServiceStack.Text": "4.5.4", "NLog": "4.4.0-betaV15", diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index d63987fde1..bcdfa858ff 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -108,10 +108,6 @@ - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - diff --git a/MediaBrowser.Server.Mono/packages.config b/MediaBrowser.Server.Mono/packages.config index b9b604b16c..81da308f52 100644 --- a/MediaBrowser.Server.Mono/packages.config +++ b/MediaBrowser.Server.Mono/packages.config @@ -7,5 +7,4 @@ - \ No newline at end of file diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 3bda058111..749468fe2b 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -114,10 +114,6 @@ - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index 257d7898d0..68d0a7fdad 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -7,5 +7,4 @@ - \ No newline at end of file diff --git a/SharedVersion.cs b/SharedVersion.cs index 88b93bd20e..2a6e142935 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.13.6")] +[assembly: AssemblyVersion("3.2.13.7")]