Skip to content

Commit 4cc7b4a

Browse files
StuartFergusonStuartFerguson
committed
:|
1 parent 6b9578d commit 4cc7b4a

7 files changed

Lines changed: 33 additions & 33 deletions

‎.github/workflows/android_e2e_tests.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up .NET
1616
uses: actions/setup-dotnet@v1
1717
with:
18-
dotnet-version: '8.0.x'
18+
dotnet-version: '9.0.x'
1919

2020
- name: Set up JDK
2121
uses: actions/setup-java@v3
@@ -48,7 +48,7 @@ jobs:
4848
# Accept licenses and install required components
4949
yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
5050
# Install Android API level 34 and necessary system images
51-
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-34" "system-images;android-34;google_apis;x86_64"
51+
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-35" "system-images;android-35;google_apis;x86_64"
5252
5353
# Export paths for future steps
5454
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
@@ -59,11 +59,11 @@ jobs:
5959
uses: actions/cache@v3
6060
with:
6161
path: ~/.android/avd
62-
key: android-emulator-x86-${{ runner.os }}-android-34
62+
key: android-emulator-x86-${{ runner.os }}-android-35
6363

6464
- name: Create Android Emulator (x86)
6565
run: |
66-
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-34;google_apis;x86_64" --device "pixel_4"
66+
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-35;google_apis;x86_64" --device "pixel_4"
6767
6868
- name: List AVDs
6969
run: avdmanager list avd
@@ -124,7 +124,7 @@ jobs:
124124
- name: Install Android Build Tools
125125
run: |
126126
echo "Installing Android Build Tools..."
127-
sdkmanager "build-tools;34.0.0" # Updated to use Android 34 build tools
127+
sdkmanager "build-tools;35.0.0" # Updated to use Android 34 build tools
128128
sdkmanager --update
129129
130130
- name: Install MAUI workloads
@@ -157,7 +157,7 @@ jobs:
157157
run: dotnet restore TransactionMobile.Maui.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json
158158

159159
- name: Build Code
160-
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -f net8.0-android -c Release --no-restore
160+
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -f net9.0-android -c Release --no-restore
161161

162162
- name: Run Android Navigation Tests
163163
run: dotnet test TransactionMobile.Maui.UiTests/TransactionMobile.Maui.UiTests.csproj --filter "(Category=PRTest)&(Category=Android)" --no-restore

‎.github/workflows/android_navigation_tests.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up .NET
1616
uses: actions/setup-dotnet@v1
1717
with:
18-
dotnet-version: '8.0.x'
18+
dotnet-version: '9.0.x'
1919

2020
- name: Set up JDK
2121
uses: actions/setup-java@v3
@@ -48,7 +48,7 @@ jobs:
4848
# Accept licenses and install required components
4949
yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
5050
# Install Android API level 34 and necessary system images
51-
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-34" "system-images;android-34;google_apis;x86_64"
51+
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-35" "system-images;android-35;google_apis;x86_64"
5252
5353
# Export paths for future steps
5454
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
@@ -63,7 +63,7 @@ jobs:
6363

6464
- name: Create Android Emulator (x86)
6565
run: |
66-
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-34;google_apis;x86_64" --device "pixel_4"
66+
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-35;google_apis;x86_64" --device "pixel_4"
6767
6868
- name: List AVDs
6969
run: avdmanager list avd
@@ -124,7 +124,7 @@ jobs:
124124
- name: Install Android Build Tools
125125
run: |
126126
echo "Installing Android Build Tools..."
127-
sdkmanager "build-tools;34.0.0" # Updated to use Android 34 build tools
127+
sdkmanager "build-tools;35.0.0" # Updated to use Android 34 build tools
128128
sdkmanager --update
129129
130130
- name: Install MAUI workloads
@@ -144,7 +144,7 @@ jobs:
144144
run: dotnet restore TransactionMobile.Maui.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json
145145

146146
- name: Build Code
147-
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -f net8.0-android -c Release --no-restore
147+
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -f net9.0-android -c Release --no-restore
148148

149149
- name: Run Android Navigation Tests
150150
run: dotnet test TransactionMobile.Maui.UiTests/TransactionMobile.Maui.UiTests.csproj --filter "(Category=PRNavTest)&(Category=Android)" --no-restore
@@ -165,7 +165,7 @@ jobs:
165165
- name: Set up .NET
166166
uses: actions/setup-dotnet@v1
167167
with:
168-
dotnet-version: '8.0.x'
168+
dotnet-version: '9.0.x'
169169

170170
- name: Set up JDK
171171
uses: actions/setup-java@v3
@@ -198,7 +198,7 @@ jobs:
198198
# Accept licenses and install required components
199199
yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
200200
# Install Android API level 34 and necessary system images
201-
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-34" "system-images;android-34;google_apis;x86_64"
201+
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-35" "system-images;android-35;google_apis;x86_64"
202202
203203
# Export paths for future steps
204204
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
@@ -209,11 +209,11 @@ jobs:
209209
uses: actions/cache@v3
210210
with:
211211
path: ~/.android/avd
212-
key: android-emulator-x86-${{ runner.os }}-android-34
212+
key: android-emulator-x86-${{ runner.os }}-android-35
213213

214214
- name: Create Android Emulator (x86)
215215
run: |
216-
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-34;google_apis;x86_64" --device "pixel_4"
216+
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-35;google_apis;x86_64" --device "pixel_4"
217217
218218
- name: List AVDs
219219
run: avdmanager list avd
@@ -274,7 +274,7 @@ jobs:
274274
- name: Install Android Build Tools
275275
run: |
276276
echo "Installing Android Build Tools..."
277-
sdkmanager "build-tools;34.0.0" # Updated to use Android 34 build tools
277+
sdkmanager "build-tools;35.0.0" # Updated to use Android 34 build tools
278278
sdkmanager --update
279279
280280
- name: Install MAUI workloads
@@ -294,7 +294,7 @@ jobs:
294294
run: dotnet restore TransactionMobile.Maui.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json
295295

296296
- name: Build Code
297-
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -f net8.0-android -c Release --no-restore
297+
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -f net9.0-android -c Release --no-restore
298298

299299
- name: Run Android Navigation Tests
300300
run: dotnet test TransactionMobile.Maui.UiTests/TransactionMobile.Maui.UiTests.csproj --filter "(Category=PRHWNavTest)&(Category=Android)" --no-restore

‎.github/workflows/ios_e2e_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: 🔧 Set up .NET
2626
uses: actions/setup-dotnet@v4
2727
with:
28-
dotnet-version: '8.0.x'
28+
dotnet-version: '9.0.x'
2929

3030
- name: 📦 Install Appium + XCUITest driver
3131
run: |
@@ -61,7 +61,7 @@ jobs:
6161
run: dotnet restore TransactionMobile.Maui.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json
6262

6363
- name: Build Code
64-
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -f net8.0-ios -c Release --no-restore
64+
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -f net9.0-ios -c Release --no-restore
6565

6666
- name: Run iOS Navigation Tests
6767
run: dotnet test TransactionMobile.Maui.UiTests/TransactionMobile.Maui.UiTests.csproj --filter "(Category=iOSPRTest)&(Category=iOS)" --no-restore

‎.github/workflows/ios_navigation_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: 🔧 Set up .NET
2626
uses: actions/setup-dotnet@v4
2727
with:
28-
dotnet-version: '8.0.x'
28+
dotnet-version: '9.0.x'
2929

3030
- name: 📦 Install Appium + XCUITest driver
3131
run: |
@@ -61,7 +61,7 @@ jobs:
6161
run: dotnet restore TransactionMobile.Maui.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json
6262

6363
- name: Build Code
64-
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -f net8.0-ios -c Release --no-restore
64+
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -f net9.0-ios -c Release --no-restore
6565

6666
- name: Run iOS Navigation Tests
6767
run: dotnet test TransactionMobile.Maui.UiTests/TransactionMobile.Maui.UiTests.csproj --filter "(Category=PRNavTest)&(Category=iOS)" --no-restore

‎.github/workflows/unit_tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up .NET
1616
uses: actions/setup-dotnet@v1
1717
with:
18-
dotnet-version: '8.0.x'
18+
dotnet-version: '9.0.x'
1919

2020
- name: Install KVM and Android SDK (x86)
2121
run: |
@@ -36,7 +36,7 @@ jobs:
3636
# Accept licenses and install required components
3737
yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
3838
# Install Android API level 34 and necessary system images
39-
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-34" "system-images;android-34;google_apis;x86_64"
39+
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-35" "system-images;android-35;google_apis;x86_64"
4040
4141
# Export paths for future steps
4242
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
@@ -46,15 +46,15 @@ jobs:
4646
- name: Install Android Build Tools
4747
run: |
4848
echo "Installing Android Build Tools..."
49-
sdkmanager "build-tools;34.0.0" # Updated to use Android 34 build tools
49+
sdkmanager "build-tools;35.0.0" # Updated to use Android 34 build tools
5050
sdkmanager --update
5151
5252
- name: Install MAUI workloads
5353
run: |
5454
dotnet workload install maui-android
5555
5656
- name: Build Code
57-
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json -f net8.0-android -c Release #--no-restore
57+
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json -f net9.0-android -c Release #--no-restore
5858

5959
- name: Run unit tests
6060
run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj --configuration Release

‎.github/workflows/windows_e2e_tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up .NET
2626
uses: actions/setup-dotnet@v1
2727
with:
28-
dotnet-version: '8.0.x'
28+
dotnet-version: '9.0.x'
2929

3030
- name: Install MAUI workloads
3131
run: |
@@ -44,7 +44,7 @@ jobs:
4444
run: dotnet restore TransactionMobile.Maui.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json
4545

4646
- name: Build Code
47-
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -f net8.0-android -c Release --no-restore
47+
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -f net9.0-android -c Release --no-restore
4848

4949
- name: Decrypt PFX File
5050
run: |
@@ -56,13 +56,13 @@ jobs:
5656

5757
- name: Publish App
5858
run: |
59-
dotnet publish TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net8.0-windows10.0.19041.0 /p:AppxPackageSigningEnabled=true /p:PackageCertificateThumbprint="${{ secrets.WINDOWSSIGNINGCERTTHUMBPRINT }}"
59+
dotnet publish TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net9.0-windows10.0.19041.0 /p:AppxPackageSigningEnabled=true /p:PackageCertificateThumbprint="${{ secrets.WINDOWSSIGNINGCERTTHUMBPRINT }}"
6060
6161
- name: Install App
6262
shell: powershell
6363
run: |
6464
Import-Module Appx
65-
.\TransactionMobile.Maui/bin/Release/net8.0-windows10.0.19041.0/win10-x64/AppPackages/TransactionMobile.Maui_1.0.0.0_Test/Install.ps1 -Force
65+
.\TransactionMobile.Maui/bin/Release/net9.0-windows10.0.19041.0/win10-x64/AppPackages/TransactionMobile.Maui_1.0.0.0_Test/Install.ps1 -Force
6666
6767
- name: Run Windows End To End Tests
6868
env:

‎.github/workflows/windows_navigation_tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up .NET
2121
uses: actions/setup-dotnet@v1
2222
with:
23-
dotnet-version: '8.0.x'
23+
dotnet-version: '9.0.x'
2424

2525
- name: Install MAUI workloads
2626
run: |
@@ -39,7 +39,7 @@ jobs:
3939
run: dotnet restore TransactionMobile.Maui.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json
4040

4141
- name: Build Code
42-
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -f net8.0-android -c Release --no-restore
42+
run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -f net9.0-android -c Release --no-restore
4343

4444
- name: Decrypt PFX File
4545
run: |
@@ -51,13 +51,13 @@ jobs:
5151

5252
- name: Publish App
5353
run: |
54-
dotnet publish TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net8.0-windows10.0.19041.0 /p:AppxPackageSigningEnabled=true /p:PackageCertificateThumbprint="${{ secrets.WINDOWSSIGNINGCERTTHUMBPRINT }}"
54+
dotnet publish TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net9.0-windows10.0.19041.0 /p:AppxPackageSigningEnabled=true /p:PackageCertificateThumbprint="${{ secrets.WINDOWSSIGNINGCERTTHUMBPRINT }}"
5555
5656
- name: Install App
5757
shell: powershell
5858
run: |
5959
Import-Module Appx
60-
.\TransactionMobile.Maui/bin/Release/net8.0-windows10.0.19041.0/win10-x64/AppPackages/TransactionMobile.Maui_1.0.0.0_Test/Install.ps1 -Force
60+
.\TransactionMobile.Maui/bin/Release/net9.0-windows10.0.19041.0/win10-x64/AppPackages/TransactionMobile.Maui_1.0.0.0_Test/Install.ps1 -Force
6161
6262
- name: Run Windows Navigation Tests
6363
run: dotnet test TransactionMobile.Maui.UiTests/TransactionMobile.Maui.UiTests.csproj --filter "(Category=PRNavTest)&(Category=Windows)" --no-restore

0 commit comments

Comments
 (0)