From 758be9ae133bcff12e456e5bf700524f27035503 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 8 Jun 2017 09:07:18 -0700
Subject: [PATCH] Remove usage of TaskCache

---
 .../Microsoft.AspNetCore.Razor.Runtime.csproj                  | 1 -
 .../Runtime/TagHelpers/TagHelperExecutionContext.cs            | 3 +--
 src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelper.cs | 3 +--
 .../TagHelpers/TagHelperComponent.cs                           | 3 +--
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj b/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj
index 11fa0bfa54..b548aecc0a 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj
@@ -20,6 +20,5 @@ Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper</Description>
     <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs
index 39b54c3396..030e898b44 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs
@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
@@ -32,7 +31,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
                    tagMode,
                    items: new Dictionary<object, object>(),
                    uniqueId: string.Empty,
-                   executeChildContentAsync: () => TaskCache.CompletedTask,
+                   executeChildContentAsync: () => Task.CompletedTask,
                    startTagHelperWritingScope: _ => { },
                    endTagHelperWritingScope: () => new DefaultTagHelperContent())
         {
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelper.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelper.cs
index 3a6084c4e5..ccac7d51e2 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelper.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelper.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
-using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
@@ -54,7 +53,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         public virtual Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             Process(context, output);
-            return TaskCache.CompletedTask;
+            return Task.CompletedTask;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperComponent.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperComponent.cs
index ba6987873b..1a2c748cab 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperComponent.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperComponent.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
-using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
@@ -34,7 +33,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
         public virtual Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
             Process(context, output);
-            return TaskCache.CompletedTask;
+            return Task.CompletedTask;
         }
     }
 }