Imported Upstream version 5.14.0.87

Former-commit-id: c3343e9add11acc574a2fbf8a043908a2124b8f6
2018-05-19 08:39:49 +00:00
parent ee1763fb41
commit ac4ce81c31
37 changed files with 61 additions and 34 deletions
--- a/mcs/class/corlib/Test/System.Threading/ThreadPrincipalTests.cs
+++ b/mcs/class/corlib/Test/System.Threading/ThreadPrincipalTests.cs
@@ -14,8 +14,9 @@ namespace MonoTests.System.Threading.Tasks
        [Test]
        public void PrincipalFlowsToAsyncTask ()
        {
-            var t = _PrincipalFlowsToAsyncTask();
-            t.GetAwaiter().GetResult();
+            /* run in different thread to work around problems on platforms
+            * where SynchronizationContext is set (e.g. Xamarin.iOS) */
+            Assert.IsTrue (Task.Run (async () => await _PrincipalFlowsToAsyncTask ()).Wait (5000));
        }

        public async Task _PrincipalFlowsToAsyncTask ()