Remove usage of TaskCache

pranavkm · pranavkm · commit a78b194a84cf · 2017-06-08T13:46:05.000-07:00
diff --git a/src/Microsoft.AspNetCore.Authentication.Abstractions/Microsoft.AspNetCore.Authentication.Abstractions.csproj b/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>
diff --git a/src/Microsoft.AspNetCore.Authentication.Core/Microsoft.AspNetCore.Authentication.Core.csproj b/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>
diff --git a/src/Microsoft.AspNetCore.Http.Abstractions/HttpResponse.cs b/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 @@ public abstract class HttpResponse
         private static readonly Func<object, Task> _disposeDelegate = disposable =>
         {
             ((IDisposable)disposable).Dispose();
-            return TaskCache.CompletedTask;
+            return Task.CompletedTask;
         };
 
         /// <summary>
diff --git a/src/Microsoft.AspNetCore.Http.Abstractions/Microsoft.AspNetCore.Http.Abstractions.csproj b/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>
 
diff --git a/src/Microsoft.AspNetCore.Http/Internal/ApplicationBuilder.cs b/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 @@ public RequestDelegate Build()
             RequestDelegate app = context =>
             {
                 context.Response.StatusCode = 404;
-                return TaskCache.CompletedTask;
+                return Task.CompletedTask;
             };
 
             foreach (var component in _components.Reverse())
diff --git a/src/Microsoft.AspNetCore.Http/Microsoft.AspNetCore.Http.csproj b/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>
diff --git a/src/Microsoft.AspNetCore.Owin/Microsoft.AspNetCore.Owin.csproj b/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>
diff --git a/src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs b/src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs
@@ -17,7 +17,6 @@
 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 @@ public OwinEnvironment(HttpContext context)
                         feature.OnStarting(s =>
                         {
                             cb(s);
-                            return TaskCache.CompletedTask;
+                            return Task.CompletedTask;
                         }, state);
                     }))
                 },
diff --git a/src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAdapter.cs b/src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAdapter.cs
@@ -7,7 +7,6 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Owin
 {
@@ -69,7 +68,7 @@ internal Task SendAsync(ArraySegment<byte> buffer, int messageType, bool endOfMe
             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);
diff --git a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/UseMiddlewareTest.cs b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/UseMiddlewareTest.cs
@@ -7,7 +7,6 @@
 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 @@ private class MiddlewareInjectInvokeNoService
         {
             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 @@ private class MiddlewareMultipleInvokesStub
         {
             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;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.IO;`
`6`	`6`	`using System.Threading.Tasks;`
`7`		`-using Microsoft.Extensions.Internal;`
`8`	`7`
`9`	`8`	`namespace Microsoft.AspNetCore.Http`
`10`	`9`	`{`
`@@ -17,7 +16,7 @@ public abstract class HttpResponse`
`17`	`16`	`private static readonly Func<object, Task> _disposeDelegate = disposable =>`
`18`	`17`	`{`
`19`	`18`	`((IDisposable)disposable).Dispose();`
`20`		`- return TaskCache.CompletedTask;`
	`19`	`+ return Task.CompletedTask;`
`21`	`20`	`};`
`22`	`21`
`23`	`22`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`using System.Text;`
`8`	`8`	`using System.Threading;`
`9`	`9`	`using System.Threading.Tasks;`
`10`		`-using Microsoft.Extensions.Internal;`
`11`	`10`
`12`	`11`	`namespace Microsoft.AspNetCore.Owin`
`13`	`12`	`{`
`@@ -69,7 +68,7 @@ internal Task SendAsync(ArraySegment<byte> buffer, int messageType, bool endOfMe`
`69`	`68`	`else if (messageType == 0x9 \|\| messageType == 0xA)`
`70`	`69`	`{`
`71`	`70`	`// Ping & Pong, not allowed by the underlying APIs, silently discard.`
`72`		`- return TaskCache.CompletedTask;`
	`71`	`+ return Task.CompletedTask;`
`73`	`72`	`}`
`74`	`73`
`75`	`74`	`return _webSocket.SendAsync(buffer, OpCodeToEnum(messageType), endOfMessage, cancel);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`using Microsoft.AspNetCore.Builder;`
`8`	`8`	`using Microsoft.AspNetCore.Builder.Internal;`
`9`	`9`	`using Microsoft.AspNetCore.Http.Abstractions;`
`10`		`-using Microsoft.Extensions.Internal;`
`11`	`10`	`using Xunit;`
`12`	`11`
`13`	`12`	`namespace Microsoft.AspNetCore.Http`
`@@ -304,28 +303,28 @@ private class MiddlewareInjectInvokeNoService`
`304`	`303`	`{`
`305`	`304`	`public MiddlewareInjectInvokeNoService(RequestDelegate next) { }`
`306`	`305`
`307`		`- public Task Invoke(HttpContext context, object value) => TaskCache.CompletedTask;`
	`306`	`+ public Task Invoke(HttpContext context, object value) => Task.CompletedTask;`
`308`	`307`	`}`
`309`	`308`
`310`	`309`	`private class MiddlewareInjectInvoke`
`311`	`310`	`{`
`312`	`311`	`public MiddlewareInjectInvoke(RequestDelegate next) { }`
`313`	`312`
`314`		`- public Task Invoke(HttpContext context, IServiceProvider provider) => TaskCache.CompletedTask;`
	`313`	`+ public Task Invoke(HttpContext context, IServiceProvider provider) => Task.CompletedTask;`
`315`	`314`	`}`
`316`	`315`
`317`	`316`	`private class MiddlewareNoParametersStub`
`318`	`317`	`{`
`319`	`318`	`public MiddlewareNoParametersStub(RequestDelegate next) { }`
`320`	`319`
`321`		`- public Task Invoke() => TaskCache.CompletedTask;`
	`320`	`+ public Task Invoke() => Task.CompletedTask;`
`322`	`321`	`}`
`323`	`322`
`324`	`323`	`private class MiddlewareAsyncNoParametersStub`
`325`	`324`	`{`
`326`	`325`	`public MiddlewareAsyncNoParametersStub(RequestDelegate next) { }`
`327`	`326`
`328`		`- public Task InvokeAsync() => TaskCache.CompletedTask;`
	`327`	`+ public Task InvokeAsync() => Task.CompletedTask;`
`329`	`328`	`}`
`330`	`329`
`331`	`330`	`private class MiddlewareNonTaskReturnStub`
`@@ -351,27 +350,27 @@ private class MiddlewareMultipleInvokesStub`
`351`	`350`	`{`
`352`	`351`	`public MiddlewareMultipleInvokesStub(RequestDelegate next) { }`
`353`	`352`
`354`		`- public Task Invoke(HttpContext context) => TaskCache.CompletedTask;`
	`353`	`+ public Task Invoke(HttpContext context) => Task.CompletedTask;`
`355`	`354`
`356`		`- public Task Invoke(HttpContext context, int i) => TaskCache.CompletedTask;`
	`355`	`+ public Task Invoke(HttpContext context, int i) => Task.CompletedTask;`
`357`	`356`	`}`
`358`	`357`
`359`	`358`	`private class MiddlewareMultipleInvokeAsyncStub`
`360`	`359`	`{`
`361`	`360`	`public MiddlewareMultipleInvokeAsyncStub(RequestDelegate next) { }`
`362`	`361`
`363`		`- public Task InvokeAsync(HttpContext context) => TaskCache.CompletedTask;`
	`362`	`+ public Task InvokeAsync(HttpContext context) => Task.CompletedTask;`
`364`	`363`
`365`		`- public Task InvokeAsync(HttpContext context, int i) => TaskCache.CompletedTask;`
	`364`	`+ public Task InvokeAsync(HttpContext context, int i) => Task.CompletedTask;`
`366`	`365`	`}`
`367`	`366`
`368`	`367`	`private class MiddlewareMultipleInvokeAndInvokeAsyncStub`
`369`	`368`	`{`
`370`	`369`	`public MiddlewareMultipleInvokeAndInvokeAsyncStub(RequestDelegate next) { }`
`371`	`370`
`372`		`- public Task Invoke(HttpContext context) => TaskCache.CompletedTask;`
	`371`	`+ public Task Invoke(HttpContext context) => Task.CompletedTask;`
`373`	`372`
`374`		`- public Task InvokeAsync(HttpContext context) => TaskCache.CompletedTask;`
	`373`	`+ public Task InvokeAsync(HttpContext context) => Task.CompletedTask;`
`375`	`374`	`}`
`376`	`375`	`}`
`377`	`376`	`}`