Use new string.Split() overloads (#23683)

This commit is contained in:
Martin Costello 2020-07-05 21:16:15 +01:00 committed by GitHub
parent 3d5c8ed114
commit 4b3fcaf769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions

View File

@ -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);
}

View File

@ -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);
}

View File

@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Hosting
}
var list = new List<string>();
foreach (var part in value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
foreach (var part in value.Split(';', StringSplitOptions.RemoveEmptyEntries))
{
var trimmedPart = part;
if (!string.IsNullOrEmpty(trimmedPart))

View File

@ -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<TextWriter> _textWriterStack = new Stack<TextWriter>();
/// <summary>
@ -292,8 +293,8 @@ namespace Microsoft.Extensions.RazorViews
// Split on line breaks before passing it through the encoder.
return string.Join("<br />" + 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));
}
}