From: Jan Kotas <jkotas@microsoft.com>
Date: Mon, 25 Apr 2016 14:29:52 +0000 (-0700)
Subject: Add back internal FromCancellation methods
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e47d44bff1ab7b272de754113a85671b1f5423c;p=platform%2Fupstream%2Fcoreclr.git

Add back internal FromCancellation methods

System.Runtime.WindowsRuntime implementation depends on them

[tfs-changeset: 1598965]
---

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&lt;TResult&gt;(System.Exception)" />
       <Member Name="FromCanceled(System.Threading.CancellationToken)" />
       <Member Name="FromCanceled&lt;TResult&gt;(System.Threading.CancellationToken)" />
+      <Member Status="ApiFxInternal" Name="FromCancellation(System.Threading.CancellationToken)" />
+      <Member Status="ApiFxInternal" Name="FromCancellation&lt;TResult&gt;(System.Threading.CancellationToken)" />
       <Member Name="Run(System.Action)" />
       <Member Name="Run(System.Action,System.Threading.CancellationToken)" />
       <Member Name="Run&lt;TResult&gt;(System.Func&lt;TResult&gt;)" />
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