From ef272815ea23c251517b7dd0d8902f24c54ec725 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Tue, 12 Mar 2024 17:16:23 +0800
Subject: [PATCH] fix: update the latest template of Browser project.

---
 demo/Semi.Avalonia.Demo.Web/Program.cs              |   4 ++--
 .../Semi.Avalonia.Demo.Web.csproj                   |   9 +++++----
 .../{AppBundle => wwwroot}/Logo.svg                 |   0
 .../{AppBundle => wwwroot}/app.css                  |   0
 .../{AppBundle => wwwroot}/favicon.ico              | Bin
 .../{AppBundle => wwwroot}/index.html               |   4 ++--
 .../{AppBundle => wwwroot}/main.js                  |   4 ++--
 7 files changed, 11 insertions(+), 10 deletions(-)
 rename demo/Semi.Avalonia.Demo.Web/{AppBundle => wwwroot}/Logo.svg (100%)
 rename demo/Semi.Avalonia.Demo.Web/{AppBundle => wwwroot}/app.css (100%)
 rename demo/Semi.Avalonia.Demo.Web/{AppBundle => wwwroot}/favicon.ico (100%)
 rename demo/Semi.Avalonia.Demo.Web/{AppBundle => wwwroot}/index.html (86%)
 rename demo/Semi.Avalonia.Demo.Web/{AppBundle => wwwroot}/main.js (69%)

diff --git a/demo/Semi.Avalonia.Demo.Web/Program.cs b/demo/Semi.Avalonia.Demo.Web/Program.cs
index 17e83a9..41a1c77 100644
--- a/demo/Semi.Avalonia.Demo.Web/Program.cs
+++ b/demo/Semi.Avalonia.Demo.Web/Program.cs
@@ -7,9 +7,9 @@ using Avalonia.Browser;
 
 namespace Semi.Avalonia.Demo.Web;
 
-internal partial class Program
+internal sealed partial class Program
 {
-    private static async Task Main(string[] args) => await BuildAvaloniaApp()
+    private static Task Main(string[] args) => BuildAvaloniaApp()
         .StartBrowserAppAsync("out");
 
     public static AppBuilder BuildAvaloniaApp()
diff --git a/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj b/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
index b169194..24864dd 100644
--- a/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
+++ b/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
-        <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
-        <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
         <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0-browser</TargetFramework>
+        <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
+        <WasmMainJSPath>wwwroot\main.js</WasmMainJSPath>
+        <WasmRuntimeAssetsLocation>./_framework</WasmRuntimeAssetsLocation>
     </PropertyGroup>
 
     <ItemGroup>
-        <WasmExtraFilesToDeploy Include="AppBundle\**" />
+        <WasmExtraFilesToDeploy Include="wwwroot\**"/>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/demo/Semi.Avalonia.Demo.Web/AppBundle/Logo.svg b/demo/Semi.Avalonia.Demo.Web/wwwroot/Logo.svg
similarity index 100%
rename from demo/Semi.Avalonia.Demo.Web/AppBundle/Logo.svg
rename to demo/Semi.Avalonia.Demo.Web/wwwroot/Logo.svg
diff --git a/demo/Semi.Avalonia.Demo.Web/AppBundle/app.css b/demo/Semi.Avalonia.Demo.Web/wwwroot/app.css
similarity index 100%
rename from demo/Semi.Avalonia.Demo.Web/AppBundle/app.css
rename to demo/Semi.Avalonia.Demo.Web/wwwroot/app.css
diff --git a/demo/Semi.Avalonia.Demo.Web/AppBundle/favicon.ico b/demo/Semi.Avalonia.Demo.Web/wwwroot/favicon.ico
similarity index 100%
rename from demo/Semi.Avalonia.Demo.Web/AppBundle/favicon.ico
rename to demo/Semi.Avalonia.Demo.Web/wwwroot/favicon.ico
diff --git a/demo/Semi.Avalonia.Demo.Web/AppBundle/index.html b/demo/Semi.Avalonia.Demo.Web/wwwroot/index.html
similarity index 86%
rename from demo/Semi.Avalonia.Demo.Web/AppBundle/index.html
rename to demo/Semi.Avalonia.Demo.Web/wwwroot/index.html
index 703ee35..8b9f68f 100644
--- a/demo/Semi.Avalonia.Demo.Web/AppBundle/index.html
+++ b/demo/Semi.Avalonia.Demo.Web/wwwroot/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <base href="/" />
     <link rel="modulepreload" href="./main.js" />
-    <link rel="modulepreload" href="./dotnet.js" />
-    <link rel="modulepreload" href="./avalonia.js" />
+    <link rel="modulepreload" href="./_framework/dotnet.js" />
+    <link rel="modulepreload" href="./_framework/avalonia.js" />
     <link rel="stylesheet" href="./app.css" />
 </head>
 
diff --git a/demo/Semi.Avalonia.Demo.Web/AppBundle/main.js b/demo/Semi.Avalonia.Demo.Web/wwwroot/main.js
similarity index 69%
rename from demo/Semi.Avalonia.Demo.Web/AppBundle/main.js
rename to demo/Semi.Avalonia.Demo.Web/wwwroot/main.js
index 0dbe2e4..a9de29f 100644
--- a/demo/Semi.Avalonia.Demo.Web/AppBundle/main.js
+++ b/demo/Semi.Avalonia.Demo.Web/wwwroot/main.js
@@ -1,4 +1,4 @@
-import { dotnet } from './dotnet.js'
+import { dotnet } from './_framework/dotnet.js'
 
 const is_browser = typeof window != "undefined";
 if (!is_browser) throw new Error(`Expected to be running in a browser`);
@@ -10,4 +10,4 @@ const dotnetRuntime = await dotnet
 
 const config = dotnetRuntime.getConfig();
 
-await dotnetRuntime.runMainAndExit(config.mainAssemblyName, [window.location.search]);
\ No newline at end of file
+await dotnetRuntime.runMain(config.mainAssemblyName, [window.location.search]);