From 0caacb8217a2a16dfa829b5dead4f7a5c0bf0dc0 Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@microsoft.com>
Date: Tue, 17 Jul 2018 05:08:06 -0700
Subject: [PATCH] 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
 {
     /// <summary>
-    /// An implementation of <see cref="IUrlHelper"/> that uses <see cref="ILinkGenerator"/> to build URLs 
+    /// An implementation of <see cref="IUrlHelper"/> that uses <see cref="LinkGenerator"/> to build URLs 
     /// for ASP.NET MVC within an application.
     /// </summary>
     internal class DispatcherUrlHelper : UrlHelperBase
     {
         private readonly ILogger<DispatcherUrlHelper> _logger;
-        private readonly ILinkGenerator _linkGenerator;
+        private readonly LinkGenerator _linkGenerator;
         private readonly IEndpointFinder<RouteValuesBasedEndpointFinderContext> _routeValuesBasedEndpointFinder;
 
         /// <summary>
@@ -26,12 +26,12 @@ namespace Microsoft.AspNetCore.Mvc.Routing
         /// <param name="routeValuesBasedEndpointFinder">
         /// The <see cref="IEndpointFinder{T}"/> which finds endpoints by required route values.
         /// </param>
-        /// <param name="linkGenerator">The <see cref="ILinkGenerator"/> used to generate the link.</param>
+        /// <param name="linkGenerator">The <see cref="LinkGenerator"/> used to generate the link.</param>
         /// <param name="logger">The <see cref="ILogger"/>.</param>
         public DispatcherUrlHelper(
             ActionContext actionContext,
             IEndpointFinder<RouteValuesBasedEndpointFinderContext> routeValuesBasedEndpointFinder,
-            ILinkGenerator linkGenerator,
+            LinkGenerator linkGenerator,
             ILogger<DispatcherUrlHelper> 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<ILinkGenerator>();
+                var linkGenerator = services.GetRequiredService<LinkGenerator>();
                 var routeValuesBasedEndpointFinder = services.GetRequiredService<IEndpointFinder<RouteValuesBasedEndpointFinderContext>>();
                 var logger = services.GetRequiredService<ILogger<DispatcherUrlHelper>>();