[browser] Update browser template to use Wasm SDK

src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs

@@ -39,7 +39,7 @@ private void UpdateProgramCS()
 
         private void UpdateBrowserMainJs(string targetFramework, string runtimeAssetsRelativePath = DefaultRuntimeAssetsRelativePath)
         {
-            string mainJsPath = Path.Combine(_projectDir!, "main.js");
+            string mainJsPath = Path.Combine(_projectDir!, "wwwroot", "main.js");
             string mainJsContent = File.ReadAllText(mainJsPath);
 
             // .withExitOnUnhandledError() is available only only >net7.0
@@ -407,23 +407,21 @@ public void ConsolePublishAndRun(string config, bool aot, bool relinking)
         }
 
         [Theory]
-        [InlineData("", BuildTestBase.DefaultTargetFramework, DefaultRuntimeAssetsRelativePath)]
-        [InlineData("", BuildTestBase.DefaultTargetFramework, "./")]
+        [InlineData("", BuildTestBase.DefaultTargetFramework)]
         // [ActiveIssue("https://github.com/dotnet/runtime/issues/79313")]
         // [InlineData("-f net7.0", "net7.0")]
-        [InlineData("-f net8.0", "net8.0", DefaultRuntimeAssetsRelativePath)]
-        [InlineData("-f net8.0", "net8.0", "./")]
-        public async Task BrowserBuildAndRun(string extraNewArgs, string targetFramework, string runtimeAssetsRelativePath)
+        [InlineData("-f net8.0", "net8.0")]
+        public async Task BrowserBuildAndRun(string extraNewArgs, string targetFramework)
         {
             string config = "Debug";
             string id = $"browser_{config}_{GetRandomId()}";
             CreateWasmTemplateProject(id, "wasmbrowser", extraNewArgs);
 
-            UpdateBrowserMainJs(targetFramework, runtimeAssetsRelativePath);
+            UpdateBrowserMainJs(targetFramework);
 
             new DotNetCommand(s_buildEnv, _testOutput)
                     .WithWorkingDirectory(_projectDir!)
-                    .Execute($"build -c {config} -bl:{Path.Combine(s_buildEnv.LogRootPath, $"{id}.binlog")} {(runtimeAssetsRelativePath != DefaultRuntimeAssetsRelativePath ? "-p:WasmRuntimeAssetsLocation=" + runtimeAssetsRelativePath : "")}")
+                    .Execute($"build -c {config} -bl:{Path.Combine(s_buildEnv.LogRootPath, $"{id}.binlog")}")
                     .EnsureSuccessful();
 
             using var runCommand = new RunCommand(s_buildEnv, _testOutput)

src/mono/wasm/host/DevServer/DevServer.cs

@@ -70,8 +70,7 @@ private static IConfiguration ConfigureHostConfiguration(DevServerOptions option
             [WebHostDefaults.EnvironmentKey] = "Development",
             ["Logging:LogLevel:Microsoft"] = "Warning",
             ["Logging:LogLevel:Microsoft.Hosting.Lifetime"] = "Information",
-            [WebHostDefaults.StaticWebAssetsKey] = options.StaticWebAssetsPath,
-            ["ApplyCopHeaders"] = options.WebServerUseCrossOriginPolicy.ToString()
+            [WebHostDefaults.StaticWebAssetsKey] = options.StaticWebAssetsPath
         };
 
         config.AddInMemoryCollection(inMemoryConfiguration);

src/mono/wasm/host/DevServer/DevServerStartup.cs

@@ -1,14 +1,18 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
 using System.IO;
+using System.Net.WebSockets;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Microsoft.WebAssembly.AppHost;
 
 namespace Microsoft.WebAssembly.AppHost.DevServer;
@@ -27,16 +31,16 @@ public static void ConfigureServices(IServiceCollection services)
         services.AddRouting();
     }
 
-    public static void Configure(IApplicationBuilder app, TaskCompletionSource<ServerURLs> realUrlsAvailableTcs, ILogger logger, IHostApplicationLifetime applicationLifetime, IConfiguration configuration)
+    public static void Configure(IApplicationBuilder app, IOptions<DevServerOptions> optionsContainer, TaskCompletionSource<ServerURLs> realUrlsAvailableTcs, ILogger logger, IHostApplicationLifetime applicationLifetime, IConfiguration configuration)
     {
         app.UseDeveloperExceptionPage();
         EnableConfiguredPathbase(app, configuration);
 
         app.UseWebAssemblyDebugging();
 
-        bool applyCopHeaders = configuration.GetValue<bool>("ApplyCopHeaders");
+        DevServerOptions options = optionsContainer.Value;
 
-        if (applyCopHeaders)
+        if (options.WebServerUseCrossOriginPolicy)
         {
             app.Use(async (ctx, next) =>
             {
@@ -63,14 +67,39 @@ public static void Configure(IApplicationBuilder app, TaskCompletionSource<Serve
         });
 
         app.UseRouting();
+        app.UseWebSockets();
+
+        Debugger.Launch();
+
+        if (options.OnConsoleConnected is not null)
+        {
+            app.Use(async (ctx, next) =>
+            {
+                if (ctx.Request.Path.StartsWithSegments("/console"))
+                {
+                    if (!ctx.WebSockets.IsWebSocketRequest)
+                    {
+                        ctx.Response.StatusCode = 400;
+                        return;
+                    }
+
+                    using WebSocket socket = await ctx.WebSockets.AcceptWebSocketAsync();
+                    await options.OnConsoleConnected(socket);
+                }
+                else
+                {
+                    await next(ctx);
+                }
+            });
+        }
 
         app.UseEndpoints(endpoints =>
         {
             endpoints.MapFallbackToFile("index.html", new StaticFileOptions
             {
                 OnPrepareResponse = fileContext =>
                 {
-                    if (applyCopHeaders)
+                    if (options.WebServerUseCrossOriginPolicy)
                     {
                         // Browser multi-threaded runtime requires cross-origin policy headers to enable SharedArrayBuffer.
                         ApplyCrossOriginPolicyHeaders(fileContext.Context);

src/mono/wasm/host/Program.cs

@@ -30,6 +30,9 @@ public static async Task<int> Main(string[] args)
         RegisterHostHandler(WasmHost.Wasmtime, WasiEngineHost.InvokeAsync);
 
         using CancellationTokenSource cts = new();
+
+        Console.CancelKeyPress += (object? sender, ConsoleCancelEventArgs e) => cts.Cancel();
+
         ILoggerFactory loggerFactory = LoggerFactory.Create(builder =>
             builder
                 .AddPassThroughConsole()

src/mono/wasm/templates/templates/browser/browser.0.csproj

@@ -1,13 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WebAssembly">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
-    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-
-  <ItemGroup>
-    <WasmExtraFilesToDeploy Include="index.html" />
-    <WasmExtraFilesToDeploy Include="main.js" />
-  </ItemGroup>
 </Project>

src/mono/wasm/templates/templates/browser/runtimeconfig.template.json

@@ -3,9 +3,8 @@
         "perHostConfig": [
             {
                 "name": "browser",
-                "html-path": "index.html",
-                "Host": "browser"
+                "host": "browser"
             }
         ]
     }
-}
+}