Add MAUI iOS Inner Loop measurements for CI

eng/performance/maui_scenarios_ios.proj

@@ -2,45 +2,50 @@
   <Import Project="Scenarios.Common.props" />
 
   <PropertyGroup>
-    <IncludeXHarnessCli>true</IncludeXHarnessCli>
+    <_IsInnerLoop Condition="'$(RunKind)' == 'maui_scenarios_ios_innerloop'">true</_IsInnerLoop>
+    <IncludeXHarnessCli Condition="'$(_IsInnerLoop)' != 'true'">true</IncludeXHarnessCli>
   </PropertyGroup>
 
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(_IsInnerLoop)' != 'true'">
     <AfterPreparePayloadWorkItemCommand>$(Python) post.py</AfterPreparePayloadWorkItemCommand>
     <PreparePayloadOutDirectoryName>scenarios_out</PreparePayloadOutDirectoryName>
     <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' == 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)\</PreparePayloadWorkItemBaseDirectory>
     <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' != 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)/</PreparePayloadWorkItemBaseDirectory>
-    
+
     <_MSBuildArgs Condition="'$(RuntimeFlavor)' == 'mono'">/p:UseMonoRuntime=true</_MSBuildArgs>
     <_MSBuildArgs Condition="'$(RuntimeFlavor)' == 'coreclr'">/p:UseMonoRuntime=false</_MSBuildArgs>
 
-    <!-- Mono FullAOT and CoreCLR R2R are considered as default configurations, so no need for explicit properties -->
-
-    <!--  We have to set the following two variables until https://github.com/dotnet/runtime/pull/124604 flows to us -->
-    <_MSBuildArgs Condition="'$(RuntimeFlavor)' == 'coreclr'">$(_MSBuildArgs);/p:PublishReadyToRunStripDebugInfo=false;/p:PublishReadyToRunStripInliningInfo=false</_MSBuildArgs>
-
-    <!-- CoreCLR Interpreter -->
     <_MSBuildArgs Condition="'$(RuntimeFlavor)' == 'coreclr' and '$(CodegenType)' == 'Interpreter'">$(_MSBuildArgs);/p:PublishReadyToRun=false</_MSBuildArgs>
-    <!-- CoreCLR NativeAOT -->
     <_MSBuildArgs Condition="'$(RuntimeFlavor)' == 'coreclr' and '$(CodegenType)' == 'NativeAOT'">$(_MSBuildArgs);/p:PublishAot=true;/p:PublishAotUsingRuntimePack=true</_MSBuildArgs>
+  </PropertyGroup>
 
+  <PropertyGroup Condition="'$(_IsInnerLoop)' == 'true'">
+    <_MSBuildArgs Condition="'$(RuntimeFlavor)' == 'mono'">/p:UseMonoRuntime=true</_MSBuildArgs>
+    <_MSBuildArgs Condition="'$(RuntimeFlavor)' == 'coreclr'">/p:UseMonoRuntime=false</_MSBuildArgs>
+    <iOSRid Condition="'$(iOSRid)' == ''">iossimulator-x64</iOSRid>
+    <_MSBuildArgs>$(_MSBuildArgs) /p:RuntimeIdentifier=$(iOSRid)</_MSBuildArgs>
+    <_MSBuildArgs Condition="'$(iOSRid)' == 'ios-arm64'">$(_MSBuildArgs) /p:EnableCodeSigning=false</_MSBuildArgs>
+    <_MSBuildArgs>$(_MSBuildArgs) /p:MtouchLink=None</_MSBuildArgs>
+    <RunConfigsString>$(RuntimeFlavor)_Default</RunConfigsString>
+    <InnerLoopIterations Condition="'$(InnerLoopIterations)' == ''">3</InnerLoopIterations>
+    <_MacEnvVars>export DOTNET_ROOT=$HELIX_CORRELATION_PAYLOAD/dotnet;export DOTNET_CLI_TELEMETRY_OPTOUT=1;export DOTNET_MULTILEVEL_LOOKUP=0;export NUGET_PACKAGES=$HELIX_WORKITEM_ROOT/.packages;export PATH=$HELIX_CORRELATION_PAYLOAD/dotnet:$PATH</_MacEnvVars>
   </PropertyGroup>
 
   <Target Name="RemoveDotnetFromCorrelationStaging" BeforeTargets="BeforeTest">
     <Message Text="Removing Dotnet Packs from Correlation Staging" Importance="high" />
     <RemoveDir Directories="$(CorrelationPayloadDirectory)dotnet/packs" />
-    <!-- Remove scenario build intermediates to reduce payload size (published output is in scenarios_out/) -->
-    <RemoveDir Directories="@(MAUIiOSScenario -> '%(PayloadDirectory)/app/obj')" />
-    <RemoveDir Directories="@(MAUIiOSScenario -> '%(PayloadDirectory)/app/bin')" />
+    <RemoveDir Condition="'$(_IsInnerLoop)' != 'true'" Directories="@(MAUIiOSScenario -> '%(PayloadDirectory)/app/obj')" />
+    <RemoveDir Condition="'$(_IsInnerLoop)' != 'true'" Directories="@(MAUIiOSScenario -> '%(PayloadDirectory)/app/bin')" />
   </Target>
 
   <ItemDefinitionGroup>
     <HelixWorkItem>
-      <Timeout>00:30</Timeout>
+      <Timeout Condition="'$(_IsInnerLoop)' != 'true'">00:30</Timeout>
+      <Timeout Condition="'$(_IsInnerLoop)' == 'true'">02:30</Timeout>
     </HelixWorkItem>
   </ItemDefinitionGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(_IsInnerLoop)' != 'true'">
     <MAUIiOSScenario Include=".NET iOS Default Template">
       <ScenarioDirectoryName>netios</ScenarioDirectoryName>
       <PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
@@ -67,15 +72,15 @@
     </MAUIiOSScenario>
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(_IsInnerLoop)' != 'true'">
     <PreparePayloadWorkItem Include="@(MAUIiOSScenario)">
       <!-- Select the highest installed versioned Xcode bundle and avoid runner-image symlink aliases as they do not work with iOS SDK -->
       <Command>XCODE_PATH=`find /Applications -maxdepth 1 -type d -name 'Xcode_*.app' | sort -t_ -k2 -V | tail -1` &amp;&amp; echo &quot;Selected Xcode: $XCODE_PATH&quot; &amp;&amp; sudo xcode-select -s &quot;$XCODE_PATH&quot; &amp;&amp; $(Python) pre.py publish -f $(PERFLAB_Framework)-ios --self-contained -c $(BuildConfig) -r ios-arm64 --msbuild=&quot;$(_MSBuildArgs)&quot; --binlog $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)/%(PreparePayloadWorkItem.ScenarioDirectoryName).binlog -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName) &amp;&amp; rm -rf app/obj app/bin &amp;&amp; cd ../ &amp;&amp; zip -r %(PreparePayloadWorkItem.ScenarioDirectoryName).zip %(PreparePayloadWorkItem.ScenarioDirectoryName)</Command>
       <WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
     </PreparePayloadWorkItem>
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(_IsInnerLoop)' != 'true'">
     <HelixWorkItem Include="@(MAUIiOSScenario -> 'SOD - %(Identity) IPA Size')">
       <PreCommands>cp -r $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/%(HelixWorkItem.ScenarioDirectoryName) $HELIX_WORKITEM_ROOT/pub</PreCommands>
       <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot; $(ScenarioArgs)</Command>
@@ -124,7 +129,7 @@
         <![CDATA[
             # PreCommands
             export XHARNESSPATH=$XHARNESS_CLI_PATH
-            
+
             cp -v $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/mauiios/MauiiOSDefault.ipa $HELIX_WORKITEM_ROOT/mauiios/MauiiOSDefault.zip
             mkdir $HELIX_WORKITEM_ROOT/mauiios/pub
             cp -v $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/mauiios/versions.json $HELIX_WORKITEM_ROOT/mauiios/pub/versions.json
@@ -152,7 +157,7 @@
         <![CDATA[
             # PreCommands
             export XHARNESSPATH=$XHARNESS_CLI_PATH
-            
+
             cp -v $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/mauisamplecontentios/MauiSampleContentiOSDefault.ipa $HELIX_WORKITEM_ROOT/mauisamplecontentios/MauiSampleContentiOSDefault.zip
             mkdir $HELIX_WORKITEM_ROOT/mauisamplecontentios/pub
             cp -v $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/mauisamplecontentios/versions.json $HELIX_WORKITEM_ROOT/mauisamplecontentios/pub/versions.json
@@ -172,44 +177,41 @@
           ]]>
         </CustomCommands>
     </XHarnessAppBundleToTest>
-    <!-- Now also disabled for normal mono runs. (Reenable for mono and native aot once fixed). Tracking issue: https://github.com/dotnet/performance/issues/3148 -->
-    <!-- <XHarnessAppBundleToTest Condition="'$(RuntimeFlavor)' == 'mono'" Include="Device Startup - iOS Maui Blazor Default Template">
-      <AppBundlePath>$(ScenariosDir)mauiblazorios.zip</AppBundlePath>
-      <WorkItemTimeout>00:15:00</WorkItemTimeout>
-      <TestTarget>ios-device</TestTarget>
-      <CustomCommands>
-        <![CDATA[
-          # PreCommands
-          export XHARNESSPATH=$XHARNESS_CLI_PATH
-
-          cp -v $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/mauiblazorios/MauiBlazoriOSDefault.ipa $HELIX_WORKITEM_ROOT/mauiblazorios/MauiBlazoriOSDefault.zip
-          mkdir $HELIX_WORKITEM_ROOT/mauiblazorios/pub
-          cp -v $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/mauiblazorios/versions.json $HELIX_WORKITEM_ROOT/mauiblazorios/pub/versions.json
-          unzip -d $HELIX_WORKITEM_ROOT/mauiblazorios $HELIX_WORKITEM_ROOT/mauiblazorios/MauiBlazoriOSDefault.zip
-          mv $HELIX_WORKITEM_ROOT/mauiblazorios/Payload/MauiBlazoriOSDefault.app $HELIX_WORKITEM_ROOT/mauiblazorios/MauiBlazoriOSDefault.app
-          cp -f embedded.mobileprovision $HELIX_WORKITEM_ROOT/mauiblazorios/MauiBlazoriOSDefault.app
-          cd $HELIX_WORKITEM_ROOT/mauiblazorios
-          sign MauiBlazoriOSDefault.app
-
-          # Testing commands
-          $(Python) test.py devicestartup -1-device-type ios -1-package-path MauiBlazoriOSDefault.app -1-package-name net.dot.mauiblazortesting -1-scenario-name "%(Identity)" -1-use-fully-drawn-time -1-fully-drawn-magic-string __MAUI_Blazor_WebView_OnAfterRender__ -1-startup-iterations 5 $(ScenarioArgs)
-          ((result=$?))
-
-          # Post commands
-          $(Python) post.py
-          exit $result
-        ]]>
-      </CustomCommands>
-    </XHarnessAppBundleToTest> -->
   </ItemGroup>
 
+  <ItemGroup Condition="'$(_IsInnerLoop)' == 'true'">
+    <MAUIiOSInnerLoopScenario Include="MAUI iOS Inner Loop">
+      <ScenarioDirectoryName>mauiiosinnerloop</ScenarioDirectoryName>
+      <PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
+    </MAUIiOSInnerLoopScenario>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(_IsInnerLoop)' == 'true'">
+    <PreparePayloadWorkItem Include="@(MAUIiOSInnerLoopScenario)">
+      <Command>XCODE_PATH=`find /Applications -maxdepth 1 -type d -name 'Xcode_*.app' | sort -t_ -k2 -V | tail -1` &amp;&amp; echo &quot;Selected Xcode: $XCODE_PATH&quot; &amp;&amp; sudo xcode-select -s &quot;$XCODE_PATH&quot; &amp;&amp; $(Python) pre.py default -f $(PERFLAB_Framework)-ios</Command>
+      <WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
+    </PreparePayloadWorkItem>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(_IsInnerLoop)' == 'true' and '$(iOSRid)' != 'ios-arm64'">
+    <HelixWorkItem Include="@(MAUIiOSInnerLoopScenario -> 'Inner Loop Simulator - %(Identity)')">
+      <PreCommands>$(_MacEnvVars);export IOS_RID=$(iOSRid);$(Python) setup_helix.py $(PERFLAB_Framework)-ios &quot;$(_MSBuildArgs)&quot; || exit $?</PreCommands>
+      <Command>$(Python) test.py iosinnerloop --csproj-path app/MauiiOSInnerLoop.csproj --edit-src &quot;src/MainPage.xaml.cs;src/MainPage.xaml&quot; --edit-dest &quot;app/Pages/MainPage.xaml.cs;app/Pages/MainPage.xaml&quot; --bundle-id com.companyname.mauiiosinnerloop -f $(PERFLAB_Framework)-ios -c Debug --msbuild-args &quot;$(_MSBuildArgs)&quot; --device-type simulator --inner-loop-iterations $(InnerLoopIterations) --scenario-name &quot;%(Identity)&quot; $(ScenarioArgs)</Command>
+      <PostCommands>export IOS_RID=$(iOSRid);$(Python) post.py</PostCommands>
+      <DownloadFilesFromResults>output.log</DownloadFilesFromResults>
+    </HelixWorkItem>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(_IsInnerLoop)' == 'true' and '$(iOSRid)' == 'ios-arm64'">
+    <HelixWorkItem Include="@(MAUIiOSInnerLoopScenario -> 'Inner Loop Device - %(Identity)')">
+      <PreCommands>$(_MacEnvVars);export IOS_RID=$(iOSRid);$(Python) setup_helix.py $(PERFLAB_Framework)-ios &quot;$(_MSBuildArgs)&quot; || exit $?</PreCommands>
+      <Command>$(Python) test.py iosinnerloop --csproj-path app/MauiiOSInnerLoop.csproj --edit-src &quot;src/MainPage.xaml.cs;src/MainPage.xaml&quot; --edit-dest &quot;app/Pages/MainPage.xaml.cs;app/Pages/MainPage.xaml&quot; --bundle-id com.companyname.mauiiosinnerloop -f $(PERFLAB_Framework)-ios -c Debug --msbuild-args &quot;$(_MSBuildArgs)&quot; --device-type device --inner-loop-iterations $(InnerLoopIterations) --scenario-name &quot;%(Identity)&quot; $(ScenarioArgs)</Command>
+      <PostCommands>export IOS_RID=$(iOSRid);$(Python) post.py</PostCommands>
+      <DownloadFilesFromResults>output.log</DownloadFilesFromResults>
+    </HelixWorkItem>
+  </ItemGroup>
 
-  <!--
-    This target is to work around the XHarness command that depend on scripts in ORIGPYPATH
-    being run before we get to run our normal Post commands. AddXHarnessCLI is the XHarness
-    Target so we just make sure we add this after that.
-  -->
-  <Target Name="ResetPYTHONPATHBeforeXHarnessCommand" AfterTargets="AddXHarnessCLI">
+  <Target Name="ResetPYTHONPATHBeforeXHarnessCommand" AfterTargets="AddXHarnessCLI" Condition="'$(_IsInnerLoop)' != 'true'">
     <PropertyGroup>
       <HelixPostCommands>export PYTHONPATH=$ORIGPYPATH;$(HelixPostCommands)</HelixPostCommands>
     </PropertyGroup>

eng/pipelines/sdk-perf-jobs.yml

@@ -565,6 +565,86 @@ jobs:
         ${{ each parameter in parameters.jobParameters }}:
           ${{ parameter.key }}: ${{ parameter.value }}
 
+  # Maui iOS Inner Loop (Mono) - Debug - Simulator
+  - template: /eng/pipelines/templates/build-machine-matrix.yml
+    parameters:
+      jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
+      buildMachines:
+        - osx-x64-ios-arm64
+      isPublic: false
+      jobParameters:
+        runKind: maui_scenarios_ios_innerloop
+        projectFileName: maui_scenarios_ios.proj
+        channels:
+          - main
+        runtimeFlavor: mono
+        codeGenType: Default
+        buildConfig: Debug
+        additionalJobIdentifier: Mono_InnerLoop_Simulator
+        ${{ each parameter in parameters.jobParameters }}:
+          ${{ parameter.key }}: ${{ parameter.value }}
+
+  # Maui iOS Inner Loop (CoreCLR) - Debug - Simulator
+  - template: /eng/pipelines/templates/build-machine-matrix.yml
+    parameters:
+      jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
+      buildMachines:
+        - osx-x64-ios-arm64
+      isPublic: false
+      jobParameters:
+        runKind: maui_scenarios_ios_innerloop
+        projectFileName: maui_scenarios_ios.proj
+        channels:
+          - main
+        runtimeFlavor: coreclr
+        codeGenType: Default
+        buildConfig: Debug
+        additionalJobIdentifier: CoreCLR_InnerLoop_Simulator
+        ${{ each parameter in parameters.jobParameters }}:
+          ${{ parameter.key }}: ${{ parameter.value }}
+
+  # Maui iOS Inner Loop (Mono) - Debug - Device
+  - template: /eng/pipelines/templates/build-machine-matrix.yml
+    parameters:
+      jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
+      buildMachines:
+        - osx-x64-ios-arm64
+      isPublic: false
+      jobParameters:
+        runKind: maui_scenarios_ios_innerloop
+        projectFileName: maui_scenarios_ios.proj
+        channels:
+          - main
+        runtimeFlavor: mono
+        codeGenType: Default
+        buildConfig: Debug
+        additionalJobIdentifier: Mono_InnerLoop_Device
+        runEnvVars:
+          - iOSRid=ios-arm64
+        ${{ each parameter in parameters.jobParameters }}:
+          ${{ parameter.key }}: ${{ parameter.value }}
+
+  # Maui iOS Inner Loop (CoreCLR) - Debug - Device
+  - template: /eng/pipelines/templates/build-machine-matrix.yml
+    parameters:
+      jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
+      buildMachines:
+        - osx-x64-ios-arm64
+      isPublic: false
+      jobParameters:
+        runKind: maui_scenarios_ios_innerloop
+        projectFileName: maui_scenarios_ios.proj
+        channels:
+          - main
+        runtimeFlavor: coreclr
+        codeGenType: Default
+        buildConfig: Debug
+        additionalJobIdentifier: CoreCLR_InnerLoop_Device
+        runEnvVars:
+          - iOSRid=ios-arm64
+        ${{ each parameter in parameters.jobParameters }}:
+          ${{ parameter.key }}: ${{ parameter.value }}
+
   # Maui scenario benchmarks
   - ${{ if false }}:
     - template: /eng/pipelines/templates/build-machine-matrix.yml

eng/pipelines/templates/run-performance-job.yml

@@ -190,7 +190,7 @@ jobs:
               - '--is-scenario'
             - ${{ if ne(length(parameters.runEnvVars), 0) }}:
               - "--run-env-vars ${{ join(' ', parameters.runEnvVars)}}"
-            - ${{ if and(in(parameters.runKind, 'maui_scenarios_ios', 'maui_scenarios_android'), ne(parameters.runtimeFlavor, '')) }}:
+            - ${{ if and(in(parameters.runKind, 'maui_scenarios_ios', 'maui_scenarios_android', 'maui_scenarios_ios_innerloop'), ne(parameters.runtimeFlavor, '')) }}:
               - '--runtime-flavor ${{ parameters.runtimeFlavor }}'
             - ${{ if ne(parameters.osVersion, '') }}:
               - '--os-version ${{ parameters.osVersion }}'

scripts/run_performance_job.py

@@ -590,6 +590,15 @@ def get_run_configurations(
         if build_config is not None and build_config != DEFAULT_BUILD_CONFIG:
             configurations["BuildConfig"] = build_config
 
+    # .NET MAUI iOS inner loop (build+deploy) scenarios
+    if run_kind == "maui_scenarios_ios_innerloop":
+        if not runtime_flavor in ("mono", "coreclr"):
+            raise Exception("Runtime flavor must be specified for maui_scenarios_ios_innerloop")
+        configurations["CodegenType"] = str(codegen_type)
+        configurations["RuntimeType"] = str(runtime_flavor)
+        if build_config is not None and build_config != DEFAULT_BUILD_CONFIG:
+            configurations["BuildConfig"] = build_config
+
     return configurations
 
 def get_work_item_command(os_group: str, target_csproj: str, architecture: str, perf_lab_framework: str, internal: bool, wasm: bool, bdn_artifacts_dir: str, wasm_coreclr: bool = False, only_sanity_check: bool = False):
@@ -1164,6 +1173,12 @@ def publish_dotnet_app_to_payload(payload_dir_name: str, csproj_path: str, self_
             os.environ["CodegenType"] = args.codegen_type or ''
             os.environ["BuildConfig"] = args.build_config or DEFAULT_BUILD_CONFIG
 
+            # Propagate run_env_vars to os.environ so they reach MSBuild
+            # evaluation as properties (e.g., iOSRid for device builds).
+            if args.run_env_vars:
+                for key, value in args.run_env_vars.items():
+                    os.environ[key] = value
+
             # TODO: See if these commands are needed for linux as they were being called before but were failing.
             if args.os_group == "windows" or args.os_group == "osx":
                 break_system_packages = ["--break-system-packages"] if args.os_group == "osx" else []
@@ -1193,7 +1208,7 @@ def publish_dotnet_app_to_payload(payload_dir_name: str, csproj_path: str, self_
                 verbose=True).run()
 
             # Search for additional binlogs generated by the maui scenarios prepare payload work items to copy to the artifacts log dir
-            if args.run_kind in ["maui_scenarios_android", "maui_scenarios_ios"]:
+            if args.run_kind in ["maui_scenarios_android", "maui_scenarios_ios", "maui_scenarios_ios_innerloop"]:
                 for binlog_path in glob(os.path.join(payload_dir, "scenarios_out", "**", "*.binlog"), recursive=True):
                     shutil.copy(binlog_path, ci_artifacts_log_dir)
 
@@ -1324,10 +1339,20 @@ def get_work_item_command_for_artifact_dir(artifact_dir: str):
         only_sanity_check=args.only_sanity_check,
         ios_strip_symbols=args.ios_strip_symbols,
         ios_llvm_build=args.ios_llvm_build,
+        ios_rid=args.run_env_vars.get("iOSRid"),
         fail_on_test_failure=fail_on_test_failure,
         scenario_arguments=scenario_arguments or None)
 
     if args.send_to_helix:
+        # Re-apply run_env_vars so they reach SendToHelix MSBuild evaluation.
+        # The env was snapshot/restored earlier (environ_copy), and while
+        # os.environ.update() preserves new keys, some shell wrappers may not
+        # inherit them reliably. Explicitly re-setting ensures properties like
+        # iOSRid (used in .proj ItemGroup conditions) are available.
+        if args.run_env_vars:
+            for key, value in args.run_env_vars.items():
+                os.environ[key] = value
+
         perf_send_to_helix(perf_send_to_helix_args)
 
         results_glob = os.path.join(helix_results_destination_dir, '**', '*perf-lab-report.json')