Reacting to IHtmlContentBuilder changes

src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs

@@ -252,7 +252,7 @@ namespace Microsoft.AspNet.Mvc.Razor
             }
 
             var tagHelperContent = new DefaultTagHelperContent();
-            tagHelperContent.Append(writer.ContentBuilder);
+            tagHelperContent.AppendHtml(writer.ContentBuilder);
             return tagHelperContent;
         }
 

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

@@ -193,7 +193,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
                 if (tagBuilder != null)
                 {
                     output.MergeAttributes(tagBuilder);
-                    output.PostContent.Append(tagBuilder.InnerHtml);
+                    output.PostContent.AppendHtml(tagBuilder.InnerHtml);
                 }
             }
 
@@ -202,7 +202,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
                 var antiforgeryTag = Generator.GenerateAntiforgery(ViewContext);
                 if (antiforgeryTag != null)
                 {
-                    output.PostContent.Append(antiforgeryTag);
+                    output.PostContent.AppendHtml(antiforgeryTag);
                 }
             }
         }

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

@@ -226,7 +226,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
                 // This TagBuilder contains the one <input/> element of interest. Since this is not the "checkbox"
                 // special-case, output is a self-closing element no longer guaranteed.
                 output.MergeAttributes(tagBuilder);
-                output.Content.Append(tagBuilder.InnerHtml);
+                output.Content.AppendHtml(tagBuilder.InnerHtml);
             }
         }
 
@@ -273,7 +273,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
                 var renderingMode =
                     output.TagMode == TagMode.SelfClosing ? TagRenderMode.SelfClosing : TagRenderMode.StartTag;
                 checkBoxTag.TagRenderMode = renderingMode;
-                output.Content.Append(checkBoxTag);
+                output.Content.AppendHtml(checkBoxTag);
 
                 var hiddenForCheckboxTag = Generator.GenerateHiddenForCheckbox(ViewContext, modelExplorer, For.Name);
                 if (hiddenForCheckboxTag != null)
@@ -286,7 +286,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
                     }
                     else
                     {
-                        output.Content.Append(hiddenForCheckboxTag);
+                        output.Content.AppendHtml(hiddenForCheckboxTag);
                     }
                 }
             }

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

@@ -338,7 +338,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
                     }
                 }
 
-                builder.Append(HtmlString.NewLine);
+                builder.AppendHtml(HtmlString.NewLine);
 
                 // Build the <meta /> tag that's used to test for the presence of the stylesheet
                 builder

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

@@ -60,7 +60,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
                 // Perf: Avoid allocating enumerator
                 for (var i = 0; i < formContext.EndOfFormContent.Count; i++)
                 {
-                    output.PostContent.Append(formContext.EndOfFormContent[i]);
+                    output.PostContent.AppendHtml(formContext.EndOfFormContent[i]);
                 }
             }
 

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

@@ -130,7 +130,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
             if (tagBuilder != null)
             {
                 output.MergeAttributes(tagBuilder);
-                output.PostContent.Append(tagBuilder.InnerHtml);
+                output.PostContent.AppendHtml(tagBuilder.InnerHtml);
             }
         }
     }

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

@@ -107,7 +107,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
             if (tagBuilder != null)
             {
                 output.MergeAttributes(tagBuilder);
-                output.PostContent.Append(tagBuilder.InnerHtml);
+                output.PostContent.AppendHtml(tagBuilder.InnerHtml);
             }
         }
     }

src/Microsoft.AspNet.Mvc.ViewFeatures/Buffer/ViewBuffer.cs

@@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures.Buffer
         }
 
         /// <inheritdoc />
-        public IHtmlContentBuilder Append(IHtmlContent content)
+        public IHtmlContentBuilder AppendHtml(IHtmlContent content)
         {
             if (content == null)
             {

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

@@ -55,7 +55,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
 
             foreach (var item in TriStateValues(value))
             {
-                selectTag.InnerHtml.Append(DefaultHtmlGenerator.GenerateOption(item, item.Text));
+                selectTag.InnerHtml.AppendHtml(DefaultHtmlGenerator.GenerateOption(item, item.Text));
             }
             
             return selectTag;
@@ -152,7 +152,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
                         templateName: null,
                         readOnly: true,
                         additionalViewData: null);
-                    result.Append(templateBuilder.Build());
+                    result.AppendHtml(templateBuilder.Build());
                 }
 
                 return result;
@@ -266,7 +266,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
                 }
                 else
                 {
-                    content.Append(templateBuilderResult);
+                    content.AppendHtml(templateBuilderResult);
                 }
             }
 

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

@@ -116,7 +116,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
                         templateName: null,
                         readOnly: false,
                         additionalViewData: null);
-                    result.Append(templateBuilder.Build());
+                    result.AppendHtml(templateBuilder.Build());
                 }
 
                 return result;
@@ -146,7 +146,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
             var result = new HtmlContentBuilder();
             if (!viewData.ModelMetadata.HideSurroundingHtml)
             {
-                result.Append(DefaultDisplayTemplates.StringTemplate(htmlHelper));
+                result.AppendHtml(DefaultDisplayTemplates.StringTemplate(htmlHelper));
             }
 
             // Special-case opaque values and arbitrary binary data.
@@ -158,7 +158,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
 
             var htmlAttributesObject = viewData[HtmlAttributeKey];
             var hiddenResult = htmlHelper.Hidden(expression: null, value: model, htmlAttributes: htmlAttributesObject);
-            result.Append(hiddenResult);
+            result.AppendHtml(hiddenResult);
 
             return result;
         }
@@ -285,9 +285,9 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
                     var valueDivTag = new TagBuilder("div");
                     valueDivTag.AddCssClass("editor-field");
 
-                    valueDivTag.InnerHtml.Append(templateBuilderResult);
+                    valueDivTag.InnerHtml.AppendHtml(templateBuilderResult);
                     valueDivTag.InnerHtml.AppendHtml(" ");
-                    valueDivTag.InnerHtml.Append(htmlHelper.ValidationMessage(
+                    valueDivTag.InnerHtml.AppendHtml(htmlHelper.ValidationMessage(
                         propertyMetadata.PropertyName,
                         message: null,
                         htmlAttributes: null,
@@ -297,7 +297,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
                 }
                 else
                 {
-                    content.Append(templateBuilderResult);
+                    content.AppendHtml(templateBuilderResult);
                 }
             }
 

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

@@ -848,8 +848,8 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
                 tagBuilder.AddCssClass(HtmlHelper.ValidationSummaryCssClassName);
             }
 
-            tagBuilder.InnerHtml.Append(wrappedMessage);
+            tagBuilder.InnerHtml.AppendHtml(wrappedMessage);
-            tagBuilder.InnerHtml.Append(htmlSummary);
+            tagBuilder.InnerHtml.AppendHtml(htmlSummary);
 
             if (formContext != null && !excludePropertyErrors)
             {

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

@@ -103,7 +103,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
                 throw new ArgumentNullException(nameof(value));
             }
 
-            ContentBuilder.Append(value);
+            ContentBuilder.AppendHtml(value);
         }
 
         /// <inheritdoc />

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

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

test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Buffer/ViewBufferTest.cs

@@ -37,7 +37,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Buffer
             var content = new HtmlString("hello-world");
 
             // Act
-            buffer.Append(content);
+            buffer.AppendHtml(content);
 
             // Assert
             var segment = Assert.Single(buffer.BufferSegments);
@@ -136,7 +136,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Buffer
 
             // Act
             buffer.Append("Hello");
-            buffer.Append(new HtmlString(" world"));
+            buffer.AppendHtml(new HtmlString(" world"));
             buffer.AppendHtml(" 123");
             buffer.WriteTo(writer, new HtmlTestEncoder());
 

test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/HtmlContentWrapperTextWriterTest.cs

@@ -159,7 +159,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
                 return this;
             }
 
-            public IHtmlContentBuilder Append(IHtmlContent content)
+            public IHtmlContentBuilder AppendHtml(IHtmlContent content)
             {
                 Values.Add(content);
                 return this;