Merge branch 'upstream'

Former-commit-id: 26bf0eea6f7efcf1037bd9c89250dd970993a510
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-01-11 08:33:24 +00:00
commit 20407544bb
46 changed files with 42 additions and 38 deletions

View File

@ -1 +1 @@
ae98551b1db35055297baac5f507513e249171ed 821406e39bda6b475ab8262523590b3d45bf9d49

View File

@ -1 +1 @@
dc37e92b4d1cf4287140b253da667bc8e075bbe5 8932c606c17293b53296a42a8029105cf46d68c1

View File

@ -152,7 +152,11 @@ namespace System.Linq.Expressions
return dynVisitor.VisitDynamic(this); return dynVisitor.VisitDynamic(this);
} }
#if MONO
return visitor.VisitDynamic(this);
#else
return base.Accept(visitor); return base.Accept(visitor);
#endif
} }
/// <summary> /// <summary>

View File

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

View File

@ -1 +1 @@
73216614b63455b8959385eab8f19b27f142dee8 4073b83279f7f038c200ab642e8773f0f3f70331

View File

@ -1 +1 @@
dc2ad9e429a07d03a9ef5ef7247c7ea7aa4c01a0 610870bb605ba9c4cf035c3654622bb0b772c494

View File

@ -1 +1 @@
af5616e10547d1218a89bce0a5b9fbfa10ef2fc5 f2c3161722b34a9121c26887f012eb49d7c824ab

View File

@ -1 +1 @@
a984e5eca05c5ac8f59ebf753d70f49fc98f698c d74c12343d18871a6f6fc91ce7fce46d1973a7db

View File

@ -1 +1 @@
b1811ca5f190b17ecaa4a2fe92524a63c3aeca35 267b467a27a236097c16a30f88f093b743a170ca

View File

@ -1 +1 @@
1e323831768417819f63539aacf0e47608fffc08 4a529741e033dac1470428b99ca9c63f54339594

View File

@ -1 +1 @@
00f8e64f276112f0ca6203b87234f6eb49f495e6 6918437e2e75cfec553ecab463a3e7f3ddafbc25

View File

@ -1 +1 @@
73216614b63455b8959385eab8f19b27f142dee8 4073b83279f7f038c200ab642e8773f0f3f70331

View File

@ -1 +1 @@
dc2ad9e429a07d03a9ef5ef7247c7ea7aa4c01a0 610870bb605ba9c4cf035c3654622bb0b772c494

View File

@ -1 +1 @@
af5616e10547d1218a89bce0a5b9fbfa10ef2fc5 f2c3161722b34a9121c26887f012eb49d7c824ab

View File

@ -1 +1 @@
a984e5eca05c5ac8f59ebf753d70f49fc98f698c d74c12343d18871a6f6fc91ce7fce46d1973a7db

View File

@ -1 +1 @@
b1811ca5f190b17ecaa4a2fe92524a63c3aeca35 267b467a27a236097c16a30f88f093b743a170ca

View File

@ -1 +1 @@
1e323831768417819f63539aacf0e47608fffc08 4a529741e033dac1470428b99ca9c63f54339594

View File

@ -1 +1 @@
00f8e64f276112f0ca6203b87234f6eb49f495e6 6918437e2e75cfec553ecab463a3e7f3ddafbc25

View File

@ -1 +1 @@
73216614b63455b8959385eab8f19b27f142dee8 4073b83279f7f038c200ab642e8773f0f3f70331

View File

@ -1 +1 @@
dc2ad9e429a07d03a9ef5ef7247c7ea7aa4c01a0 610870bb605ba9c4cf035c3654622bb0b772c494

View File

@ -1 +1 @@
af5616e10547d1218a89bce0a5b9fbfa10ef2fc5 f2c3161722b34a9121c26887f012eb49d7c824ab

View File

@ -1 +1 @@
a984e5eca05c5ac8f59ebf753d70f49fc98f698c d74c12343d18871a6f6fc91ce7fce46d1973a7db

View File

@ -1 +1 @@
b1811ca5f190b17ecaa4a2fe92524a63c3aeca35 267b467a27a236097c16a30f88f093b743a170ca

View File

@ -1 +1 @@
1e323831768417819f63539aacf0e47608fffc08 4a529741e033dac1470428b99ca9c63f54339594

View File

@ -1 +1 @@
00f8e64f276112f0ca6203b87234f6eb49f495e6 6918437e2e75cfec553ecab463a3e7f3ddafbc25

View File

@ -1 +1 @@
73216614b63455b8959385eab8f19b27f142dee8 4073b83279f7f038c200ab642e8773f0f3f70331

View File

@ -1 +1 @@
dc2ad9e429a07d03a9ef5ef7247c7ea7aa4c01a0 610870bb605ba9c4cf035c3654622bb0b772c494

View File

@ -1 +1 @@
af5616e10547d1218a89bce0a5b9fbfa10ef2fc5 f2c3161722b34a9121c26887f012eb49d7c824ab

View File

@ -1 +1 @@
a984e5eca05c5ac8f59ebf753d70f49fc98f698c d74c12343d18871a6f6fc91ce7fce46d1973a7db

View File

@ -1 +1 @@
b1811ca5f190b17ecaa4a2fe92524a63c3aeca35 267b467a27a236097c16a30f88f093b743a170ca

View File

@ -1 +1 @@
1e323831768417819f63539aacf0e47608fffc08 4a529741e033dac1470428b99ca9c63f54339594

View File

@ -1 +1 @@
00f8e64f276112f0ca6203b87234f6eb49f495e6 6918437e2e75cfec553ecab463a3e7f3ddafbc25

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/29e0e64" #define FULL_VERSION "explicit/25a8be9"

Binary file not shown.

View File

@ -1 +1 @@
53175c0a7df44f2ff92e614d5e479e8034babb65 8fe6ff1b2a92d70d81264d8dd4d1409343db117d

Binary file not shown.

View File

@ -1 +1 @@
9b75230615b2cc1f5abec3cec4aed2400f0e8daf e697609e2cb02d53c52e62348bed25b693be9177

Binary file not shown.

View File

@ -1 +1 @@
127032e602a8ba99b4d3d621853e03274ff5916c 961507ab29e18d530cebb74fb0185cb880e7cbb7

View File

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

Binary file not shown.

View File

@ -1 +1 @@
b45c457e17b1048ee4d04c5561996415abc65636 a830eef4b01818210169c97e1cfa87091daf49a1