huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'merge/release/2.2-to-master'

This commit is contained in:
James Newton-King 2018-08-07 18:30:15 +12:00
parent bf1cc45e5e dce72c9553
commit 14a3a98f48
No known key found for this signature in database
GPG Key ID: 0A66B2F456BF5526
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Microsoft.AspNetCore.Routing/Builder/EndpointRoutingApplicationBuilderExtensions.cs
View File

@ -1,19 +0,0 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
namespace Microsoft.AspNetCore.Builder
{
// TODO: Remove once MVC is updated
public static class EndpointRoutingApplicationBuilderExtensions
{
public static IApplicationBuilder UseGlobalRouting(this IApplicationBuilder builder)
{
return Internal.EndpointRoutingApplicationBuilderExtensions.UseEndpointRouting(builder);
}
public static IApplicationBuilder UseEndpoint(this IApplicationBuilder builder)
{
return Internal.EndpointRoutingApplicationBuilderExtensions.UseEndpoint(builder);
}
}
}

4
src/Microsoft.AspNetCore.Routing/Internal/EndpointRoutingApplicationBuilderExtensions.cs
View File

@ -11,9 +11,6 @@ namespace Microsoft.AspNetCore.Internal
{
public static class EndpointRoutingApplicationBuilderExtensions
{
// TODO: Remove once MVC is updated
private const string GlobalRoutingRegisteredKey = "__GlobalRoutingMiddlewareRegistered";
private const string EndpointRoutingRegisteredKey = "__EndpointRoutingMiddlewareRegistered";
public static IApplicationBuilder UseEndpointRouting(this IApplicationBuilder builder)
@ -21,7 +18,6 @@ namespace Microsoft.AspNetCore.Internal
VerifyRoutingIsRegistered(builder);
builder.Properties[EndpointRoutingRegisteredKey] = true;
builder.Properties[GlobalRoutingRegisteredKey] = true;
return builder.UseMiddleware<EndpointRoutingMiddleware>();
}