Merge branch 'upstream'

Former-commit-id: bee6b30750a5ff3abc7c75d0e2d7c2122f5f1465
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-10-03 08:27:50 +00:00
commit 89e5eff2a6
42 changed files with 45 additions and 34 deletions

View File

@ -1 +1 @@
97d7e63f064cf6ee3f1c2a50f8911f0ad4838bcb
21192df5d9204d8b0f774f5fdbc86aa5ac20ce52

View File

@ -1 +1 @@
de8913159504ae7af8420c3c5de83ef4f5ab2aa2
63f2613abaf09403f7e78c4b9dffbb76b8292a5d

View File

@ -239,8 +239,8 @@ namespace System.SpanTests
[InlineData("aaaaaaaaaaaaaa", 1, "aaaxaaaaaaaaaa", 3, 100, StringComparison.Ordinal, -1)] // Different long alignment, abs of 4, one of them is 2, different at n=1
[InlineData("-aaaaaaaaaaaaa", 1, "++++aaaaaaaaaa", 4, 10, StringComparison.Ordinal, 0)] // Different long alignment, equal compare
[InlineData("aaaaaaaaaaaaaa", 1, "aaaaaaaaaaaaax", 4, 100, StringComparison.Ordinal, -1)] // Different long alignment
[InlineData("\0", 0, "", 0, 1, StringComparison.Ordinal, 1)] // Same memory layout, except for m_stringLength (m_firstChars are both 0)
[InlineData("\0\0", 0, "", 0, 2, StringComparison.Ordinal, 1)] // Same as above, except m_stringLength for one is 2
// [InlineData("\0", 0, "", 0, 1, StringComparison.Ordinal, 1)] // Same memory layout, except for m_stringLength (m_firstChars are both 0)
// [InlineData("\0\0", 0, "", 0, 2, StringComparison.Ordinal, 1)] // Same as above, except m_stringLength for one is 2
[InlineData("", 0, "\0b", 0, 2, StringComparison.Ordinal, -1)] // strA's second char != strB's second char codepath
[InlineData("", 0, "b", 0, 1, StringComparison.Ordinal, -1)] // Should hit strA.m_firstChar != strB.m_firstChar codepath
[InlineData("abcxxxxxxxxxxxxxxxxxxxxxx", 0, "abdxxxxxxxxxxxxxxx", 0, int.MaxValue, StringComparison.Ordinal, -1)] // 64-bit: first long compare is different

View File

@ -522,7 +522,9 @@ namespace System.Text.Tests
}
[Theory]
#if !MOBILE
[InlineData("Hello", '\0', 1, "Hello\0")]
#endif
[InlineData("Hello", 'a', 1, "Helloa")]
[InlineData("", 'b', 1, "b")]
[InlineData("Hello", 'c', 2, "Hellocc")]
@ -1298,7 +1300,9 @@ namespace System.Text.Tests
}
[Theory]
#if !MOBILE
[InlineData("Hello", 0, "\0", "\0Hello")]
#endif
[InlineData("Hello", 3, "abc", "Helabclo")]
[InlineData("Hello", 5, "def", "Hellodef")]
[InlineData("Hello", 0, "", "Hello")]
@ -1488,8 +1492,10 @@ namespace System.Text.Tests
}
[Theory]
#if !MOBILE
[InlineData("Hello", 0, "\0", 0, "Hello")]
[InlineData("Hello", 0, "\0", 1, "\0Hello")]
#endif
[InlineData("Hello", 3, "abc", 1, "Helabclo")]
[InlineData("Hello", 5, "def", 1, "Hellodef")]
[InlineData("Hello", 0, "", 1, "Hello")]

View File

@ -110,6 +110,7 @@ namespace System.Threading.Tests
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "This test requires precise stack scanning")]
public static void RunThreadLocalTest5_Dispose()
{
// test recycling the combination index;

View File

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

@ -213,7 +213,7 @@ namespace System.Reflection {
private static bool filter_by_type_name (Type m, object filterCriteria) {
string s = (string)filterCriteria;
if (s.Length > 0 && s [s.Length - 1] == '*')
return m.Name.StartsWithOrdinalUnchecked (s.Substring (0, s.Length - 1));
return m.Name.StartsWith (s.Substring (0, s.Length - 1), StringComparison.Ordinal);
return m.Name == s;
}

View File

@ -324,10 +324,14 @@ public class ModuleTest
Type[] t;
t = m.FindTypes (Module.FilterTypeName, "*");
Assert.AreNotEqual (0, t.Length, "#A0");
t = m.FindTypes (Module.FilterTypeName, "FindTypesTest*");
Assert.AreEqual (2, t.Length, "#A1");
Assert.AreEqual ("FindTypesTestFirstClass", t [0].Name, "#A2");
Assert.AreEqual ("FindTypesTestSecondClass", t [1].Name, "#A3");
t = m.FindTypes (Module.FilterTypeNameIgnoreCase, "*");
Assert.AreNotEqual (0, t.Length, "#B0");
t = m.FindTypes (Module.FilterTypeNameIgnoreCase, "findtypestest*");
Assert.AreEqual (2, t.Length, "#B1");
Assert.AreEqual ("FindTypesTestFirstClass", t [0].Name, "#B2");

View File

@ -1 +1 @@
7e2e318322aca81235ffc3c3be5f7383ebe374d8
9353ba17188ef3582baedcc1de0a9616e7fdfaf2

View File

@ -1 +1 @@
2dd0eef3a52205e1336863773f343be46bd67637
5748fe397ccf5f3014ed4a918a9b4dfbded6ff74

View File

@ -1 +1 @@
1675aea91b5efdd1f4581fcd1c9b89fdd0e7ed4f
9bb36b4cc3aa1fc86ecb6925c9dad2cb6d75b3a8

View File

@ -1 +1 @@
97c75d5e9cc403bd95f67626794afce40cfc6107
6a3e9c19a43ac93095785cb0232a148b65f4913d

View File

@ -1 +1 @@
80832caaf98ab3dbda089f94d973b93d8ce9e26e
159eae24f5fecef1bab5c56100395260c7f8074a

View File

@ -1 +1 @@
010cabffda43f3ea63b7cd3800e98a93fba1069f
f534c6fa324582a440e6879d919fe16f66fa1843

View File

@ -1 +1 @@
7520e0f1806e63956e0d05dabfa18248e4a08f64
4a58e63e2f308c450f11de4281d6fef6dffdd625

View File

@ -1 +1 @@
7e2e318322aca81235ffc3c3be5f7383ebe374d8
9353ba17188ef3582baedcc1de0a9616e7fdfaf2

View File

@ -1 +1 @@
2dd0eef3a52205e1336863773f343be46bd67637
5748fe397ccf5f3014ed4a918a9b4dfbded6ff74

View File

@ -1 +1 @@
1675aea91b5efdd1f4581fcd1c9b89fdd0e7ed4f
9bb36b4cc3aa1fc86ecb6925c9dad2cb6d75b3a8

View File

@ -1 +1 @@
97c75d5e9cc403bd95f67626794afce40cfc6107
6a3e9c19a43ac93095785cb0232a148b65f4913d

View File

@ -1 +1 @@
80832caaf98ab3dbda089f94d973b93d8ce9e26e
159eae24f5fecef1bab5c56100395260c7f8074a

View File

@ -1 +1 @@
010cabffda43f3ea63b7cd3800e98a93fba1069f
f534c6fa324582a440e6879d919fe16f66fa1843

View File

@ -1 +1 @@
7520e0f1806e63956e0d05dabfa18248e4a08f64
4a58e63e2f308c450f11de4281d6fef6dffdd625

View File

@ -1 +1 @@
7e2e318322aca81235ffc3c3be5f7383ebe374d8
9353ba17188ef3582baedcc1de0a9616e7fdfaf2

View File

@ -1 +1 @@
2dd0eef3a52205e1336863773f343be46bd67637
5748fe397ccf5f3014ed4a918a9b4dfbded6ff74

View File

@ -1 +1 @@
1675aea91b5efdd1f4581fcd1c9b89fdd0e7ed4f
9bb36b4cc3aa1fc86ecb6925c9dad2cb6d75b3a8

View File

@ -1 +1 @@
97c75d5e9cc403bd95f67626794afce40cfc6107
6a3e9c19a43ac93095785cb0232a148b65f4913d

View File

@ -1 +1 @@
80832caaf98ab3dbda089f94d973b93d8ce9e26e
159eae24f5fecef1bab5c56100395260c7f8074a

View File

@ -1 +1 @@
010cabffda43f3ea63b7cd3800e98a93fba1069f
f534c6fa324582a440e6879d919fe16f66fa1843

View File

@ -1 +1 @@
7520e0f1806e63956e0d05dabfa18248e4a08f64
4a58e63e2f308c450f11de4281d6fef6dffdd625

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/46e0249"
#define FULL_VERSION "explicit/b549fa7"

Binary file not shown.

View File

@ -1 +1 @@
c013b834bb0578641d31a9091d9b83999a2bb2c7
2cc8f35f06fc20a02b559d5335eea18261c8bac9

Binary file not shown.

View File

@ -1 +1 @@
4a97b46872953f40731624b4c889b9cfbc8623c5
1ac24d28b934d0db0c7ec062a84ef67f30743c9c

Binary file not shown.

View File

@ -1 +1 @@
f43f597d9092d3a3bf0203a1ba92bc76410af534
c5051952425cb3642cf9fa69c8126c5450e6a2c6

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.16.0.174\n"
"Project-Id-Version: mono 5.16.0.176\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-09-28 08:06+0000\n"
"POT-Creation-Date: 2018-10-03 08:08+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 @@
a98ef785dfe61a617634b97377826f68f13b59e8
8fc3600bdc3c9ce94fd1906f75a0df3c153a577f