Merge branch 'upstream'

Former-commit-id: ea715b39fd45e9d8f3a97228a81fbfeb09dbf221
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-10-10 09:00:21 +00:00
commit 669af6ee1d
46 changed files with 42 additions and 39 deletions

View File

@ -1 +1 @@
9b2fd835af009b5dd6dd4db4bed39050a935a5ea
1d1a992d5d686e5e5a56a2b642a4ff4fb51b4572

View File

@ -1 +1 @@
31d01c63c1999848cd2cd8c491268eca5b0f9084
3d010c3c72782d1747bbaf1811af2abd135789c7

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.18.0.142";
public const string MonoVersion = "5.18.0.143";
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

@ -633,10 +633,13 @@ namespace System.Security.Cryptography.X509Certificates
if (!culture.DateTimeFormat.Calendar.IsValidDay (date.Year, date.Month, date.Day, 0)) {
// The most common case of culture failing to work is in the Um-AlQuara calendar. In this case,
// we can fall back to the Hijri calendar, otherwise fall back to the invariant culture.
#if !MOBILE
if (culture.DateTimeFormat.Calendar is UmAlQuraCalendar) {
culture = culture.Clone () as CultureInfo;
culture.DateTimeFormat.Calendar = new HijriCalendar ();
} else {
} else
#endif
{
culture = CultureInfo.InvariantCulture;
}
}

View File

@ -1 +1 @@
409fdf3ca6ce6639a2a9e055114afb62e104b8dc
802f26e849d2fc0c518a08551c06344ae8cf7d6e

View File

@ -1 +1 @@
b3da2d3903548b23f6b0c021fe1642efd01cf2b2
96ffb57600ed1b0c09ec7c645300e6adcbf8aed6

View File

@ -1 +1 @@
1b165af598037e6a4228ebdf2950ca338534b9dc
17a35b9e6d8a06b7edb722425c155310f85db0da

View File

@ -1 +1 @@
46236ad7acc056c1c10a13d7cecdec9233991e41
4f938aeefd3cfc658764d0385e2181e6ac575cb2

View File

@ -1 +1 @@
b7746223c709fb771b2b185e5f900f657c06ceb8
299a0f7a03122cba58b13178572d5e4d16475bc2

View File

@ -1 +1 @@
aeec656d52ce933e620be5c419a560d8ac8323a3
03321a8395d80950b148ecb656024bdbb889bc4c

View File

@ -1 +1 @@
e3c1398a8ed2d1f8a91ade82741b81f351a1f3fe
b08364e80d951757ca9729410a9ad44a06b05431

View File

@ -1 +1 @@
409fdf3ca6ce6639a2a9e055114afb62e104b8dc
802f26e849d2fc0c518a08551c06344ae8cf7d6e

View File

@ -1 +1 @@
b3da2d3903548b23f6b0c021fe1642efd01cf2b2
96ffb57600ed1b0c09ec7c645300e6adcbf8aed6

View File

@ -1 +1 @@
1b165af598037e6a4228ebdf2950ca338534b9dc
17a35b9e6d8a06b7edb722425c155310f85db0da

View File

@ -1 +1 @@
46236ad7acc056c1c10a13d7cecdec9233991e41
4f938aeefd3cfc658764d0385e2181e6ac575cb2

View File

@ -1 +1 @@
b7746223c709fb771b2b185e5f900f657c06ceb8
299a0f7a03122cba58b13178572d5e4d16475bc2

View File

@ -1 +1 @@
aeec656d52ce933e620be5c419a560d8ac8323a3
03321a8395d80950b148ecb656024bdbb889bc4c

View File

@ -1 +1 @@
e3c1398a8ed2d1f8a91ade82741b81f351a1f3fe
b08364e80d951757ca9729410a9ad44a06b05431

Some files were not shown because too many files have changed in this diff Show More