Skip to content

Commit

Permalink
Merge branch 'main' into dev/grendel/cpp-tweaks
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
grendello committed Jan 25, 2024
2 parents 06329f8 + c6ccc65 commit 0939db2
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build-tools/automation/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ stages:
installLegacyDotNet: false
restoreNUnitConsole: false
updateMono: false
androidSdkPlatforms: 23,24,25,26,27,28,29,30,31,32,$(DefaultTestSdkPlatforms)
androidSdkPlatforms: 23,24,25,26,27,28,29,30,31,32,33,$(DefaultTestSdkPlatforms)

- task: NuGetAuthenticate@0
displayName: authenticate with azure artifacts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ stages:
avdAbi: x86
avdType: android-wear
deviceName: wear_square
androidSdkPlatforms: 33
androidSdkPlatforms: 34
pool:
vmImage: $(HostedMacImage)
workspace:
Expand Down
2 changes: 1 addition & 1 deletion build-tools/automation/yaml-templates/variables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ variables:
- name: IsRelOrTargetingRel
value: $[or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['System.PullRequest.TargetBranch'], 'release/'))]
- name: DefaultTestSdkPlatforms # Comma-separated SDK Platform(s) to install on test agents (no spaces)
value: 33,34
value: 34
- name: ExcludedNightlyNUnitCategories
value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization'
2 changes: 1 addition & 1 deletion external/xamarin-android-tools

0 comments on commit 0939db2

Please sign in to comment.