diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs
index ac655388f8..fcde47da43 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs
+++ b/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;
}
diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs
index 5809222c88..82c51527a9 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs
+++ b/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);
}
}
}
diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs
index 0ed5c44bd7..9801b63e82 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs
+++ b/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs
@@ -226,7 +226,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
// This TagBuilder contains the one 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);
}
}
}
diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs
index 451055fba1..6650d9bc0a 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs
+++ b/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 tag that's used to test for the presence of the stylesheet
builder
diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs
index 6e7a5650fb..624a94fd78 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs
+++ b/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]);
}
}
diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs
index 19ec7e6d0d..ee00d9c94a 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs
+++ b/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);
}
}
}
diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs
index dfe1eb9f37..70b75bc826 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs
+++ b/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);
}
}
}
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Buffer/ViewBuffer.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Buffer/ViewBuffer.cs
index 9f94fafaa5..a57fa7775e 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Buffer/ViewBuffer.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Buffer/ViewBuffer.cs
@@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures.Buffer
}
///
- public IHtmlContentBuilder Append(IHtmlContent content)
+ public IHtmlContentBuilder AppendHtml(IHtmlContent content)
{
if (content == null)
{
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultDisplayTemplates.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultDisplayTemplates.cs
index 5081b41c07..450654adb0 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultDisplayTemplates.cs
+++ b/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);
}
}
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultEditorTemplates.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultEditorTemplates.cs
index c7ef0a4378..bf3e182b7f 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultEditorTemplates.cs
+++ b/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);
}
}
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs
index 4ce5513019..1dbefb93c1 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs
+++ b/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.Append(htmlSummary);
+ tagBuilder.InnerHtml.AppendHtml(wrappedMessage);
+ tagBuilder.InnerHtml.AppendHtml(htmlSummary);
if (formContext != null && !excludePropertyErrors)
{
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlContentWrapperTextWriter.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlContentWrapperTextWriter.cs
index ab1610ab5e..1f92f2dacc 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlContentWrapperTextWriter.cs
+++ b/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);
}
///
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs
index 6810a4f476..cc57851e91 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs
+++ b/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;
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Buffer/ViewBufferTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Buffer/ViewBufferTest.cs
index 32d208ca7a..979063dd89 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Buffer/ViewBufferTest.cs
+++ b/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());
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/HtmlContentWrapperTextWriterTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/HtmlContentWrapperTextWriterTest.cs
index 0ed1a854a2..ba8ef6b97b 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/HtmlContentWrapperTextWriterTest.cs
+++ b/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;