Skip to content

Commit 2cc7a4c

Browse files
Merge pull request #422 from TransactionProcessing/task/#420_remove_mac_and_ios
remove IOS support
2 parents b1dfe52 + 7f89003 commit 2cc7a4c

68 files changed

Lines changed: 535 additions & 2806 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/android_e2e_tests.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ jobs:
1212
- name: Checkout repository
1313
uses: actions/checkout@v2
1414

15-
- name: Set up .NET
16-
uses: actions/setup-dotnet@v1
17-
with:
18-
dotnet-version: '9.0.x'
19-
2015
- name: Set up JDK
2116
uses: actions/setup-java@v3
2217
with:
@@ -48,7 +43,7 @@ jobs:
4843
# Accept licenses and install required components
4944
yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
5045
# Install Android API level 35 and necessary system images
51-
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-35" "system-images;android-35;google_apis;x86_64"
46+
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-36" "system-images;android-36;google_apis;x86_64"
5247
5348
# Export paths for future steps
5449
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
@@ -59,11 +54,11 @@ jobs:
5954
uses: actions/cache@v3
6055
with:
6156
path: ~/.android/avd
62-
key: android-emulator-x86-${{ runner.os }}-android-35
57+
key: android-emulator-x86-${{ runner.os }}-android-36
6358

6459
- name: Create Android Emulator (x86)
6560
run: |
66-
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-35;google_apis;x86_64" --device "pixel_4"
61+
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-36;google_apis;x86_64" --device "pixel_4"
6762
6863
- name: List AVDs
6964
run: avdmanager list avd
@@ -124,7 +119,7 @@ jobs:
124119
- name: Install Android Build Tools
125120
run: |
126121
echo "Installing Android Build Tools..."
127-
sdkmanager "build-tools;35.0.0" # Updated to use Android 34 build tools
122+
sdkmanager "build-tools;36.0.0" # Updated to use Android 34 build tools
128123
sdkmanager --update
129124
130125
- name: Install MAUI workloads
@@ -157,7 +152,7 @@ jobs:
157152
run: dotnet restore TransactionProcessor.Mobile.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json
158153

159154
- name: Build Code
160-
run: dotnet build TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj -f net9.0-android -c Release --no-restore
155+
run: dotnet build TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj -f net10.0-android -c Release --no-restore
161156

162157
- name: Run Android Navigation Tests
163158
run: dotnet test TransactionProcessor.Mobile.UITests/TransactionProcessor.Mobile.UITests.csproj --filter "(Category=PRTest)&(Category=Android)" --no-restore

.github/workflows/android_navigation_tests.yml

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ jobs:
1212
- name: Checkout repository
1313
uses: actions/checkout@v2
1414

15-
- name: Set up .NET
16-
uses: actions/setup-dotnet@v1
17-
with:
18-
dotnet-version: '9.0.x'
19-
2015
- name: Set up JDK
2116
uses: actions/setup-java@v3
2217
with:
@@ -48,7 +43,7 @@ jobs:
4843
# Accept licenses and install required components
4944
yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
5045
# Install Android API level 35 and necessary system images
51-
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-35" "system-images;android-35;google_apis;x86_64"
46+
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-36" "system-images;android-36;google_apis;x86_64"
5247
5348
# Export paths for future steps
5449
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
@@ -59,11 +54,11 @@ jobs:
5954
uses: actions/cache@v3
6055
with:
6156
path: ~/.android/avd
62-
key: android-emulator-x86-${{ runner.os }}-android-35
57+
key: android-emulator-x86-${{ runner.os }}-android-36
6358

6459
- name: Create Android Emulator (x86)
6560
run: |
66-
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-35;google_apis;x86_64" --device "pixel_4"
61+
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-36;google_apis;x86_64" --device "pixel_4"
6762
6863
- name: List AVDs
6964
run: avdmanager list avd
@@ -124,7 +119,7 @@ jobs:
124119
- name: Install Android Build Tools
125120
run: |
126121
echo "Installing Android Build Tools..."
127-
sdkmanager "build-tools;35.0.0" # Updated to use Android 35 build tools
122+
sdkmanager "build-tools;36.0.0" # Updated to use Android 35 build tools
128123
sdkmanager --update
129124
130125
- name: Install MAUI workloads
@@ -144,7 +139,7 @@ jobs:
144139
run: dotnet restore TransactionProcessor.Mobile.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json
145140

146141
- name: Build Code
147-
run: dotnet build TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj -f net9.0-android -c Release --no-restore
142+
run: dotnet build TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj -f net10.0-android -c Release --no-restore
148143

149144
- name: Run Android Navigation Tests
150145
run: dotnet test TransactionProcessor.Mobile.UITests/TransactionProcessor.Mobile.UITests.csproj --filter "(Category=PRNavTest)&(Category=Android)" --no-restore
@@ -162,11 +157,6 @@ jobs:
162157
- name: Checkout repository
163158
uses: actions/checkout@v2
164159

165-
- name: Set up .NET
166-
uses: actions/setup-dotnet@v1
167-
with:
168-
dotnet-version: '9.0.x'
169-
170160
- name: Set up JDK
171161
uses: actions/setup-java@v3
172162
with:
@@ -198,7 +188,7 @@ jobs:
198188
# Accept licenses and install required components
199189
yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
200190
# Install Android API level 35 and necessary system images
201-
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-35" "system-images;android-35;google_apis;x86_64"
191+
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-36" "system-images;android-36;google_apis;x86_64"
202192
203193
# Export paths for future steps
204194
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
@@ -209,11 +199,11 @@ jobs:
209199
uses: actions/cache@v3
210200
with:
211201
path: ~/.android/avd
212-
key: android-emulator-x86-${{ runner.os }}-android-35
202+
key: android-emulator-x86-${{ runner.os }}-android-36
213203

214204
- name: Create Android Emulator (x86)
215205
run: |
216-
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-35;google_apis;x86_64" --device "pixel_4"
206+
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-36;google_apis;x86_64" --device "pixel_4"
217207
218208
- name: List AVDs
219209
run: avdmanager list avd
@@ -274,7 +264,7 @@ jobs:
274264
- name: Install Android Build Tools
275265
run: |
276266
echo "Installing Android Build Tools..."
277-
sdkmanager "build-tools;35.0.0" # Updated to use Android 35 build tools
267+
sdkmanager "build-tools;36.0.0" # Updated to use Android 35 build tools
278268
sdkmanager --update
279269
280270
- name: Install MAUI workloads
@@ -294,7 +284,7 @@ jobs:
294284
run: dotnet restore TransactionProcessor.Mobile.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json
295285

296286
- name: Build Code
297-
run: dotnet build TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj -f net9.0-android -c Release --no-restore
287+
run: dotnet build TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj -f net10.0-android -c Release --no-restore
298288

299289
- name: Run Android Navigation Tests
300290
run: dotnet test TransactionProcessor.Mobile.UITests/TransactionProcessor.Mobile.UITests.csproj --filter "(Category=PRHWNavTest)&(Category=Android)" --no-restore

.github/workflows/ios_e2e_tests - selfhosted.yml

Lines changed: 0 additions & 207 deletions
This file was deleted.

0 commit comments

Comments
 (0)