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

Imported Upstream version 5.8.0.22

Browse Source 
Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -624,7 +624,7 @@ namespace System
else
ParseRegTzi(adjustmentRules, 1, 9999, reg_tzi);
return CreateCustomTimeZone (id, baseUtcOffset, display_name, standard_name, daylight_name, ValidateRules (adjustmentRules).ToArray ());
return CreateCustomTimeZone (id, baseUtcOffset, display_name, standard_name, daylight_name, ValidateRules (adjustmentRules));
}
private static void ParseRegTzi (List<AdjustmentRule> adjustmentRules, int start_year, int end_year, byte [] buffer)
@ -1231,8 +1231,11 @@ namespace System
return new DateTime (year, transition.Month, day) + transition.TimeOfDay.TimeOfDay;
}
static List<AdjustmentRule> ValidateRules (List<AdjustmentRule> adjustmentRules)
static AdjustmentRule[] ValidateRules (List<AdjustmentRule> adjustmentRules)
{
if (adjustmentRules == null || adjustmentRules.Count == 0)
return null;
AdjustmentRule prev = null;
foreach (AdjustmentRule current in adjustmentRules.ToArray ()) {
if (prev != null && prev.DateEnd > current.DateStart) {
@ -1240,7 +1243,7 @@ namespace System
}
prev = current;
}
return adjustmentRules;
return adjustmentRules.ToArray ();
}
#if LIBC || MONOTOUCH
@ -1404,13 +1407,13 @@ namespace System
}
tz = CreateCustomTimeZone (id, baseUtcOffset, id, standardDisplayName);
} else {
tz = CreateCustomTimeZone (id, baseUtcOffset, id, standardDisplayName, daylightDisplayName, ValidateRules (adjustmentRules).ToArray ());
tz = CreateCustomTimeZone (id, baseUtcOffset, id, standardDisplayName, daylightDisplayName, ValidateRules (adjustmentRules));
}
if (storeTransition && transitions.Count > 0) {
tz.transitions = transitions;
tz.supportsDaylightSavingTime = true;
}
tz.supportsDaylightSavingTime = adjustmentRules.Count > 0;
return tz;
}