diff --git a/src/Microsoft.AspNetCore.Authentication.Abstractions/Microsoft.AspNetCore.Authentication.Abstractions.csproj b/src/Microsoft.AspNetCore.Authentication.Abstractions/Microsoft.AspNetCore.Authentication.Abstractions.csproj index adda966c8b..a332a50bb3 100644 --- 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 @@ - - - - + \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.Core/Microsoft.AspNetCore.Authentication.Core.csproj b/src/Microsoft.AspNetCore.Authentication.Core/Microsoft.AspNetCore.Authentication.Core.csproj index 0ceaa4d374..5b7ed721d7 100644 --- 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 @@ - diff --git a/src/Microsoft.AspNetCore.Http.Abstractions/HttpResponse.cs b/src/Microsoft.AspNetCore.Http.Abstractions/HttpResponse.cs index 01854e6ccd..626139183e 100644 --- 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 @@ namespace Microsoft.AspNetCore.Http private static readonly Func _disposeDelegate = disposable => { ((IDisposable)disposable).Dispose(); - return TaskCache.CompletedTask; + return Task.CompletedTask; }; /// diff --git a/src/Microsoft.AspNetCore.Http.Abstractions/Microsoft.AspNetCore.Http.Abstractions.csproj b/src/Microsoft.AspNetCore.Http.Abstractions/Microsoft.AspNetCore.Http.Abstractions.csproj index e19971e2db..0e87594e50 100644 --- 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 - diff --git a/src/Microsoft.AspNetCore.Http/Internal/ApplicationBuilder.cs b/src/Microsoft.AspNetCore.Http/Internal/ApplicationBuilder.cs index 86b098aacd..d0b6b6f6bf 100644 --- 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 @@ namespace Microsoft.AspNetCore.Builder.Internal 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 index a4d86ade8c..82aeb9cf86 100644 --- a/src/Microsoft.AspNetCore.Http/Microsoft.AspNetCore.Http.csproj +++ b/src/Microsoft.AspNetCore.Http/Microsoft.AspNetCore.Http.csproj @@ -21,7 +21,6 @@ - diff --git a/src/Microsoft.AspNetCore.Owin/Microsoft.AspNetCore.Owin.csproj b/src/Microsoft.AspNetCore.Owin/Microsoft.AspNetCore.Owin.csproj index b6eb0a3585..8c3b67f000 100644 --- a/src/Microsoft.AspNetCore.Owin/Microsoft.AspNetCore.Owin.csproj +++ b/src/Microsoft.AspNetCore.Owin/Microsoft.AspNetCore.Owin.csproj @@ -14,8 +14,4 @@ - - - - diff --git a/src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs b/src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs index 165c3eece4..6c7f3ad66f 100644 --- a/src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs +++ b/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); })) }, diff --git a/src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAdapter.cs b/src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAdapter.cs index 45bb017925..7fad98704c 100644 --- a/src/Microsoft.AspNetCore.Owin/WebSockets/WebSocketAdapter.cs +++ b/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); diff --git a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/UseMiddlewareTest.cs b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/UseMiddlewareTest.cs index e00b3ead76..7bf6ad4a74 100644 --- a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/UseMiddlewareTest.cs +++ b/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; } } }