From 0caacb8217a2a16dfa829b5dead4f7a5c0bf0dc0 Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Tue, 17 Jul 2018 05:08:06 -0700 Subject: [PATCH 1/3] React to LinkGenerator api changes --- .../Routing/DispatcherUrlHelper.cs | 10 ++++++---- .../Routing/UrlHelperFactory.cs | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/DispatcherUrlHelper.cs b/src/Microsoft.AspNetCore.Mvc.Core/Routing/DispatcherUrlHelper.cs index ea56fb5b6a..8b0efc4c38 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Routing/DispatcherUrlHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/Routing/DispatcherUrlHelper.cs @@ -9,13 +9,13 @@ using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Mvc.Routing { /// - /// An implementation of that uses to build URLs + /// An implementation of that uses to build URLs /// for ASP.NET MVC within an application. /// internal class DispatcherUrlHelper : UrlHelperBase { private readonly ILogger _logger; - private readonly ILinkGenerator _linkGenerator; + private readonly LinkGenerator _linkGenerator; private readonly IEndpointFinder _routeValuesBasedEndpointFinder; /// @@ -26,12 +26,12 @@ namespace Microsoft.AspNetCore.Mvc.Routing /// /// The which finds endpoints by required route values. /// - /// The used to generate the link. + /// The used to generate the link. /// The . public DispatcherUrlHelper( ActionContext actionContext, IEndpointFinder routeValuesBasedEndpointFinder, - ILinkGenerator linkGenerator, + LinkGenerator linkGenerator, ILogger logger) : base(actionContext) { @@ -94,6 +94,7 @@ namespace Microsoft.AspNetCore.Mvc.Routing }); var successfullyGeneratedLink = _linkGenerator.TryGetLink( + ActionContext.HttpContext, endpoints, valuesDictionary, AmbientValues, @@ -128,6 +129,7 @@ namespace Microsoft.AspNetCore.Mvc.Routing }); var successfullyGeneratedLink = _linkGenerator.TryGetLink( + ActionContext.HttpContext, endpoints, valuesDictionary, AmbientValues, diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperFactory.cs b/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperFactory.cs index d8c257ffdc..9d464aafa3 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperFactory.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperFactory.cs @@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Mvc.Routing if (endpointFeature?.Endpoint != null) { var services = httpContext.RequestServices; - var linkGenerator = services.GetRequiredService(); + var linkGenerator = services.GetRequiredService(); var routeValuesBasedEndpointFinder = services.GetRequiredService>(); var logger = services.GetRequiredService>(); From dd252c0ccc22c1ba2381d59ee4634f0ab1d570c9 Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Tue, 17 Jul 2018 05:24:51 -0700 Subject: [PATCH 2/3] Updated dependencies.props to use feature branch versions --- build/dependencies.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 3577022de9..f253ec51ed 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -39,7 +39,7 @@ 2.2.0-preview1-34694 2.2.0-preview1-34694 2.2.0-preview1-34694 - 2.2.0-preview1-34694 + 2.2.0-a-preview1-abstract-linkgenerator-16720 2.2.0-preview1-34694 2.2.0-preview1-34694 2.2.0-preview1-34694 @@ -48,8 +48,8 @@ 2.2.0-preview1-34694 2.2.0-preview1-34694 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 + 2.2.0-a-preview1-abstract-linkgenerator-16742 + 2.2.0-a-preview1-abstract-linkgenerator-16742 2.2.0-preview1-34694 2.2.0-preview1-34694 2.2.0-preview1-34694 From c1fab727a062dd82d2ba686cbfa62adb94519b03 Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Tue, 17 Jul 2018 10:09:36 -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 f253ec51ed..542e600ae9 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-34694 + 2.2.0-preview1-34709 2.2.0-preview1-17099 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-a-preview1-abstract-linkgenerator-16720 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-a-preview1-abstract-linkgenerator-16742 - 2.2.0-a-preview1-abstract-linkgenerator-16742 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 5.2.6 2.8.0 2.8.0 - 2.2.0-preview1-34694 + 2.2.0-preview1-34709 1.7.0 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 2.1.0 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 15.6.1 4.7.49 2.0.3