Addressed code review comments and modified to use latest bits.

Author: NTaylorMullen

src/Microsoft.AspNet.Mvc.TagHelpers/AnchorTagHelper.cs

@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Mvc.Rendering;
-using Microsoft.AspNet.Mvc.TagHelpers.Internal;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
 
 namespace Microsoft.AspNet.Mvc.TagHelpers
@@ -17,9 +17,6 @@ public class AnchorTagHelper : TagHelper
     {
         private const string RouteAttributePrefix = "route-";
 
-        [Activate]
-        private ViewContext ViewContext { get; set; }
-
         [Activate]
         private IHtmlGenerator Generator { get; set; }
 
@@ -82,13 +79,18 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
             {
                 TagBuilder tagBuilder;
 
-                var prefixedValues = TagHelperOutputHelper.PullPrefixedAttributes(RouteAttributePrefix, output);
+                var prefixedValues = output.PullPrefixedAttributes(RouteAttributePrefix);
+
+                Dictionary<string, object> routeValues = null;
 
-                // Generator.GenerateActionLink || GenerateRouteLink does not accept a Dictionary<string, string> for
-                // route values.
-                var routeValues = prefixedValues.ToDictionary(
-                    attribute => attribute.Key.Substring(RouteAttributePrefix.Length),
-                    attribute => (object)attribute.Value);
+                if (prefixedValues.Any())
+                {
+                    // Generator.GenerateActionLink || GenerateRouteLink does not accept a Dictionary<string, string> for
+                    // route values.
+                    routeValues = prefixedValues.ToDictionary(
+                        attribute => attribute.Key.Substring(RouteAttributePrefix.Length),
+                        attribute => (object)attribute.Value);
+                }
 
                 if (Route == null)
                 {
@@ -122,40 +124,40 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
                                                              htmlAttributes: null);
                 }
 
-                TagHelperOutputHelper.MergeAttributes(tagBuilder, output);
+                output.MergeAttributes(tagBuilder);
             }
         }
 
         private void RestoreBoundHtmlAttributes(TagHelperContext context, TagHelperOutput output)
         {
             if (Action != null)
             {
-                TagHelperOutputHelper.RestoreBoundHtmlAttribute(nameof(Action), context, output);
+                output.RestoreBoundHtmlAttribute(nameof(Action), context);
             }
 
             if (Controller != null)
             {
-                TagHelperOutputHelper.RestoreBoundHtmlAttribute(nameof(Controller), context, output);
+                output.RestoreBoundHtmlAttribute(nameof(Controller), context);
             }
 
             if (Protocol != null)
             {
-                TagHelperOutputHelper.RestoreBoundHtmlAttribute(nameof(Protocol), context, output);
+                output.RestoreBoundHtmlAttribute(nameof(Protocol), context);
             }
 
             if (Host != null)
             {
-                TagHelperOutputHelper.RestoreBoundHtmlAttribute(nameof(Host), context, output);
+                output.RestoreBoundHtmlAttribute(nameof(Host), context);
             }
 
             if (Fragment != null)
             {
-                TagHelperOutputHelper.RestoreBoundHtmlAttribute(nameof(Fragment), context, output);
+                output.RestoreBoundHtmlAttribute(nameof(Fragment), context);
             }
 
             if (Route != null)
             {
-                TagHelperOutputHelper.RestoreBoundHtmlAttribute(nameof(Route), context, output);
+                output.RestoreBoundHtmlAttribute(nameof(Route), context);
             }
         }
     }