diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-04-29 13:31:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-29 13:31:00 -0400 |
| commit | b7226b86674bde314d489a59ce65118d1f14fa37 (patch) | |
| tree | 8abda7248fd888714cb401c86a9bd0e0473f6357 /Emby.Common.Implementations | |
| parent | bdfbc854f7db7200b30401027d31a45add23c93f (diff) | |
| parent | b275cb2451253de07f548ae33e324bf5e2aea733 (diff) | |
Merge pull request #2602 from MediaBrowser/dev
3.2.13.7
Diffstat (limited to 'Emby.Common.Implementations')
| -rw-r--r-- | Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs | 42 | ||||
| -rw-r--r-- | Emby.Common.Implementations/project.json | 1 |
2 files changed, 33 insertions, 10 deletions
diff --git a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs index a9debe8d2..27fc642f1 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 dcd4085b9..674101e8a 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", |