Merge branch 'upstream'

Former-commit-id: 9e9592aed2ef9c0103b4860f5cbe61f5427f3fbb
2018-05-24 09:35:28 +00:00 · 2018-05-24 09:35:28 +00:00 · cc9cefd4e3
commit cc9cefd4e3
parent 406890ac3c c30f196079
40 changed files with 68 additions and 38 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-5df36bf6767b4dc7856dd80dcc0b9b48d09fea80
+8dde0017e6f63b3054466a77bab8ef5722a54870
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-5fc828dca3fdf41143cc1f3b6afabb8ebbc1ce43
+43264e0ee4e38c606242bd6d2a3541ca4b06049f
--- 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.14.0.93";
+	public const string MonoVersion = "5.14.0.100";
 	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.Threading/ThreadPrincipalTests.cs
+++ b/mcs/class/corlib/Test/System.Threading/ThreadPrincipalTests.cs
@ -10,7 +10,9 @@ namespace MonoTests.System.Threading.Tasks
 {
    [TestFixture]
    public class ThreadPrincipalTests
-    {   
+    {
+
+#if !MONOTOUCH // Uses LogicalCallContext
        [Test]
        public void PrincipalFlowsToAsyncTask ()
        {
@ -18,6 +20,7 @@ namespace MonoTests.System.Threading.Tasks
            * where SynchronizationContext is set (e.g. Xamarin.iOS) */
            Assert.IsTrue (Task.Run (async () => await _PrincipalFlowsToAsyncTask ()).Wait (5000));
        }
+#endif

        public async Task _PrincipalFlowsToAsyncTask ()
        {    
--- a/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-e0c31033cb234fbe245111fd514aa92d8fdf2932
+387874c33279821ecf4c3c65c4b6be0fbf4530ca
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-0918023fa07a69ea21bf62858b5e96077aa3691c
+94a0e366dc7a3a32249f013acdb108113871c9f0
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-0f0a171716a2a2c26c59478c41d1810394a93ca6
+b29ac60ca35d1e9dae87583d2b7183dd9bc0e356
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-b79a2601bb345aa58d09bd453fc59773b13e326c
+dce6045ebed689ee7cc0cf98225aa3474f3eb3d8
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-e8a3d67696f746c7f1053bee56d7678f26e7ad44
+fa787623a7ef5d34d480976111f5791b0d92c4a8
--- a/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-70e683ec01f53c43698314560eea4bb57c2aa44d
+80f27b413640ff25223e654724f276a4c6925abc
--- a/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-dbf109dbc245a0e693d2ded6244fa5929d0055be
+ffde4cb2ef12a7462c5b6e336ae8c5e27f8b79ed
--- a/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-e0c31033cb234fbe245111fd514aa92d8fdf2932
+387874c33279821ecf4c3c65c4b6be0fbf4530ca
--- a/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-0918023fa07a69ea21bf62858b5e96077aa3691c
+94a0e366dc7a3a32249f013acdb108113871c9f0
--- a/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-0f0a171716a2a2c26c59478c41d1810394a93ca6
+b29ac60ca35d1e9dae87583d2b7183dd9bc0e356
--- a/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-b79a2601bb345aa58d09bd453fc59773b13e326c
+dce6045ebed689ee7cc0cf98225aa3474f3eb3d8
--- a/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-e8a3d67696f746c7f1053bee56d7678f26e7ad44
+fa787623a7ef5d34d480976111f5791b0d92c4a8
--- a/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-70e683ec01f53c43698314560eea4bb57c2aa44d
+80f27b413640ff25223e654724f276a4c6925abc
--- a/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-dbf109dbc245a0e693d2ded6244fa5929d0055be
+ffde4cb2ef12a7462c5b6e336ae8c5e27f8b79ed
--- a/mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-e0c31033cb234fbe245111fd514aa92d8fdf2932
+387874c33279821ecf4c3c65c4b6be0fbf4530ca
--- a/mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-0918023fa07a69ea21bf62858b5e96077aa3691c
+94a0e366dc7a3a32249f013acdb108113871c9f0
--- a/Show More
+++ b/Show More