From 3f771ef0bc8093d4ba929a71816a3ace0de22a39 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 8 Jun 2017 13:47:01 -0700 Subject: [PATCH] Remove usage of TaskCache (#1889) * Remove usage of TaskCache --- .../Internal/Http/Frame.cs | 17 +++---- .../Internal/Http/FrameRequestStream.cs | 4 +- .../Internal/Http/OutputProducer.cs | 5 +- ...soft.AspNetCore.Server.Kestrel.Core.csproj | 1 - .../Internal/ClosedStream.cs | 5 +- ...oft.AspNetCore.Server.Kestrel.Https.csproj | 1 - ...Core.Server.Kestrel.Transport.Libuv.csproj | 1 - .../FrameTests.cs | 3 +- .../KestrelServerTests.cs | 4 +- .../MessageBodyTests.cs | 6 +-- .../TestHelpers/MockFrameControl.cs | 5 +- .../TestInput.cs | 9 +--- .../BadHttpRequestTests.cs | 3 +- .../ChunkedRequestTests.cs | 3 +- .../DefaultHeaderTests.cs | 3 +- .../HttpsConnectionAdapterTests.cs | 9 ++-- .../RequestTests.cs | 7 ++- .../ResponseTests.cs | 49 +++++++++---------- .../UpgradeTests.cs | 7 ++- test/shared/TestApp.cs | 3 +- 20 files changed, 60 insertions(+), 85 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/Frame.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/Frame.cs index 6919a10ccb..7db00bebb1 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/Frame.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/Frame.cs @@ -12,15 +12,14 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Internal.System; using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines; using Microsoft.AspNetCore.Server.Kestrel.Internal.System.Text.Encodings.Web.Utf8; using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; -using Microsoft.AspNetCore.Http.Features; // ReSharper disable AccessToModifiedClosure @@ -526,7 +525,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { if (data.Count == 0) { - return TaskCache.CompletedTask; + return Task.CompletedTask; } return WriteChunkedAsync(data, cancellationToken); } @@ -539,7 +538,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http else { HandleNonBodyResponseWrite(); - return TaskCache.CompletedTask; + return Task.CompletedTask; } } @@ -665,7 +664,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { if (HasResponseStarted) { - return TaskCache.CompletedTask; + return Task.CompletedTask; } if (_onStarting != null) @@ -681,7 +680,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http VerifyAndUpdateWrite(firstWriteByteCount); ProduceStart(appCompleted: false); - return TaskCache.CompletedTask; + return Task.CompletedTask; } private async Task InitializeResponseAwaited(int firstWriteByteCount) @@ -716,7 +715,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return ProduceEnd(); } - return TaskCache.CompletedTask; + return Task.CompletedTask; } protected Task ProduceEnd() @@ -727,7 +726,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { // We can no longer change the response, so we simply close the connection. _requestProcessingStopping = true; - return TaskCache.CompletedTask; + return Task.CompletedTask; } // If the request was rejected, the error state has already been set by SetBadRequestState and @@ -780,7 +779,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http Log.ConnectionHeadResponseBodyWrite(ConnectionId, _responseBytesWritten); } - return TaskCache.CompletedTask; + return Task.CompletedTask; } private async Task WriteAutoChunkSuffixAwaited() diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameRequestStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameRequestStream.cs index ce518d17d8..65665d543b 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameRequestStream.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameRequestStream.cs @@ -3,12 +3,10 @@ using System; using System.IO; -using System.Runtime.ExceptionServices; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { @@ -42,7 +40,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http public override Task FlushAsync(CancellationToken cancellationToken) { // No-op. - return TaskCache.CompletedTask; + return Task.CompletedTask; } public override long Seek(long offset, SeekOrigin origin) diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/OutputProducer.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/OutputProducer.cs index 378ed8bb4e..560c4440cc 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/OutputProducer.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/OutputProducer.cs @@ -6,7 +6,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { @@ -110,7 +109,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { if (_completed) { - return TaskCache.CompletedTask; + return Task.CompletedTask; } writableBuffer = _pipe.Writer.Alloc(1); @@ -143,7 +142,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http if (awaitable.IsCompleted) { // The flush task can't fail today - return TaskCache.CompletedTask; + return Task.CompletedTask; } return FlushAsyncAwaited(awaitable, cancellationToken); } diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Microsoft.AspNetCore.Server.Kestrel.Core.csproj index 2565c8cfb8..d408125990 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Microsoft.AspNetCore.Server.Kestrel.Core.csproj +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Microsoft.AspNetCore.Server.Kestrel.Core.csproj @@ -20,7 +20,6 @@ - diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Internal/ClosedStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Https/Internal/ClosedStream.cs index 3e63d4d69b..a744faf0ec 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Internal/ClosedStream.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Https/Internal/ClosedStream.cs @@ -5,12 +5,13 @@ using System; using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Https.Internal { internal class ClosedStream : Stream { + private static readonly Task ZeroResultTask = Task.FromResult(result: 0); + public override bool CanRead => true; public override bool CanSeek => false; public override bool CanWrite => false; @@ -56,7 +57,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Https.Internal public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) { - return TaskCache.DefaultCompletedTask; + return ZeroResultTask; } public override void Write(byte[] buffer, int offset, int count) diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj b/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj index a9d552dc1b..d1801ffa01 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj @@ -19,7 +19,6 @@ - diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj b/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj index 19c7d923b2..725988a030 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj @@ -17,7 +17,6 @@ - diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameTests.cs index e8d2481942..31822b16f8 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameTests.cs @@ -17,7 +17,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines; using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; using Moq; @@ -240,7 +239,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests // Act/Assert Assert.True(_frame.HasResponseStarted); - Assert.Throws(() => ((IHttpResponseFeature)_frame).OnStarting(_ => TaskCache.CompletedTask, null)); + Assert.Throws(() => ((IHttpResponseFeature)_frame).OnStarting(_ => Task.CompletedTask, null)); } [Fact] diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/KestrelServerTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/KestrelServerTests.cs index a61feba7bc..bb9e6ee61c 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/KestrelServerTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/KestrelServerTests.cs @@ -5,12 +5,12 @@ using System; using System.Linq; using System.Net; using System.Threading; +using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions; using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Moq; @@ -161,7 +161,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests private static void StartDummyApplication(IServer server) { - server.StartAsync(new DummyApplication(context => TaskCache.CompletedTask), CancellationToken.None).GetAwaiter().GetResult(); + server.StartAsync(new DummyApplication(context => Task.CompletedTask), CancellationToken.None).GetAwaiter().GetResult(); } private class MockTransportFactory : ITransportFactory diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/MessageBodyTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/MessageBodyTests.cs index 1bb42355f6..fe502feb1e 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/MessageBodyTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/MessageBodyTests.cs @@ -9,14 +9,10 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.Internal; -using Microsoft.Extensions.Logging; using Moq; using Xunit; -using Xunit.Abstractions; using Xunit.Sdk; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests @@ -398,7 +394,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests writeTcs.SetResult(buffer); writeCount++; }) - .Returns(TaskCache.CompletedTask); + .Returns(Task.CompletedTask); using (var input = new TestInput()) { diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/TestHelpers/MockFrameControl.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/TestHelpers/MockFrameControl.cs index f9e2d1bb5e..df99b9fb05 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/TestHelpers/MockFrameControl.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/TestHelpers/MockFrameControl.cs @@ -5,7 +5,6 @@ using System; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests.TestHelpers { @@ -13,7 +12,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests.TestHelpers { public Task FlushAsync(CancellationToken cancellationToken) { - return TaskCache.CompletedTask; + return Task.CompletedTask; } public void ProduceContinue() @@ -22,7 +21,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests.TestHelpers public Task WriteAsync(ArraySegment data, CancellationToken cancellationToken) { - return TaskCache.CompletedTask; + return Task.CompletedTask; } } } diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/TestInput.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/TestInput.cs index df90641045..6f96c33711 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/TestInput.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/TestInput.cs @@ -2,17 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.IO; using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; -using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Internal.System.IO.Pipelines; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions; using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.Internal; -using Moq; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests { @@ -82,12 +77,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests Task IFrameControl.WriteAsync(ArraySegment data, CancellationToken cancellationToken) { - return TaskCache.CompletedTask; + return Task.CompletedTask; } Task IFrameControl.FlushAsync(CancellationToken cancellationToken) { - return TaskCache.CompletedTask; + return Task.CompletedTask; } public void Dispose() diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/BadHttpRequestTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/BadHttpRequestTests.cs index 089b86006d..923f0fdccc 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/BadHttpRequestTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/BadHttpRequestTests.cs @@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; using Moq; using Xunit; @@ -181,7 +180,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests .Setup(trace => trace.ConnectionBadRequest(It.IsAny(), It.IsAny())) .Callback((connectionId, exception) => loggedException = exception); - using (var server = new TestServer(context => TaskCache.CompletedTask, new TestServiceContext { Log = mockKestrelTrace.Object })) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext { Log = mockKestrelTrace.Object })) { using (var connection = server.CreateConnection()) { diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ChunkedRequestTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ChunkedRequestTests.cs index ce0f9bf2df..380f199768 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ChunkedRequestTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ChunkedRequestTests.cs @@ -10,7 +10,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.Internal; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests @@ -538,7 +537,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var testContext = new TestServiceContext(); using (var server = new TestServer(httpContext => { - return TaskCache.CompletedTask; + return Task.CompletedTask; }, testContext, listenOptions)) { using (var connection = server.CreateConnection()) diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/DefaultHeaderTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/DefaultHeaderTests.cs index 167019d218..757a5a0a63 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/DefaultHeaderTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/DefaultHeaderTests.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.Internal; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests @@ -18,7 +17,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests ServerOptions = { AddServerHeader = true } }; - using (var server = new TestServer(ctx => TaskCache.CompletedTask, testContext)) + using (var server = new TestServer(ctx => Task.CompletedTask, testContext)) { using (var connection = server.CreateConnection()) { diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs index eb4b7976d1..0f6b48097e 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs @@ -17,7 +17,6 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Https; using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.Internal; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests @@ -126,7 +125,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } }; - using (var server = new TestServer(context => TaskCache.CompletedTask, serviceContext, listenOptions)) + using (var server = new TestServer(context => Task.CompletedTask, serviceContext, listenOptions)) { using (var client = new TcpClient()) { @@ -256,7 +255,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } }; - using (var server = new TestServer(context => TaskCache.CompletedTask, serviceContext, listenOptions)) + using (var server = new TestServer(context => Task.CompletedTask, serviceContext, listenOptions)) { using (var client = new TcpClient()) { @@ -287,7 +286,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } }; - using (var server = new TestServer(context => TaskCache.CompletedTask, serviceContext, listenOptions)) + using (var server = new TestServer(context => Task.CompletedTask, serviceContext, listenOptions)) { using (var client = new TcpClient()) { @@ -316,7 +315,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } }; - using (var server = new TestServer(context => TaskCache.CompletedTask, serviceContext, listenOptions)) + using (var server = new TestServer(context => Task.CompletedTask, serviceContext, listenOptions)) { using (var client = new TcpClient()) { diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestTests.cs index 50004ca37a..68daae3363 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestTests.cs @@ -21,7 +21,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions; using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; using Moq; using Newtonsoft.Json; @@ -291,7 +290,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests .Setup(factory => factory.CreateLogger(It.IsIn("Microsoft.AspNetCore.Server.Kestrel", "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv"))) .Returns(mockLogger.Object); - using (var server = new TestServer(context => TaskCache.CompletedTask, new TestServiceContext(mockLoggerFactory.Object))) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(mockLoggerFactory.Object))) { using (var connection = server.CreateConnection()) { @@ -345,7 +344,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests .Setup(factory => factory.CreateLogger(It.IsIn("Microsoft.AspNetCore.Server.Kestrel", "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv"))) .Returns(mockLogger.Object); - using (var server = new TestServer(context => TaskCache.CompletedTask, new TestServiceContext(mockLoggerFactory.Object))) + using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(mockLoggerFactory.Object))) { using (var connection = server.CreateConnection()) { @@ -1105,7 +1104,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests Assert.Same(originalRequestHeaders, requestFeature.Headers); } - return TaskCache.CompletedTask; + return Task.CompletedTask; }, testContext, listenOptions)) { using (var connection = server.CreateConnection()) diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ResponseTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ResponseTests.cs index 5966eab03f..155a1dac95 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ResponseTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ResponseTests.cs @@ -21,7 +21,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; using Moq; @@ -182,7 +181,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { await context.Response.WriteAsync("hello, world"); await context.Response.Body.FlushAsync(); - ex = Assert.Throws(() => context.Response.OnStarting(_ => TaskCache.CompletedTask, null)); + ex = Assert.Throws(() => context.Response.OnStarting(_ => Task.CompletedTask, null)); }); }); @@ -220,7 +219,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests context => { context.Abort(); - return TaskCache.CompletedTask; + return Task.CompletedTask; }, expectedClientStatusCode: null, expectedServerStatusCode: 0); @@ -245,7 +244,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests return ResponseStatusCodeSetBeforeHttpContextDispose( context => { - return TaskCache.CompletedTask; + return Task.CompletedTask; }, expectedClientStatusCode: null, expectedServerStatusCode: HttpStatusCode.BadRequest, @@ -421,7 +420,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var server = new TestServer(httpContext => { httpContext.Response.StatusCode = statusCode; - return TaskCache.CompletedTask; + return Task.CompletedTask; })) { using (var connection = server.CreateConnection()) @@ -445,7 +444,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { using (var server = new TestServer(httpContext => { - return TaskCache.CompletedTask; + return Task.CompletedTask; })) { using (var connection = server.CreateConnection()) @@ -516,7 +515,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests httpContext.Response.ContentLength = 11; httpContext.Response.Body.Write(Encoding.ASCII.GetBytes("hello,"), 0, 6); httpContext.Response.Body.Write(Encoding.ASCII.GetBytes(" world"), 0, 6); - return TaskCache.CompletedTask; + return Task.CompletedTask; }, serviceContext)) { using (var connection = server.CreateConnection()) @@ -592,7 +591,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var response = Encoding.ASCII.GetBytes("hello, world"); httpContext.Response.ContentLength = 5; httpContext.Response.Body.Write(response, 0, response.Length); - return TaskCache.CompletedTask; + return Task.CompletedTask; }, serviceContext)) { using (var connection = server.CreateConnection()) @@ -764,7 +763,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var server = new TestServer(httpContext => { httpContext.Response.ContentLength = 5; - return TaskCache.CompletedTask; + return Task.CompletedTask; }, serviceContext)) { using (var connection = server.CreateConnection()) @@ -912,7 +911,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var server = new TestServer(httpContext => { httpContext.Response.ContentLength = 42; - return TaskCache.CompletedTask; + return Task.CompletedTask; })) { using (var connection = server.CreateConnection()) @@ -973,7 +972,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests httpContext.Response.ContentLength = 12; httpContext.Response.Body.Write(Encoding.ASCII.GetBytes("hello, world"), 0, 12); flushed.Wait(); - return TaskCache.CompletedTask; + return Task.CompletedTask; })) { using (var connection = server.CreateConnection()) @@ -1255,7 +1254,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { // Change response to chunked httpContext.Response.ContentLength = null; - return TaskCache.CompletedTask; + return Task.CompletedTask; }); var response = Encoding.ASCII.GetBytes("hello, world"); @@ -1263,7 +1262,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // If OnStarting is not run before verifying writes, an error response will be sent. httpContext.Response.Body.Write(response, 0, response.Length); - return TaskCache.CompletedTask; + return Task.CompletedTask; })) { using (var connection = server.CreateConnection()) @@ -1296,7 +1295,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { // Change response to chunked httpContext.Response.ContentLength = null; - return TaskCache.CompletedTask; + return Task.CompletedTask; }); var response = Encoding.ASCII.GetBytes("hello, world"); @@ -1305,7 +1304,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // If OnStarting is not run before verifying writes, an error response will be sent. httpContext.Response.Body.Write(response, 0, response.Length / 2); httpContext.Response.Body.Write(response, response.Length / 2, response.Length - response.Length / 2); - return TaskCache.CompletedTask; + return Task.CompletedTask; })) { using (var connection = server.CreateConnection()) @@ -1340,7 +1339,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { // Change response to chunked httpContext.Response.ContentLength = null; - return TaskCache.CompletedTask; + return Task.CompletedTask; }); var response = Encoding.ASCII.GetBytes("hello, world"); @@ -1380,7 +1379,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { // Change response to chunked httpContext.Response.ContentLength = null; - return TaskCache.CompletedTask; + return Task.CompletedTask; }); var response = Encoding.ASCII.GetBytes("hello, world"); @@ -1454,7 +1453,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task WhenResponseNotStartedResponseEndedAfterConsumingRequestBody() { - using (var server = new TestServer(httpContext => TaskCache.CompletedTask)) + using (var server = new TestServer(httpContext => Task.CompletedTask)) { using (var connection = server.CreateConnection()) { @@ -1822,7 +1821,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests response.OnStarting(_ => { onStartingCalled = true; - return TaskCache.CompletedTask; + return Task.CompletedTask; }, null); // Anything added to the ResponseHeaders dictionary is ignored @@ -2166,7 +2165,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var server = new TestServer(httpContext => { httpContext.Abort(); - return TaskCache.CompletedTask; + return Task.CompletedTask; }, testContext, listenOptions)) { using (var connection = server.CreateConnection()) @@ -2205,7 +2204,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests Assert.Same(originalResponseHeaders, responseFeature.Headers); } - return TaskCache.CompletedTask; + return Task.CompletedTask; }, testContext, listenOptions)) { using (var connection = server.CreateConnection()) @@ -2249,12 +2248,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { callOrder.Push(1); onStartingTcs.SetResult(null); - return TaskCache.CompletedTask; + return Task.CompletedTask; }, null); context.Response.OnStarting(_ => { callOrder.Push(2); - return TaskCache.CompletedTask; + return Task.CompletedTask; }, null); context.Response.ContentLength = response.Length; @@ -2301,12 +2300,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { callOrder.Push(1); onCompletedTcs.SetResult(null); - return TaskCache.CompletedTask; + return Task.CompletedTask; }, null); context.Response.OnCompleted(_ => { callOrder.Push(2); - return TaskCache.CompletedTask; + return Task.CompletedTask; }, null); context.Response.ContentLength = response.Length; diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/UpgradeTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/UpgradeTests.cs index d1d981bed6..5fa497dd0e 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/UpgradeTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/UpgradeTests.cs @@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Tests; using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.Internal; using Xunit; using Xunit.Abstractions; @@ -154,7 +153,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task RejectsRequestWithContentLengthAndUpgrade() { - using (var server = new TestServer(context => TaskCache.CompletedTask)) + using (var server = new TestServer(context => Task.CompletedTask)) using (var connection = server.CreateConnection()) { await connection.Send("POST / HTTP/1.1", @@ -177,7 +176,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task AcceptsRequestWithNoContentLengthAndUpgrade() { - using (var server = new TestServer(context => TaskCache.CompletedTask)) + using (var server = new TestServer(context => Task.CompletedTask)) { using (var connection = server.CreateConnection()) { @@ -201,7 +200,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public async Task RejectsRequestWithChunkedEncodingAndUpgrade() { - using (var server = new TestServer(context => TaskCache.CompletedTask)) + using (var server = new TestServer(context => Task.CompletedTask)) using (var connection = server.CreateConnection()) { await connection.Send("POST / HTTP/1.1", diff --git a/test/shared/TestApp.cs b/test/shared/TestApp.cs index 54a4f33a90..ef4eca006b 100644 --- a/test/shared/TestApp.cs +++ b/test/shared/TestApp.cs @@ -4,7 +4,6 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNetCore.Testing { @@ -43,7 +42,7 @@ namespace Microsoft.AspNetCore.Testing public static Task EmptyApp(HttpContext httpContext) { - return TaskCache.CompletedTask; + return Task.CompletedTask; } } } \ No newline at end of file