From 24784d0681fb3a2167762adf7abf164d22c76bce Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Thu, 9 May 2019 09:05:22 -0700 Subject: [PATCH] Fix #10066 --- ...ft.AspNetCore.Http.Abstractions.netcoreapp3.0.cs | 13 +++++-------- .../src/Routing/EndpointHttpContextExtensions.cs | 2 +- .../test/EndpointHttpContextExtensionsTests.cs | 1 - src/Http/Http/src/Internal/ApplicationBuilder.cs | 1 - .../Http/test/Internal/ApplicationBuilderTests.cs | 1 - .../Routing/perf/Matching/MatcherAzureBenchmark.cs | 2 +- .../Routing/perf/Matching/MatcherGithubBenchmark.cs | 2 +- .../perf/Matching/MatcherSingleEntryBenchmark.cs | 1 - src/Http/Routing/perf/Matching/TrivialMatcher.cs | 1 - src/Http/Routing/src/EndpointRoutingMiddleware.cs | 1 - .../Routing/src/Matching/DefaultEndpointSelector.cs | 1 - src/Http/Routing/src/Matching/DfaMatcher.cs | 3 +-- src/Http/Routing/src/Matching/EndpointSelector.cs | 1 - .../Routing/src/Matching/HttpMethodMatcherPolicy.cs | 1 - .../Routing/src/Matching/IEndpointSelectorPolicy.cs | 1 - ...dpointRoutingApplicationBuilderExtensionsTest.cs | 1 - .../test/UnitTests/EndpointMiddlewareTest.cs | 5 ++--- .../test/UnitTests/EndpointRoutingMiddlewareTest.cs | 1 - .../test/UnitTests/Matching/BarebonesMatcher.cs | 1 - .../Matching/DefaultEndpointSelectorTest.cs | 1 - .../test/UnitTests/Matching/DfaMatcherTest.cs | 1 - .../HttpMethodMatcherPolicyIntegrationTestBase.cs | 1 - .../test/UnitTests/Matching/MatcherAssert.cs | 1 - .../test/UnitTests/Matching/RouteMatcherBuilder.cs | 1 - .../UnitTests/Matching/TreeRouterMatcherBuilder.cs | 2 +- .../test/UnitTests/TestObjects/TestMatcher.cs | 1 - .../RoutingWebSite/UseEndpointRoutingStartup.cs | 1 - .../CORS/src/Infrastructure/CorsMiddleware.cs | 1 - .../CORS/test/UnitTests/CorsMiddlewareTests.cs | 1 - .../DeveloperExceptionPageSample/Startup.cs | 1 - .../src/SpaDefaultPageMiddleware.cs | 2 +- .../src/StaticFiles/SpaStaticFilesExtensions.cs | 1 - .../StaticFiles/src/DefaultFilesMiddleware.cs | 3 +-- .../StaticFiles/src/DirectoryBrowserMiddleware.cs | 3 +-- .../StaticFiles/src/StaticFileMiddleware.cs | 1 - .../StaticFilesEndpointRouteBuilderExtensions.cs | 1 - .../FunctionalTests/StaticFileMiddlewareTests.cs | 1 - .../test/UnitTests/DefaultFilesMiddlewareTests.cs | 1 - .../UnitTests/DirectoryBrowserMiddlewareTests.cs | 1 - .../Mvc.Core/src/Authorization/AuthorizeFilter.cs | 4 ++-- .../Mvc.Core/src/Routing/ConsumesMatcherPolicy.cs | 1 - .../test/Authorization/AuthorizeFilterTest.cs | 1 - .../test/Routing/ConsumesMatcherPolicyTest.cs | 1 - .../test/Routing/EndpointRoutingUrlHelperTest.cs | 3 +-- .../Core/src/Policy/AuthorizationMiddleware.cs | 1 - .../test/AuthorizationAppBuilderExtensionsTests.cs | 3 +-- .../test/AuthorizationMiddlewareTests.cs | 1 - src/Security/samples/StaticFilesAuth/Startup.cs | 1 - .../src/Internal/HttpConnectionDispatcher.cs | 1 - .../test/HttpConnectionDispatcherTests.cs | 1 - 50 files changed, 19 insertions(+), 65 deletions(-) diff --git a/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.netcoreapp3.0.cs b/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.netcoreapp3.0.cs index a4abcde2a0..1c2f4371cc 100644 --- a/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.netcoreapp3.0.cs +++ b/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.netcoreapp3.0.cs @@ -147,6 +147,11 @@ namespace Microsoft.AspNetCore.Http public Microsoft.AspNetCore.Http.RequestDelegate RequestDelegate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public override string ToString() { throw null; } } + public static partial class EndpointHttpContextExtensions + { + public static Microsoft.AspNetCore.Http.Endpoint GetEndpoint(this Microsoft.AspNetCore.Http.HttpContext context) { throw null; } + public static void SetEndpoint(this Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Http.Endpoint endpoint) { } + } public sealed partial class EndpointMetadataCollection : System.Collections.Generic.IEnumerable, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.IReadOnlyList, System.Collections.IEnumerable { public static readonly Microsoft.AspNetCore.Http.EndpointMetadataCollection Empty; @@ -463,14 +468,6 @@ namespace Microsoft.AspNetCore.Http public abstract System.Threading.Tasks.Task AcceptWebSocketAsync(string subProtocol); } } -namespace Microsoft.AspNetCore.Http.Endpoints -{ - public static partial class EndpointHttpContextExtensions - { - public static Microsoft.AspNetCore.Http.Endpoint GetEndpoint(this Microsoft.AspNetCore.Http.HttpContext context) { throw null; } - public static void SetEndpoint(this Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Http.Endpoint endpoint) { } - } -} namespace Microsoft.AspNetCore.Http.Features { public partial interface IEndpointFeature diff --git a/src/Http/Http.Abstractions/src/Routing/EndpointHttpContextExtensions.cs b/src/Http/Http.Abstractions/src/Routing/EndpointHttpContextExtensions.cs index c7ec9618b3..d766e8336a 100644 --- a/src/Http/Http.Abstractions/src/Routing/EndpointHttpContextExtensions.cs +++ b/src/Http/Http.Abstractions/src/Routing/EndpointHttpContextExtensions.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNetCore.Http.Endpoints +namespace Microsoft.AspNetCore.Http { /// /// Extension methods to expose Endpoint on HttpContext. diff --git a/src/Http/Http.Abstractions/test/EndpointHttpContextExtensionsTests.cs b/src/Http/Http.Abstractions/test/EndpointHttpContextExtensionsTests.cs index 0e297c8041..a011145bec 100644 --- a/src/Http/Http.Abstractions/test/EndpointHttpContextExtensionsTests.cs +++ b/src/Http/Http.Abstractions/test/EndpointHttpContextExtensionsTests.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Xunit; diff --git a/src/Http/Http/src/Internal/ApplicationBuilder.cs b/src/Http/Http/src/Internal/ApplicationBuilder.cs index b623dc85e9..33c8880315 100644 --- a/src/Http/Http/src/Internal/ApplicationBuilder.cs +++ b/src/Http/Http/src/Internal/ApplicationBuilder.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Http.Internal; using Microsoft.Extensions.Internal; diff --git a/src/Http/Http/test/Internal/ApplicationBuilderTests.cs b/src/Http/Http/test/Internal/ApplicationBuilderTests.cs index 4e918bc79e..ec03ea94f0 100644 --- a/src/Http/Http/test/Internal/ApplicationBuilderTests.cs +++ b/src/Http/Http/test/Internal/ApplicationBuilderTests.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Xunit; namespace Microsoft.AspNetCore.Builder.Internal diff --git a/src/Http/Routing/perf/Matching/MatcherAzureBenchmark.cs b/src/Http/Routing/perf/Matching/MatcherAzureBenchmark.cs index e3ee56d521..23544d9569 100644 --- a/src/Http/Routing/perf/Matching/MatcherAzureBenchmark.cs +++ b/src/Http/Routing/perf/Matching/MatcherAzureBenchmark.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using BenchmarkDotNet.Attributes; -using Microsoft.AspNetCore.Http.Endpoints; +using Microsoft.AspNetCore.Http; namespace Microsoft.AspNetCore.Routing.Matching { diff --git a/src/Http/Routing/perf/Matching/MatcherGithubBenchmark.cs b/src/Http/Routing/perf/Matching/MatcherGithubBenchmark.cs index 35bf41521e..f5183298c5 100644 --- a/src/Http/Routing/perf/Matching/MatcherGithubBenchmark.cs +++ b/src/Http/Routing/perf/Matching/MatcherGithubBenchmark.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using BenchmarkDotNet.Attributes; -using Microsoft.AspNetCore.Http.Endpoints; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; namespace Microsoft.AspNetCore.Routing.Matching diff --git a/src/Http/Routing/perf/Matching/MatcherSingleEntryBenchmark.cs b/src/Http/Routing/perf/Matching/MatcherSingleEntryBenchmark.cs index 0991ad48b0..b6c4bafb21 100644 --- a/src/Http/Routing/perf/Matching/MatcherSingleEntryBenchmark.cs +++ b/src/Http/Routing/perf/Matching/MatcherSingleEntryBenchmark.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; namespace Microsoft.AspNetCore.Routing.Matching diff --git a/src/Http/Routing/perf/Matching/TrivialMatcher.cs b/src/Http/Routing/perf/Matching/TrivialMatcher.cs index 5d5714b52b..f029f74e13 100644 --- a/src/Http/Routing/perf/Matching/TrivialMatcher.cs +++ b/src/Http/Routing/perf/Matching/TrivialMatcher.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; namespace Microsoft.AspNetCore.Routing.Matching diff --git a/src/Http/Routing/src/EndpointRoutingMiddleware.cs b/src/Http/Routing/src/EndpointRoutingMiddleware.cs index eb42e484c1..b1fcc00a42 100644 --- a/src/Http/Routing/src/EndpointRoutingMiddleware.cs +++ b/src/Http/Routing/src/EndpointRoutingMiddleware.cs @@ -6,7 +6,6 @@ using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Routing.Matching; using Microsoft.Extensions.Logging; diff --git a/src/Http/Routing/src/Matching/DefaultEndpointSelector.cs b/src/Http/Routing/src/Matching/DefaultEndpointSelector.cs index 98415acaf4..cc455d4eb7 100644 --- a/src/Http/Routing/src/Matching/DefaultEndpointSelector.cs +++ b/src/Http/Routing/src/Matching/DefaultEndpointSelector.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; namespace Microsoft.AspNetCore.Routing.Matching { diff --git a/src/Http/Routing/src/Matching/DfaMatcher.cs b/src/Http/Routing/src/Matching/DfaMatcher.cs index af4fd1af11..d79f13e2ab 100644 --- a/src/Http/Routing/src/Matching/DfaMatcher.cs +++ b/src/Http/Routing/src/Matching/DfaMatcher.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Routing.Patterns; using Microsoft.Extensions.Logging; @@ -230,7 +229,7 @@ namespace Microsoft.AspNetCore.Routing.Matching for (var i = 0; i < captures.Length; i++) { (var parameterName, var segmentIndex, var slotIndex) = captures[i]; - + if ((uint)segmentIndex < (uint)segments.Length) { var segment = segments[segmentIndex]; diff --git a/src/Http/Routing/src/Matching/EndpointSelector.cs b/src/Http/Routing/src/Matching/EndpointSelector.cs index 1e868d76b2..e5db914c28 100644 --- a/src/Http/Routing/src/Matching/EndpointSelector.cs +++ b/src/Http/Routing/src/Matching/EndpointSelector.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; namespace Microsoft.AspNetCore.Routing.Matching { diff --git a/src/Http/Routing/src/Matching/HttpMethodMatcherPolicy.cs b/src/Http/Routing/src/Matching/HttpMethodMatcherPolicy.cs index 58b9c5f4fd..ea1989e477 100644 --- a/src/Http/Routing/src/Matching/HttpMethodMatcherPolicy.cs +++ b/src/Http/Routing/src/Matching/HttpMethodMatcherPolicy.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.Extensions.Internal; using Microsoft.Extensions.Primitives; using Microsoft.Net.Http.Headers; diff --git a/src/Http/Routing/src/Matching/IEndpointSelectorPolicy.cs b/src/Http/Routing/src/Matching/IEndpointSelectorPolicy.cs index 221f8a9776..7654e39728 100644 --- a/src/Http/Routing/src/Matching/IEndpointSelectorPolicy.cs +++ b/src/Http/Routing/src/Matching/IEndpointSelectorPolicy.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/src/Http/Routing/test/UnitTests/Builder/EndpointRoutingApplicationBuilderExtensionsTest.cs b/src/Http/Routing/test/UnitTests/Builder/EndpointRoutingApplicationBuilderExtensionsTest.cs index dda1e3f79e..0da1e56bdb 100644 --- a/src/Http/Routing/test/UnitTests/Builder/EndpointRoutingApplicationBuilderExtensionsTest.cs +++ b/src/Http/Routing/test/UnitTests/Builder/EndpointRoutingApplicationBuilderExtensionsTest.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder.Internal; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing.Matching; diff --git a/src/Http/Routing/test/UnitTests/EndpointMiddlewareTest.cs b/src/Http/Routing/test/UnitTests/EndpointMiddlewareTest.cs index 4d0cafb81b..dc7dc3d87c 100644 --- a/src/Http/Routing/test/UnitTests/EndpointMiddlewareTest.cs +++ b/src/Http/Routing/test/UnitTests/EndpointMiddlewareTest.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Cors.Infrastructure; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; @@ -46,7 +45,7 @@ namespace Microsoft.AspNetCore.Routing var httpContext = new DefaultHttpContext(); httpContext.RequestServices = new ServiceProvider(); httpContext.SetEndpoint(null); - + RequestDelegate next = (c) => { return Task.CompletedTask; @@ -75,7 +74,7 @@ namespace Microsoft.AspNetCore.Routing }; httpContext.SetEndpoint(new Endpoint(endpointFunc, EndpointMetadataCollection.Empty, "Test")); - + RequestDelegate next = (c) => { return Task.CompletedTask; diff --git a/src/Http/Routing/test/UnitTests/EndpointRoutingMiddlewareTest.cs b/src/Http/Routing/test/UnitTests/EndpointRoutingMiddlewareTest.cs index 88b5de1555..946fd7755f 100644 --- a/src/Http/Routing/test/UnitTests/EndpointRoutingMiddlewareTest.cs +++ b/src/Http/Routing/test/UnitTests/EndpointRoutingMiddlewareTest.cs @@ -5,7 +5,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Routing.Matching; using Microsoft.AspNetCore.Routing.TestObjects; diff --git a/src/Http/Routing/test/UnitTests/Matching/BarebonesMatcher.cs b/src/Http/Routing/test/UnitTests/Matching/BarebonesMatcher.cs index 160d11d014..25e6431a3a 100644 --- a/src/Http/Routing/test/UnitTests/Matching/BarebonesMatcher.cs +++ b/src/Http/Routing/test/UnitTests/Matching/BarebonesMatcher.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; namespace Microsoft.AspNetCore.Routing.Matching diff --git a/src/Http/Routing/test/UnitTests/Matching/DefaultEndpointSelectorTest.cs b/src/Http/Routing/test/UnitTests/Matching/DefaultEndpointSelectorTest.cs index a5d234b97d..722e10efa7 100644 --- a/src/Http/Routing/test/UnitTests/Matching/DefaultEndpointSelectorTest.cs +++ b/src/Http/Routing/test/UnitTests/Matching/DefaultEndpointSelectorTest.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Routing.Patterns; using Moq; diff --git a/src/Http/Routing/test/UnitTests/Matching/DfaMatcherTest.cs b/src/Http/Routing/test/UnitTests/Matching/DfaMatcherTest.cs index 1539abc9a9..9816886937 100644 --- a/src/Http/Routing/test/UnitTests/Matching/DfaMatcherTest.cs +++ b/src/Http/Routing/test/UnitTests/Matching/DfaMatcherTest.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Routing.Constraints; using Microsoft.AspNetCore.Routing.Patterns; diff --git a/src/Http/Routing/test/UnitTests/Matching/HttpMethodMatcherPolicyIntegrationTestBase.cs b/src/Http/Routing/test/UnitTests/Matching/HttpMethodMatcherPolicyIntegrationTestBase.cs index c665958a61..bd477bb4d3 100644 --- a/src/Http/Routing/test/UnitTests/Matching/HttpMethodMatcherPolicyIntegrationTestBase.cs +++ b/src/Http/Routing/test/UnitTests/Matching/HttpMethodMatcherPolicyIntegrationTestBase.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Routing.Patterns; using Microsoft.Extensions.DependencyInjection; diff --git a/src/Http/Routing/test/UnitTests/Matching/MatcherAssert.cs b/src/Http/Routing/test/UnitTests/Matching/MatcherAssert.cs index 16156551fd..0aa06089e0 100644 --- a/src/Http/Routing/test/UnitTests/Matching/MatcherAssert.cs +++ b/src/Http/Routing/test/UnitTests/Matching/MatcherAssert.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Xunit.Sdk; diff --git a/src/Http/Routing/test/UnitTests/Matching/RouteMatcherBuilder.cs b/src/Http/Routing/test/UnitTests/Matching/RouteMatcherBuilder.cs index ff4511ae85..cf888a2cfa 100644 --- a/src/Http/Routing/test/UnitTests/Matching/RouteMatcherBuilder.cs +++ b/src/Http/Routing/test/UnitTests/Matching/RouteMatcherBuilder.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Routing.Patterns; using Microsoft.AspNetCore.Routing.TestObjects; diff --git a/src/Http/Routing/test/UnitTests/Matching/TreeRouterMatcherBuilder.cs b/src/Http/Routing/test/UnitTests/Matching/TreeRouterMatcherBuilder.cs index 66af506cc3..6441e8369e 100644 --- a/src/Http/Routing/test/UnitTests/Matching/TreeRouterMatcherBuilder.cs +++ b/src/Http/Routing/test/UnitTests/Matching/TreeRouterMatcherBuilder.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNetCore.Http.Endpoints; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Routing.Internal; using Microsoft.AspNetCore.Routing.Template; diff --git a/src/Http/Routing/test/UnitTests/TestObjects/TestMatcher.cs b/src/Http/Routing/test/UnitTests/TestObjects/TestMatcher.cs index 1ae4fa149f..39263ef053 100644 --- a/src/Http/Routing/test/UnitTests/TestObjects/TestMatcher.cs +++ b/src/Http/Routing/test/UnitTests/TestObjects/TestMatcher.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Routing.Matching; diff --git a/src/Http/Routing/test/testassets/RoutingWebSite/UseEndpointRoutingStartup.cs b/src/Http/Routing/test/testassets/RoutingWebSite/UseEndpointRoutingStartup.cs index f355ba7835..31aeba31db 100644 --- a/src/Http/Routing/test/testassets/RoutingWebSite/UseEndpointRoutingStartup.cs +++ b/src/Http/Routing/test/testassets/RoutingWebSite/UseEndpointRoutingStartup.cs @@ -8,7 +8,6 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.Routing; diff --git a/src/Middleware/CORS/src/Infrastructure/CorsMiddleware.cs b/src/Middleware/CORS/src/Infrastructure/CorsMiddleware.cs index 19aab2cc83..c54e4e85c3 100644 --- a/src/Middleware/CORS/src/Infrastructure/CorsMiddleware.cs +++ b/src/Middleware/CORS/src/Infrastructure/CorsMiddleware.cs @@ -5,7 +5,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Cors.Internal; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Cors.Infrastructure diff --git a/src/Middleware/CORS/test/UnitTests/CorsMiddlewareTests.cs b/src/Middleware/CORS/test/UnitTests/CorsMiddlewareTests.cs index d6ceaa8f38..759d1a4c8f 100644 --- a/src/Middleware/CORS/test/UnitTests/CorsMiddlewareTests.cs +++ b/src/Middleware/CORS/test/UnitTests/CorsMiddlewareTests.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging.Abstractions; diff --git a/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/Startup.cs b/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/Startup.cs index 5c29a13da8..52d67cf9b4 100644 --- a/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/Startup.cs +++ b/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/Startup.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing.Patterns; diff --git a/src/Middleware/SpaServices.Extensions/src/SpaDefaultPageMiddleware.cs b/src/Middleware/SpaServices.Extensions/src/SpaDefaultPageMiddleware.cs index 35c31fe79e..7e86ab5629 100644 --- a/src/Middleware/SpaServices.Extensions/src/SpaDefaultPageMiddleware.cs +++ b/src/Middleware/SpaServices.Extensions/src/SpaDefaultPageMiddleware.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http.Endpoints; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using System; diff --git a/src/Middleware/SpaServices.Extensions/src/StaticFiles/SpaStaticFilesExtensions.cs b/src/Middleware/SpaServices.Extensions/src/StaticFiles/SpaStaticFilesExtensions.cs index 36a5c3236d..0156c9130c 100644 --- a/src/Middleware/SpaServices.Extensions/src/StaticFiles/SpaStaticFilesExtensions.cs +++ b/src/Middleware/SpaServices.Extensions/src/StaticFiles/SpaStaticFilesExtensions.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.SpaServices.StaticFiles; using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Options; diff --git a/src/Middleware/StaticFiles/src/DefaultFilesMiddleware.cs b/src/Middleware/StaticFiles/src/DefaultFilesMiddleware.cs index 627c4b2b5f..b3ce8123d9 100644 --- a/src/Middleware/StaticFiles/src/DefaultFilesMiddleware.cs +++ b/src/Middleware/StaticFiles/src/DefaultFilesMiddleware.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; @@ -47,7 +46,7 @@ namespace Microsoft.AspNetCore.StaticFiles { throw new ArgumentNullException(nameof(options)); } - + _next = next; _options = options.Value; _fileProvider = _options.FileProvider ?? Helpers.ResolveFileProvider(hostingEnv); diff --git a/src/Middleware/StaticFiles/src/DirectoryBrowserMiddleware.cs b/src/Middleware/StaticFiles/src/DirectoryBrowserMiddleware.cs index cc9c9118a6..4fa79e38ab 100644 --- a/src/Middleware/StaticFiles/src/DirectoryBrowserMiddleware.cs +++ b/src/Middleware/StaticFiles/src/DirectoryBrowserMiddleware.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; @@ -31,7 +30,7 @@ namespace Microsoft.AspNetCore.StaticFiles /// The next middleware in the pipeline. /// The used by this middleware. /// The configuration for this middleware. - public DirectoryBrowserMiddleware(RequestDelegate next, IWebHostEnvironment hostingEnv, IOptions options) + public DirectoryBrowserMiddleware(RequestDelegate next, IWebHostEnvironment hostingEnv, IOptions options) : this(next, hostingEnv, HtmlEncoder.Default, options) { } diff --git a/src/Middleware/StaticFiles/src/StaticFileMiddleware.cs b/src/Middleware/StaticFiles/src/StaticFileMiddleware.cs index b05c58f6e0..a1d885b965 100644 --- a/src/Middleware/StaticFiles/src/StaticFileMiddleware.cs +++ b/src/Middleware/StaticFiles/src/StaticFileMiddleware.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/Middleware/StaticFiles/src/StaticFilesEndpointRouteBuilderExtensions.cs b/src/Middleware/StaticFiles/src/StaticFilesEndpointRouteBuilderExtensions.cs index 4a102ae4bc..23a2c2c6ac 100644 --- a/src/Middleware/StaticFiles/src/StaticFilesEndpointRouteBuilderExtensions.cs +++ b/src/Middleware/StaticFiles/src/StaticFilesEndpointRouteBuilderExtensions.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.StaticFiles; diff --git a/src/Middleware/StaticFiles/test/FunctionalTests/StaticFileMiddlewareTests.cs b/src/Middleware/StaticFiles/test/FunctionalTests/StaticFileMiddlewareTests.cs index ba4d7e5538..68a5514ccb 100644 --- a/src/Middleware/StaticFiles/test/FunctionalTests/StaticFileMiddlewareTests.cs +++ b/src/Middleware/StaticFiles/test/FunctionalTests/StaticFileMiddlewareTests.cs @@ -14,7 +14,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.Common; using Microsoft.AspNetCore.Testing; diff --git a/src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs b/src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs index 5c4c43f704..d88885f1da 100644 --- a/src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs +++ b/src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs @@ -9,7 +9,6 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Extensions; using Microsoft.AspNetCore.TestHost; using Microsoft.AspNetCore.Testing.xunit; diff --git a/src/Middleware/StaticFiles/test/UnitTests/DirectoryBrowserMiddlewareTests.cs b/src/Middleware/StaticFiles/test/UnitTests/DirectoryBrowserMiddlewareTests.cs index 010daa14da..5c966b3136 100644 --- a/src/Middleware/StaticFiles/test/UnitTests/DirectoryBrowserMiddlewareTests.cs +++ b/src/Middleware/StaticFiles/test/UnitTests/DirectoryBrowserMiddlewareTests.cs @@ -9,7 +9,6 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.TestHost; using Microsoft.AspNetCore.Testing.xunit; diff --git a/src/Mvc/Mvc.Core/src/Authorization/AuthorizeFilter.cs b/src/Mvc/Mvc.Core/src/Authorization/AuthorizeFilter.cs index b407afc41c..6e2da4fd73 100644 --- a/src/Mvc/Mvc.Core/src/Authorization/AuthorizeFilter.cs +++ b/src/Mvc/Mvc.Core/src/Authorization/AuthorizeFilter.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization.Policy; -using Microsoft.AspNetCore.Http.Endpoints; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.ApplicationModels; using Microsoft.AspNetCore.Mvc.Core; using Microsoft.AspNetCore.Mvc.Filters; @@ -230,7 +230,7 @@ namespace Microsoft.AspNetCore.Mvc.Authorization } // When doing endpoint routing, MVC does not add AllowAnonymousFilters for AllowAnonymousAttributes that - // were discovered on controllers and actions. To maintain compat with 2.x, + // were discovered on controllers and actions. To maintain compat with 2.x, // we'll check for the presence of IAllowAnonymous in endpoint metadata. var endpoint = context.HttpContext.GetEndpoint(); if (endpoint?.Metadata?.GetMetadata() != null) diff --git a/src/Mvc/Mvc.Core/src/Routing/ConsumesMatcherPolicy.cs b/src/Mvc/Mvc.Core/src/Routing/ConsumesMatcherPolicy.cs index 5314d8ad87..abf85e3284 100644 --- a/src/Mvc/Mvc.Core/src/Routing/ConsumesMatcherPolicy.cs +++ b/src/Mvc/Mvc.Core/src/Routing/ConsumesMatcherPolicy.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Mvc.Formatters; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing.Matching; diff --git a/src/Mvc/Mvc.Core/test/Authorization/AuthorizeFilterTest.cs b/src/Mvc/Mvc.Core/test/Authorization/AuthorizeFilterTest.cs index 11d93b8907..1d95168d40 100644 --- a/src/Mvc/Mvc.Core/test/Authorization/AuthorizeFilterTest.cs +++ b/src/Mvc/Mvc.Core/test/Authorization/AuthorizeFilterTest.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization.Infrastructure; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Filters; diff --git a/src/Mvc/Mvc.Core/test/Routing/ConsumesMatcherPolicyTest.cs b/src/Mvc/Mvc.Core/test/Routing/ConsumesMatcherPolicyTest.cs index bbb77a86c1..cd6f9e5f28 100644 --- a/src/Mvc/Mvc.Core/test/Routing/ConsumesMatcherPolicyTest.cs +++ b/src/Mvc/Mvc.Core/test/Routing/ConsumesMatcherPolicyTest.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing.Matching; using Microsoft.AspNetCore.Routing.Patterns; diff --git a/src/Mvc/Mvc.Core/test/Routing/EndpointRoutingUrlHelperTest.cs b/src/Mvc/Mvc.Core/test/Routing/EndpointRoutingUrlHelperTest.cs index ee0b81571e..d702ab8196 100644 --- a/src/Mvc/Mvc.Core/test/Routing/EndpointRoutingUrlHelperTest.cs +++ b/src/Mvc/Mvc.Core/test/Routing/EndpointRoutingUrlHelperTest.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing.Matching; @@ -146,7 +145,7 @@ namespace Microsoft.AspNetCore.Mvc.Routing protected override IUrlHelper CreateUrlHelper(ActionContext actionContext) { var httpContext = actionContext.HttpContext; - httpContext.SetEndpoint(new Endpoint(context => Task.CompletedTask, EndpointMetadataCollection.Empty, null)); + httpContext.SetEndpoint(new Endpoint(context => Task.CompletedTask, EndpointMetadataCollection.Empty, null)); var urlHelperFactory = httpContext.RequestServices.GetRequiredService(); var urlHelper = urlHelperFactory.GetUrlHelper(actionContext); diff --git a/src/Security/Authorization/Core/src/Policy/AuthorizationMiddleware.cs b/src/Security/Authorization/Core/src/Policy/AuthorizationMiddleware.cs index 5352a3b1bf..e49ec78118 100644 --- a/src/Security/Authorization/Core/src/Policy/AuthorizationMiddleware.cs +++ b/src/Security/Authorization/Core/src/Policy/AuthorizationMiddleware.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization.Policy; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Authorization diff --git a/src/Security/Authorization/test/AuthorizationAppBuilderExtensionsTests.cs b/src/Security/Authorization/test/AuthorizationAppBuilderExtensionsTests.cs index 09f20b8f49..1431364b1f 100644 --- a/src/Security/Authorization/test/AuthorizationAppBuilderExtensionsTests.cs +++ b/src/Security/Authorization/test/AuthorizationAppBuilderExtensionsTests.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Authorization.Test.TestObjects; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder.Internal; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.DependencyInjection; using Xunit; @@ -53,7 +52,7 @@ namespace Microsoft.AspNetCore.Authorization.Test { // Arrange var authenticationService = new TestAuthenticationService(); - + var app = new ApplicationBuilder(new ServiceCollection().BuildServiceProvider()); // Act diff --git a/src/Security/Authorization/test/AuthorizationMiddlewareTests.cs b/src/Security/Authorization/test/AuthorizationMiddlewareTests.cs index 6d2ed9b046..7557f1b9ca 100644 --- a/src/Security/Authorization/test/AuthorizationMiddlewareTests.cs +++ b/src/Security/Authorization/test/AuthorizationMiddlewareTests.cs @@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization.Infrastructure; using Microsoft.AspNetCore.Authorization.Test.TestObjects; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; diff --git a/src/Security/samples/StaticFilesAuth/Startup.cs b/src/Security/samples/StaticFilesAuth/Startup.cs index 737dca18fc..04025b5387 100644 --- a/src/Security/samples/StaticFilesAuth/Startup.cs +++ b/src/Security/samples/StaticFilesAuth/Startup.cs @@ -6,7 +6,6 @@ using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs index c10dc10131..20bd0ccb24 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs @@ -12,7 +12,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http.Connections.Internal.Transports; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Internal; using Microsoft.Extensions.Logging; diff --git a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs index f25d0bdf2d..5b4c164ce3 100644 --- a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs +++ b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs @@ -19,7 +19,6 @@ using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.Http.Connections.Internal; using Microsoft.AspNetCore.Http.Connections.Internal.Transports; -using Microsoft.AspNetCore.Http.Endpoints; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Http.Internal; using Microsoft.AspNetCore.SignalR.Tests;