From 7dbe4554972b29c52eb2bafa5d38463ac5c96a0c Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 23 Jul 2026 23:29:17 +0200
Subject: [PATCH] [MAUI] Measure only APK in Android SOD jobs

Stage only the signed APK and versions metadata for Android SizeOnDisk work items so mapping files, binlogs, and other publish sidecars are not reported as APK size.

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

Copilot-Session: a301fa68-0e6c-4280-b2f2-bc3d4c9ae3de
---
 eng/performance/maui_scenarios_android.proj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eng/performance/maui_scenarios_android.proj b/eng/performance/maui_scenarios_android.proj
index 5ef4fa5ef01..f8038f2885a 100644
--- a/eng/performance/maui_scenarios_android.proj
+++ b/eng/performance/maui_scenarios_android.proj
@@ -82,12 +82,13 @@
 
 <!-- We only run the android tests from Windows machines (at least for now) -->
   <ItemGroup>
+    <!-- SizeOnDisk recursively measures pub, so stage only the APK and versions.json (removed by test.py in the lab). -->
     <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) APK Size')" Condition="!$(HelixTargetQueue.ToLowerInvariant().Contains('pixel'))">
-      <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y</PreCommands>
+      <PreCommands>echo on; if not exist "%HELIX_WORKITEM_ROOT%\pub" mkdir "%HELIX_WORKITEM_ROOT%\pub"; copy /Y "%HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)\%(HelixWorkItem.ApkName).apk" "%HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).apk"; copy /Y "%HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)\versions.json" "%HELIX_WORKITEM_ROOT%\pub\versions.json"</PreCommands>
       <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot; $(ScenarioArgs)</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) Extracted Size')" Condition="!$(HelixTargetQueue.ToLowerInvariant().Contains('pixel'))">
-      <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y; ren %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).apk %(HelixWorkItem.ApkName).zip; powershell.exe -nologo -noprofile -command "&amp; {Expand-Archive %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip -DestinationPath %HELIX_WORKITEM_ROOT%\pub\}"; del %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip</PreCommands>
+      <PreCommands>echo on; if not exist "%HELIX_WORKITEM_ROOT%\pub" mkdir "%HELIX_WORKITEM_ROOT%\pub"; copy /Y "%HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)\%(HelixWorkItem.ApkName).apk" "%HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).apk"; copy /Y "%HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)\versions.json" "%HELIX_WORKITEM_ROOT%\pub\versions.json"; ren "%HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).apk" "%(HelixWorkItem.ApkName).zip"; powershell.exe -nologo -noprofile -command "&amp; {Expand-Archive '%HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip' -DestinationPath '%HELIX_WORKITEM_ROOT%\pub'}"; del "%HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip"</PreCommands>
       <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot; $(ScenarioArgs)</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity)')">