Remove usage of TaskCache

src/Microsoft.AspNetCore.Authentication.Abstractions/Microsoft.AspNetCore.Authentication.Abstractions.csproj

@@ -16,9 +16,6 @@
   <ItemGroup>
     <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>
-  <ItemGroup>
-    <Folder Include="Properties\" />
   </ItemGroup>
+
 </Project>

src/Microsoft.AspNetCore.Authentication.Core/Microsoft.AspNetCore.Authentication.Core.csproj

@@ -15,7 +15,6 @@
     <ProjectReference Include="..\Microsoft.AspNetCore.Authentication.Abstractions\Microsoft.AspNetCore.Authentication.Abstractions.csproj" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Http\Microsoft.AspNetCore.Http.csproj" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Http.Extensions\Microsoft.AspNetCore.Http.Extensions.csproj" />
-    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

src/Microsoft.AspNetCore.Http.Abstractions/HttpResponse.cs

@@ -4,7 +4,6 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Http
 {
@@ -17,7 +16,7 @@ namespace Microsoft.AspNetCore.Http
         private static readonly Func<object, Task> _disposeDelegate = disposable =>
         {
             ((IDisposable)disposable).Dispose();
-            return TaskCache.CompletedTask;
+            return Task.CompletedTask;
         };
 
         /// <summary>

src/Microsoft.AspNetCore.Http.Abstractions/Microsoft.AspNetCore.Http.Abstractions.csproj

@@ -22,7 +22,6 @@ Microsoft.AspNetCore.Http.HttpResponse</Description>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
     <PackageReference Include="System.Text.Encodings.Web" Version="$(CoreFxVersion)" />
   </ItemGroup>
 

src/Microsoft.AspNetCore.Http/Internal/ApplicationBuilder.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http.Internal;
@@ -81,7 +82,7 @@ namespace Microsoft.AspNetCore.Builder.Internal
             RequestDelegate app = context =>
             {
                 context.Response.StatusCode = 404;
-                return TaskCache.CompletedTask;
+                return Task.CompletedTask;
             };
 
             foreach (var component in _components.Reverse())

src/Microsoft.AspNetCore.Http/Microsoft.AspNetCore.Http.csproj

@@ -21,7 +21,6 @@
     <PackageReference Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

src/Microsoft.AspNetCore.Owin/Microsoft.AspNetCore.Owin.csproj

@@ -14,8 +14,4 @@
     <ProjectReference Include="..\Microsoft.AspNetCore.Http\Microsoft.AspNetCore.Http.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
 </Project>

src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs

@@ -17,7 +17,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http.Features.Authentication;
-using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Owin
 {
@@ -68,7 +67,7 @@ namespace Microsoft.AspNetCore.Owin
                         feature.OnStarting(s =>
                         {
                             cb(s);
-                            return TaskCache.CompletedTask;
+                            return Task.CompletedTask;
                         }, state);
                     }))
                 },

src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAdapter.cs

@@ -7,7 +7,6 @@ using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Owin
 {
@@ -69,7 +68,7 @@ namespace Microsoft.AspNetCore.Owin
             else if (messageType == 0x9 || messageType == 0xA)
             {
                 // Ping & Pong, not allowed by the underlying APIs, silently discard.
-                return TaskCache.CompletedTask;
+                return Task.CompletedTask;
             }
 
             return _webSocket.SendAsync(buffer, OpCodeToEnum(messageType), endOfMessage, cancel);

test/Microsoft.AspNetCore.Http.Abstractions.Tests/UseMiddlewareTest.cs

@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Builder.Internal;
 using Microsoft.AspNetCore.Http.Abstractions;
-using Microsoft.Extensions.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Http
@@ -304,28 +303,28 @@ namespace Microsoft.AspNetCore.Http
         {
             public MiddlewareInjectInvokeNoService(RequestDelegate next) { }
 
-            public Task Invoke(HttpContext context, object value) => TaskCache.CompletedTask;
+            public Task Invoke(HttpContext context, object value) => Task.CompletedTask;
         }
 
         private class MiddlewareInjectInvoke
         {
             public MiddlewareInjectInvoke(RequestDelegate next) { }
 
-            public Task Invoke(HttpContext context, IServiceProvider provider) => TaskCache.CompletedTask;
+            public Task Invoke(HttpContext context, IServiceProvider provider) => Task.CompletedTask;
         }
 
         private class MiddlewareNoParametersStub
         {
             public MiddlewareNoParametersStub(RequestDelegate next) { }
 
-            public Task Invoke() => TaskCache.CompletedTask;
+            public Task Invoke() => Task.CompletedTask;
         }
 
         private class MiddlewareAsyncNoParametersStub
         {
             public MiddlewareAsyncNoParametersStub(RequestDelegate next) { }
 
-            public Task InvokeAsync() => TaskCache.CompletedTask;
+            public Task InvokeAsync() => Task.CompletedTask;
         }
 
         private class MiddlewareNonTaskReturnStub
@@ -351,27 +350,27 @@ namespace Microsoft.AspNetCore.Http
         {
             public MiddlewareMultipleInvokesStub(RequestDelegate next) { }
 
-            public Task Invoke(HttpContext context) => TaskCache.CompletedTask;
+            public Task Invoke(HttpContext context) => Task.CompletedTask;
 
-            public Task Invoke(HttpContext context, int i) => TaskCache.CompletedTask;
+            public Task Invoke(HttpContext context, int i) => Task.CompletedTask;
         }
 
         private class MiddlewareMultipleInvokeAsyncStub
         {
             public MiddlewareMultipleInvokeAsyncStub(RequestDelegate next) { }
 
-            public Task InvokeAsync(HttpContext context) => TaskCache.CompletedTask;
+            public Task InvokeAsync(HttpContext context) => Task.CompletedTask;
 
-            public Task InvokeAsync(HttpContext context, int i) => TaskCache.CompletedTask;
+            public Task InvokeAsync(HttpContext context, int i) => Task.CompletedTask;
         }
 
         private class MiddlewareMultipleInvokeAndInvokeAsyncStub
         {
             public MiddlewareMultipleInvokeAndInvokeAsyncStub(RequestDelegate next) { }
 
-            public Task Invoke(HttpContext context) => TaskCache.CompletedTask;
+            public Task Invoke(HttpContext context) => Task.CompletedTask;
 
-            public Task InvokeAsync(HttpContext context) => TaskCache.CompletedTask;
+            public Task InvokeAsync(HttpContext context) => Task.CompletedTask;
         }
     }
 }