Merge branch 'upstream'

Former-commit-id: f3498d85a7e3738b6302afee03ee58a122bfd857
2018-09-21 08:31:21 +00:00 · 2018-09-21 08:31:21 +00:00 · dec1ba878b
commit dec1ba878b
parent 8d7c3a177c 9453585fa5
39 changed files with 36 additions and 38 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-328b4f0c7026773896f9b8f9431e22729d34c418
+aaa2d39c7828ec9479576c8f4aa71414836148cb
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-1acb4ecc41015019c7f394aaf1b1025246bc3a01
+910051c9be6de79d72bcd149c6bf88047745769d
--- a/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Formatter/FormatterTests.cs
+++ b/external/corefx/src/System.Memory/tests/ParsersAndFormatters/Formatter/FormatterTests.cs
@ -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);
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@ -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";
--- a/mcs/class/corlib/Test/System.Runtime.Remoting/RemotingServicesTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.Remoting/RemotingServicesTest.cs
@ -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
 	}
 }
--- a/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-cbcd64cd77d070cd661473e23a4316790b765443
+3e322d33351860817b1ef90222478cf02796a980
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-f481c6fb894fd7af68e77220f2c7493b67a4fcd6
+74f59f0b43f0a3cf96a739e0416c5cbcf7b65e76
--- a/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-9017348bf1891a3baea0087b4db14b694f7a3001
+e37ba24bdd22d8e28b060af4bed0cac07feff5bd
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-dfd320e42236ccea92c0012a84d4a13d26467077
+e332566be37e8cca25c291e0eff98e8952a5729a
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-0db065b891cf7add08bdba86fcc71a56615c35ba
+c902b0520f27fb5e696674bbb3f67c52bc3cb6c9
--- a/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-d2ce1f246fb723c118ea12eee232a6b39800ecda
+81df612987d21ce04c9490ea98f8c4747498112e
--- a/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-a0159ead83b6724f17857a322578e51f3817329d
+b9351d759ddc12a70657f172b7f04f0bb2941dd2
--- a/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-cbcd64cd77d070cd661473e23a4316790b765443
+3e322d33351860817b1ef90222478cf02796a980
--- a/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-f481c6fb894fd7af68e77220f2c7493b67a4fcd6
+74f59f0b43f0a3cf96a739e0416c5cbcf7b65e76
--- a/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-9017348bf1891a3baea0087b4db14b694f7a3001
+e37ba24bdd22d8e28b060af4bed0cac07feff5bd
--- a/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-dfd320e42236ccea92c0012a84d4a13d26467077
+e332566be37e8cca25c291e0eff98e8952a5729a
--- a/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-0db065b891cf7add08bdba86fcc71a56615c35ba
+c902b0520f27fb5e696674bbb3f67c52bc3cb6c9
--- a/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-d2ce1f246fb723c118ea12eee232a6b39800ecda
+81df612987d21ce04c9490ea98f8c4747498112e
--- a/Show More
+++ b/Show More