From 176430f95f797320f04fa7889558f35883623da4 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Tue, 7 Oct 2025 13:20:13 +0800 Subject: [PATCH] fix: fix web demo issue#674. upgrade web demo to .NET 9.0 and update GitHub Actions to use checkout@v5. --- .github/workflows/deploy.yml | 12 +++++++----- .github/workflows/pack-nightly.yml | 2 +- .github/workflows/pack.yml | 2 +- .github/workflows/publish.yml | 18 +++++++++--------- .../Semi.Avalonia.Demo.Web.csproj | 2 +- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e6b2376..ea4a27a 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/net8.0-browser/publish/wwwroot + OUTPUT_PATH: demo/Semi.Avalonia.Demo.Web/bin/Release/net9.0-browser/publish/wwwroot on: workflow_dispatch: @@ -11,12 +11,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v5 - - name: Setup .NET 8 - uses: actions/setup-dotnet@v4 + - name: Setup dotnet + uses: actions/setup-dotnet@v5 with: - dotnet-version: 8.0.x + dotnet-version: | + 8.0.x + 9.0.x - name: Install wasm-tools run: dotnet workload install wasm-tools diff --git a/.github/workflows/pack-nightly.yml b/.github/workflows/pack-nightly.yml index 6c465e7..2e82c13 100644 --- a/.github/workflows/pack-nightly.yml +++ b/.github/workflows/pack-nightly.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5 - name: Get Version run: | diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml index 876f8b8..4d8d8f2 100644 --- a/.github/workflows/pack.yml +++ b/.github/workflows/pack.yml @@ -47,7 +47,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5 - name: Pack Semi.Avalonia if: ${{ inputs.Semi_Avalonia }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f2b1bfa..57f0de7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -75,7 +75,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5 - name: Publish win-x64 run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true - name: Upload a Build Artifact @@ -91,7 +91,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5 - name: Enable Native AOT in .csproj run: sed -i 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj - name: Publish win-x64 AOT @@ -109,7 +109,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5 - name: Publish linux-x64 run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release -o publish --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true - name: Upload a Build Artifact @@ -125,7 +125,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5 - name: Enable Native AOT in .csproj run: sed -i 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj - name: Publish linux-x64 AOT @@ -143,7 +143,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5 - name: Publish linux-x64 DRM run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release -o publish --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true - name: Upload a Build Artifact @@ -159,7 +159,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5 - name: Enable Native AOT in .csproj run: sed -i 's##true#' demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj - name: Publish linux-x64 AOT @@ -177,7 +177,7 @@ jobs: runs-on: macos-latest steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5 - name: Publish osx-arm64 run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r osx-arm64 -c Release -o publish --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true - name: Upload a Build Artifact @@ -193,7 +193,7 @@ jobs: runs-on: macos-latest steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5 - name: Enable Native AOT in .csproj run: sed -i '' 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj - name: Publish osx-arm64 AOT @@ -211,7 +211,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5 - name: CD Android run: cd demo/Semi.Avalonia.Demo.Android - name: Restore Dependencies 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 be7b942..15dbffc 100644 --- a/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj +++ b/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj @@ -1,6 +1,6 @@  - net8.0-browser + net9.0-browser Exe true enable