Imported Upstream version 6.4.0.137

Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions

View File

@ -563,10 +563,12 @@ namespace System {
string dir = null;
#pragma warning disable 162
if (Environment.IsRunningOnWindows)
dir = GetWindowsFolderPath ((int) folder);
else
dir = UnixGetFolderPath (folder, option);
#pragma warning restore 162
#if MONO_FEATURE_CAS
if ((dir != null) && (dir.Length > 0) && SecurityManager.SecurityEnabled) {
@ -957,7 +959,7 @@ namespace System {
}
// private methods
#if (MONOTOUCH || MONODROID || XAMMAC) && !MOBILE_DESKTOP_HOST
#if (MONOTOUCH || MONODROID || XAMMAC || WASM) && !MOBILE_DESKTOP_HOST
internal const bool IsRunningOnWindows = false;
#else
internal static bool IsRunningOnWindows {