Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@ -409,7 +409,6 @@ namespace MonoTests.System.Threading.Tasks
Assert.IsTrue (tasks[1].IsCanceled, "#4");
}
#if NET_4_5
[Test]
public void WaitAll_CancelledAndTimeout ()
{
@ -418,7 +417,6 @@ namespace MonoTests.System.Threading.Tasks
var t2 = Task.Delay (3000);
Assert.IsFalse (Task.WaitAll (new[] { t1, t2 }, 10));
}
#endif
[Test]
public void WaitAllExceptionThenCancelled ()
@ -1216,7 +1214,6 @@ namespace MonoTests.System.Threading.Tasks
}
}
#if NET_4_5
[Test]
public void ContinuationOnBrokenScheduler ()
{
@ -2111,6 +2108,5 @@ namespace MonoTests.System.Threading.Tasks
}
}
#endif
}
}