From cea5965bd3da7d2cd92af2d614646341ab8bbbcf Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 8 Jun 2017 08:27:55 -0700
Subject: [PATCH] Remove usage of TaskCache

---
 src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs     | 3 +--
 .../Microsoft.AspNetCore.Buffering.csproj                      | 1 -
 .../Microsoft.AspNetCore.Rewrite.csproj                        | 1 -
 src/Microsoft.AspNetCore.Rewrite/RewriteMiddleware.cs          | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs b/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs
index b81b70922b..db3aacf5dd 100644
--- a/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs
+++ b/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs
@@ -5,7 +5,6 @@ using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Buffering
 {
@@ -134,7 +133,7 @@ namespace Microsoft.AspNetCore.Buffering
             {
                 return FlushAsync(cancellationToken);
             }
-            return TaskCache.CompletedTask;
+            return Task.CompletedTask;
         }
 
         public override void Write(byte[] buffer, int offset, int count)
diff --git a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj
index 545b87b140..ea677dbd36 100644
--- a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj
+++ b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj
@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj b/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj
index c3577cb2e8..a6d014cafb 100644
--- a/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj
+++ b/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj
@@ -21,7 +21,6 @@
     <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.Rewrite/RewriteMiddleware.cs b/src/Microsoft.AspNetCore.Rewrite/RewriteMiddleware.cs
index cc27a90ab2..256c1cbe1b 100644
--- a/src/Microsoft.AspNetCore.Rewrite/RewriteMiddleware.cs
+++ b/src/Microsoft.AspNetCore.Rewrite/RewriteMiddleware.cs
@@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.Rewrite
                         _logger.RewriteMiddlewareRequestResponseComplete(
                             context.Response.Headers[HeaderNames.Location],
                             context.Response.StatusCode);
-                        return TaskCache.CompletedTask;
+                        return Task.CompletedTask;
                     case RuleResult.SkipRemainingRules:
                         _logger.RewriteMiddlewareRequestStopRules(context.Request.GetEncodedUrl());
                         return _next(context);