Update the WASM control catalog for Avalonia 11.1 / .NET 8.0

fsprojects · Apr 1, 2024 · 3233256 · 3233256
1 parent 51c8b7b
commit 3233256
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/...alog/Avalonia.FuncUI.ControlCatalog.Browser/Avalonia.FuncUI.ControlCatalog.Browser.fsproj b/...alog/Avalonia.FuncUI.ControlCatalog.Browser/Avalonia.FuncUI.ControlCatalog.Browser.fsproj
@@ -1,15 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0-browser</TargetFramework>
     <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
-    <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
+    <WasmMainJSPath>wwwroot\main.js</WasmMainJSPath>
+    <WasmRuntimeAssetsLocation>./_framework</WasmRuntimeAssetsLocation>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="Properties\**" />
-    <None Include="AppBundle\**" />
-    <WasmExtraFilesToDeploy Include="AppBundle\**" />
+    <None Include="wwwroot\**" />
+    <WasmExtraFilesToDeploy Include="wwwroot\**" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ControlCatalog.Browser/AppBundle/Logo.svg → ...I.ControlCatalog.Browser/wwwroot/Logo.svg b/...ControlCatalog.Browser/AppBundle/Logo.svg → ...I.ControlCatalog.Browser/wwwroot/Logo.svg
diff --git a/....ControlCatalog.Browser/AppBundle/app.css → ...UI.ControlCatalog.Browser/wwwroot/app.css b/....ControlCatalog.Browser/AppBundle/app.css → ...UI.ControlCatalog.Browser/wwwroot/app.css
diff --git a/...trolCatalog.Browser/AppBundle/favicon.ico → ...ontrolCatalog.Browser/wwwroot/favicon.ico b/...trolCatalog.Browser/AppBundle/favicon.ico → ...ontrolCatalog.Browser/wwwroot/favicon.ico
diff --git a/...ntrolCatalog.Browser/AppBundle/index.html → ...ControlCatalog.Browser/wwwroot/index.html b/...ntrolCatalog.Browser/AppBundle/index.html → ...ControlCatalog.Browser/wwwroot/index.html
diff --git a/....ControlCatalog.Browser/AppBundle/main.js → ...UI.ControlCatalog.Browser/wwwroot/main.js b/....ControlCatalog.Browser/AppBundle/main.js → ...UI.ControlCatalog.Browser/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]);
+await dotnetRuntime.runMain(config.mainAssemblyName, [window.location.search]);