Imported Upstream version 5.2.0.209

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

View File

@@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.2.0.196";
public const string MonoVersion = "5.2.0.209";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

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 {

View File

@@ -1 +1 @@
4497cfcb5089d0ed6ed0b846294a63fbcf08f52e
1ca3fde1b1b4c254fcb5eab73ff76e53342c705c

View File

@@ -1 +1 @@
b3e5819252f2dfe873b98496c4b9f7aba7845977
ce3d07f7ec1645e24655704e780af2c167ec2228

View File

@@ -1 +1 @@
b27b8a6e548edff6c0506e9b608ba59afdb8918a
e06237966e578465031c9b5b75fda2646c22d3b8

View File

@@ -1 +1 @@
abe11ddc5086f3f9280be51b8317faade585a3d0
e5df4b091b873c156c670e852104e4fc3e8c0471

View File

@@ -1 +1 @@
793058153521be1aa8a87270c4b9b6946fe603fc
5d90e89d6a858e59e8cc2236e8cc8c2123078544

View File

@@ -1 +1 @@
1ddf2e51db3032fd1035fa077362a1776bda49ec
d2881996900ded8e0a91bd974814b5bceb32a3f8