Merge branch 'upstream'
Former-commit-id: d91283e822b7114428c15316ef995960b3d7e2db
This commit is contained in:
commit
5c13e0dfa6
@ -1 +1 @@
|
||||
1e69e575f03df42c51281a8ac2b32d2d1dfa3628
|
||||
699cfd4c9b1bce8dffc3b7885c49e33ab58c6bd4
|
@ -1 +1 @@
|
||||
48c4dc291d8b06e8db3a816fdee6367c97808e9c
|
||||
46cd124686fe49a205eccc03cff361d68ed53609
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.18.0.188";
|
||||
public const string MonoVersion = "5.18.0.190";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -77,12 +77,12 @@ namespace MonoTests.System.Threading.Tasks
|
||||
{
|
||||
ParallelTestHelper.Repeat (delegate {
|
||||
var t = CreateNestedFuture(10);
|
||||
var t2 = CreateNestedFuture(100);
|
||||
var t3 = CreateNestedFuture(100);
|
||||
var t2 = CreateNestedFuture(20);
|
||||
var t3 = CreateNestedFuture(30);
|
||||
|
||||
Assert.AreEqual (11, t.Result);
|
||||
Assert.AreEqual (101, t2.Result);
|
||||
Assert.AreEqual (101, t3.Result);
|
||||
Assert.AreEqual (21, t2.Result);
|
||||
Assert.AreEqual (31, t3.Result);
|
||||
}, 50);
|
||||
}
|
||||
|
||||
|
@ -1 +1 @@
|
||||
f08cf95a27f8788a5fac479832eeac05d6b3b2bf
|
||||
d113ce43d45192e8b4eac1f3a70040dd9914c4a2
|
@ -1 +1 @@
|
||||
136b55561804ea30b9802bf3349f3b9d3a128382
|
||||
deacbcc73d0c0ce210681aab5be8ea85f53dbb48
|
@ -1 +1 @@
|
||||
95965caca30677cd03edec4bbd343a32e4b91cc8
|
||||
82b544f297d2b86af057ed8ef8d8f39e67e9e4e9
|
Binary file not shown.
@ -1 +1 @@
|
||||
3acdd351a8730b79c29d4a32377fda818b29c175
|
||||
83960687818f20fb5ed018da0987e6c79a1dadda
|
@ -1 +1 @@
|
||||
622c1389d250d66e471ea86dda4a46c7bbbd18cd
|
||||
cd4e431c854eb1cef0d7f729072eee8d6db33cf8
|
@ -1 +1 @@
|
||||
d60335ee10213941805c538e86bffdb4ed5b19cf
|
||||
34423be78579b2ad73855ddda85fee17e27dff0a
|
@ -1 +1 @@
|
||||
18afc6ce3e480143e8756997d2b4f25d07c8268a
|
||||
1183369df2ab1c52caf025f381f873d77262161f
|
@ -1 +1 @@
|
||||
f08cf95a27f8788a5fac479832eeac05d6b3b2bf
|
||||
d113ce43d45192e8b4eac1f3a70040dd9914c4a2
|
@ -1 +1 @@
|
||||
136b55561804ea30b9802bf3349f3b9d3a128382
|
||||
deacbcc73d0c0ce210681aab5be8ea85f53dbb48
|
@ -1 +1 @@
|
||||
95965caca30677cd03edec4bbd343a32e4b91cc8
|
||||
82b544f297d2b86af057ed8ef8d8f39e67e9e4e9
|
Binary file not shown.
@ -1 +1 @@
|
||||
3acdd351a8730b79c29d4a32377fda818b29c175
|
||||
83960687818f20fb5ed018da0987e6c79a1dadda
|
@ -1 +1 @@
|
||||
622c1389d250d66e471ea86dda4a46c7bbbd18cd
|
||||
cd4e431c854eb1cef0d7f729072eee8d6db33cf8
|
@ -1 +1 @@
|
||||
d60335ee10213941805c538e86bffdb4ed5b19cf
|
||||
34423be78579b2ad73855ddda85fee17e27dff0a
|
@ -1 +1 @@
|
||||
18afc6ce3e480143e8756997d2b4f25d07c8268a
|
||||
1183369df2ab1c52caf025f381f873d77262161f
|
@ -1 +1 @@
|
||||
f08cf95a27f8788a5fac479832eeac05d6b3b2bf
|
||||
d113ce43d45192e8b4eac1f3a70040dd9914c4a2
|
@ -1 +1 @@
|
||||
136b55561804ea30b9802bf3349f3b9d3a128382
|
||||
deacbcc73d0c0ce210681aab5be8ea85f53dbb48
|
@ -1 +1 @@
|
||||
95965caca30677cd03edec4bbd343a32e4b91cc8
|
||||
82b544f297d2b86af057ed8ef8d8f39e67e9e4e9
|
Binary file not shown.
@ -1 +1 @@
|
||||
3acdd351a8730b79c29d4a32377fda818b29c175
|
||||
83960687818f20fb5ed018da0987e6c79a1dadda
|
@ -1 +1 @@
|
||||
622c1389d250d66e471ea86dda4a46c7bbbd18cd
|
||||
cd4e431c854eb1cef0d7f729072eee8d6db33cf8
|
@ -1 +1 @@
|
||||
d60335ee10213941805c538e86bffdb4ed5b19cf
|
||||
34423be78579b2ad73855ddda85fee17e27dff0a
|
@ -1 +1 @@
|
||||
18afc6ce3e480143e8756997d2b4f25d07c8268a
|
||||
1183369df2ab1c52caf025f381f873d77262161f
|
@ -1 +1 @@
|
||||
f08cf95a27f8788a5fac479832eeac05d6b3b2bf
|
||||
d113ce43d45192e8b4eac1f3a70040dd9914c4a2
|
@ -1 +1 @@
|
||||
136b55561804ea30b9802bf3349f3b9d3a128382
|
||||
deacbcc73d0c0ce210681aab5be8ea85f53dbb48
|
@ -1 +1 @@
|
||||
95965caca30677cd03edec4bbd343a32e4b91cc8
|
||||
82b544f297d2b86af057ed8ef8d8f39e67e9e4e9
|
Binary file not shown.
@ -1 +1 @@
|
||||
3acdd351a8730b79c29d4a32377fda818b29c175
|
||||
83960687818f20fb5ed018da0987e6c79a1dadda
|
@ -1 +1 @@
|
||||
622c1389d250d66e471ea86dda4a46c7bbbd18cd
|
||||
cd4e431c854eb1cef0d7f729072eee8d6db33cf8
|
@ -1 +1 @@
|
||||
d60335ee10213941805c538e86bffdb4ed5b19cf
|
||||
34423be78579b2ad73855ddda85fee17e27dff0a
|
@ -1 +1 @@
|
||||
18afc6ce3e480143e8756997d2b4f25d07c8268a
|
||||
1183369df2ab1c52caf025f381f873d77262161f
|
@ -1 +1 @@
|
||||
61aac3f326dbb8b3e9f1d35a6f84f74c4821681b
|
||||
23ebc542bf2ff2ae5569f4d45cf349dc6f013b6f
|
@ -1 +1 @@
|
||||
5f15fd78eb6a4a433a67bad581c0dc6595a7b84d
|
||||
b8467b2051f2c56c531cc23e72ab8eab2edd4f67
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/04bdf88"
|
||||
#define FULL_VERSION "explicit/5fedefe"
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
5fa993b0418bfdebeb4150e4370cbf45eb8b3e5a
|
||||
2a0c07af172869e633705547c9bf9d151b879c1a
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
c7ea47242154a66ffea8198ef5a5c21fd3d1481e
|
||||
0f61dcb89fdba9a994c8bd4316a1ee71ad3e3a26
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
425cde46bf5789d9a5e7725803ec0f527a755355
|
||||
97142eac85063dfe203f0e1bf7511a419137fb01
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.18.0.188\n"
|
||||
"Project-Id-Version: mono 5.18.0.190\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-10-31 08:09+0000\n"
|
||||
"POT-Creation-Date: 2018-10-31 14:50+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"
|
||||
|
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
fa93013e642e7cd73f182dc6ee2d3cc7ef111068
|
||||
8e089752c90cbec66080ebed8d2837c0050fb406
|
Loading…
x
Reference in New Issue
Block a user