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

Imported Upstream version 5.10.0.47

Browse Source 
Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,9 +209,12 @@ namespace System
#if WIN_PLATFORM
if (TimeZoneKey != null) {
foreach (string id in TimeZoneKey.GetSubKeyNames ()) {
try {
systemTimeZones.Add (FindSystemTimeZoneById (id));
} catch {}
using (RegistryKey subkey = TimeZoneKey.OpenSubKey (id))
{
if (subkey == null || subkey.GetValue ("TZI") == null)
continue;
}
systemTimeZones.Add (FindSystemTimeZoneById (id));
}
return;
@ -657,15 +660,13 @@ namespace System
DateTime start_timeofday = new DateTime (1, 1, 1, daylight_hour, daylight_minute, daylight_second, daylight_millisecond);
TransitionTime start_transition_time;
start_date = new DateTime (start_year, 1, 1);
if (daylight_year == 0) {
start_date = new DateTime (start_year, 1, 1);
start_transition_time = TransitionTime.CreateFloatingDateRule (
start_timeofday, daylight_month, daylight_day,
(DayOfWeek) daylight_dayofweek);
}
else {
start_date = new DateTime (daylight_year, daylight_month, daylight_day,
daylight_hour, daylight_minute, daylight_second, daylight_millisecond);
start_transition_time = TransitionTime.CreateFixedDateRule (
start_timeofday, daylight_month, daylight_day);
}
@ -674,15 +675,13 @@ namespace System
DateTime end_timeofday = new DateTime (1, 1, 1, standard_hour, standard_minute, standard_second, standard_millisecond);
TransitionTime end_transition_time;
end_date = new DateTime (end_year, 12, 31);
if (standard_year == 0) {
end_date = new DateTime (end_year, 12, 31);
end_transition_time = TransitionTime.CreateFloatingDateRule (
end_timeofday, standard_month, standard_day,
(DayOfWeek) standard_dayofweek);
}
else {
end_date = new DateTime (standard_year, standard_month, standard_day,
standard_hour, standard_minute, standard_second, standard_millisecond);
end_transition_time = TransitionTime.CreateFixedDateRule (
end_timeofday, standard_month, standard_day);
}