diff --git a/src/Microsoft.AspNetCore.ResponseCaching/Internal/MemoryResponseCache.cs b/src/Microsoft.AspNetCore.ResponseCaching/Internal/MemoryResponseCache.cs index 42c613bc2c..c96ba5e751 100644 --- a/src/Microsoft.AspNetCore.ResponseCaching/Internal/MemoryResponseCache.cs +++ b/src/Microsoft.AspNetCore.ResponseCaching/Internal/MemoryResponseCache.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; using Microsoft.Extensions.Caching.Memory; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNetCore.ResponseCaching.Internal { @@ -86,7 +85,7 @@ namespace Microsoft.AspNetCore.ResponseCaching.Internal public Task SetAsync(string key, IResponseCacheEntry entry, TimeSpan validFor) { Set(key, entry, validFor); - return TaskCache.CompletedTask; + return Task.CompletedTask; } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj b/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj index f9bbe57da5..fc70849ef1 100644 --- a/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj +++ b/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj @@ -20,7 +20,6 @@ - diff --git a/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingMiddleware.cs b/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingMiddleware.cs index 24fa3c1c40..1073181ac5 100644 --- a/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingMiddleware.cs +++ b/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingMiddleware.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.ResponseCaching.Internal; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Microsoft.Extensions.Primitives; @@ -314,7 +313,7 @@ namespace Microsoft.AspNetCore.ResponseCaching { return _cache.SetAsync(context.BaseKey, context.CachedVaryByRules, context.CachedResponseValidFor); } - return TaskCache.CompletedTask; + return Task.CompletedTask; } internal async Task FinalizeCacheBodyAsync(ResponseCachingContext context) @@ -378,7 +377,7 @@ namespace Microsoft.AspNetCore.ResponseCaching { return FinalizeCacheHeadersAsync(context); } - return TaskCache.CompletedTask; + return Task.CompletedTask; } internal static void AddResponseCachingFeature(HttpContext context) diff --git a/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentWriteStream.cs b/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentWriteStream.cs index 6efeaf589f..81df72a9d1 100644 --- a/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentWriteStream.cs +++ b/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentWriteStream.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.Extensions.Internal; namespace Microsoft.AspNetCore.ResponseCaching.Internal { @@ -170,7 +169,7 @@ namespace Microsoft.AspNetCore.ResponseCaching.Internal public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) { Write(buffer, offset, count); - return TaskCache.CompletedTask; + return Task.CompletedTask; } public override void WriteByte(byte value) diff --git a/test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingMiddlewareTests.cs b/test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingMiddlewareTests.cs index dfd9c12be9..64aa0e3a1f 100644 --- a/test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingMiddlewareTests.cs +++ b/test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingMiddlewareTests.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.ResponseCaching.Internal; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Primitives; using Microsoft.Net.Http.Headers; @@ -857,7 +856,7 @@ namespace Microsoft.AspNetCore.ResponseCaching.Tests var middleware = TestUtils.CreateTestMiddleware(next: httpContext => { responseCachingFeatureAdded = httpContext.Features.Get() != null; - return TaskCache.CompletedTask; + return Task.CompletedTask; }, policyProvider: new TestResponseCachingPolicyProvider { diff --git a/test/Microsoft.AspNetCore.ResponseCaching.Tests/TestUtils.cs b/test/Microsoft.AspNetCore.ResponseCaching.Tests/TestUtils.cs index d5889b3554..7ccb4a5ae6 100644 --- a/test/Microsoft.AspNetCore.ResponseCaching.Tests/TestUtils.cs +++ b/test/Microsoft.AspNetCore.ResponseCaching.Tests/TestUtils.cs @@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.ResponseCaching.Internal; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Testing; @@ -83,7 +82,7 @@ namespace Microsoft.AspNetCore.ResponseCaching.Tests { context.Response.Write(uniqueId); } - return TaskCache.CompletedTask; + return Task.CompletedTask; } internal static IResponseCachingKeyProvider CreateTestKeyProvider() @@ -169,7 +168,7 @@ namespace Microsoft.AspNetCore.ResponseCaching.Tests { if (next == null) { - next = httpContext => TaskCache.CompletedTask; + next = httpContext => Task.CompletedTask; } if (cache == null) { @@ -294,7 +293,7 @@ namespace Microsoft.AspNetCore.ResponseCaching.Tests { public Task SendFileAsync(string path, long offset, long? count, CancellationToken cancellation) { - return TaskCache.CompletedTask; + return Task.CompletedTask; } } @@ -383,7 +382,7 @@ namespace Microsoft.AspNetCore.ResponseCaching.Tests public Task SetAsync(string key, IResponseCacheEntry entry, TimeSpan validFor) { Set(key, entry, validFor); - return TaskCache.CompletedTask; + return Task.CompletedTask; } }