Imported Upstream version 5.10.0.97

Former-commit-id: 342b95328bb2df3d11df4dc7b0c4bfd8ea99763a
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-02-08 19:41:13 +00:00
parent 06a4bb97d8
commit 2f56126bcb
60 changed files with 300 additions and 42 deletions

View File

@ -124,7 +124,7 @@ namespace MonoTests.System
} catch (DllNotFoundException e) {
return;
}
#if !MONOTOUCH && !XAMMAC
#if !MONOTOUCH && !XAMMAC && !XAMMAC_4_5
// this assumption is incorrect for iOS, tvO, watchOS and OSX
Assert.IsTrue (TimeZoneInfo.Local.Id != "Local", "Local timezone id should not be \"Local\"");
#endif