Imported Upstream version 5.14.0.78

Former-commit-id: 3494343bcc9ddb42b36b82dd9ae7b69e85e0229f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-05-10 08:37:03 +00:00
parent 74b74abd9f
commit 19234507ba
1776 changed files with 67755 additions and 31107 deletions

View File

@@ -43,6 +43,9 @@ namespace System.Runtime.InteropServices
public static bool IsOSPlatform (OSPlatform osPlatform)
{
#if WASM
return osPlatform == OSPlatform.Create ("WEBASSEMBLY");
#else
switch (Environment.Platform) {
case PlatformID.Win32NT:
return osPlatform == OSPlatform.Windows;
@@ -53,13 +56,18 @@ namespace System.Runtime.InteropServices
default:
return false;
}
#endif
}
public static string OSDescription
{
get
{
#if WASM
return "web"; //yes, hardcoded as right now we don't really support other environments
#else
return Environment.OSVersion.VersionString;
#endif
}
}