React to change in HtmlAbstractions

src/Microsoft.AspNet.Mvc.ViewFeatures/HtmlTextWriter.cs

@@ -1,50 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.IO;
-using Microsoft.AspNet.Html.Abstractions;
-
-namespace Microsoft.AspNet.Mvc.ViewFeatures
-{
-    /// <summary>
-    /// A <see cref="TextWriter"/> which supports special processing of <see cref="IHtmlContent"/>.
-    /// </summary>
-    public abstract class HtmlTextWriter : TextWriter
-    {
-        /// <summary>
-        /// Writes an <see cref="IHtmlContent"/> value.
-        /// </summary>
-        /// <param name="value">The <see cref="IHtmlContent"/> value.</param>
-        public abstract void Write(IHtmlContent value);
-
-        /// <inheritdoc />
-        public override void Write(object value)
-        {
-            var htmlContent = value as IHtmlContent;
-            if (htmlContent == null)
-            {
-                base.Write(value);
-            }
-            else
-            {
-                Write(htmlContent);
-            }
-        }
-
-        /// <inheritdoc />
-        public override void WriteLine(object value)
-        {
-            var htmlContent = value as IHtmlContent;
-            if (htmlContent == null)
-            {
-                base.Write(value);
-            }
-            else
-            {
-                Write(htmlContent);
-            }
-
-            base.WriteLine();
-        }
-    }
-}

src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MvcForm.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Text.Encodings.Web;
-using Microsoft.AspNet.Mvc.ViewFeatures;
+using Microsoft.AspNet.Html.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc.Rendering

src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/TagBuilder.cs

@@ -35,7 +35,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
             }
 
             TagName = tagName;
-            InnerHtml = new BufferedHtmlContent();
+            InnerHtml = new HtmlContentBuilder();
         }
 
         /// <summary>

src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultDisplayTemplates.cs

@@ -122,7 +122,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
                 htmlHelper.ViewData.TemplateInfo.HtmlFieldPrefix = string.Empty;
 
                 var fieldNameBase = oldPrefix;
-                var result = new BufferedHtmlContent();
+                var result = new HtmlContentBuilder();
                 var viewEngine = serviceProvider.GetRequiredService<ICompositeViewEngine>();
 
                 var index = 0;
@@ -224,7 +224,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
             var serviceProvider = htmlHelper.ViewContext.HttpContext.RequestServices;
             var viewEngine = serviceProvider.GetRequiredService<ICompositeViewEngine>();
 
-            var content = new BufferedHtmlContent();
+            var content = new HtmlContentBuilder();
             foreach (var propertyExplorer in modelExplorer.Properties)
             {
                 var propertyMetadata = propertyExplorer.Metadata;

src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultEditorTemplates.cs

@@ -86,7 +86,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
                 viewData.TemplateInfo.HtmlFieldPrefix = string.Empty;
 
                 var fieldNameBase = oldPrefix;
-                var result = new BufferedHtmlContent();
+                var result = new HtmlContentBuilder();
                 var viewEngine = serviceProvider.GetRequiredService<ICompositeViewEngine>();
 
                 var index = 0;
@@ -141,7 +141,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
             var viewData = htmlHelper.ViewData;
             var model = viewData.Model;
 
-            var result = new BufferedHtmlContent();
+            var result = new HtmlContentBuilder();
             if (!viewData.ModelMetadata.HideSurroundingHtml)
             {
                 result.Append(DefaultDisplayTemplates.StringTemplate(htmlHelper));
@@ -247,7 +247,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
             var serviceProvider = htmlHelper.ViewContext.HttpContext.RequestServices;
             var viewEngine = serviceProvider.GetRequiredService<ICompositeViewEngine>();
 
-            var content = new BufferedHtmlContent();
+            var content = new HtmlContentBuilder();
             foreach (var propertyExplorer in modelExplorer.Properties)
             {
                 var propertyMetadata = propertyExplorer.Metadata;

src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs

@@ -776,7 +776,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
                 return null;
             }
 
-            var wrappedMessage = new BufferedHtmlContent();
+            var wrappedMessage = new HtmlContentBuilder();
             if (!string.IsNullOrEmpty(message))
             {
                 if (string.IsNullOrEmpty(headerTag))
@@ -1418,7 +1418,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
 
         private IHtmlContent GenerateGroupsAndOptions(string optionLabel, IEnumerable<SelectListItem> selectList)
         {
-            var listItemBuilder = new BufferedHtmlContent();
+            var listItemBuilder = new HtmlContentBuilder();
 
             // Make optionLabel the first item that gets rendered.
             if (optionLabel != null)

src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs

@@ -726,7 +726,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
                 return HtmlString.Empty;
             }
 
-            var checkboxContent = new BufferedHtmlContent().Append(checkbox);
+            var checkboxContent = new HtmlContentBuilder().Append(checkbox);
 
             if (ViewContext.FormContext.CanRenderAtEndOfForm)
             {

src/Microsoft.AspNet.Mvc.ViewFeatures/project.json

@@ -16,10 +16,6 @@
     "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
     "Microsoft.AspNet.Mvc.DataAnnotations": "6.0.0-*",
     "Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-*",
-    "Microsoft.Extensions.BufferedHtmlContent.Sources": {
-      "version": "1.0.0-*",
-      "type": "build"
-    },
     "Microsoft.Extensions.ClosedGenericMatcher.Sources": {
       "version": "1.0.0-*",
       "type": "build"