Merge branch 'upstream'

Former-commit-id: f3498d85a7e3738b6302afee03ee58a122bfd857
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-09-21 08:31:21 +00:00
commit dec1ba878b
39 changed files with 36 additions and 38 deletions

View File

@ -1 +1 @@
328b4f0c7026773896f9b8f9431e22729d34c418
aaa2d39c7828ec9479576c8f4aa71414836148cb

View File

@ -1 +1 @@
1acb4ecc41015019c7f394aaf1b1025246bc3a01
910051c9be6de79d72bcd149c6bf88047745769d

View File

@ -73,6 +73,7 @@ namespace System.Buffers.Text.Tests
[Theory]
[MemberData(nameof(TestData.DecimalFormatterTheoryData), MemberType = typeof(TestData))]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono)]
public static void TestFormatterDecimal(FormatterTestData<decimal> testData)
{
ValidateFormatter(testData);

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

@ -36,6 +36,7 @@ namespace MonoTests.System.Runtime.Remoting
appDomainObject.Init(crossDomainSerializedObject);
}
#if !MOBILE
[Test]
public void Bug46473 () // concurrent serialization/deserialization
{
@ -48,13 +49,9 @@ namespace MonoTests.System.Runtime.Remoting
var name = "AppDomainWithCall" + i;
tasks [i] = Task.Factory.StartNew(() => AppDomainWithRemotingSerialization(assembly, name));
}
try {
Task.WaitAll (tasks);
} catch (AggregateException e) {
success = false;
Console.WriteLine ($"{e}, {e.InnerException}");
}
Assert.IsTrue (success, "Bug46473 (exception during remoting call)");
Assert.IsTrue (Task.WaitAll (tasks, 5000));
}
#endif
}
}

View File

@ -1 +1 @@
cbcd64cd77d070cd661473e23a4316790b765443
3e322d33351860817b1ef90222478cf02796a980

View File

@ -1 +1 @@
f481c6fb894fd7af68e77220f2c7493b67a4fcd6
74f59f0b43f0a3cf96a739e0416c5cbcf7b65e76

View File

@ -1 +1 @@
9017348bf1891a3baea0087b4db14b694f7a3001
e37ba24bdd22d8e28b060af4bed0cac07feff5bd

View File

@ -1 +1 @@
dfd320e42236ccea92c0012a84d4a13d26467077
e332566be37e8cca25c291e0eff98e8952a5729a

View File

@ -1 +1 @@
0db065b891cf7add08bdba86fcc71a56615c35ba
c902b0520f27fb5e696674bbb3f67c52bc3cb6c9

View File

@ -1 +1 @@
d2ce1f246fb723c118ea12eee232a6b39800ecda
81df612987d21ce04c9490ea98f8c4747498112e

View File

@ -1 +1 @@
a0159ead83b6724f17857a322578e51f3817329d
b9351d759ddc12a70657f172b7f04f0bb2941dd2

View File

@ -1 +1 @@
cbcd64cd77d070cd661473e23a4316790b765443
3e322d33351860817b1ef90222478cf02796a980

View File

@ -1 +1 @@
f481c6fb894fd7af68e77220f2c7493b67a4fcd6
74f59f0b43f0a3cf96a739e0416c5cbcf7b65e76

View File

@ -1 +1 @@
9017348bf1891a3baea0087b4db14b694f7a3001
e37ba24bdd22d8e28b060af4bed0cac07feff5bd

View File

@ -1 +1 @@
dfd320e42236ccea92c0012a84d4a13d26467077
e332566be37e8cca25c291e0eff98e8952a5729a

View File

@ -1 +1 @@
0db065b891cf7add08bdba86fcc71a56615c35ba
c902b0520f27fb5e696674bbb3f67c52bc3cb6c9

View File

@ -1 +1 @@
d2ce1f246fb723c118ea12eee232a6b39800ecda
81df612987d21ce04c9490ea98f8c4747498112e

View File

@ -1 +1 @@
a0159ead83b6724f17857a322578e51f3817329d
b9351d759ddc12a70657f172b7f04f0bb2941dd2

View File

@ -1 +1 @@
cbcd64cd77d070cd661473e23a4316790b765443
3e322d33351860817b1ef90222478cf02796a980

View File

@ -1 +1 @@
f481c6fb894fd7af68e77220f2c7493b67a4fcd6
74f59f0b43f0a3cf96a739e0416c5cbcf7b65e76

View File

@ -1 +1 @@
9017348bf1891a3baea0087b4db14b694f7a3001
e37ba24bdd22d8e28b060af4bed0cac07feff5bd

View File

@ -1 +1 @@
dfd320e42236ccea92c0012a84d4a13d26467077
e332566be37e8cca25c291e0eff98e8952a5729a

View File

@ -1 +1 @@
0db065b891cf7add08bdba86fcc71a56615c35ba
c902b0520f27fb5e696674bbb3f67c52bc3cb6c9

View File

@ -1 +1 @@
d2ce1f246fb723c118ea12eee232a6b39800ecda
81df612987d21ce04c9490ea98f8c4747498112e

View File

@ -1 +1 @@
a0159ead83b6724f17857a322578e51f3817329d
b9351d759ddc12a70657f172b7f04f0bb2941dd2

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/7dd65f7"
#define FULL_VERSION "explicit/8f36212"

Binary file not shown.

View File

@ -1 +1 @@
b23fe7a470845f34b505db09db50688cfca8f327
3c3472704296d194e2c3cd812f1ec066e63062a2

Binary file not shown.

View File

@ -1 +1 @@
4099b3cd62edc3c9968d3c37f3f63c8d8cc4b4cf
ab5830ff212467d3c87471a339e3637fb7eff504

Binary file not shown.

View File

@ -1 +1 @@
0463c8ff274c22f2e78d9f7eb0bdaf0ba337a87d
d426452a94c3e5ad4d70ba079d5ccf38dd8d170e

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.16.0.163\n"
"Project-Id-Version: mono 5.16.0.165\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-09-20 08:05+0000\n"
"POT-Creation-Date: 2018-09-21 08:07+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 @@
497cad09608c61d200b09d20a1a347f533cdca93
2a06c50c6547bc40ea62627ced9aba5636b99372