Imported Upstream version 6.0.0.172

Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-12 14:10:50 +00:00
parent 8016999e4d
commit 64ac736ec5
32155 changed files with 3981439 additions and 75368 deletions

View File

@ -149,7 +149,7 @@ namespace System
return true;
}
#if !MONODROID && !MONOTOUCH && !XAMMAC
#if !MONODROID && !MONOTOUCH && !XAMMAC && !WASM
static TimeZoneInfo CreateLocal ()
{
#if WIN_PLATFORM
@ -245,7 +245,7 @@ namespace System
throw new NotImplementedException ("This method is not implemented for this platform");
#endif
}
#endif // !MONODROID && !MONOTOUCH && !XAMMAC
#endif // !MONODROID && !MONOTOUCH && !XAMMAC && !WASM
string standardDisplayName;
public string StandardName {