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

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

# Conflicts:
#	build/dependencies.props
This commit is contained in:
Kiran Challa 2018-07-24 10:06:00 -07:00
parent 64a977b87d 5580928209
commit a608f9f844
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Microsoft.AspNetCore.Mvc.Core/Routing/GlobalRoutingUrlHelper.cs
View File

@ -94,10 +94,13 @@ namespace Microsoft.AspNetCore.Mvc.Routing
});
var successfullyGeneratedLink = _linkGenerator.TryGetLink(
ActionContext.HttpContext,
endpoints,
valuesDictionary,
AmbientValues,
new LinkGeneratorContext
{
HttpContext = ActionContext.HttpContext,
Endpoints = endpoints,
ExplicitValues = valuesDictionary,
AmbientValues = AmbientValues
},
out var link);
if (!successfullyGeneratedLink)
@ -129,10 +132,13 @@ namespace Microsoft.AspNetCore.Mvc.Routing
});
var successfullyGeneratedLink = _linkGenerator.TryGetLink(
ActionContext.HttpContext,
endpoints,
valuesDictionary,
AmbientValues,
new LinkGeneratorContext
{
HttpContext = ActionContext.HttpContext,
Endpoints = endpoints,
ExplicitValues = valuesDictionary,
AmbientValues = AmbientValues
},
out var link);
if (!successfullyGeneratedLink)