Merge branch 'upstream'

Former-commit-id: 31ea0da6888a63532b0d4c432aed130df9da2142
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-05-09 09:19:05 +00:00
commit b855914dd3
47 changed files with 41 additions and 41 deletions

View File

@ -1 +1 @@
d13adbe4169bf27e8634ae420107cc9141b0a644
68e2a845bb27480070695a60f4cdcb72a154a353

View File

@ -1 +1 @@
ce47d9cbf49ddd172353243284d178e025f3f293
8518cfdd7136281b77dc008b86eb265159face89

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.0.0.221";
public const string MonoVersion = "6.0.0.225";
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

@ -1 +1 @@
b67c3ba4e01e1a6e905294d845ef64eb5784813b
f04488d495bbf3bdb7ac1c319baf571a2141c1c2

View File

@ -1 +1 @@
ff1aca0ad14155446712c32cb0f975ee93b9ae10
b17aadeb6b78a99aee2b77511d9884efa77888bc

View File

@ -1 +1 @@
9d826c18ea8fa65c91dc0f190dbb18ef3025cb6c
c34d118fd276336ad85062d6a6a6b3f6b7444fe7

View File

@ -1 +1 @@
c35625df7ec7cd6c538987628604c59c95435f8c
15b36dcfcbdfbcf409bdc8d146d53b8a0c4aa6b1

View File

@ -1 +1 @@
a1968bd59eb9a0d56a5ee470dca5ab827152bb7a
c24fee98d9f0992305b9b31d8b1625981c725589

View File

@ -1 +1 @@
d465c9e8bc5d2912e3df531c7edbf9a1e76131c9
42696c6ba9f54675dbbbb5084800d59f8b67c8af

View File

@ -1 +1 @@
58523a3cf50602f07c731e3b7e19c8805524da19
77e0e45a2a98bbdb0f0f9aecb1c75608ab4430eb

View File

@ -1 +1 @@
b67c3ba4e01e1a6e905294d845ef64eb5784813b
f04488d495bbf3bdb7ac1c319baf571a2141c1c2

View File

@ -1 +1 @@
ff1aca0ad14155446712c32cb0f975ee93b9ae10
b17aadeb6b78a99aee2b77511d9884efa77888bc

View File

@ -1 +1 @@
9d826c18ea8fa65c91dc0f190dbb18ef3025cb6c
c34d118fd276336ad85062d6a6a6b3f6b7444fe7

View File

@ -1 +1 @@
c35625df7ec7cd6c538987628604c59c95435f8c
15b36dcfcbdfbcf409bdc8d146d53b8a0c4aa6b1

View File

@ -1 +1 @@
a1968bd59eb9a0d56a5ee470dca5ab827152bb7a
c24fee98d9f0992305b9b31d8b1625981c725589

View File

@ -1 +1 @@
d465c9e8bc5d2912e3df531c7edbf9a1e76131c9
42696c6ba9f54675dbbbb5084800d59f8b67c8af

View File

@ -1 +1 @@
58523a3cf50602f07c731e3b7e19c8805524da19
77e0e45a2a98bbdb0f0f9aecb1c75608ab4430eb

View File

@ -1 +1 @@
b67c3ba4e01e1a6e905294d845ef64eb5784813b
f04488d495bbf3bdb7ac1c319baf571a2141c1c2

View File

@ -1 +1 @@
ff1aca0ad14155446712c32cb0f975ee93b9ae10
b17aadeb6b78a99aee2b77511d9884efa77888bc

View File

@ -1 +1 @@
9d826c18ea8fa65c91dc0f190dbb18ef3025cb6c
c34d118fd276336ad85062d6a6a6b3f6b7444fe7

View File

@ -1 +1 @@
c35625df7ec7cd6c538987628604c59c95435f8c
15b36dcfcbdfbcf409bdc8d146d53b8a0c4aa6b1

View File

@ -1 +1 @@
a1968bd59eb9a0d56a5ee470dca5ab827152bb7a
c24fee98d9f0992305b9b31d8b1625981c725589

View File

@ -1 +1 @@
d465c9e8bc5d2912e3df531c7edbf9a1e76131c9
42696c6ba9f54675dbbbb5084800d59f8b67c8af

View File

@ -1 +1 @@
58523a3cf50602f07c731e3b7e19c8805524da19
77e0e45a2a98bbdb0f0f9aecb1c75608ab4430eb

View File

@ -1 +1 @@
b67c3ba4e01e1a6e905294d845ef64eb5784813b
f04488d495bbf3bdb7ac1c319baf571a2141c1c2

View File

@ -1 +1 @@
ff1aca0ad14155446712c32cb0f975ee93b9ae10
b17aadeb6b78a99aee2b77511d9884efa77888bc

View File

@ -1 +1 @@
1cc63427c733c002aac78a8a7d75ac5aa2dd42e6
87092b691830def4e85f37628c7856ebe6facf7f

View File

@ -1 +1 @@
c35625df7ec7cd6c538987628604c59c95435f8c
15b36dcfcbdfbcf409bdc8d146d53b8a0c4aa6b1

View File

@ -1 +1 @@
a1968bd59eb9a0d56a5ee470dca5ab827152bb7a
c24fee98d9f0992305b9b31d8b1625981c725589

View File

@ -1 +1 @@
d465c9e8bc5d2912e3df531c7edbf9a1e76131c9
42696c6ba9f54675dbbbb5084800d59f8b67c8af

View File

@ -1 +1 @@
60a2b7149e592667f4687812d8013924cee4ff62
646c6b3bbe88902f112aed3d9bb883481119b0ba

View File

@ -1 +1 @@
2849c6f5fd29dd38ee916a71745911d46eb23c51
ebd594b90cd64eebfd2f7a0aece4f06d78e1fae4

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/bc3791b"
#define FULL_VERSION "explicit/238d4a7"

View File

@ -1442,10 +1442,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 \

Binary file not shown.

View File

@ -1 +1 @@
98bbbc3107f9243c96d84b0e421ad62646abfe57
1d9fd2ca414d3988f8d153c89c5f8480e9ef7adc

Binary file not shown.

View File

@ -1 +1 @@
04306dcff669ae6904be0b7ec0921488f3f84a77
6e3b7581aab0f08723345ec5f37f2b37e7371147

Binary file not shown.

View File

@ -1 +1 @@
81d95d095702faf6e714db9405f996d742aa1b3d
6754a605cfed6fbf3c4b3e9e17f65ebc89503ac2

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 6.0.0.221\n"
"Project-Id-Version: mono 6.0.0.225\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-05-08 08:09+0000\n"
"POT-Creation-Date: 2019-05-09 08:06+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 @@
1a67ac060e296f04036a26bfca4eb20628cf39f9
3a987177ca13076412bcfb54c09e6174de4bc831