Skip to content

[release/8.0][wasm] Use intended ports when running DevServer #92906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 3, 2023
Merged

[release/8.0][wasm] Use intended ports when running DevServer #92906

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
88b6c00
[wasm] Ignore empty `$ASPNETCORE_URLS`
radical Oct 2, 2023
655abe3
[wasm] DevServer: honor urls specified in the options
radical Oct 2, 2023
2bb69f0
[wasm] CI: Don't trigger non-wbt jobs on wasm-app-host changes
radical Oct 2, 2023
c6a292d
CI: don't trigger wasm runtime tests on wasm-app-host changes
radical Oct 2, 2023
407fc17
[wasm] wasmbrowser - change the default webserver port to 0, to rando…
radical Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions eng/pipelines/common/evaluate-default-paths.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ jobs:
- eng/testing/workloads-testing.targets
- src/mono/mono/component/mini-wasm-debugger.c
- src/mono/wasm/debugger/*
- src/mono/wasm/host/*
- src/mono/wasm/Wasm.Build.Tests/*
- src/mono/nuget/Microsoft.NET.Runtime*
src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/*
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/host/BrowserHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
debugging: _args.CommonConfig.Debugging);
runArgsJson.Save(Path.Combine(_args.CommonConfig.AppPath, "runArgs.json"));

string[] urls = envVars.TryGetValue("ASPNETCORE_URLS", out string? aspnetUrls)
string[] urls = (envVars.TryGetValue("ASPNETCORE_URLS", out string? aspnetUrls) && aspnetUrls.Length > 0)
? aspnetUrls.Split(';', StringSplitOptions.RemoveEmptyEntries)
: new string[] { $"http://127.0.0.1:{_args.CommonConfig.HostProperties.WebServerPort}", "https://127.0.0.1:0" };

Expand Down
3 changes: 2 additions & 1 deletion src/mono/wasm/host/DevServer/DevServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ internal static class DevServer
services.AddSingleton(Options.Create(options));
services.AddSingleton(realUrlsAvailableTcs);
services.AddRouting();
});
})
.UseUrls(options.Urls);


IWebHost? host = builder.Build();
Expand Down