Skip to content

Commit 4b3fcaf

Browse files
Use new string.Split() overloads (#23683)
1 parent 3d5c8ed commit 4b3fcaf

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
7373
{
7474
serverAddressesFeature.PreferHostingUrls = WebHostUtilities.ParseBool(Configuration, WebHostDefaults.PreferHostingUrlsKey);
7575

76-
foreach (var value in urls.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
76+
foreach (var value in urls.Split(';', StringSplitOptions.RemoveEmptyEntries))
7777
{
7878
addresses.Add(value);
7979
}

src/Hosting/Hosting/src/Internal/WebHost.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ private void EnsureServer()
306306
{
307307
serverAddressesFeature.PreferHostingUrls = WebHostUtilities.ParseBool(_config, WebHostDefaults.PreferHostingUrlsKey);
308308

309-
foreach (var value in urls.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
309+
foreach (var value in urls.Split(';', StringSplitOptions.RemoveEmptyEntries))
310310
{
311311
addresses.Add(value);
312312
}

src/Hosting/Hosting/src/Internal/WebHostOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ private IReadOnlyList<string> Split(string value)
8282
}
8383

8484
var list = new List<string>();
85-
foreach (var part in value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
85+
foreach (var part in value.Split(';', StringSplitOptions.RemoveEmptyEntries))
8686
{
8787
var trimmedPart = part;
8888
if (!string.IsNullOrEmpty(trimmedPart))

src/Shared/RazorViews/BaseView.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ namespace Microsoft.Extensions.RazorViews
2020
internal abstract class BaseView
2121
{
2222
private static readonly Encoding UTF8NoBOM = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: true);
23+
private static readonly char[] NewLineChars = new[] { '\r', '\n' };
2324
private readonly Stack<TextWriter> _textWriterStack = new Stack<TextWriter>();
2425

2526
/// <summary>
@@ -292,8 +293,8 @@ protected string HtmlEncodeAndReplaceLineBreaks(string input)
292293

293294
// Split on line breaks before passing it through the encoder.
294295
return string.Join("<br />" + Environment.NewLine,
295-
input.Split(new[] { "\r\n" }, StringSplitOptions.None)
296-
.SelectMany(s => s.Split(new[] { '\r', '\n' }, StringSplitOptions.None))
296+
input.Split("\r\n", StringSplitOptions.None)
297+
.SelectMany(s => s.Split(NewLineChars, StringSplitOptions.None))
297298
.Select(HtmlEncoder.Encode));
298299
}
299300
}

0 commit comments

Comments
 (0)