Skip to content

Commit 30e7420

Browse files
committed
Merge branch 'main' into dev/grendel/blobs-in-lib
* main: Bump external/xamarin-android-tools from `b175674` to `ed102fc` (#8667) Bump external/android-api-docs from `3f64bdd` to `9b7ea12` (#8672) [ci] Only install Android SDK API-34 on test agents. (#8670)
2 parents 8429091 + c6ccc65 commit 30e7420

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ stages:
342342
installLegacyDotNet: false
343343
restoreNUnitConsole: false
344344
updateMono: false
345-
androidSdkPlatforms: 23,24,25,26,27,28,29,30,31,32,$(DefaultTestSdkPlatforms)
345+
androidSdkPlatforms: 23,24,25,26,27,28,29,30,31,32,33,$(DefaultTestSdkPlatforms)
346346

347347
- task: NuGetAuthenticate@0
348348
displayName: authenticate with azure artifacts

build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ stages:
8686
avdAbi: x86
8787
avdType: android-wear
8888
deviceName: wear_square
89-
androidSdkPlatforms: 33
89+
androidSdkPlatforms: 34
9090
pool:
9191
vmImage: $(HostedMacImage)
9292
workspace:

build-tools/automation/yaml-templates/variables.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ variables:
4949
- name: IsRelOrTargetingRel
5050
value: $[or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['System.PullRequest.TargetBranch'], 'release/'))]
5151
- name: DefaultTestSdkPlatforms # Comma-separated SDK Platform(s) to install on test agents (no spaces)
52-
value: 33,34
52+
value: 34
5353
- name: ExcludedNightlyNUnitCategories
5454
value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization'

external/xamarin-android-tools

0 commit comments

Comments
 (0)