Home Explore Help
Sign In
csharp
/
PixiEditor
mirror of https://github.com/PixiEditor/PixiEditor.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Fixed browser project errors

flabbet 1 year ago
parent
4a1494e625
commit
482be8c875
7 changed files with 25 additions and 24 deletions
Unified View Show Diff Stats
  1. 18 17
      src/PixiEditor.AvaloniaUI.Browser/PixiEditor.AvaloniaUI.Browser.csproj
  2. 2 2
      src/PixiEditor.AvaloniaUI.Browser/Program.cs
  3. 0 0
      src/PixiEditor.AvaloniaUI.Browser/wwwroot/Logo.svg
  4. 0 0
      src/PixiEditor.AvaloniaUI.Browser/wwwroot/app.css
  5. 0 0
      src/PixiEditor.AvaloniaUI.Browser/wwwroot/favicon.ico
  6. 3 3
      src/PixiEditor.AvaloniaUI.Browser/wwwroot/index.html
  7. 2 2
      src/PixiEditor.AvaloniaUI.Browser/wwwroot/main.js

+ 18 - 17
src/PixiEditor.AvaloniaUI.Browser/PixiEditor.AvaloniaUI.Browser.csproj
View File 

@@ -1,22 +1,23 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
 
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
 
-        <TargetFramework>net8.0</TargetFramework>
 
-        <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
 
-        <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
 
-        <OutputType>Exe</OutputType>
 
-        <RootNamespace>PixiEditor.Avalonia.Browser</RootNamespace>
 
-        <Nullable>enable</Nullable>
 
-    </PropertyGroup>
 
+  <PropertyGroup>
 
+    <TargetFramework>net8.0-browser</TargetFramework>
 
+    <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
 
+    <WasmMainJSPath>wwwroot\main.js</WasmMainJSPath>
 
+    <OutputType>Exe</OutputType>
 
+    <RootNamespace>PixiEditor.Avalonia.Browser</RootNamespace>
 
+    <Nullable>enable</Nullable>
 
+    <WasmRuntimeAssetsLocation>./_framework</WasmRuntimeAssetsLocation>
 
+  </PropertyGroup>
 
 
 
-    <ItemGroup>
 
-        <WasmExtraFilesToDeploy Include="AppBundle\**"/>
 
-    </ItemGroup>
 
+  <ItemGroup>
 
+    <WasmExtraFilesToDeploy Include="wwwroot\**"/>
 
+  </ItemGroup>
 
 
 
-    <ItemGroup>
 
-        <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)"/>
 
-    </ItemGroup>
 
+  <ItemGroup>
 
+    <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)"/>
 
+  </ItemGroup>
 
 
 
-    <ItemGroup>
 
-        <ProjectReference Include="..\PixiEditor.AvaloniaUI\PixiEditor.AvaloniaUI.csproj" />
 
-    </ItemGroup>
 
+  <ItemGroup>
 
+    <ProjectReference Include="..\PixiEditor.AvaloniaUI\PixiEditor.AvaloniaUI.csproj"/>
 
+  </ItemGroup>
 
 </Project>
 
 </Project>

+ 2 - 2
src/PixiEditor.AvaloniaUI.Browser/Program.cs
View File 

@@ -6,9 +6,9 @@ using PixiEditor.AvaloniaUI;
 
 
 
 [assembly: SupportedOSPlatform("browser")]
 
 [assembly: SupportedOSPlatform("browser")]
 
 
 
-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");
 
         .StartBrowserAppAsync("out");
 
 
 
     public static AppBuilder BuildAvaloniaApp()
 
     public static AppBuilder BuildAvaloniaApp()

+ 0 - 0
src/PixiEditor.AvaloniaUI.Browser/AppBundle/Logo.svg → src/PixiEditor.AvaloniaUI.Browser/wwwroot/Logo.svg
View File


+ 0 - 0
src/PixiEditor.AvaloniaUI.Browser/AppBundle/app.css → src/PixiEditor.AvaloniaUI.Browser/wwwroot/app.css
View File


+ 0 - 0
src/PixiEditor.AvaloniaUI.Browser/AppBundle/favicon.ico → src/PixiEditor.AvaloniaUI.Browser/wwwroot/favicon.ico
View File


+ 3 - 3
src/PixiEditor.AvaloniaUI.Browser/AppBundle/index.html → src/PixiEditor.AvaloniaUI.Browser/wwwroot/index.html
View File 

@@ -2,13 +2,13 @@
 
 <html>
 
 <html>
 
 
 
 <head>
 
 <head>
 
-    <title>PixiEditor.Avalonia.Browser</title>
 
+    <title>AvaloniaApplication1.Browser</title>
 
     <meta charset="UTF-8">
 
     <meta charset="UTF-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <base href="/" />
 
     <base href="/" />
 
     <link rel="modulepreload" href="./main.js" />
 
     <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" />
 
     <link rel="stylesheet" href="./app.css" />
 
 </head>
 
 </head>

+ 2 - 2
src/PixiEditor.AvaloniaUI.Browser/AppBundle/main.js → src/PixiEditor.AvaloniaUI.Browser/wwwroot/main.js
View File 

@@ -1,4 +1,4 @@
 
-import { dotnet } from './dotnet.js'
 
+import { dotnet } from './_framework/dotnet.js'
 
 
 
 const is_browser = typeof window != "undefined";
 
 const is_browser = typeof window != "undefined";
 
 if (!is_browser) throw new Error(`Expected to be running in a browser`);
 
 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();
 
 const config = dotnetRuntime.getConfig();
 
 
 
-await dotnetRuntime.runMainAndExit(config.mainAssemblyName, [window.location.search]);
 
+await dotnetRuntime.runMain(config.mainAssemblyName, [window.location.search]);