diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-04-25 14:11:56 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-04-25 14:11:56 -0700 |
| commit | 5df671e6fbdaa8c356c9032b03cdb21e2c0e32be (patch) | |
| tree | d0ffdac5ba4f4db469bcb075977f9047436c23f0 | |
| parent | 8ad41b2be2ede3578e5ef4b888cec0e597c11759 (diff) | |
| parent | 3e47d44bff1ab7b272de754113a85671b1f5423c (diff) | |
| download | coreclr-5df671e6fbdaa8c356c9032b03cdb21e2c0e32be.tar.gz coreclr-5df671e6fbdaa8c356c9032b03cdb21e2c0e32be.tar.bz2 coreclr-5df671e6fbdaa8c356c9032b03cdb21e2c0e32be.zip | |
Merge pull request #4561 from dotnet-bot/from-tfs
Merge changes from TFS
| -rw-r--r-- | src/mscorlib/model.xml | 2 | ||||
| -rw-r--r-- | src/mscorlib/src/System/Threading/Tasks/Task.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml index 85727ce508..d20c3c4aa3 100644 --- a/src/mscorlib/model.xml +++ b/src/mscorlib/model.xml @@ -10309,6 +10309,8 @@ <Member Name="FromException<TResult>(System.Exception)" /> <Member Name="FromCanceled(System.Threading.CancellationToken)" /> <Member Name="FromCanceled<TResult>(System.Threading.CancellationToken)" /> + <Member Status="ApiFxInternal" Name="FromCancellation(System.Threading.CancellationToken)" /> + <Member Status="ApiFxInternal" Name="FromCancellation<TResult>(System.Threading.CancellationToken)" /> <Member Name="Run(System.Action)" /> <Member Name="Run(System.Action,System.Threading.CancellationToken)" /> <Member Name="Run<TResult>(System.Func<TResult>)" /> diff --git a/src/mscorlib/src/System/Threading/Tasks/Task.cs b/src/mscorlib/src/System/Threading/Tasks/Task.cs index a0fa7e02ef..1a84f37dcb 100644 --- a/src/mscorlib/src/System/Threading/Tasks/Task.cs +++ b/src/mscorlib/src/System/Threading/Tasks/Task.cs @@ -5584,7 +5584,6 @@ namespace System.Threading.Tasks return task; } -#if !FEATURE_CORECLR /// <summary>Creates a <see cref="Task"/> that's completed due to cancellation with the specified token.</summary> /// <param name="cancellationToken">The token with which to complete the task.</param> /// <returns>The canceled task.</returns> @@ -5603,7 +5602,6 @@ namespace System.Threading.Tasks { return FromCanceled<TResult>(cancellationToken); } -#endif #endregion |