From e4abe6301e72888e6bb6c205ed485298ee85d84a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Thu, 14 Nov 2024 09:47:49 -0500
Subject: [PATCH] chore: Adjust tooling install

---
 build/templates/package-validation.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/templates/package-validation.yml b/build/templates/package-validation.yml
index 2a560dad..77a09d31 100644
--- a/build/templates/package-validation.yml
+++ b/build/templates/package-validation.yml
@@ -27,6 +27,15 @@ steps:
   env:
     TargetDotNetVersion: $(ValidationDotNetVersion)
 
+# Install android 34 as we're running on macos-15, early so we use the tooling from the agent
+- bash: |
+    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'tools' | tr '\r' '\n' | uniq
+    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'platform-tools' | tr '\r' '\n' | uniq
+    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'build-tools;35.0.0' | tr '\r' '\n' | uniq
+    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'platforms;android-34' | tr '\r' '\n' | uniq
+  displayName: Install Android 34
+  condition: eq(variables['Agent.OS'], 'Darwin')
+
 - template: dotnet-install-windows.yml
   parameters:
     DotNetVersion: $(DotNetVersion)
@@ -55,15 +64,6 @@ steps:
   displayName: OpenJDK (Linux)
   condition: eq(variables['Agent.OS'], 'Linux')
 
-# Install android 34 as we're running on macos-15
-- bash: |
-    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'tools' | tr '\r' '\n' | uniq
-    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'platform-tools' | tr '\r' '\n' | uniq
-    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'build-tools;35.0.0' | tr '\r' '\n' | uniq
-    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'platforms;android-34' | tr '\r' '\n' | uniq
-  displayName: Install Android 34
-  condition: eq(variables['Agent.OS'], 'Darwin')
-
 - powershell: |
     & dotnet tool install --global Uno.Check --version $env:ValidationUnoCheckVersion
     uno-check -v --ci --non-interactive --fix --skip androidemulator --skip dotnetnewunotemplates  ${{ parameters.unocheckArguments }}