From ccfd235f5017178b88c15ff3b0ddb0a28cefbaa6 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Mon, 16 Nov 2015 09:49:20 -0800 Subject: [PATCH] React to change in HtmlAbstractions --- .../HtmlTextWriter.cs | 50 ------------------- .../Rendering/MvcForm.cs | 2 +- .../Rendering/TagBuilder.cs | 2 +- .../ViewFeatures/DefaultDisplayTemplates.cs | 4 +- .../ViewFeatures/DefaultEditorTemplates.cs | 6 +-- .../ViewFeatures/DefaultHtmlGenerator.cs | 4 +- .../ViewFeatures/HtmlHelper.cs | 2 +- .../project.json | 4 -- 8 files changed, 10 insertions(+), 64 deletions(-) delete mode 100644 src/Microsoft.AspNet.Mvc.ViewFeatures/HtmlTextWriter.cs diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/HtmlTextWriter.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/HtmlTextWriter.cs deleted file mode 100644 index ba63907357..0000000000 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/HtmlTextWriter.cs +++ /dev/null @@ -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 -{ - /// - /// A which supports special processing of . - /// - public abstract class HtmlTextWriter : TextWriter - { - /// - /// Writes an value. - /// - /// The value. - public abstract void Write(IHtmlContent value); - - /// - public override void Write(object value) - { - var htmlContent = value as IHtmlContent; - if (htmlContent == null) - { - base.Write(value); - } - else - { - Write(htmlContent); - } - } - - /// - public override void WriteLine(object value) - { - var htmlContent = value as IHtmlContent; - if (htmlContent == null) - { - base.Write(value); - } - else - { - Write(htmlContent); - } - - base.WriteLine(); - } - } -} diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MvcForm.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MvcForm.cs index aed7cac014..96380b8e2a 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MvcForm.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/TagBuilder.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/TagBuilder.cs index 1acfeb3b91..c776fd709e 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/TagBuilder.cs +++ b/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(); } /// diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultDisplayTemplates.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultDisplayTemplates.cs index b0f04a8f7e..64cdabf82b 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultDisplayTemplates.cs +++ b/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(); var index = 0; @@ -224,7 +224,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures var serviceProvider = htmlHelper.ViewContext.HttpContext.RequestServices; var viewEngine = serviceProvider.GetRequiredService(); - var content = new BufferedHtmlContent(); + var content = new HtmlContentBuilder(); foreach (var propertyExplorer in modelExplorer.Properties) { var propertyMetadata = propertyExplorer.Metadata; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultEditorTemplates.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultEditorTemplates.cs index 88cf18785d..ece0d2524f 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultEditorTemplates.cs +++ b/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(); 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(); - var content = new BufferedHtmlContent(); + var content = new HtmlContentBuilder(); foreach (var propertyExplorer in modelExplorer.Properties) { var propertyMetadata = propertyExplorer.Metadata; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs index 58c941e785..9f1e9e9f36 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs +++ b/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 selectList) { - var listItemBuilder = new BufferedHtmlContent(); + var listItemBuilder = new HtmlContentBuilder(); // Make optionLabel the first item that gets rendered. if (optionLabel != null) diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs index 0dc821dbbd..a0b0d78d4e 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs +++ b/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) { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/project.json b/src/Microsoft.AspNet.Mvc.ViewFeatures/project.json index de3475a75c..f772d7a512 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/project.json +++ b/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"