From 0e4405ab7f92f65be76d4051416e32db6b8e9c05 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 8 Jun 2017 11:44:04 -0700
Subject: [PATCH] Remove usage of TaskCache

---
 .../AuthenticationHandler.cs                             | 9 ++++-----
 .../FeatureContext.cs                                    | 3 +--
 .../Microsoft.AspNetCore.Server.HttpSys.csproj           | 1 -
 .../DummyApplication.cs                                  | 3 +--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Server.HttpSys/AuthenticationHandler.cs b/src/Microsoft.AspNetCore.Server.HttpSys/AuthenticationHandler.cs
index 77656d1d96..9b3e4637b0 100644
--- a/src/Microsoft.AspNetCore.Server.HttpSys/AuthenticationHandler.cs
+++ b/src/Microsoft.AspNetCore.Server.HttpSys/AuthenticationHandler.cs
@@ -7,7 +7,6 @@ using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Server.HttpSys
 {
@@ -29,13 +28,13 @@ namespace Microsoft.AspNetCore.Server.HttpSys
         public Task ChallengeAsync(AuthenticationProperties properties)
         {
             _requestContext.Response.StatusCode = 401;
-            return TaskCache.CompletedTask;
+            return Task.CompletedTask;
         }
 
         public Task ForbidAsync(AuthenticationProperties properties)
         {
             _requestContext.Response.StatusCode = 403;
-            return TaskCache.CompletedTask;
+            return Task.CompletedTask;
         }
 
         public Task InitializeAsync(AuthenticationScheme scheme, HttpContext context)
@@ -48,7 +47,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
                 throw new InvalidOperationException("No RequestContext found.");
             }
 
-            return TaskCache.CompletedTask;
+            return Task.CompletedTask;
         }
 
         public Task SignInAsync(ClaimsPrincipal user, AuthenticationProperties properties)
@@ -58,7 +57,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
 
         public Task SignOutAsync(AuthenticationProperties properties)
         {
-            return TaskCache.CompletedTask;
+            return Task.CompletedTask;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Server.HttpSys/FeatureContext.cs b/src/Microsoft.AspNetCore.Server.HttpSys/FeatureContext.cs
index 8d250e4ff1..f8eec7eeea 100644
--- a/src/Microsoft.AspNetCore.Server.HttpSys/FeatureContext.cs
+++ b/src/Microsoft.AspNetCore.Server.HttpSys/FeatureContext.cs
@@ -13,7 +13,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http.Features.Authentication;
-using Microsoft.Extensions.Internal;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNetCore.Server.HttpSys
@@ -553,7 +552,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
         {
             if (_completed)
             {
-                return TaskCache.CompletedTask;
+                return Task.CompletedTask;
             }
             _completed = true;
             return NotifyOnCompletedAsync();
diff --git a/src/Microsoft.AspNetCore.Server.HttpSys/Microsoft.AspNetCore.Server.HttpSys.csproj b/src/Microsoft.AspNetCore.Server.HttpSys/Microsoft.AspNetCore.Server.HttpSys.csproj
index 4bbc01835d..2e8a9ab592 100644
--- a/src/Microsoft.AspNetCore.Server.HttpSys/Microsoft.AspNetCore.Server.HttpSys.csproj
+++ b/src/Microsoft.AspNetCore.Server.HttpSys/Microsoft.AspNetCore.Server.HttpSys.csproj
@@ -14,7 +14,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Net.Http.Headers" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="$(CoreFxVersion)" />
     <PackageReference Include="System.Security.Principal.Windows" Version="$(CoreFxVersion)" />
diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/DummyApplication.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/DummyApplication.cs
index 4d1f273e4a..14d975e1fa 100644
--- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/DummyApplication.cs
+++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/DummyApplication.cs
@@ -6,7 +6,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Server.HttpSys
 {
@@ -14,7 +13,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
     {
         private readonly RequestDelegate _requestDelegate;
 
-        public DummyApplication() : this(context => TaskCache.CompletedTask) { }
+        public DummyApplication() : this(context => Task.CompletedTask) { }
 
         public DummyApplication(RequestDelegate requestDelegate)
         {