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 @@  - net7.0 - browser-wasm - AppBundle\main.js Exe + net8.0-browser + browser-wasm + wwwroot\main.js + ./_framework - + 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 @@ - - + + 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]);