alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-19 00:26:25 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

update environment detection

Browse Source
This commit is contained in:
Luke Pulverenti
2017-04-29 02:22:33 -04:00
parent b220e221fa
commit f53472584e
32 changed files with 58 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
View File

@@ -22,30 +22,19 @@ 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 OperatingSystem.OSX;
return MediaBrowser.Model.System.OperatingSystem.OSX;
}
if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
return OperatingSystem.Windows;
return MediaBrowser.Model.System.OperatingSystem.Windows;
}
if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
return OperatingSystem.Linux;
return MediaBrowser.Model.System.OperatingSystem.Linux;
}
#endif
return MediaBrowser.Model.System.OperatingSystem.Windows;
}
}
@@ -54,12 +43,7 @@ namespace Emby.Common.Implementations.EnvironmentInfo
{
get
{
#if NET46
return Environment.OSVersion.Platform.ToString();
#elif NETSTANDARD1_6
return System.Runtime.InteropServices.RuntimeInformation.OSDescription;
#endif
return "Operating System";
return System.Runtime.InteropServices.RuntimeInformation.OSDescription;
}
}
@@ -67,12 +51,7 @@ namespace Emby.Common.Implementations.EnvironmentInfo
{
get
{
#if NET46
return Environment.OSVersion.Version.ToString() + " " + Environment.OSVersion.ServicePack.ToString();
#elif NETSTANDARD1_6
return System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription;
#endif
return "1.0";
return System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription;
}
}
@@ -92,10 +71,8 @@ namespace Emby.Common.Implementations.EnvironmentInfo
{
return CustomArchitecture.Value;
}
#if NET46
return Environment.Is64BitOperatingSystem ? MediaBrowser.Model.System.Architecture.X64 : MediaBrowser.Model.System.Architecture.X86;
#elif NETSTANDARD1_6
switch(System.Runtime.InteropServices.RuntimeInformation.OSArchitecture)
switch (System.Runtime.InteropServices.RuntimeInformation.OSArchitecture)
{
case System.Runtime.InteropServices.Architecture.Arm:
return MediaBrowser.Model.System.Architecture.Arm;
@@ -106,7 +83,6 @@ namespace Emby.Common.Implementations.EnvironmentInfo
case System.Runtime.InteropServices.Architecture.X86:
return MediaBrowser.Model.System.Architecture.X86;
}
#endif
return MediaBrowser.Model.System.Architecture.X64;
}
}

1
Emby.Common.Implementations/project.json
View File

@@ -23,6 +23,7 @@
"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",