diff --git a/src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs b/src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs index d259f769e1..e7b4ef62e9 100644 --- a/src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs +++ b/src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs @@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.Hosting { serverAddressesFeature.PreferHostingUrls = WebHostUtilities.ParseBool(Configuration, WebHostDefaults.PreferHostingUrlsKey); - foreach (var value in urls.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) + foreach (var value in urls.Split(';', StringSplitOptions.RemoveEmptyEntries)) { addresses.Add(value); } diff --git a/src/Hosting/Hosting/src/Internal/WebHost.cs b/src/Hosting/Hosting/src/Internal/WebHost.cs index 060b3fd9a7..ae935412b4 100644 --- a/src/Hosting/Hosting/src/Internal/WebHost.cs +++ b/src/Hosting/Hosting/src/Internal/WebHost.cs @@ -306,7 +306,7 @@ namespace Microsoft.AspNetCore.Hosting { serverAddressesFeature.PreferHostingUrls = WebHostUtilities.ParseBool(_config, WebHostDefaults.PreferHostingUrlsKey); - foreach (var value in urls.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) + foreach (var value in urls.Split(';', StringSplitOptions.RemoveEmptyEntries)) { addresses.Add(value); } diff --git a/src/Hosting/Hosting/src/Internal/WebHostOptions.cs b/src/Hosting/Hosting/src/Internal/WebHostOptions.cs index 88ceac1dac..1f78e3e255 100644 --- a/src/Hosting/Hosting/src/Internal/WebHostOptions.cs +++ b/src/Hosting/Hosting/src/Internal/WebHostOptions.cs @@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Hosting } var list = new List(); - foreach (var part in value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) + foreach (var part in value.Split(';', StringSplitOptions.RemoveEmptyEntries)) { var trimmedPart = part; if (!string.IsNullOrEmpty(trimmedPart)) diff --git a/src/Shared/RazorViews/BaseView.cs b/src/Shared/RazorViews/BaseView.cs index 04b112a1c1..7a1e2dc8f8 100644 --- a/src/Shared/RazorViews/BaseView.cs +++ b/src/Shared/RazorViews/BaseView.cs @@ -20,6 +20,7 @@ namespace Microsoft.Extensions.RazorViews internal abstract class BaseView { private static readonly Encoding UTF8NoBOM = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: true); + private static readonly char[] NewLineChars = new[] { '\r', '\n' }; private readonly Stack _textWriterStack = new Stack(); /// @@ -292,8 +293,8 @@ namespace Microsoft.Extensions.RazorViews // Split on line breaks before passing it through the encoder. return string.Join("
" + Environment.NewLine, - input.Split(new[] { "\r\n" }, StringSplitOptions.None) - .SelectMany(s => s.Split(new[] { '\r', '\n' }, StringSplitOptions.None)) + input.Split("\r\n", StringSplitOptions.None) + .SelectMany(s => s.Split(NewLineChars, StringSplitOptions.None)) .Select(HtmlEncoder.Encode)); } }