Imported Upstream version 6.4.0.137

Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions

View File

@@ -338,8 +338,17 @@ namespace System
// EnumDynamicTimeZoneInformation() might not be available.
}
if (result.Count == 0)
if (result.Count == 0) {
result.Add (Local);
result.Add (Utc);
}
result.Sort ((x, y) =>
{
int comparison = x.BaseUtcOffset.CompareTo(y.BaseUtcOffset);
return comparison == 0 ? string.CompareOrdinal(x.DisplayName, y.DisplayName) : comparison;
});
return result;
}
}