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

Merge branch 'release/2.2'

This commit is contained in:
Ryan Nowak 2018-09-22 16:37:02 -07:00
parent 90089953d7 89a962716f
commit 71d4d1be07
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/dependencies.props
View File

@ -48,8 +48,8 @@
<MicrosoftAspNetCoreRazorTagHelpersTestingSourcesPackageVersion>3.0.0-alpha1-10486</MicrosoftAspNetCoreRazorTagHelpersTestingSourcesPackageVersion> <MicrosoftAspNetCoreRazorTagHelpersTestingSourcesPackageVersion>3.0.0-alpha1-10486</MicrosoftAspNetCoreRazorTagHelpersTestingSourcesPackageVersion>
<MicrosoftAspNetCoreResponseCachingAbstractionsPackageVersion>3.0.0-alpha1-10486</MicrosoftAspNetCoreResponseCachingAbstractionsPackageVersion> <MicrosoftAspNetCoreResponseCachingAbstractionsPackageVersion>3.0.0-alpha1-10486</MicrosoftAspNetCoreResponseCachingAbstractionsPackageVersion>
<MicrosoftAspNetCoreResponseCachingPackageVersion>3.0.0-alpha1-10486</MicrosoftAspNetCoreResponseCachingPackageVersion> <MicrosoftAspNetCoreResponseCachingPackageVersion>3.0.0-alpha1-10486</MicrosoftAspNetCoreResponseCachingPackageVersion>
<MicrosoftAspNetCoreRoutingAbstractionsPackageVersion>3.0.0-alpha1-10486</MicrosoftAspNetCoreRoutingAbstractionsPackageVersion> <MicrosoftAspNetCoreRoutingAbstractionsPackageVersion>3.0.0-a-alpha1-ambientvalues-master-17010</MicrosoftAspNetCoreRoutingAbstractionsPackageVersion>
<MicrosoftAspNetCoreRoutingPackageVersion>3.0.0-alpha1-10486</MicrosoftAspNetCoreRoutingPackageVersion> <MicrosoftAspNetCoreRoutingPackageVersion>3.0.0-a-alpha1-ambientvalues-master-17010</MicrosoftAspNetCoreRoutingPackageVersion>
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10486</MicrosoftAspNetCoreServerIISIntegrationPackageVersion> <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10486</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
<MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10486</MicrosoftAspNetCoreServerKestrelPackageVersion> <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10486</MicrosoftAspNetCoreServerKestrelPackageVersion>
<MicrosoftAspNetCoreSessionPackageVersion>3.0.0-alpha1-10486</MicrosoftAspNetCoreSessionPackageVersion> <MicrosoftAspNetCoreSessionPackageVersion>3.0.0-alpha1-10486</MicrosoftAspNetCoreSessionPackageVersion>

4
src/Microsoft.AspNetCore.Mvc.Core/Routing/EndpointRoutingUrlHelper.cs
View File

@ -85,7 +85,7 @@ namespace Microsoft.AspNetCore.Mvc.Routing
ActionContext.HttpContext, ActionContext.HttpContext,
routeName: null, routeName: null,
values, values,
new FragmentString(urlActionContext.Fragment == null ? null : "#" + urlActionContext.Fragment)); fragment: new FragmentString(urlActionContext.Fragment == null ? null : "#" + urlActionContext.Fragment));
return GenerateUrl(urlActionContext.Protocol, urlActionContext.Host, path); return GenerateUrl(urlActionContext.Protocol, urlActionContext.Host, path);
} }
@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.Mvc.Routing
ActionContext.HttpContext, ActionContext.HttpContext,
routeContext.RouteName, routeContext.RouteName,
routeContext.Values, routeContext.Values,
new FragmentString(routeContext.Fragment == null ? null : "#" + routeContext.Fragment)); fragment: new FragmentString(routeContext.Fragment == null ? null : "#" + routeContext.Fragment));
return GenerateUrl(routeContext.Protocol, routeContext.Host, path); return GenerateUrl(routeContext.Protocol, routeContext.Host, path);
} }
} }