Skip to content

Commit c0e325f

Browse files
[main] Source code updates from dotnet/aspnetcore (#1581)
[main] Source code updates from dotnet/aspnetcore
1 parent c16be7e commit c0e325f

File tree

6 files changed

+294
-291
lines changed

6 files changed

+294
-291
lines changed

src/aspnetcore/eng/Version.Details.xml

Lines changed: 189 additions & 189 deletions
Large diffs are not rendered by default.

src/aspnetcore/eng/Versions.props

Lines changed: 91 additions & 91 deletions
Large diffs are not rendered by default.

src/aspnetcore/global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25368.105",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25368.105",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25368.105",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25371.106",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25371.106",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25371.106",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

src/aspnetcore/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ internal async Task InitializeStandardComponentServicesAsync(
8484
IFormCollection? form = null)
8585
{
8686
var navigationManager = httpContext.RequestServices.GetRequiredService<NavigationManager>();
87-
((IHostEnvironmentNavigationManager)navigationManager)?.Initialize(GetContextBaseUri(httpContext.Request), GetFullUri(httpContext.Request), OnNavigateTo);
87+
((IHostEnvironmentNavigationManager)navigationManager)?.Initialize(
88+
GetContextBaseUri(httpContext.Request),
89+
GetFullUri(httpContext.Request),
90+
uri => GetErrorHandledTask(OnNavigateTo(uri)));
8891

8992
navigationManager?.OnNotFound += (sender, args) => NotFoundEventArgs = args;
9093

src/aspnetcore/src/Servers/Kestrel/Core/src/Internal/AddressBinder.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,21 +142,21 @@ internal static ListenOptions ParseAddress(string address, out bool https)
142142

143143
return options;
144144

145-
bool IsLocalhost(string host, out string? prefix)
145+
static bool IsLocalhost(string host, out string? prefix)
146146
{
147147
// Check for "localhost"
148-
if (string.Equals(parsedAddress.Host, "localhost", StringComparison.OrdinalIgnoreCase))
148+
if (string.Equals(host, "localhost", StringComparison.OrdinalIgnoreCase))
149149
{
150150
prefix = null;
151151
return true;
152152
}
153153

154154
// Check for use of .localhost TLD (Top Level Domain)
155-
if (host.EndsWith(".localhost", StringComparison.OrdinalIgnoreCase)
156-
&& !string.Equals(parsedAddress.Host, ".localhost", StringComparison.OrdinalIgnoreCase))
155+
const string localhostTld = ".localhost";
156+
if (host.Length > localhostTld.Length && host.EndsWith(localhostTld, StringComparison.OrdinalIgnoreCase))
157157
{
158158
// Take all but the .localhost TLD as the prefix
159-
prefix = host[..^10]; // 10 is the length of ".localhost"
159+
prefix = host[..^localhostTld.Length];
160160
return true;
161161
}
162162

src/source-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
"commitSha": "d777c20040bdc2e52b372fa98dcb84141ed692d3"
88
},
99
{
10-
"barId": 276109,
10+
"barId": 276302,
1111
"path": "aspnetcore",
1212
"remoteUri": "https://github.com/dotnet/aspnetcore",
13-
"commitSha": "71edbbce00a3b52d8d268f737d6d927dfd356f58"
13+
"commitSha": "60572f1236fdc738af336e436f5c4db537671973"
1414
},
1515
{
1616
"barId": 273742,

0 commit comments

Comments
 (0)