Merge pull request #371 from irihitech/workflow

Update workflow version

.github/workflows/deploy.yml

@@ -2,7 +2,7 @@ name: Deploy to GitHub Pages
 
 env:
   PROJECT_PATH: demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
-  OUTPUT_PATH: demo/Semi.Avalonia.Demo.Web/bin/Release/net7.0/browser-wasm/AppBundle
+  OUTPUT_PATH: demo/Semi.Avalonia.Demo.Web/bin/Release/net8.0-browser/publish/wwwroot
 on:
   push:
     branches: [ "action/deploy" ]
@@ -16,19 +16,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4.1.1
 
-      - name: Setup .NET 7
+      - name: Setup .NET 8
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 7.0.405
+          dotnet-version: 8.0.x
 
       - name: Install wasm-tools
-        run: dotnet workload install wasm-tools wasm-tools-net7
+        run: dotnet workload install wasm-tools
-
-      - name: Install DotNetCompress
-        run: dotnet tool install --global DotNetCompress --version 3.0.0 --no-cache
 
       - name: Publish .NET Project
-        run: dotnet publish $PROJECT_PATH -c Release -o release --nologo
+        run: dotnet publish $PROJECT_PATH -c Release --nologo
 
       - name: Change base-tag in index.html
         run: sed -i 's/<base href="\/" \/>/<base href="\/Semi.Avalonia\/" \/>/g' $OUTPUT_PATH/index.html
@@ -36,12 +33,6 @@ jobs:
       - name: copy index.html to 404.html
         run: cp $OUTPUT_PATH/index.html $OUTPUT_PATH/404.html
 
-      - name: Compress Output using Brotli
-        run: DotNetCompress -d $OUTPUT_PATH -p "*.dll" "*.js" "*.wasm" --format br --threads 4
-
-      - name: Compress Output using GZip
-        run: DotNetCompress -d $OUTPUT_PATH -p "*.dll" "*.js" "*.wasm" --format gz --threads 4
-
       - name: Add .nojekyll file
         run: touch $OUTPUT_PATH/.nojekyll
 

.github/workflows/pack.yml

@@ -49,7 +49,7 @@ jobs:
         run: dotnet restore
 
       - name: Build
-        run: dotnet publish ./demo/Semi.Avalonia.Demo.Android -c Release -f net7.0-android --no-restore
+        run: dotnet publish ./demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore
 
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v4.3.1

demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj

@@ -1,16 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WebAssembly">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net8.0-browser</TargetFramework>
-        <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
-        <WasmMainJSPath>wwwroot\main.js</WasmMainJSPath>
-        <WasmRuntimeAssetsLocation>./_framework</WasmRuntimeAssetsLocation>
     </PropertyGroup>
 
-    <ItemGroup>
-        <WasmExtraFilesToDeploy Include="wwwroot\**"/>
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
     </ItemGroup>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.0",
+    "version": "8.0.0",
     "rollForward": "latestMajor",
     "allowPrerelease": true
   }

src/Semi.Avalonia/Themes/SemiTheme.axaml.cs

@@ -11,8 +11,8 @@ public class SemiTheme: Styles
 {
     private static readonly Dictionary<CultureInfo, string> _localeToResource = new()
     {
-        { new CultureInfo("zh-CN"), "avares://Semi.Avalonia/Locale/zh-CN.axaml" },
+        { new CultureInfo("zh-cn"), "avares://Semi.Avalonia/Locale/zh-cn.axaml" },
-        { new CultureInfo("en-US"), "avares://Semi.Avalonia/Locale/en-US.axaml" },
+        { new CultureInfo("en-us"), "avares://Semi.Avalonia/Locale/en-us.axaml" },
     };
     
     private readonly IServiceProvider? sp;
@@ -43,13 +43,13 @@ public class SemiTheme: Styles
     {
         if (locale is null)
         {
-            return _localeToResource[new CultureInfo("zh-CN")];
+            return _localeToResource[new CultureInfo("zh-cn")];
         }
 
         if (_localeToResource.TryGetValue(locale, out var resource))
         {
             return resource;
         }
-        return _localeToResource[new CultureInfo("zh-CN")];
+        return _localeToResource[new CultureInfo("zh-cn")];
     }
 }