mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.2.0.209

Browse Source 
Former-commit-id: 79ca95c189bbab714d05d31b88e606887569acb7
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-07-24 15:36:55 +00:00
parent bdb6e93184
commit af702198e1
26 changed files with 68 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/class/corlib/System/TimeZoneInfo.cs
View File

@@ -152,7 +152,7 @@ namespace System
#if !MONODROID && !MONOTOUCH && !XAMMAC
static TimeZoneInfo CreateLocal ()
{
#if (!FULL_AOT_DESKTOP || WIN_PLATFORM) && !XAMMAC_4_5
#if WIN_PLATFORM
if (IsWindows && LocalZoneKey != null) {
string name = (string)LocalZoneKey.GetValue ("TimeZoneKeyName");
if (name == null)
@@ -206,7 +206,7 @@ namespace System
static void GetSystemTimeZonesCore (List<TimeZoneInfo> systemTimeZones)
{
#if (!FULL_AOT_DESKTOP || WIN_PLATFORM) && !XAMMAC_4_5
#if WIN_PLATFORM
if (TimeZoneKey != null) {
foreach (string id in TimeZoneKey.GetSubKeyNames ()) {
try {