diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ba56bfb..16165d3 100644 --- a/.github/workflows/deploy.yml +++ b/.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 - - - name: Install DotNetCompress - run: dotnet tool install --global DotNetCompress --version 3.0.0 --no-cache + run: dotnet workload install wasm-tools - 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///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 diff --git a/.github/workflows/Pack.yml b/.github/workflows/pack.yml similarity index 97% rename from .github/workflows/Pack.yml rename to .github/workflows/pack.yml index 6987468..5f0a4b5 100644 --- a/.github/workflows/Pack.yml +++ b/.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 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 24864dd..2babab2 100644 --- a/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj +++ b/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj @@ -1,16 +1,9 @@ - + Exe net8.0-browser - browser-wasm - wwwroot\main.js - ./_framework - - - - diff --git a/global.json b/global.json index 7cd6a1f..dad2db5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.0", + "version": "8.0.0", "rollForward": "latestMajor", "allowPrerelease": true }