From 3df34dbbfef274c0b89d02e4b681771dc8e8e5ce Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Tue, 24 Jul 2018 05:20:53 -0700 Subject: [PATCH 1/3] React to Routing repo's LinkGenerator api changes --- .../Routing/GlobalRoutingUrlHelper.cs | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/GlobalRoutingUrlHelper.cs b/src/Microsoft.AspNetCore.Mvc.Core/Routing/GlobalRoutingUrlHelper.cs index e77274c3cd..13dd697fce 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Routing/GlobalRoutingUrlHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/Routing/GlobalRoutingUrlHelper.cs @@ -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) From 9b217892ab9bc7b24ccedb092405c1c468f0620c Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Tue, 24 Jul 2018 05:21:37 -0700 Subject: [PATCH 2/3] Using routing feature branch versions to prevent cross repo breaking changes --- build/dependencies.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 9c0bc2d198..e478d41d3f 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -39,7 +39,7 @@ 2.2.0-preview1-34758 2.2.0-preview1-34758 2.2.0-preview1-34758 - 2.2.0-preview1-34758 + 2.2.0-a-preview1-routeoptions-linkgenerator-16726 2.2.0-preview1-34758 2.2.0-preview1-34758 2.2.0-preview1-34758 @@ -48,8 +48,8 @@ 2.2.0-preview1-34758 2.2.0-preview1-34758 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 + 2.2.0-a-preview1-routeoptions-linkgenerator-16775 + 2.2.0-a-preview1-routeoptions-linkgenerator-16775 2.2.0-preview1-34758 2.2.0-preview1-34758 2.2.0-preview1-34758 From 5580928209471a4d004082ffe495f59f65d7f075 Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Tue, 24 Jul 2018 09:18:08 -0700 Subject: [PATCH 3/3] Upgraded dependencies.props --- build/dependencies.props | 144 +++++++++++++++++++-------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index e478d41d3f..889ffe96a4 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -16,87 +16,87 @@ 0.42.1 2.1.0 2.1.0-rc1-final - 2.2.0-preview1-34758 + 2.2.0-preview1-34773 2.2.0-preview1-17099 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-a-preview1-routeoptions-linkgenerator-16726 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-a-preview1-routeoptions-linkgenerator-16775 - 2.2.0-a-preview1-routeoptions-linkgenerator-16775 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 5.2.6 2.8.0 2.8.0 - 2.2.0-preview1-34758 + 2.2.0-preview1-34773 1.7.0 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 2.1.0 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34758 - 2.2.0-preview1-34758 + 2.2.0-preview1-34773 + 2.2.0-preview1-34773 15.6.1 4.7.49 2.0.3