Imported Upstream version 6.0.0.246

Former-commit-id: 241b0eee0d9f22ae63312d981dd04646ce8514ed
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-05-18 08:35:58 +00:00
parent fdf94592db
commit 65ce5c75f1
75 changed files with 607 additions and 61 deletions

View File

@ -149,7 +149,7 @@ namespace System
return true;
}
#if !MONODROID && !MONOTOUCH && !XAMMAC && !WASM
#if (!MONODROID && !MONOTOUCH && !XAMMAC && !WASM) || MOBILE_DESKTOP_HOST
static TimeZoneInfo CreateLocal ()
{
#if WIN_PLATFORM