diff --git a/.github/workflows/pack-nightly.yml b/.github/workflows/pack-nightly.yml index 1ed121c..2b7ba13 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 Ursa - if: ${{ inputs.Ursa == true }} + if: ${{ inputs.Ursa }} run: dotnet pack src/Ursa -o nugets /p:Version=${{ env.VERSION }} - name: Pack Ursa.Themes.Semi - if: ${{ inputs.Ursa_Themes_Semi == true }} + if: ${{ inputs.Ursa_Themes_Semi }} run: dotnet pack src/Ursa.Themes.Semi -o nugets /p:Version=${{ env.VERSION }} - name: Pack Prism Extension - if: ${{ inputs.PrismExtension == true }} + if: ${{ inputs.PrismExtension }} run: dotnet pack src/Ursa.PrismExtension -o nugets /p:Version=${{ env.VERSION }} - name: Pack ReactiveUI Extension - if: ${{ inputs.ReactiveUIExtension == true }} + if: ${{ inputs.ReactiveUIExtension }} run: dotnet pack src/Ursa.ReactiveUIExtension -o nugets /p:Version=${{ env.VERSION }} - name: Add NuGet Source diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml index 5398be3..2c50c5f 100644 --- a/.github/workflows/pack.yml +++ b/.github/workflows/pack.yml @@ -49,23 +49,23 @@ jobs: uses: actions/checkout@v4.1.1 - name: Pack Ursa - if: ${{ inputs.Ursa == true }} + if: ${{ inputs.Ursa }} run: dotnet pack src/Ursa -o nugets - name: Pack Ursa.Themes.Semi - if: ${{ inputs.Ursa_Themes_Semi == true }} + if: ${{ inputs.Ursa_Themes_Semi }} run: dotnet pack src/Ursa.Themes.Semi -o nugets - name: Pack Prism Extension - if: ${{ inputs.PrismExtension == true }} + if: ${{ inputs.PrismExtension }} run: dotnet pack src/Ursa.PrismExtension -o nugets - name: Pack ReactiveUI Extension - if: ${{ inputs.ReactiveUIExtension == true }} + if: ${{ inputs.ReactiveUIExtension }} run: dotnet pack src/Ursa.ReactiveUIExtension -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 0973bdd..1dde577 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -57,13 +57,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/Ursa.Demo.Desktop -r win-x64 -c Release -o publish --sc -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true + run: dotnet publish demo/Ursa.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: @@ -73,15 +73,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/Ursa.Demo.Desktop/Ursa.Demo.Desktop.csproj - sed -i 's##true#' demo/Ursa.Demo.Desktop/Ursa.Demo.Desktop.csproj + run: sed -i 's##true#' demo/Ursa.Demo.Desktop/Ursa.Demo.Desktop.csproj - name: Publish win-x64 AOT run: dotnet publish demo/Ursa.Demo.Desktop -r win-x64 -c Release -o publish - name: Upload a Build Artifact @@ -93,13 +91,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/Ursa.Demo.Desktop -r linux-x64 -c Release -o publish --sc -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true + run: dotnet publish demo/Ursa.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: @@ -109,15 +107,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/Ursa.Demo.Desktop/Ursa.Demo.Desktop.csproj - sed -i 's##true#' demo/Ursa.Demo.Desktop/Ursa.Demo.Desktop.csproj + run: sed -i 's##true#' demo/Ursa.Demo.Desktop/Ursa.Demo.Desktop.csproj - name: Publish linux-x64 AOT run: dotnet publish demo/Ursa.Demo.Desktop -r linux-x64 -c Release -o publish - name: Upload a Build Artifact @@ -129,13 +125,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/Ursa.Demo.Desktop -r osx-arm64 -c Release -o publish --sc -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true + run: dotnet publish demo/Ursa.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: @@ -145,15 +141,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/Ursa.Demo.Desktop/Ursa.Demo.Desktop.csproj - sed -i '' 's##true#' demo/Ursa.Demo.Desktop/Ursa.Demo.Desktop.csproj + run: sed -i '' 's##true#' demo/Ursa.Demo.Desktop/Ursa.Demo.Desktop.csproj - name: Publish osx-arm64 AOT run: dotnet publish demo/Ursa.Demo.Desktop -r osx-arm64 -c Release -o publish - name: Upload a Build Artifact @@ -165,7 +159,7 @@ jobs: !publish/*.pdb android-arm64: - if: ${{ inputs.android-arm64 == true }} + if: ${{ inputs.android-arm64 }} runs-on: windows-latest steps: - name: Checkout @@ -175,7 +169,7 @@ jobs: - name: Restore Dependencies run: dotnet restore - name: Publish Android - run: dotnet publish demo/Ursa.Demo.Android -c Release -f net8.0-android --no-restore -o publish -p:RuntimeIdentifier=android-arm64 + run: dotnet publish demo/Ursa.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/Ursa.Demo.Desktop/Ursa.Demo.Desktop.csproj b/demo/Ursa.Demo.Desktop/Ursa.Demo.Desktop.csproj index cf622f4..dbb20f1 100644 --- a/demo/Ursa.Demo.Desktop/Ursa.Demo.Desktop.csproj +++ b/demo/Ursa.Demo.Desktop/Ursa.Demo.Desktop.csproj @@ -9,7 +9,6 @@ true -