Merge branch 'upstream'

Former-commit-id: b093cb6602c2aa319a89fbcd56439b1ab6060afd
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-09-04 09:15:52 +00:00
commit 57d444d558
48 changed files with 86 additions and 46 deletions

View File

@ -1 +1 @@
697def686b221f80e49bd7286802b3a76adac046
42081cb7ce765fb36c75762f4e8cbcbde4e0960f

View File

@ -1 +1 @@
3f61beb1f86b86a2da5ac63d27ef6bf2ce7e9d75
6226c861f8c989cad651f3ae647920bbb5a81902

View File

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

@ -34,6 +34,36 @@ namespace System.Globalization
[StructLayout (LayoutKind.Sequential)]
partial class CalendarData
{
private static string[] HEBREW_MONTH_NAMES = new[] {
"\u05EA\u05E9\u05E8\u05D9",
"\u05D7\u05E9\u05D5\u05DF",
"\u05DB\u05E1\u05DC\u05D5",
"\u05D8\u05D1\u05EA",
"\u05E9\u05D1\u05D8",
"\u05D0\u05D3\u05E8",
"\u05D0\u05D3\u05E8\u0020\u05D1",
"\u05E0\u05D9\u05E1\u05DF",
"\u05D0\u05D9\u05D9\u05E8",
"\u05E1\u05D9\u05D5\u05DF",
"\u05EA\u05DE\u05D5\u05D6",
"\u05D0\u05D1",
"\u05D0\u05DC\u05D5\u05DC" };
private static string[] HEBREW_LEAP_MONTH_NAMES = new[] {
"\u05EA\u05E9\u05E8\u05D9",
"\u05D7\u05E9\u05D5\u05DF",
"\u05DB\u05E1\u05DC\u05D5",
"\u05D8\u05D1\u05EA",
"\u05E9\u05D1\u05D8",
"\u05D0\u05D3\u05E8\u0020\u05D0",
"\u05D0\u05D3\u05E8\u0020\u05D1",
"\u05E0\u05D9\u05E1\u05DF",
"\u05D0\u05D9\u05D9\u05E8",
"\u05E1\u05D9\u05D5\u05DF",
"\u05EA\u05DE\u05D5\u05D6",
"\u05D0\u05D1",
"\u05D0\u05DC\u05D5\u05DC" };
public static int nativeGetTwoDigitYearMax (int calID)
{
// -1 mean OS does not override default BCL max year
@ -43,7 +73,17 @@ namespace System.Globalization
static bool nativeGetCalendarData (CalendarData data, string localeName, int calendarId)
{
// TODO: Convert calendar-id to mono runtime calendar-id when it's used
return data.fill_calendar_data (localeName.ToLowerInvariant (), calendarId);
if (data.fill_calendar_data (localeName.ToLowerInvariant (), calendarId)) {
if ((CalendarId)calendarId == CalendarId.HEBREW) {
// HACK: Generate leap month names because the native code does not do it
// and tests would fail to round-trip dates on leap years.
// https://github.com/mono/mono/issues/16623
data.saMonthNames = HEBREW_MONTH_NAMES;
data.saLeapYearMonthNames = HEBREW_LEAP_MONTH_NAMES;
}
return true;
}
return false;
}
[MethodImplAttribute (MethodImplOptions.InternalCall)]

View File

@ -1 +1 @@
3abc8e8f55c5cb4a9a3e4efe4cd0763769d9c195
1bfb37576d4b00841ddf9fd40c66d4e0ecdda8b2

View File

@ -1 +1 @@
e925fe0f1361b9e6bf78893830c63667f5e41fb3
0558b482cc4b6d782482b40f0be298a4d234a9eb

View File

@ -1 +1 @@
1398f4d7f255841ea15d7ba1d0c00b608b2083c3
925636b92585ed8cf097a3278ec15abb29afdab9

View File

@ -1 +1 @@
3c2e330763ca854a2259da0baf98936541785934
22f9e3194800bdb1b6397ef5af7489878dd2c3d9

View File

@ -1 +1 @@
f0a8f37dc4e0a5992a38660b3ffe3cf70d200455
c24d6993e92f58c39c034ff2e33329e793e333cf

View File

@ -1 +1 @@
e4e76f037929f101e9690211286da031013a0833
d43dc7ff8d03ca3518a2a7fbb37dbf628b987b61

View File

@ -1 +1 @@
93b139c713973ccf7c2ef61bab9feab364715fda
2006f7f6eaab992e2d565e700bbb1a368a0c58f0

View File

@ -1 +1 @@
310ca82df358b8d54b3ebffa12954e9f1718ea28
00ce3736b604ad60da0844e3e91bd38987e30ffb

View File

@ -1 +1 @@
e925fe0f1361b9e6bf78893830c63667f5e41fb3
0558b482cc4b6d782482b40f0be298a4d234a9eb

View File

@ -1 +1 @@
1398f4d7f255841ea15d7ba1d0c00b608b2083c3
925636b92585ed8cf097a3278ec15abb29afdab9

View File

@ -1 +1 @@
3c2e330763ca854a2259da0baf98936541785934
22f9e3194800bdb1b6397ef5af7489878dd2c3d9

View File

@ -1 +1 @@
f0a8f37dc4e0a5992a38660b3ffe3cf70d200455
c24d6993e92f58c39c034ff2e33329e793e333cf

View File

@ -1 +1 @@
e4e76f037929f101e9690211286da031013a0833
d43dc7ff8d03ca3518a2a7fbb37dbf628b987b61

View File

@ -1 +1 @@
93b139c713973ccf7c2ef61bab9feab364715fda
2006f7f6eaab992e2d565e700bbb1a368a0c58f0

View File

@ -1 +1 @@
a3edf311a2041e2c64c3b214e8ae124aa50e4809
1742a410702df3146103f8541d4bc52ad15b9eb5

View File

@ -1 +1 @@
310ca82df358b8d54b3ebffa12954e9f1718ea28
00ce3736b604ad60da0844e3e91bd38987e30ffb

View File

@ -1 +1 @@
e925fe0f1361b9e6bf78893830c63667f5e41fb3
0558b482cc4b6d782482b40f0be298a4d234a9eb

View File

@ -1 +1 @@
1398f4d7f255841ea15d7ba1d0c00b608b2083c3
925636b92585ed8cf097a3278ec15abb29afdab9

View File

@ -1 +1 @@
3c2e330763ca854a2259da0baf98936541785934
22f9e3194800bdb1b6397ef5af7489878dd2c3d9

View File

@ -1 +1 @@
f0a8f37dc4e0a5992a38660b3ffe3cf70d200455
c24d6993e92f58c39c034ff2e33329e793e333cf

View File

@ -1 +1 @@
e4e76f037929f101e9690211286da031013a0833
d43dc7ff8d03ca3518a2a7fbb37dbf628b987b61

View File

@ -1 +1 @@
93b139c713973ccf7c2ef61bab9feab364715fda
2006f7f6eaab992e2d565e700bbb1a368a0c58f0

View File

@ -1 +1 @@
a3edf311a2041e2c64c3b214e8ae124aa50e4809
1742a410702df3146103f8541d4bc52ad15b9eb5

View File

@ -1 +1 @@
310ca82df358b8d54b3ebffa12954e9f1718ea28
00ce3736b604ad60da0844e3e91bd38987e30ffb

View File

@ -1 +1 @@
e925fe0f1361b9e6bf78893830c63667f5e41fb3
0558b482cc4b6d782482b40f0be298a4d234a9eb

View File

@ -1 +1 @@
1398f4d7f255841ea15d7ba1d0c00b608b2083c3
925636b92585ed8cf097a3278ec15abb29afdab9

View File

@ -1 +1 @@
86be9deec79ef9fb4f41ab99820c5c3352e86660
26776250303f3378d66a2629069847c42db5fe31

View File

@ -1 +1 @@
f0a8f37dc4e0a5992a38660b3ffe3cf70d200455
c24d6993e92f58c39c034ff2e33329e793e333cf

View File

@ -1 +1 @@
e4e76f037929f101e9690211286da031013a0833
d43dc7ff8d03ca3518a2a7fbb37dbf628b987b61

View File

@ -1 +1 @@
93b139c713973ccf7c2ef61bab9feab364715fda
2006f7f6eaab992e2d565e700bbb1a368a0c58f0

View File

@ -1 +1 @@
a3edf311a2041e2c64c3b214e8ae124aa50e4809
1742a410702df3146103f8541d4bc52ad15b9eb5

View File

@ -1 +1 @@
02da03284d8e08a084e3401656a8df759ce4f810
829717702259356d656abea3d0e62c98864e1f74

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/3216a3c"
#define FULL_VERSION "explicit/2c3aeaf"

View File

@ -1491,10 +1491,10 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
@CROSS_COMPILE_TRUE@test-local:
@HOST_WIN32_TRUE@test-local:
@CROSS_COMPILE_TRUE@clean-local:
@HOST_WIN32_TRUE@clean-local:
@CROSS_COMPILE_TRUE@test-local:
@HOST_WIN32_TRUE@test-local:
clean: clean-am
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \

View File

@ -520,8 +520,8 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
@ENABLE_MSVC_FALSE@clean-local:
@ENABLE_MSVC_FALSE@install-exec-local:
@ENABLE_MSVC_FALSE@clean-local:
clean: clean-am
clean-am: clean-generic clean-libtool clean-local mostlyclean-am

Binary file not shown.

View File

@ -1 +1 @@
1d733780162acfa33503df4ca165679a813c8231
a71812e556e37c06082e039f5cfea1b45e5c6f23

Binary file not shown.

View File

@ -1 +1 @@
90338ca43f6a7f342c131145dd5b29617a7de47d
ed80178dc681ef4a7283957de3b0effd0503f2be

Binary file not shown.

View File

@ -1 +1 @@
0b09e40cbdb0494273ab266ba96c0794f386ca09
fab5286ae2b7044a45df68c10792d890ef72518b

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 6.4.0.187\n"
"Project-Id-Version: mono 6.4.0.188\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-08-30 19:04+0000\n"
"POT-Creation-Date: 2019-09-04 08:05+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
5c95d15fd24c36df8e25d521a7ad221505f7c289
be4263e413f1509efa07852ca803c700b344a0c1