From 96446a10159a58dc65d9d7362034ed4681c7f078 Mon Sep 17 00:00:00 2001 From: Zachary Keeping Date: Thu, 10 Oct 2024 09:13:21 +1100 Subject: [PATCH 01/10] Pin to 8.0.402.0 and macos-14 --- .github/workflows/ios-build.yml | 2 +- .github/workflows/ios-deploy.yml | 2 +- global.json | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ios-build.yml b/.github/workflows/ios-build.yml index 8d9c989f0..570714d86 100644 --- a/.github/workflows/ios-build.yml +++ b/.github/workflows/ios-build.yml @@ -12,7 +12,7 @@ on: jobs: build: - runs-on: macos-13 + runs-on: macos-14 environment: ${{ inputs.environment }} name: iOS Build diff --git a/.github/workflows/ios-deploy.yml b/.github/workflows/ios-deploy.yml index 4303d0af7..65ffba4c9 100644 --- a/.github/workflows/ios-deploy.yml +++ b/.github/workflows/ios-deploy.yml @@ -12,7 +12,7 @@ on: jobs: deploy-ios: name: Deploy iOS to TestFlight - runs-on: macos-13 + runs-on: macos-14 environment: ${{ inputs.environment }} steps: - name: Download artifact diff --git a/global.json b/global.json index c19a2e057..7d8e475f2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,8 @@ { "sdk": { - "version": "8.0.100", - "rollForward": "latestMinor" + "version": "8.0.402", + "workloadVersion": "8.0.402.0", + "rollForward": "disable", + "allowPrerelease": false } } From 767ce3c3a30ffb76e2d07313076a125db23c34f8 Mon Sep 17 00:00:00 2001 From: Zachary Keeping Date: Thu, 10 Oct 2024 10:03:45 +1100 Subject: [PATCH 02/10] Update workload version --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 7d8e475f2..f9197665b 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { "version": "8.0.402", - "workloadVersion": "8.0.402.0", + "workloadVersion": "8.0.402", "rollForward": "disable", "allowPrerelease": false } From c54fc6710beef15816807c930ba448b3e2f12c79 Mon Sep 17 00:00:00 2001 From: Zachary Keeping Date: Thu, 10 Oct 2024 10:31:43 +1100 Subject: [PATCH 03/10] update rollForward --- global.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index f9197665b..eda2ddd5c 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,7 @@ { "sdk": { "version": "8.0.402", - "workloadVersion": "8.0.402", - "rollForward": "disable", - "allowPrerelease": false + "workloadVersion": "8.0.402.0", + "rollForward": "latestMinor" } } From 90f7e86b82406a8d65b54d2c68fc98bdd1cbcdfb Mon Sep 17 00:00:00 2001 From: Zachary Keeping Date: Thu, 10 Oct 2024 10:33:58 +1100 Subject: [PATCH 04/10] Try 8.0.403 --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index eda2ddd5c..2591f6d7c 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "8.0.402", - "workloadVersion": "8.0.402.0", + "version": "8.0.403", + "workloadVersion": "8.0.403", "rollForward": "latestMinor" } } From 79f1024833946d1fac6160ec88baf2e6bfa8940c Mon Sep 17 00:00:00 2001 From: Zachary Keeping Date: Thu, 10 Oct 2024 10:43:12 +1100 Subject: [PATCH 05/10] Test iOS build --- .github/workflows/ci.yml | 72 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf9e6416b..05b9d9115 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,6 +32,9 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 + - name: Restore Workload + run: dotnet workload restore + - name: Restore run: dotnet restore ${{ inputs.project_path }} @@ -56,7 +59,7 @@ jobs: path: test-results.trx reporter: dotnet-trx - build_and_test_mobile: + build_and_test_android: name: Build & Test Android runs-on: windows-latest if: ${{ inputs.test_mobile != 'false' && inputs.test_mobile != '' }} @@ -104,3 +107,70 @@ jobs: name: Tests Results path: test-results.trx reporter: dotnet-trx + + build_and_test_ios: + name: Build & Test iOS + runs-on: macos-14 + if: ${{ inputs.test_mobile != 'false' && inputs.test_mobile != '' }} + + steps: + - uses: actions/checkout@v3 + + - name: Update Build Number + run: sed -i '' "s|.*|${{ inputs.build_number }}|g" src/MobileUI/MobileUI.csproj + + - name: Update GoogleService-Info.plist + shell: bash + run: | + echo ${{ vars.GOOGLESERVICE_INFO_PLIST }} | base64 --decode > src/MobileUI/Platforms/iOS/GoogleService-Info.plist + + - name: Setup DotNet Environment + uses: actions/setup-dotnet@v3 + with: + dotnet-version: "8.0.x" + + - name: Install MAUI Workload + run: | + dotnet nuget locals all --clear + dotnet workload install maui --ignore-failed-sources + dotnet workload install ios maui wasm-tools --source https://api.nuget.org/v3/index.json --ignore-failed-sources + + - name: Set XCode Version + if: runner.os == 'macOS' + shell: bash + run: | + sudo xcode-select -s "/Applications/Xcode_15.1.app" + echo "MD_APPLE_SDK_ROOT=/Applications/Xcode_15.1.app" >> $GITHUB_ENV + + - name: Import Code-Signing Certificates + uses: Apple-Actions/import-codesign-certs@v2 + with: + p12-file-base64: ${{ secrets.APPLE_CERT }} + p12-password: ${{ secrets.APPLE_CERT_PASSWORD }} + + - name: Import Provisioning Profile + run: | + echo ${{ secrets.APPLE_PROFILE }} | base64 --decode > SSW_Rewards_iOS_Distribution.mobileprovision + mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles + cp SSW_Rewards_iOS_Distribution.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/ + + - name: Build and sign + run: dotnet build src/MobileUI/MobileUI.csproj -f:net8.0-ios --configuration Release + + - name: Test + run: dotnet test ${{ inputs.project_path }} --no-build --configuration Release --logger "trx;LogFileName=test-results.trx" + + - name: Check file existence + id: check_files + if: success() || failure() + uses: andstor/file-existence-action@v1 + with: + files: "test-results.trx" + + - name: Test Report + uses: dorny/test-reporter@v1 + if: steps.check_files.outputs.files_exists == 'true' + with: + name: Tests Results + path: test-results.trx + reporter: dotnet-trx \ No newline at end of file From 4409b46ba040f8c10c83b4f8bc034c31faa5edff Mon Sep 17 00:00:00 2001 From: Zachary Keeping Date: Thu, 10 Oct 2024 10:49:37 +1100 Subject: [PATCH 06/10] Update xcode version --- .github/workflows/ci.yml | 18 ++++-------------- .github/workflows/ios-build.yml | 4 ++-- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05b9d9115..6a2baf4ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,6 +31,8 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 + with: + dotnet-version: "8.0.x" - name: Restore Workload run: dotnet workload restore @@ -139,20 +141,8 @@ jobs: if: runner.os == 'macOS' shell: bash run: | - sudo xcode-select -s "/Applications/Xcode_15.1.app" - echo "MD_APPLE_SDK_ROOT=/Applications/Xcode_15.1.app" >> $GITHUB_ENV - - - name: Import Code-Signing Certificates - uses: Apple-Actions/import-codesign-certs@v2 - with: - p12-file-base64: ${{ secrets.APPLE_CERT }} - p12-password: ${{ secrets.APPLE_CERT_PASSWORD }} - - - name: Import Provisioning Profile - run: | - echo ${{ secrets.APPLE_PROFILE }} | base64 --decode > SSW_Rewards_iOS_Distribution.mobileprovision - mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles - cp SSW_Rewards_iOS_Distribution.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/ + sudo xcode-select -s "/Applications/Xcode_15.4.app" + echo "MD_APPLE_SDK_ROOT=/Applications/Xcode_15.4.app" >> $GITHUB_ENV - name: Build and sign run: dotnet build src/MobileUI/MobileUI.csproj -f:net8.0-ios --configuration Release diff --git a/.github/workflows/ios-build.yml b/.github/workflows/ios-build.yml index 570714d86..646ef999e 100644 --- a/.github/workflows/ios-build.yml +++ b/.github/workflows/ios-build.yml @@ -42,8 +42,8 @@ jobs: if: runner.os == 'macOS' shell: bash run: | - sudo xcode-select -s "/Applications/Xcode_15.1.app" - echo "MD_APPLE_SDK_ROOT=/Applications/Xcode_15.1.app" >> $GITHUB_ENV + sudo xcode-select -s "/Applications/Xcode_15.4.app" + echo "MD_APPLE_SDK_ROOT=/Applications/Xcode_15.4.app" >> $GITHUB_ENV - name: Import Code-Signing Certificates uses: Apple-Actions/import-codesign-certs@v2 From 6800c05bca8be44d1d6150fdbb00966d92722333 Mon Sep 17 00:00:00 2001 From: Zachary Keeping Date: Thu, 10 Oct 2024 10:57:24 +1100 Subject: [PATCH 07/10] Remove build --- .github/workflows/ci.yml | 63 ++++------------------------------------ 1 file changed, 5 insertions(+), 58 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a2baf4ab..c7fa064f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,8 +34,10 @@ jobs: with: dotnet-version: "8.0.x" - - name: Restore Workload - run: dotnet workload restore + - name: Install Workload + run: | + dotnet nuget locals all --clear + dotnet workload install wasm-tools --source https://api.nuget.org/v3/index.json --ignore-failed-sources - name: Restore run: dotnet restore ${{ inputs.project_path }} @@ -61,7 +63,7 @@ jobs: path: test-results.trx reporter: dotnet-trx - build_and_test_android: + build_and_test_mobile: name: Build & Test Android runs-on: windows-latest if: ${{ inputs.test_mobile != 'false' && inputs.test_mobile != '' }} @@ -109,58 +111,3 @@ jobs: name: Tests Results path: test-results.trx reporter: dotnet-trx - - build_and_test_ios: - name: Build & Test iOS - runs-on: macos-14 - if: ${{ inputs.test_mobile != 'false' && inputs.test_mobile != '' }} - - steps: - - uses: actions/checkout@v3 - - - name: Update Build Number - run: sed -i '' "s|.*|${{ inputs.build_number }}|g" src/MobileUI/MobileUI.csproj - - - name: Update GoogleService-Info.plist - shell: bash - run: | - echo ${{ vars.GOOGLESERVICE_INFO_PLIST }} | base64 --decode > src/MobileUI/Platforms/iOS/GoogleService-Info.plist - - - name: Setup DotNet Environment - uses: actions/setup-dotnet@v3 - with: - dotnet-version: "8.0.x" - - - name: Install MAUI Workload - run: | - dotnet nuget locals all --clear - dotnet workload install maui --ignore-failed-sources - dotnet workload install ios maui wasm-tools --source https://api.nuget.org/v3/index.json --ignore-failed-sources - - - name: Set XCode Version - if: runner.os == 'macOS' - shell: bash - run: | - sudo xcode-select -s "/Applications/Xcode_15.4.app" - echo "MD_APPLE_SDK_ROOT=/Applications/Xcode_15.4.app" >> $GITHUB_ENV - - - name: Build and sign - run: dotnet build src/MobileUI/MobileUI.csproj -f:net8.0-ios --configuration Release - - - name: Test - run: dotnet test ${{ inputs.project_path }} --no-build --configuration Release --logger "trx;LogFileName=test-results.trx" - - - name: Check file existence - id: check_files - if: success() || failure() - uses: andstor/file-existence-action@v1 - with: - files: "test-results.trx" - - - name: Test Report - uses: dorny/test-reporter@v1 - if: steps.check_files.outputs.files_exists == 'true' - with: - name: Tests Results - path: test-results.trx - reporter: dotnet-trx \ No newline at end of file From e4a0017f0dabb31d049853deb910bd409c36146b Mon Sep 17 00:00:00 2001 From: Zachary Keeping Date: Thu, 10 Oct 2024 11:11:47 +1100 Subject: [PATCH 08/10] Update sdk version --- .github/workflows/admin-build.yml | 5 +++++ .github/workflows/api-build.yml | 5 +++++ global.json | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/admin-build.yml b/.github/workflows/admin-build.yml index 0d1b09ebd..a428b2c7c 100644 --- a/.github/workflows/admin-build.yml +++ b/.github/workflows/admin-build.yml @@ -12,6 +12,11 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 + + - name: Install Workload + run: | + dotnet nuget locals all --clear + dotnet workload install wasm-tools --source https://api.nuget.org/v3/index.json --ignore-failed-sources - name: Restore shell: bash diff --git a/.github/workflows/api-build.yml b/.github/workflows/api-build.yml index cc4761f36..76b6af0ec 100644 --- a/.github/workflows/api-build.yml +++ b/.github/workflows/api-build.yml @@ -13,6 +13,11 @@ jobs: uses: actions/setup-dotnet@v2 with: dotnet-version: '8.0.x' + + - name: Install Workload + run: | + dotnet nuget locals all --clear + dotnet workload install wasm-tools --source https://api.nuget.org/v3/index.json --ignore-failed-sources - name: Install dependencies run: dotnet restore $PROJECT diff --git a/global.json b/global.json index 2591f6d7c..eda2ddd5c 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "8.0.403", - "workloadVersion": "8.0.403", + "version": "8.0.402", + "workloadVersion": "8.0.402.0", "rollForward": "latestMinor" } } From 9b224a16547f652dbd52397bf5c64d01e7accd07 Mon Sep 17 00:00:00 2001 From: Zachary Keeping Date: Thu, 10 Oct 2024 11:23:02 +1100 Subject: [PATCH 09/10] Move to actions/setup-dotnet@v4 with global.json --- .github/workflows/admin-build.yml | 4 +++- .github/workflows/android-build.yml | 4 ++-- .github/workflows/api-build.yml | 4 ++-- .github/workflows/ci.yml | 8 ++++---- .github/workflows/ios-build.yml | 4 ++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/admin-build.yml b/.github/workflows/admin-build.yml index a428b2c7c..da1d6b009 100644 --- a/.github/workflows/admin-build.yml +++ b/.github/workflows/admin-build.yml @@ -11,7 +11,9 @@ jobs: - uses: actions/checkout@v2 - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 + with: + global-json-file: global.json - name: Install Workload run: | diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index f2f5a3a32..9d519de0e 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -38,9 +38,9 @@ jobs: echo ${{ vars.GOOGLE_SERVICES_JSON }} | base64 --decode > src/MobileUI/Platforms/Android/google-services.json - name: Setup DotNet Environment - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: - dotnet-version: "8.0.x" + global-json-file: global.json - name: Install MAUI Workload run: | diff --git a/.github/workflows/api-build.yml b/.github/workflows/api-build.yml index 76b6af0ec..47d26a9ca 100644 --- a/.github/workflows/api-build.yml +++ b/.github/workflows/api-build.yml @@ -10,9 +10,9 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup .NET Core SDK - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + global-json-file: global.json - name: Install Workload run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7fa064f8..56867080c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,9 +30,9 @@ jobs: - uses: actions/checkout@v2 - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: - dotnet-version: "8.0.x" + global-json-file: global.json - name: Install Workload run: | @@ -72,9 +72,9 @@ jobs: - uses: actions/checkout@v3 - name: Setup DotNet Environment - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: - dotnet-version: "8.0.x" + global-json-file: global.json - name: Install MAUI Workload run: | diff --git a/.github/workflows/ios-build.yml b/.github/workflows/ios-build.yml index 646ef999e..4b036758a 100644 --- a/.github/workflows/ios-build.yml +++ b/.github/workflows/ios-build.yml @@ -28,9 +28,9 @@ jobs: echo ${{ vars.GOOGLESERVICE_INFO_PLIST }} | base64 --decode > src/MobileUI/Platforms/iOS/GoogleService-Info.plist - name: Setup DotNet Environment - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: - dotnet-version: "8.0.x" + global-json-file: global.json - name: Install MAUI Workload run: | From c472dc070292fffc1649fda8ec5d24c004770147 Mon Sep 17 00:00:00 2001 From: Zachary Keeping Date: Thu, 10 Oct 2024 11:32:04 +1100 Subject: [PATCH 10/10] Update workload ver --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index eda2ddd5c..c16a0a2c1 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { "version": "8.0.402", - "workloadVersion": "8.0.402.0", - "rollForward": "latestMinor" + "workloadVersion": "8.0.402", + "rollForward": "disable" } }