From 5fe284a486ef6544989bc26eefdbb09b01e7b79b Mon Sep 17 00:00:00 2001 From: ryanbrandenburg Date: Fri, 25 Mar 2016 16:15:58 -0700 Subject: [PATCH] SetContent->SetHtmlContent --- .../CacheTagHelper.cs | 14 +++++++------- .../DistributedCacheTagHelper.cs | 10 +++++----- .../LabelTagHelper.cs | 4 ++-- .../LinkTagHelper.cs | 4 ++-- .../ScriptTagHelper.cs | 2 +- .../TextAreaTagHelper.cs | 2 +- .../ValidationMessageTagHelper.cs | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs index 66c114c159..9fbf0c1ea6 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs @@ -58,18 +58,18 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers { throw new ArgumentNullException(nameof(output)); } - + IHtmlContent content = null; if (Enabled) { var key = GenerateKey(context); MemoryCacheEntryOptions options; - + while (content == null) { Task result = null; - + if (!MemoryCache.TryGetValue(key, out result)) { var tokenSource = new CancellationTokenSource(); @@ -81,13 +81,13 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers options.AddExpirationToken(new CancellationChangeToken(tokenSource.Token)); var tcs = new TaskCompletionSource(); - + // The returned value is ignored, we only do this so that // the compiler doesn't complain about the returned task // not being awaited var localTcs = MemoryCache.Set(key, tcs.Task, options); - - try + + try { // The entry is set instead of assigning a value to the // task so that the expiration options are are not impacted @@ -137,7 +137,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers // Clear the contents of the "cache" element since we don't want to render it. output.SuppressOutput(); - output.Content.SetContent(content); + output.Content.SetHtmlContent(content); } // Internal for unit testing diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/DistributedCacheTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/DistributedCacheTagHelper.cs index 94cb218b99..fde61ed662 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/DistributedCacheTagHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/DistributedCacheTagHelper.cs @@ -35,12 +35,12 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers /// The . public DistributedCacheTagHelper( IDistributedCacheTagHelperService distributedCacheService, - HtmlEncoder htmlEncoder) + HtmlEncoder htmlEncoder) : base(htmlEncoder) { _distributedCacheService = distributedCacheService; } - + /// /// Gets the instance used to cache workers. /// @@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers /// [HtmlAttributeName(NameAttributeName)] public string Name { get; set; } - + /// public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output) { @@ -85,9 +85,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers // Clear the contents of the "cache" element since we don't want to render it. output.SuppressOutput(); - output.Content.SetContent(content); + output.Content.SetHtmlContent(content); } - + // Internal for unit testing internal DistributedCacheEntryOptions GetDistributedCacheEntryOptions() { diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs index 6efc36af1e..998abb0a2c 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs @@ -82,11 +82,11 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers if (childContent.IsWhiteSpace) { // Provide default label text since there was nothing useful in the Razor source. - output.Content.SetContent(tagBuilder.InnerHtml); + output.Content.SetHtmlContent(tagBuilder.InnerHtml); } else { - output.Content.SetContent(childContent); + output.Content.SetHtmlContent(childContent); } } } diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs index f3d997d398..b344975e83 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs @@ -264,7 +264,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers { // Only HrefInclude is specified. Don't render the original tag. output.TagName = null; - output.Content.SetContent(HtmlString.Empty); + output.Content.SetHtmlContent(HtmlString.Empty); } } @@ -279,7 +279,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers BuildFallbackBlock(builder); } - output.PostElement.SetContent(builder); + output.PostElement.SetHtmlContent(builder); } private void BuildGlobbedLinkTags(TagHelperAttributeList attributes, TagHelperContent builder) diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs index 397db49d8b..3f4c46c75a 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs @@ -263,7 +263,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers BuildFallbackBlock(output.Attributes, builder); } - output.PostElement.SetContent(builder); + output.PostElement.SetHtmlContent(builder); } private void BuildGlobbedScriptTags( diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/TextAreaTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/TextAreaTagHelper.cs index 224f984497..5863780626 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/TextAreaTagHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/TextAreaTagHelper.cs @@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers if (tagBuilder != null) { // Overwrite current Content to ensure expression result round-trips correctly. - output.Content.SetContent(tagBuilder.InnerHtml); + output.Content.SetHtmlContent(tagBuilder.InnerHtml); output.MergeAttributes(tagBuilder); } diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs index 1ab46ea20d..e58f05757a 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs @@ -86,11 +86,11 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers if (childContent.IsWhiteSpace) { // Provide default label text since there was nothing useful in the Razor source. - output.Content.SetContent(tagBuilder.InnerHtml); + output.Content.SetHtmlContent(tagBuilder.InnerHtml); } else { - output.Content.SetContent(childContent); + output.Content.SetHtmlContent(childContent); } } }