diff --git a/.github/workflows/pack-nightly.yml b/.github/workflows/pack-nightly.yml index d891e7a..6c465e7 100644 --- a/.github/workflows/pack-nightly.yml +++ b/.github/workflows/pack-nightly.yml @@ -40,19 +40,19 @@ jobs: echo "VERSION=$VERSION" >> $GITHUB_ENV - name: Pack Semi.Avalonia - if: ${{ inputs.Semi_Avalonia == true }} + if: ${{ inputs.Semi_Avalonia }} run: dotnet pack src/Semi.Avalonia -o nugets /p:Version=${{ env.VERSION }} - name: Pack Semi.Avalonia.ColorPicker - if: ${{ inputs.Semi_Avalonia_ColorPicker == true }} + if: ${{ inputs.Semi_Avalonia_ColorPicker }} run: dotnet pack src/Semi.Avalonia.ColorPicker -o nugets /p:Version=${{ env.VERSION }} - name: Pack Semi.Avalonia.DataGrid - if: ${{ inputs.Semi_Avalonia_DataGrid == true }} + if: ${{ inputs.Semi_Avalonia_DataGrid }} run: dotnet pack src/Semi.Avalonia.DataGrid -o nugets /p:Version=${{ env.VERSION }} - name: Pack Semi.Avalonia.TreeDataGrid - if: ${{ inputs.Semi_Avalonia_TreeDataGrid == true }} + if: ${{ inputs.Semi_Avalonia_TreeDataGrid }} run: dotnet pack src/Semi.Avalonia.TreeDataGrid -o nugets /p:Version=${{ env.VERSION }} - name: Add NuGet Source diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml index 6f75a78..876f8b8 100644 --- a/.github/workflows/pack.yml +++ b/.github/workflows/pack.yml @@ -50,23 +50,23 @@ jobs: uses: actions/checkout@v4.2.2 - name: Pack Semi.Avalonia - if: ${{ inputs.Semi_Avalonia == true }} + if: ${{ inputs.Semi_Avalonia }} run: dotnet pack src/Semi.Avalonia -o nugets - name: Pack Semi.Avalonia.ColorPicker - if: ${{ inputs.Semi_Avalonia_ColorPicker == true }} + if: ${{ inputs.Semi_Avalonia_ColorPicker }} run: dotnet pack src/Semi.Avalonia.ColorPicker -o nugets - name: Pack Semi.Avalonia.DataGrid - if: ${{ inputs.Semi_Avalonia_DataGrid == true }} + if: ${{ inputs.Semi_Avalonia_DataGrid }} run: dotnet pack src/Semi.Avalonia.DataGrid -o nugets - name: Pack Semi.Avalonia.TreeDataGrid - if: ${{ inputs.Semi_Avalonia_TreeDataGrid == true }} + if: ${{ inputs.Semi_Avalonia_TreeDataGrid }} run: dotnet pack src/Semi.Avalonia.TreeDataGrid -o nugets - name: Upload to NuGet - if: ${{ inputs.Upload_to_NuGet == true }} + if: ${{ inputs.Upload_to_NuGet }} run: dotnet nuget push "nugets/*.nupkg" --api-key ${{ secrets.NUGET_ORG_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate - name: Upload a Build Artifact diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 30c8afd..f2b1bfa 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -71,13 +71,13 @@ on: jobs: win-x64: - if: ${{inputs.win-x64 == true}} + if: ${{inputs.win-x64}} runs-on: windows-latest steps: - name: Checkout uses: actions/checkout@v4.2.2 - 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 + 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 uses: actions/upload-artifact@v4.6.2 with: @@ -87,15 +87,13 @@ jobs: !publish/*.pdb win-x64-aot: - if: ${{inputs.win-x64-aot == true}} + if: ${{inputs.win-x64-aot}} runs-on: windows-latest steps: - name: Checkout uses: actions/checkout@v4.2.2 - name: Enable Native AOT in .csproj - run: | - sed -i 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj - sed -i 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj + run: sed -i 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj - name: Publish win-x64 AOT run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish - name: Upload a Build Artifact @@ -107,13 +105,13 @@ jobs: !publish/*.pdb linux-x64: - if: ${{inputs.linux-x64 == true}} + if: ${{inputs.linux-x64}} runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4.2.2 - 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 + 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 uses: actions/upload-artifact@v4.6.2 with: @@ -123,15 +121,13 @@ jobs: !publish/*.pdb linux-x64-aot: - if: ${{inputs.linux-x64-aot == true}} + if: ${{inputs.linux-x64-aot}} runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4.2.2 - name: Enable Native AOT in .csproj - run: | - sed -i 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj - sed -i 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj + run: sed -i 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj - name: Publish linux-x64 AOT run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release -o publish - name: Upload a Build Artifact @@ -143,13 +139,13 @@ jobs: !publish/*.pdb drm-linux-x64: - if: ${{inputs.drm-linux-x64 == true}} + if: ${{inputs.drm-linux-x64}} runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4.2.2 - 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 + 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 uses: actions/upload-artifact@v4.6.2 with: @@ -159,15 +155,13 @@ jobs: !publish/*.pdb drm-linux-x64-aot: - if: ${{inputs.drm-linux-x64-aot == true}} + if: ${{inputs.drm-linux-x64-aot}} runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4.2.2 - name: Enable Native AOT in .csproj - run: | - sed -i 's##true#' demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj - sed -i 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj + run: sed -i 's##true#' demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj - name: Publish linux-x64 AOT run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release -o publish - name: Upload a Build Artifact @@ -179,13 +173,13 @@ jobs: !publish/*.pdb osx-arm64: - if: ${{inputs.osx-arm64 == true}} + if: ${{inputs.osx-arm64}} runs-on: macos-latest steps: - name: Checkout uses: actions/checkout@v4.2.2 - 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 + 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 uses: actions/upload-artifact@v4.6.2 with: @@ -195,15 +189,13 @@ jobs: !publish/*.pdb osx-arm64-aot: - if: ${{inputs.osx-arm64-aot == true}} + if: ${{inputs.osx-arm64-aot}} runs-on: macos-latest steps: - name: Checkout uses: actions/checkout@v4.2.2 - name: Enable Native AOT in .csproj - run: | - sed -i '' 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj - sed -i '' 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj + run: sed -i '' 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj - name: Publish osx-arm64 AOT run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r osx-arm64 -c Release -o publish - name: Upload a Build Artifact @@ -215,7 +207,7 @@ jobs: !publish/*.pdb android-arm64: - if: ${{inputs.android-arm64 == true}} + if: ${{inputs.android-arm64 }} runs-on: windows-latest steps: - name: Checkout @@ -225,7 +217,7 @@ jobs: - name: Restore Dependencies run: dotnet restore - name: Publish Android - run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o publish -p:RuntimeIdentifier=android-arm64 + run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o publish /p:RuntimeIdentifier=android-arm64 - name: Upload a Build Artifact uses: actions/upload-artifact@v4.6.2 with: diff --git a/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj b/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj index 0024d30..a579f53 100644 --- a/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj +++ b/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj @@ -6,7 +6,6 @@ true - diff --git a/demo/Semi.Avalonia.Demo.Drm/README.md b/demo/Semi.Avalonia.Demo.Drm/README.md index 0990a36..5a1aca3 100644 --- a/demo/Semi.Avalonia.Demo.Drm/README.md +++ b/demo/Semi.Avalonia.Demo.Drm/README.md @@ -63,7 +63,7 @@ private static void SilenceConsole() 6. Publish the app to Linux ```bash -dotnet publish demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj -c Release -r linux-x64 --sc -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true +dotnet publish demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj -c Release -r linux-x64 --sc /p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true ``` Add the following code to the csproj file for AOT publishing diff --git a/demo/Semi.Avalonia.Demo.Drm/README_CN.md b/demo/Semi.Avalonia.Demo.Drm/README_CN.md index 740d8a1..ba89e3a 100644 --- a/demo/Semi.Avalonia.Demo.Drm/README_CN.md +++ b/demo/Semi.Avalonia.Demo.Drm/README_CN.md @@ -63,7 +63,7 @@ private static void SilenceConsole() 6. 发布程序到Linux ```bash -dotnet publish demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj -c Release -r linux-x64 --sc -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true +dotnet publish demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj -c Release -r linux-x64 --sc /p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true ``` AOT发布需要在csproj文件中添加以下代码 diff --git a/demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj b/demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj index c9d6d52..7006d63 100644 --- a/demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj +++ b/demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj @@ -6,7 +6,6 @@ true -