Imported Upstream version 5.14.0.100

Former-commit-id: 17d59e68a4be951d03b08a81c8da615569cdb00c
2018-05-24 09:23:54 +00:00
parent 300ff421ef
commit c30f196079
40 changed files with 68 additions and 38 deletions
--- 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 ()
        {