diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml index d300f84..30534bb 100644 --- a/.github/workflows/buildrelease.yml +++ b/.github/workflows/buildrelease.yml @@ -118,10 +118,6 @@ jobs: echo "$ANDROID_KEYSTORE_BASE64" | base64 -d > tfmaudio.keystore echo "ANDROID_KEYSTORE_PATH=$(pwd)/tfmaudio.keystore" >> $GITHUB_ENV - - name: '📦 Restore Android dependencies' - run: | - dotnet restore TFMAudioApp/TFMAudioApp.csproj /p:TargetFramework=net9.0-android - - name: '🔨 Build Android APK (Signed)' if: ${{ env.ANDROID_KEYSTORE_PATH != '' }} env: @@ -133,9 +129,9 @@ jobs: VERSION_CODE=${{ steps.version.outputs.version_code }} dotnet publish TFMAudioApp/TFMAudioApp.csproj \ - --no-restore \ -c Release \ -f net9.0-android \ + -p:BuildSingleTarget=android \ -p:ApplicationDisplayVersion=$VERSION \ -p:ApplicationVersion=$VERSION_CODE \ -p:AndroidKeyStore=true \ @@ -152,9 +148,9 @@ jobs: echo "⚠️ Building unsigned APK (no keystore configured)" dotnet publish TFMAudioApp/TFMAudioApp.csproj \ - --no-restore \ -c Release \ -f net9.0-android \ + -p:BuildSingleTarget=android \ -p:ApplicationDisplayVersion=$VERSION \ -p:ApplicationVersion=$VERSION_CODE @@ -214,18 +210,14 @@ jobs: echo "version=$VERSION" >> $GITHUB_OUTPUT echo "tag=$TAG" >> $GITHUB_OUTPUT - - name: '📦 Restore Windows dependencies' - run: | - dotnet restore TFMAudioApp/TFMAudioApp.csproj /p:TargetFramework=net9.0-windows10.0.19041.0 - - name: '🔨 Build Windows App' run: | $VERSION = "${{ steps.version.outputs.version }}" dotnet publish TFMAudioApp/TFMAudioApp.csproj ` - --no-restore ` -c Release ` -f net9.0-windows10.0.19041.0 ` + -p:BuildSingleTarget=windows ` -p:ApplicationDisplayVersion=$VERSION ` -p:WindowsPackageType=None ` -p:PublishSingleFile=false ` @@ -318,19 +310,15 @@ jobs: echo "version=$VERSION" >> $GITHUB_OUTPUT echo "tag=$TAG" >> $GITHUB_OUTPUT - - name: '📦 Restore macOS dependencies' - run: | - dotnet restore TFMAudioApp/TFMAudioApp.csproj /p:TargetFramework=net9.0-maccatalyst - - name: '🔨 Build macOS App (Intel x64)' run: | VERSION=${{ steps.version.outputs.version }} dotnet publish TFMAudioApp/TFMAudioApp.csproj \ - --no-restore \ -c Release \ -f net9.0-maccatalyst \ -r maccatalyst-x64 \ + -p:BuildSingleTarget=maccatalyst \ -p:ApplicationDisplayVersion=$VERSION \ -p:CreatePackage=true \ -o bin/macos-x64 @@ -340,10 +328,10 @@ jobs: VERSION=${{ steps.version.outputs.version }} dotnet publish TFMAudioApp/TFMAudioApp.csproj \ - --no-restore \ -c Release \ -f net9.0-maccatalyst \ -r maccatalyst-arm64 \ + -p:BuildSingleTarget=maccatalyst \ -p:ApplicationDisplayVersion=$VERSION \ -p:CreatePackage=true \ -o bin/macos-arm64 diff --git a/TFMAudioApp/TFMAudioApp.csproj b/TFMAudioApp/TFMAudioApp.csproj index 64cd599..6590c9b 100644 --- a/TFMAudioApp/TFMAudioApp.csproj +++ b/TFMAudioApp/TFMAudioApp.csproj @@ -10,10 +10,15 @@ Workloads needed: - dotnet workload install android - dotnet workload install maui (includes maccatalyst on Mac) + + For CI builds, use -p:BuildSingleTarget=android|windows|maccatalyst --> - net9.0-android;net9.0-windows10.0.19041.0 - net9.0-android;net9.0-maccatalyst - net9.0-android + net9.0-android + net9.0-windows10.0.19041.0 + net9.0-maccatalyst + net9.0-android;net9.0-windows10.0.19041.0 + net9.0-android;net9.0-maccatalyst + net9.0-android Exe TFMAudioApp