diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/Internal/JavaScriptStringArrayEncoder.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/Internal/JavaScriptStringArrayEncoder.cs index 15c4e358ef..c691a7772a 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/Internal/JavaScriptStringArrayEncoder.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/Internal/JavaScriptStringArrayEncoder.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using System.Text; -using Microsoft.AspNet.WebUtilities.Encoders; +using System.IO; +using Microsoft.Framework.WebEncoders; namespace Microsoft.AspNet.Mvc.TagHelpers.Internal { @@ -17,27 +17,27 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Internal /// public static string Encode(IJavaScriptStringEncoder encoder, IEnumerable values) { - var builder = new StringBuilder(); + var writer = new StringWriter(); var firstAdded = false; - builder.Append('['); + writer.Write('['); foreach (var value in values) { if (firstAdded) { - builder.Append(','); + writer.Write(','); } - builder.Append('"'); - builder.Append(encoder.JavaScriptStringEncode(value)); - builder.Append('"'); + writer.Write('"'); + encoder.JavaScriptStringEncode(value, writer); + writer.Write('"'); firstAdded = true; } - builder.Append(']'); + writer.Write(']'); - return builder.ToString(); + return writer.ToString(); } } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs index 1fe47b3082..8b46283489 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs @@ -10,9 +10,9 @@ using System.Text; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Mvc.TagHelpers.Internal; using Microsoft.AspNet.Razor.Runtime.TagHelpers; -using Microsoft.AspNet.WebUtilities.Encoders; using Microsoft.Framework.Cache.Memory; using Microsoft.Framework.Logging; +using Microsoft.Framework.WebEncoders; namespace Microsoft.AspNet.Mvc.TagHelpers { diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs index fda4d1cdc8..1afc889517 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs @@ -8,8 +8,8 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Mvc.TagHelpers.Internal; using Microsoft.AspNet.Razor.Runtime.TagHelpers; -using Microsoft.AspNet.WebUtilities.Encoders; using Microsoft.Framework.Logging; +using Microsoft.Framework.WebEncoders; namespace Microsoft.AspNet.Mvc.TagHelpers {