diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/EnvironmentTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/EnvironmentTagHelper.cs index efb29558c6..c27d116934 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/EnvironmentTagHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/EnvironmentTagHelper.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers /// public class EnvironmentTagHelper : TagHelper { - private static readonly char NameSeparator = ','; + private static readonly char[] NameSeparator = new[] { ',' }; /// /// Creates a new . diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/GlobbingUrlBuilder.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/GlobbingUrlBuilder.cs index 2e362e6ff9..4671f8bccc 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/GlobbingUrlBuilder.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/GlobbingUrlBuilder.cs @@ -29,6 +29,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal private static readonly char[] ValidAttributeWhitespaceChars = new[] { '\t', '\n', '\u000C', '\r', ' ' }; private static readonly PathComparer DefaultPathComparer = new PathComparer(); + private static readonly char[] PatternSeparator = new[] { ',' }; + private static readonly char[] PathSeparator = new[] { '/' }; private readonly FileProviderGlobbingDirectory _baseGlobbingDirectory; /// @@ -124,7 +126,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal return files; } - var includeTokenizer = new StringTokenizer(include, ','); + var includeTokenizer = new StringTokenizer(include, PatternSeparator); var includeEnumerator = includeTokenizer.GetEnumerator(); if (!includeEnumerator.MoveNext()) { @@ -144,7 +146,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal if (!string.IsNullOrWhiteSpace(exclude)) { - var excludeTokenizer = new StringTokenizer(exclude, ','); + var excludeTokenizer = new StringTokenizer(exclude, PatternSeparator); var trimmedExcludePatterns = new List(); foreach (var excludePattern in excludeTokenizer) { @@ -234,8 +236,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal var yNoExt = yExtIndex >= 0 ? y.Substring(0, yExtIndex) : y; var result = 0; - var xEnumerator = new StringTokenizer(xNoExt, '/').GetEnumerator(); - var yEnumerator = new StringTokenizer(yNoExt, '/').GetEnumerator(); + var xEnumerator = new StringTokenizer(xNoExt, PathSeparator).GetEnumerator(); + var yEnumerator = new StringTokenizer(yNoExt, PathSeparator).GetEnumerator(); StringSegment xSegment; StringSegment ySegment; while (TryGetNextSegment(ref xEnumerator, out xSegment))