From f1064d6bfeb9eb0ede25809f641e45f132d18f11 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 13 Aug 2026 09:25:20 -0500
Subject: [PATCH 1/9] [build] Update stable Android SDK packages

Update the Android SDK package catalog, versions, and SHA-256 hashes while retaining NDK r28c and Android platform 37.0.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
---
 Configuration.props               | 51 ++++++++++++++++---------------
 src/androidsdk/androidsdk.targets | 26 +++++++++-------
 2 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/Configuration.props b/Configuration.props
index 82abd668433..bb679e92041 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -73,7 +73,7 @@
     <AndroidSdkDirectory Condition=" '$(AndroidSdkDirectory)' == '' ">$(AndroidToolchainDirectory)\sdk</AndroidSdkDirectory>
     <AndroidNdkDirectory Condition=" '$(AndroidNdkDirectory)' == '' And Exists($(ANDROID_NDK_LATEST_HOME)) ">$(ANDROID_NDK_LATEST_HOME)</AndroidNdkDirectory>
     <AndroidNdkDirectory Condition=" '$(AndroidNdkDirectory)' == '' ">$(AndroidToolchainDirectory)\ndk</AndroidNdkDirectory>
-    <AndroidCmakeVersion Condition=" '$(AndroidCmakeVersion)' == '' ">3.30.3</AndroidCmakeVersion>
+    <AndroidCmakeVersion Condition=" '$(AndroidCmakeVersion)' == '' ">4.1.2</AndroidCmakeVersion>
     <AndroidCmakeUrlPrefix Condition=" '$(HostOS)' == 'Windows' And '$(AndroidCmakeUrlPrefix)' == '' "></AndroidCmakeUrlPrefix>
     <AndroidCmakeUrlPrefix Condition=" '$(HostOS)' == 'Darwin' And '$(AndroidCmakeUrlPrefix)' == '' "></AndroidCmakeUrlPrefix>
     <AndroidCmakeUrlPrefix Condition=" '$(HostOS)' == 'Linux' And '$(AndroidCmakeUrlPrefix)' == '' "></AndroidCmakeUrlPrefix>
@@ -97,26 +97,27 @@
     <AllSupported32BitTargetAndroidAbis>armeabi-v7a;x86</AllSupported32BitTargetAndroidAbis>
     <AllSupported64BitTargetAndroidAbis>arm64-v8a;x86_64</AllSupported64BitTargetAndroidAbis>
     <AllSupportedTargetAndroidAbis>$(AllSupported32BitTargetAndroidAbis);$(AllSupported64BitTargetAndroidAbis)</AllSupportedTargetAndroidAbis>
-    <XABuildToolsVersion>36</XABuildToolsVersion>
-    <XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">36.0.0</XABuildToolsFolder>
-    <XABuildToolsHashMacOS>04E7F3A72044DE4926FA038FA0E251A37BBA1E1C3FB8BEAB6F8401BFD9EB4BF3</XABuildToolsHashMacOS>
-    <XABuildToolsHashLinux>5D9AC77FB6FF43D9DA518A337B4FCF8F9097113DF531D99CCEFE80EF7CE8250B</XABuildToolsHashLinux>
-    <XABuildToolsHashWindows>AA1095CB14D83E483818A748A2C06FAAEB8E601561B06A356A119A1B2CA280D3</XABuildToolsHashWindows>
-    <XAPlatformToolsVersion>36.0.0</XAPlatformToolsVersion>
-    <XAPlatformToolsHashMacOS>D3E9FA1DF3345CF728586908426615A60863D2632F73F1CE14F0F1349EF000FD</XAPlatformToolsHashMacOS>
-    <XAPlatformToolsHashLinux>0EAD642C943FFE79701FCCCA8F5F1C69C4CE4F43DF2EEFEE553F6CCB27CBFBE8</XAPlatformToolsHashLinux>
-    <XAPlatformToolsHashWindows>12C2841F354E92A0EB2FD7BF6F0F9BF8538ABCE7BD6B060AC8349D6F6A61107C</XAPlatformToolsHashWindows>
-    <XACmdlineToolsHashMacOS>5673201E6F3869F418EEED3B5CB6C4BE7401502BD0AAE1B12A29D164D647A54E</XACmdlineToolsHashMacOS>
-    <XACmdlineToolsHashLinux>7EC965280A073311C339E571CD5DE778B9975026CFCBE79F2B1CDCB1E15317EE</XACmdlineToolsHashLinux>
-    <XACmdlineToolsHashWindows>98B565CB657B012DAE6794CEFC0F66AE1EFB4690C699B78A614B4A6A3505B003</XACmdlineToolsHashWindows>
-    <XACmakeHashMacOS>57024D590691B9D66977D2F66786F10971549441B33B7830D3D2B659F80B93EA</XACmakeHashMacOS>
-    <XACmakeHashLinux>8CF0DC4F7CE0173D13ED71066FB6861A79C73545DF71D12CA3E933430F268D50</XACmakeHashLinux>
-    <XACmakeHashWindows>026982DBA2DBD2DE4A530CF1300FFAD05F6BC7D372D9DF83D46112FE017E0C6B</XACmakeHashWindows>
+    <XABuildToolsVersion>37</XABuildToolsVersion>
+    <XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">37.0.0</XABuildToolsFolder>
+    <XABuildToolsHashMacOS>B5B1AC529028A49F11B596B89D9B34252E0F39388EE7DBD16AE3110F1C9C5722</XABuildToolsHashMacOS>
+    <XABuildToolsHashLinux>01AF179347CBCD9C208B7F8171F7B21F6DD1D2F85BCD15E88CAA51D5D7B86060</XABuildToolsHashLinux>
+    <XABuildToolsHashWindows>68075AA319ED8A01CF1A565ED1E61A3C1A801DD49191C35851248DC293C33B1A</XABuildToolsHashWindows>
+    <XAPlatformToolsVersion>37.0.1</XAPlatformToolsVersion>
+    <XAPlatformToolsHashMacOS>EE39AD5967E95C2A07F04DBCBDE96B1A0C916BA376096DB5D2F498B7727A5D1D</XAPlatformToolsHashMacOS>
+    <XAPlatformToolsHashLinux>D230F13842F60F782A8645F9C813F8F845BF36089EA7289F28C48F17979313F1</XAPlatformToolsHashLinux>
+    <XAPlatformToolsHashWindows>45F4D63113E895EBDE0C90F194099A4676B6AC653BD28D54314A9E022BBC1A99</XAPlatformToolsHashWindows>
+    <XACmdlineToolsHashMacOS>C5A6378AB5CF7E0D5701921405115BEFFF13E9FF7417FB588389338F8BD050F3</XACmdlineToolsHashMacOS>
+    <XACmdlineToolsHashMacOSArm64>835B62A26162B229B441D1F6D4680383815A270809EB33522C0D480FA5002C4E</XACmdlineToolsHashMacOSArm64>
+    <XACmdlineToolsHashLinux>4E4C464F145A7512B57D088AC6C278C03C9EEA610886B35A5E0804E74EEDF583</XACmdlineToolsHashLinux>
+    <XACmdlineToolsHashWindows>90AE805D20434428BFFCB699C290860F19BB5F66A67E6B330067E3DE801FB04A</XACmdlineToolsHashWindows>
+    <XACmakeHashMacOS>130B80221ABDA282B96E3669CEF5DCCF0D916E988E08051F5DACCDD03360A1AC</XACmakeHashMacOS>
+    <XACmakeHashLinux>46BDA18F0F3C28A55F88DA4BA05FEC21ABE3D9BCA0A78A8B18D444987B3DC817</XACmakeHashLinux>
+    <XACmakeHashWindows>3A78AD82A3F3E9E613E255618D2ACF1B3C4BDB24EF6E1F9341227CF6FC492A89</XACmakeHashWindows>
     <!-- Android emulator: per-host zips (and per-arch on macOS). -->
-    <XAEmulatorHashMacOSx64>3029489D4B2F868DC5347AA27B1E52FB48D6D28ABD51278E3FBEC2EE73201EDF</XAEmulatorHashMacOSx64>
-    <XAEmulatorHashMacOSArm64>EDA85B9BFFD0926B7A01EA334A30AB41827F573CBDE8F7F97FCD8C5B38F039F6</XAEmulatorHashMacOSArm64>
-    <XAEmulatorHashLinux>58BFDF0572F06EC007A7287154CDC6B2EBFEA947D07A1E26A0F6B5E1A39E9191</XAEmulatorHashLinux>
-    <XAEmulatorHashWindows>9F2855BFE98E80728E61D45B0EA72BA22F64952C9330559FA4E2CD3698A32231</XAEmulatorHashWindows>
+    <XAEmulatorHashMacOSx64>C1A3890F95B8868198918FAD05FFCA16FA20404D93547BA545FF5A5867EE7005</XAEmulatorHashMacOSx64>
+    <XAEmulatorHashMacOSArm64>22530DE9363F34EA945ECB5CAD74523ABD4B615F27F3C1A9899EFB183EA9E144</XAEmulatorHashMacOSArm64>
+    <XAEmulatorHashLinux>95771E0AE431897B2A4BD2D97FA095F29A8B0624A7B216BAF529F9306161C266</XAEmulatorHashLinux>
+    <XAEmulatorHashWindows>5FF441F3B12ACE9B13E9CF96FB0007D233967718652A8110705E995AC47BFEB7</XAEmulatorHashWindows>
     <!-- API 29 system image used by the emulator: per-host (x86_64) and macOS arm64 (arm64-v8a). -->
     <XASystemImageHashMacOSx64>B5C3FDA1F4B4931C30518D342E4AD5F7464945E0CDCED3538D4FF2E12F7BF201</XASystemImageHashMacOSx64>
     <XASystemImageHashMacOSArm64>7FD1610E16A69AC2E202278E82077DE134CE404FE099D872019F69F3A340ACDD</XASystemImageHashMacOSArm64>
@@ -125,7 +126,7 @@
     <!-- SDK build dependencies (host-agnostic single zip each). -->
     <XAAndroidM2RepositoryHash>A3F91808DCE50C1717737DE90C18479ED3A78B147E06985247D138E7AB5123D0</XAAndroidM2RepositoryHash>
     <XAAndroidDocsHash>68DB2690CB92E4EE5373AC9B792642C90717D8F417D83ECCEA48781171B3182A</XAAndroidDocsHash>
-    <XAAndroidSourcesHash>BD97900346A70C784AC8B15C809539DDEF34ED3B5BE1DF8A9A89CF298BE93798</XAAndroidSourcesHash>
+    <XAAndroidSourcesHash>A853F452B8BA94933EB56ED4E0F622991F9D6DE6E0AC19923AA47414D79B9129</XAAndroidSourcesHash>
     <!-- Android NDK: per-host zips. Use a private property name; the public
          $(AndroidNdkVersion) is set to the pkg revision in Common.props.in. -->
     <_XAAndroidNdkRelease>28c</_XAAndroidNdkRelease>
@@ -180,12 +181,12 @@
     <AvdManagerToolExe Condition=" '$(AvdManagerToolExe)' == '' and '$(HostOS)' == 'Windows' ">avdmanager.bat</AvdManagerToolExe>
     <AndroidToolPath Condition=" '$(AndroidToolPath)' == '' ">$(AndroidSdkFullPath)\tools</AndroidToolPath>
     <AndroidToolsBinPath Condition=" '$(AndroidToolsBinPath)' == '' ">$(AndroidToolPath)\bin</AndroidToolsBinPath>
-    <CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">19.0</CommandLineToolsFolder>
-    <CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">13114758_latest</CommandLineToolsVersion>
+    <CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">22.0</CommandLineToolsFolder>
+    <CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">15859902_latest</CommandLineToolsVersion>
     <CommandLineToolsBinPath Condition=" '$(CommandLineToolsBinPath)' == '' ">$(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)\bin</CommandLineToolsBinPath>
     <!-- Version numbers and PkgVersion are found in https://dl-ssl.google.com/android/repository/repository2-3.xml -->
-    <EmulatorVersion Condition=" '$(EmulatorVersion)' == '' ">15004761</EmulatorVersion>
-    <EmulatorPkgRevision Condition=" '$(EmulatorPkgRevision)' == '' ">36.4.10</EmulatorPkgRevision>
+    <EmulatorVersion Condition=" '$(EmulatorVersion)' == '' ">15917651</EmulatorVersion>
+    <EmulatorPkgRevision Condition=" '$(EmulatorPkgRevision)' == '' ">37.1.11</EmulatorPkgRevision>
     <EmulatorToolPath Condition=" '$(EmulatorToolPath)' == '' ">$(AndroidSdkFullPath)\emulator</EmulatorToolPath>
     <EmulatorToolExe Condition=" '$(EmulatorToolExe)' == '' and '$(HostOS)' != 'Windows'  ">emulator</EmulatorToolExe>
     <EmulatorToolExe Condition=" '$(EmulatorToolExe)' == '' and '$(HostOS)' == 'Windows'  ">emulator.exe</EmulatorToolExe>
diff --git a/src/androidsdk/androidsdk.targets b/src/androidsdk/androidsdk.targets
index 8e95e5a9899..7b16f8fa5ae 100644
--- a/src/androidsdk/androidsdk.targets
+++ b/src/androidsdk/androidsdk.targets
@@ -74,17 +74,17 @@
     <_PlatformPackage Include="platform-25_r03">      <ApiLevel>25</ApiLevel>   <Hash>9B742D34590FE73FB7229E34835ECFFB1846CA389D9F924F0B2A37DE525DC6B8</Hash></_PlatformPackage>
     <_PlatformPackage Include="platform-26_r02">      <ApiLevel>26</ApiLevel>   <Hash>2AAFA7D19C5E9C4B643EE6ADE3D85EF89DC2F79E8383EFDB9BAF7FDDAD74B52A</Hash></_PlatformPackage>
     <_PlatformPackage Include="platform-27_r03">      <ApiLevel>27</ApiLevel>   <Hash>020C4C090BC82CE87EBAAE5D1A922E21B39A1D03C78FFA43F0C3E42FC7D28169</Hash></_PlatformPackage>
-    <_PlatformPackage Include="platform-28_r04">      <ApiLevel>28</ApiLevel>   <Hash>967F8CA99B71D337AA9C7781F9D65DD8110BF5C4746F44304047BF71B20D0DED</Hash></_PlatformPackage>
-    <_PlatformPackage Include="platform-29_r01">      <ApiLevel>29</ApiLevel>   <Hash>2C9E961858E03900FFA0801A4F6234AA7223363B629FD8E1BE60DA9AA09D86BD</Hash></_PlatformPackage>
-    <_PlatformPackage Include="platform-30_r01">      <ApiLevel>30</ApiLevel>   <Hash>337B1B0E202A02F90DA2E719305F157FCCDA215C760F5B8F7121ACEDCA44942B</Hash></_PlatformPackage>
+    <_PlatformPackage Include="platform-28_r06">      <ApiLevel>28</ApiLevel>   <Hash>8452DBBF9668A428ABB243C4F02A943B7AA83AF3CCA627629A15C4C09F28E7BD</Hash></_PlatformPackage>
+    <_PlatformPackage Include="platform-29_r05">      <ApiLevel>29</ApiLevel>   <Hash>951DA8BF175254DA74626824F919BD28DEF64F8828F29DD3B124A535CF4049D8</Hash></_PlatformPackage>
+    <_PlatformPackage Include="platform-30_r03">      <ApiLevel>30</ApiLevel>   <Hash>F3F5B75744DBF6EE6ED3E8174A71E513BFEE502D0BC3463EA97E517BFF68D84E</Hash></_PlatformPackage>
     <_PlatformPackage Include="platform-31_r01">      <ApiLevel>31</ApiLevel>   <Hash>1D69FE1D7F9788D82FF3A374FAF4F6CCC9D1D372AA84A86B5BCFB517523B0B3F</Hash></_PlatformPackage>
     <_PlatformPackage Include="platform-32_r01">      <ApiLevel>32</ApiLevel>   <Hash>01D8DA1C900E70FCF5DA39767D5444E39928935B1A5927055CE749FC348CA7AE</Hash></_PlatformPackage>
-    <_PlatformPackage Include="platform-33-ext3_r03"> <ApiLevel>33</ApiLevel>   <Hash>B32B10F787867987F03AE8E101D217E053A9065B7136379FB353B388379AED1D</Hash></_PlatformPackage>
-    <_PlatformPackage Include="platform-34-ext7_r02"> <ApiLevel>34</ApiLevel>   <Hash>5323311CC3E4AD614F0B8053C72B651726F3422448CEDD39E48F00737CDA8AD0</Hash></_PlatformPackage>
-    <_PlatformPackage Include="platform-35_r02">      <ApiLevel>35</ApiLevel>   <Hash>0988CACAD01B38A18A47BAC14A0695F246BC76C1B06C0EEB8EB0DC825AB0C8E0</Hash></_PlatformPackage>
-    <_PlatformPackage Include="platform-36_r02">      <ApiLevel>36</ApiLevel>   <Hash>37607369A28C5B640B3A7998868D45898EBCB777565A0E85F9ACF36F29631D2E</Hash></_PlatformPackage>
+    <_PlatformPackage Include="platform-33-ext5_r01"> <ApiLevel>33</ApiLevel>   <Hash>3D6189A18D0CEBD4E518B8728DE0E6B940D95C96B57316769DD56EE2D1708D10</Hash></_PlatformPackage>
+    <_PlatformPackage Include="platform-34-ext12_r01"><ApiLevel>34</ApiLevel>   <Hash>B8349FF89D0BC40D26C712DCC5EB36EE60F40E203D7589BD4599B9237E98329A</Hash></_PlatformPackage>
+    <_PlatformPackage Include="platform-35-ext15_r01"><ApiLevel>35</ApiLevel>   <Hash>A93712AEDD4F851D9CF1F7281F7C4FE5581CE03A9DF37FFC8C53A487EADF311F</Hash></_PlatformPackage>
+    <_PlatformPackage Include="platform-36-ext19_r01"><ApiLevel>36</ApiLevel>   <Hash>55BD3620999428FF13097C982C9F0D40DE566D846F0BED153BF8D4E1491B90FF</Hash></_PlatformPackage>
     <_PlatformPackage Include="platform-36.1_r01">    <ApiLevel>36.1</ApiLevel> <Hash>265E9AA7D8DB6ABE7AD1696085D5D62784B341084C625DE46DB530970B1E806D</Hash></_PlatformPackage>
-    <_PlatformPackage Include="platform-37.0_r01">    <ApiLevel>37.0</ApiLevel> <IsLatestStable>true</IsLatestStable> <Hash>19BDCF42DE0CB0E9500A27DA6833FC30CDD49A7EC690AA5CABAA0EF893AF9EBE</Hash></_PlatformPackage>
+    <_PlatformPackage Include="platform-37.0_r02">    <ApiLevel>37.0</ApiLevel> <IsLatestStable>true</IsLatestStable> <Hash>840B23E827F96E64AEA4C89A1194AAC3DC5F6BAD37EDB231C5C795D890330E8D</Hash></_PlatformPackage>
   </ItemGroup>
 
   <!--
@@ -104,10 +104,14 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <!-- commandlinetools: one zip per HostOS -->
-    <_AndroidSdkPackage Include="commandlinetools-mac-$(CommandLineToolsVersion).zip" Condition=" '$(HostOS)' == 'Darwin' ">
+    <_AndroidSdkPackage Include="commandlinetools-mac_x86_64-$(CommandLineToolsVersion).zip" Condition=" '$(HostOS)' == 'Darwin' and '$(_IsArm64Apple)' != 'true' ">
       <Hash>$(XACmdlineToolsHashMacOS)</Hash>
       <Destination>$(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)</Destination>
     </_AndroidSdkPackage>
+    <_AndroidSdkPackage Include="commandlinetools-mac_arm64-$(CommandLineToolsVersion).zip" Condition=" '$(_IsArm64Apple)' == 'true' ">
+      <Hash>$(XACmdlineToolsHashMacOSArm64)</Hash>
+      <Destination>$(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)</Destination>
+    </_AndroidSdkPackage>
     <_AndroidSdkPackage Include="commandlinetools-linux-$(CommandLineToolsVersion).zip" Condition=" '$(HostOS)' == 'Linux' ">
       <Hash>$(XACmdlineToolsHashLinux)</Hash>
       <Destination>$(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)</Destination>
@@ -238,9 +242,9 @@
       <Hash>$(XAAndroidDocsHash)</Hash>
       <Destination>$(AndroidSdkFullPath)\docs</Destination>
     </_AndroidSdkPackage>
-    <_AndroidSdkPackage Include="source-36_r01.zip">
+    <_AndroidSdkPackage Include="source-37.0_r02.zip">
       <Hash>$(XAAndroidSourcesHash)</Hash>
-      <Destination>$(AndroidSdkFullPath)\sources\android-36</Destination>
+      <Destination>$(AndroidSdkFullPath)\sources\android-37.0</Destination>
     </_AndroidSdkPackage>
 
     <!--

From 690c3a8fab6dd6f6b21c00a3d36d1a863f0f1923 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 13 Aug 2026 10:03:02 -0500
Subject: [PATCH 2/9] [build] Fix Android SDK update on Windows

Keep Android sources in the API-level directory expected by the build and avoid escaping CMake source-path quotes on Windows.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
---
 src/androidsdk/androidsdk.targets | 4 ++--
 src/native/native.targets         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/androidsdk/androidsdk.targets b/src/androidsdk/androidsdk.targets
index 7b16f8fa5ae..af8fc28e2df 100644
--- a/src/androidsdk/androidsdk.targets
+++ b/src/androidsdk/androidsdk.targets
@@ -103,7 +103,7 @@
     </_AndroidSdkPackage>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <!-- commandlinetools: one zip per HostOS -->
+    <!-- commandlinetools: one zip per host OS and macOS architecture -->
     <_AndroidSdkPackage Include="commandlinetools-mac_x86_64-$(CommandLineToolsVersion).zip" Condition=" '$(HostOS)' == 'Darwin' and '$(_IsArm64Apple)' != 'true' ">
       <Hash>$(XACmdlineToolsHashMacOS)</Hash>
       <Destination>$(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)</Destination>
@@ -244,7 +244,7 @@
     </_AndroidSdkPackage>
     <_AndroidSdkPackage Include="source-37.0_r02.zip">
       <Hash>$(XAAndroidSourcesHash)</Hash>
-      <Destination>$(AndroidSdkFullPath)\sources\android-37.0</Destination>
+      <Destination>$(AndroidSdkFullPath)\sources\android-37</Destination>
     </_AndroidSdkPackage>
 
     <!--
diff --git a/src/native/native.targets b/src/native/native.targets
index 41c225d349b..67efb316f6d 100644
--- a/src/native/native.targets
+++ b/src/native/native.targets
@@ -96,7 +96,7 @@
     <ItemGroup>
       <_ConfigureArchiveDSOStubCommands Include="@(AndroidSupportedTargetJitAbi)">
         <Command>$(CmakePath)</Command>
-        <Arguments>-DOUTPUT_PATH="$(OutputPath.TrimEnd('\'))" -DRUNTIME_FLAVOR="$(CMakeRuntimeFlavor)" --preset default-release-%(AndroidSupportedTargetJitAbi.Identity) -DBUILD_ARCHIVE_DSO_STUB=ON -DSTRIP_DEBUG=ON "$(MSBuildThisFileDirectory)"</Arguments>
+        <Arguments>-DOUTPUT_PATH="$(OutputPath.TrimEnd('\'))" -DRUNTIME_FLAVOR="$(CMakeRuntimeFlavor)" --preset default-release-%(AndroidSupportedTargetJitAbi.Identity) -DBUILD_ARCHIVE_DSO_STUB=ON -DSTRIP_DEBUG=ON "$(MSBuildThisFileDirectory.TrimEnd('\'))"</Arguments>
         <WorkingDirectory>$(FlavorIntermediateOutputPath)%(AndroidSupportedTargetJitAbi.AndroidRID)-archive-dso-stub</WorkingDirectory>
       </_ConfigureArchiveDSOStubCommands>
     </ItemGroup>
@@ -135,7 +135,7 @@
     <ItemGroup>
       <_ConfigureTestJniLibraryCommands Include="@(_TestJniLibraryAbi)">
         <Command>$(CmakePath)</Command>
-        <Arguments>-DOUTPUT_PATH="$(OutputPath.TrimEnd('\'))" -DRUNTIME_FLAVOR="$(CMakeRuntimeFlavor)" --preset default-release-%(_TestJniLibraryAbi.Identity) -DBUILD_TEST_JNI_LIBRARY=ON "$(MSBuildThisFileDirectory)"</Arguments>
+        <Arguments>-DOUTPUT_PATH="$(OutputPath.TrimEnd('\'))" -DRUNTIME_FLAVOR="$(CMakeRuntimeFlavor)" --preset default-release-%(_TestJniLibraryAbi.Identity) -DBUILD_TEST_JNI_LIBRARY=ON "$(MSBuildThisFileDirectory.TrimEnd('\'))"</Arguments>
         <WorkingDirectory>$(FlavorIntermediateOutputPath)%(_TestJniLibraryAbi.AndroidRID)-test-jni-library</WorkingDirectory>
       </_ConfigureTestJniLibraryCommands>
     </ItemGroup>
@@ -161,7 +161,7 @@
       <_NoStrip Condition=" '$(DoNotStripMonodroid)' == 'true' ">-DSTRIP_DEBUG=OFF</_NoStrip>
       <_LocalDotNetRuntimePath Condition=" '$(CLRLocalRuntimePath)' != '' And '$(CMakeRuntimeFlavor)' == 'CoreCLR' ">-DLOCAL_CORECLR_PATH="$(CLRLocalRuntimePath)"</_LocalDotNetRuntimePath>
       <_LocalDotNetRuntimeConfig Condition=" '$(CLRLocalRuntimeConfig)' != '' And '$(CMakeRuntimeFlavor)' == 'CoreCLR' ">-DLOCAL_CORECLR_CONFIG="$(CLRLocalRuntimeConfig)"</_LocalDotNetRuntimeConfig>
-      <_CmakeAndroidFlags>-DOUTPUT_PATH="$(OutputPath.TrimEnd('\'))" -DRUNTIME_FLAVOR="$(CMakeRuntimeFlavor)" $(_NoInline) $(_NoStrip) $(_LocalDotNetRuntimePath) $(_LocaLDotNetRuntimeConfig) "$(MSBuildThisFileDirectory)"</_CmakeAndroidFlags>
+      <_CmakeAndroidFlags>-DOUTPUT_PATH="$(OutputPath.TrimEnd('\'))" -DRUNTIME_FLAVOR="$(CMakeRuntimeFlavor)" $(_NoInline) $(_NoStrip) $(_LocalDotNetRuntimePath) $(_LocaLDotNetRuntimeConfig) "$(MSBuildThisFileDirectory.TrimEnd('\'))"</_CmakeAndroidFlags>
     </PropertyGroup>
 
     <ItemGroup>

From 2316f08f2df770d3d03212aeffb6325aef7bab80 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 13 Aug 2026 12:16:38 -0500
Subject: [PATCH 3/9] [build] Refresh generated SDK properties after config
 changes

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
---
 .../Xamarin.Android.Build.Tasks.targets                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
index 833bce9d05a..2425ddc3087 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
@@ -132,7 +132,7 @@
   <Target Name="_GenerateXACommonProps"
       DependsOnTargets="GetXAVersionInfo"
       BeforeTargets="DeployOutputFiles"
-      Inputs="Xamarin.Android.Common.props.in;Xamarin.Android.BuildInfo.txt.in;..\..\build-tools\scripts\Ndk.targets"
+      Inputs="Xamarin.Android.Common.props.in;Xamarin.Android.BuildInfo.txt.in;..\..\Configuration.props;..\..\build-tools\scripts\Ndk.targets"
       Outputs="Xamarin.Android.Common.props;Xamarin.Android.BuildInfo.txt">
     <ReplaceFileContents
         SourceFile="Xamarin.Android.BuildInfo.txt.in"

From e6ae6b31e19520aa29b28d944007511ed138c7d7 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 13 Aug 2026 14:20:02 -0500
Subject: [PATCH 4/9] [build] Track generated SDK property values

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
---
 .../Xamarin.Android.Build.Tasks.targets       | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
index 2425ddc3087..697bf54c050 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
@@ -129,10 +129,39 @@
         Properties="Configuration=$(Configuration);AndroidApiLevel=$(AndroidLatestStableApiLevel);AndroidFrameworkVersion=$(AndroidLatestStableFrameworkVersion);AndroidPlatformId=$(AndroidLatestStablePlatformId)"
     />
   </Target>
+  <Target Name="_WriteXACommonPropsCache"
+      DependsOnTargets="GetXAVersionInfo">
+    <ItemGroup>
+      <_XACommonPropsCacheLines Include="CommandLineToolsFolder=$(CommandLineToolsFolder)" />
+      <_XACommonPropsCacheLines Include="XABundleToolVersion=$(XABundleToolVersion)" />
+      <_XACommonPropsCacheLines Include="JavaSdkVersion=$(JavaSdkVersion)" />
+      <_XACommonPropsCacheLines Include="MinimumSupportedJavaSdkVersion=$(MinimumSupportedJavaSdkVersion)" />
+      <_XACommonPropsCacheLines Include="AndroidNdkApiLevel_ArmV8a=$(AndroidNdkApiLevel_ArmV8a)" />
+      <_XACommonPropsCacheLines Include="AndroidNdkApiLevel_ArmV7a=$(AndroidNdkApiLevel_ArmV7a)" />
+      <_XACommonPropsCacheLines Include="AndroidNdkApiLevel_X86_64=$(AndroidNdkApiLevel_X86_64)" />
+      <_XACommonPropsCacheLines Include="AndroidNdkApiLevel_X86=$(AndroidNdkApiLevel_X86)" />
+      <_XACommonPropsCacheLines Include="XAVersionCommitCount=$(XAVersionCommitCount)" />
+      <_XACommonPropsCacheLines Include="ProductVersion=$(ProductVersion)" />
+      <_XACommonPropsCacheLines Include="XABuildToolsFolder=$(XABuildToolsFolder)" />
+      <_XACommonPropsCacheLines Include="XAPlatformToolsVersion=$(XAPlatformToolsVersion)" />
+      <_XACommonPropsCacheLines Include="AndroidLatestStablePlatformId=$(AndroidLatestStablePlatformId)" />
+      <_XACommonPropsCacheLines Include="_BuildInfo_SqliteCommit=$(_BuildInfo_SqliteCommit)" />
+    </ItemGroup>
+    <WriteLinesToFile
+        File="$(IntermediateOutputPath)_GenerateXACommonProps.cache"
+        Lines="@(_XACommonPropsCacheLines)"
+        Overwrite="true"
+        WriteOnlyWhenDifferent="true"
+    />
+    <ItemGroup>
+      <FileWrites Include="$(IntermediateOutputPath)_GenerateXACommonProps.cache" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="_GenerateXACommonProps"
-      DependsOnTargets="GetXAVersionInfo"
+      DependsOnTargets="_WriteXACommonPropsCache"
       BeforeTargets="DeployOutputFiles"
-      Inputs="Xamarin.Android.Common.props.in;Xamarin.Android.BuildInfo.txt.in;..\..\Configuration.props;..\..\build-tools\scripts\Ndk.targets"
+      Inputs="Xamarin.Android.Common.props.in;Xamarin.Android.BuildInfo.txt.in;$(IntermediateOutputPath)_GenerateXACommonProps.cache;..\..\build-tools\scripts\Ndk.targets"
       Outputs="Xamarin.Android.Common.props;Xamarin.Android.BuildInfo.txt">
     <ReplaceFileContents
         SourceFile="Xamarin.Android.BuildInfo.txt.in"

From bb27ac79cf379fa0aeb8e8c4055ff136765b7773 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 13 Aug 2026 15:17:38 -0500
Subject: [PATCH 5/9] [build] Isolate workload install package cache

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
---
 build-tools/create-packs/Directory.Build.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets
index f69919ef4b2..2d4a46c148d 100644
--- a/build-tools/create-packs/Directory.Build.targets
+++ b/build-tools/create-packs/Directory.Build.targets
@@ -139,6 +139,7 @@
     <MakeDir Directories="$(_TempDirectory);$(BuildOutputDirectory)lib\sdk-manifests" />
     <Exec
         Command="&quot;$(DotNetPreviewTool)&quot; workload install @(_InstallArguments, ' ')"
+        EnvironmentVariables="NUGET_PACKAGES=$(_TempDirectory)\packages"
         WorkingDirectory="$(_TempDirectory)"
     />
     <RemoveDir Directories="$(_TempDirectory)" />

From 89966eaf747f03ad742ed0c9474e11b50e30b4fb Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 13 Aug 2026 16:53:15 -0500
Subject: [PATCH 6/9] [build] Fix updated Android tooling tests

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
---
 build-tools/create-packs/Directory.Build.targets | 1 +
 build-tools/scripts/TestApks.targets             | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets
index 2d4a46c148d..408d5e3e804 100644
--- a/build-tools/create-packs/Directory.Build.targets
+++ b/build-tools/create-packs/Directory.Build.targets
@@ -130,6 +130,7 @@
       <_NuGetSources Include="$(OutputPath.TrimEnd('\'))" />
       <_PreviewPacks Condition=" '$(AndroidLatestStableApiLevel)' != '$(AndroidLatestUnstableApiLevel)' " Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\Microsoft.Android.Ref.$(AndroidLatestUnstableApiLevel).*.nupkg" />
       <_InstallArguments Include="android" />
+      <_InstallArguments Include="--no-cache" />
       <_InstallArguments Include="--skip-manifest-update" />
       <_InstallArguments Include="--skip-sign-check" />
       <_InstallArguments Include="--verbosity diag" />
diff --git a/build-tools/scripts/TestApks.targets b/build-tools/scripts/TestApks.targets
index 35f9237d829..05eecdd60a1 100644
--- a/build-tools/scripts/TestApks.targets
+++ b/build-tools/scripts/TestApks.targets
@@ -19,7 +19,6 @@
     <TestAvdForceCreation Condition=" '$(TestAvdForceCreation)' == '' ">true</TestAvdForceCreation>
     <TestAvdShowWindow Condition=" '$(TestAvdShowWindow)' == '' and '$(RunningOnCI)' == 'true' ">false</TestAvdShowWindow>
     <TestAvdExtraBootArgs Condition=" '$(TestAvdShowWindow)' == 'false' ">-no-window -no-boot-anim -gpu swiftshader $(TestAvdExtraBootArgs)</TestAvdExtraBootArgs>
-    <TestDeviceName Condition=" '$(TestDeviceName)' == '' ">pixel_4</TestDeviceName>
     <SdkManagerImageName Condition=" '$(SdkManagerImageName)' == '' ">system-images;android-$(TestAvdApiLevel);$(TestAvdType);$(TestAvdAbi)</SdkManagerImageName>
     <TestAvdName>XamarinAndroidTestRunner$(TestAvdApiLevel)-$(TestAvdAbi)</TestAvdName>
     <_AdbEmulatorPort>5570</_AdbEmulatorPort>

From 4b9150d2fa28e5854b6c3788e02ff7a41ca3c8de Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Fri, 14 Aug 2026 07:54:38 -0500
Subject: [PATCH 7/9] [build] Fix updated SDK package test setup

Seed workload installation from the SDK package produced by the current build so reused PR versions cannot resolve stale feed content. Omit the avdmanager device profile unless tests explicitly request one.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
---
 .../CreateAndroidEmulator.cs                  |  2 +-
 .../create-packs/Directory.Build.targets      | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs
index 8d8d1754a22..69815435a46 100644
--- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs
+++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs
@@ -23,7 +23,7 @@ public class CreateAndroidEmulator : ToolTask
 		public                  string          TargetId        {get; set;}
 
 		public                  string          ImageName           {get; set;} = "XamarinAndroidTestRunner64";
-		public                  string          DeviceName          {get; set;} = "pixel_4";
+		public                  string          DeviceName          {get; set;}
 		public			string		ImageType	    {get; set;} = "default";
 
 		public                  string          DataPartitionSizeMB {get; set;} = "2048";
diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets
index 408d5e3e804..13c93b9cbf6 100644
--- a/build-tools/create-packs/Directory.Build.targets
+++ b/build-tools/create-packs/Directory.Build.targets
@@ -125,10 +125,20 @@
     <!-- dotnet workload install android -->
     <PropertyGroup>
       <_TempDirectory>$(IntermediateOutputPath).xa-workload-temp-$([System.IO.Path]::GetRandomFileName())</_TempDirectory>
+      <_LocalSdkPackProject>$(_TempDirectory)\local-sdk-pack.csproj</_LocalSdkPackProject>
     </PropertyGroup>
     <ItemGroup>
       <_NuGetSources Include="$(OutputPath.TrimEnd('\'))" />
       <_PreviewPacks Condition=" '$(AndroidLatestStableApiLevel)' != '$(AndroidLatestUnstableApiLevel)' " Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\Microsoft.Android.Ref.$(AndroidLatestUnstableApiLevel).*.nupkg" />
+      <_LocalSdkPackProjectLines Include="&lt;Project Sdk=&quot;Microsoft.NET.Sdk&quot;&gt;" />
+      <_LocalSdkPackProjectLines Include="  &lt;PropertyGroup&gt;" />
+      <_LocalSdkPackProjectLines Include="    &lt;TargetFramework&gt;$(DotNetTargetFramework)&lt;/TargetFramework&gt;" />
+      <_LocalSdkPackProjectLines Include="    &lt;DisableImplicitFrameworkReferences&gt;true&lt;/DisableImplicitFrameworkReferences&gt;" />
+      <_LocalSdkPackProjectLines Include="  &lt;/PropertyGroup&gt;" />
+      <_LocalSdkPackProjectLines Include="  &lt;ItemGroup&gt;" />
+      <_LocalSdkPackProjectLines Include="    &lt;PackageDownload Include=&quot;$(MicrosoftAndroidSdkPackName)&quot; Version=&quot;[$(AndroidPackVersionLong)]&quot; /&gt;" />
+      <_LocalSdkPackProjectLines Include="  &lt;/ItemGroup&gt;" />
+      <_LocalSdkPackProjectLines Include="&lt;/Project&gt;" />
       <_InstallArguments Include="android" />
       <_InstallArguments Include="--no-cache" />
       <_InstallArguments Include="--skip-manifest-update" />
@@ -138,6 +148,17 @@
       <_InstallArguments Include="--temp-dir &quot;$(_TempDirectory)&quot;" />
     </ItemGroup>
     <MakeDir Directories="$(_TempDirectory);$(BuildOutputDirectory)lib\sdk-manifests" />
+    <!-- Seed the isolated package cache from this build. PR package versions are
+         reused across CI attempts, so a feed can contain older same-version bits. -->
+    <WriteLinesToFile
+        File="$(_LocalSdkPackProject)"
+        Lines="@(_LocalSdkPackProjectLines)"
+        Overwrite="true"
+        Encoding="UTF-8"
+    />
+    <Exec
+        Command="&quot;$(DotNetPreviewTool)&quot; restore &quot;$(_LocalSdkPackProject)&quot; --source &quot;$(OutputPath.TrimEnd('\'))&quot; --packages &quot;$(_TempDirectory)\packages&quot; --no-cache"
+    />
     <Exec
         Command="&quot;$(DotNetPreviewTool)&quot; workload install @(_InstallArguments, ' ')"
         EnvironmentVariables="NUGET_PACKAGES=$(_TempDirectory)\packages"

From 07ea53303b1abf8d284d2b3ff9be704336863c4a Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Fri, 14 Aug 2026 08:30:32 -0500
Subject: [PATCH 8/9] [build] Remove ineffective workload cache flag

The deterministic fix is pre-seeding the isolated package directory from the current build. The workload install no-cache flag did not prevent same-version feed substitution and is unnecessary.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
---
 build-tools/create-packs/Directory.Build.targets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets
index 13c93b9cbf6..9fda861b8b8 100644
--- a/build-tools/create-packs/Directory.Build.targets
+++ b/build-tools/create-packs/Directory.Build.targets
@@ -140,7 +140,6 @@
       <_LocalSdkPackProjectLines Include="  &lt;/ItemGroup&gt;" />
       <_LocalSdkPackProjectLines Include="&lt;/Project&gt;" />
       <_InstallArguments Include="android" />
-      <_InstallArguments Include="--no-cache" />
       <_InstallArguments Include="--skip-manifest-update" />
       <_InstallArguments Include="--skip-sign-check" />
       <_InstallArguments Include="--verbosity diag" />

From 16b2c9404ab6ee547a01199c0177550abd97dd6e Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Fri, 14 Aug 2026 12:04:57 -0500
Subject: [PATCH 9/9] [build] Isolate local SDK pack restore

Disable repository Directory.Build imports when seeding the workload package cache so the temporary project does not restore Arcade dependencies from the local-only source. Use a platform-correct package directory path.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
---
 build-tools/create-packs/Directory.Build.targets | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets
index 9fda861b8b8..292ef10bc69 100644
--- a/build-tools/create-packs/Directory.Build.targets
+++ b/build-tools/create-packs/Directory.Build.targets
@@ -126,6 +126,7 @@
     <PropertyGroup>
       <_TempDirectory>$(IntermediateOutputPath).xa-workload-temp-$([System.IO.Path]::GetRandomFileName())</_TempDirectory>
       <_LocalSdkPackProject>$(_TempDirectory)\local-sdk-pack.csproj</_LocalSdkPackProject>
+      <_LocalSdkPackPackagesDirectory>$([System.IO.Path]::Combine('$(_TempDirectory)', 'packages'))</_LocalSdkPackPackagesDirectory>
     </PropertyGroup>
     <ItemGroup>
       <_NuGetSources Include="$(OutputPath.TrimEnd('\'))" />
@@ -156,11 +157,11 @@
         Encoding="UTF-8"
     />
     <Exec
-        Command="&quot;$(DotNetPreviewTool)&quot; restore &quot;$(_LocalSdkPackProject)&quot; --source &quot;$(OutputPath.TrimEnd('\'))&quot; --packages &quot;$(_TempDirectory)\packages&quot; --no-cache"
+        Command="&quot;$(DotNetPreviewTool)&quot; restore &quot;$(_LocalSdkPackProject)&quot; --source &quot;$(OutputPath.TrimEnd('\'))&quot; --packages &quot;$(_LocalSdkPackPackagesDirectory)&quot; --no-cache -p:ImportDirectoryBuildProps=false -p:ImportDirectoryBuildTargets=false"
     />
     <Exec
         Command="&quot;$(DotNetPreviewTool)&quot; workload install @(_InstallArguments, ' ')"
-        EnvironmentVariables="NUGET_PACKAGES=$(_TempDirectory)\packages"
+        EnvironmentVariables="NUGET_PACKAGES=$(_LocalSdkPackPackagesDirectory)"
         WorkingDirectory="$(_TempDirectory)"
     />
     <RemoveDir Directories="$(_TempDirectory)" />