From e4e95ea8ef5e0a58d5f552087ddeba7c030f0683 Mon Sep 17 00:00:00 2001
From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com>
Date: Thu, 19 Mar 2026 13:48:02 -0400
Subject: [PATCH 01/10] Add linux_arm and windows_x86 to cDAC dump test
 platforms

Add 32-bit platform coverage to the cDAC dump test Helix infrastructure:
- windows_x86: runs on Windows.10.Amd64.Open via WoW64
- linux_arm: runs on containerized ARM32 Helix queue (Debian on ARM64)

Also adds helix_windows_x86 variable to helix-platforms.yml for
queue name centralization.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/pipelines/cdac/prepare-cdac-helix-steps.yml | 2 ++
 eng/pipelines/helix-platforms.yml               | 4 ++++
 eng/pipelines/runtime-diagnostics.yml           | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/eng/pipelines/cdac/prepare-cdac-helix-steps.yml b/eng/pipelines/cdac/prepare-cdac-helix-steps.yml
index 1661d4eb2d1198..ad221189952f0f 100644
--- a/eng/pipelines/cdac/prepare-cdac-helix-steps.yml
+++ b/eng/pipelines/cdac/prepare-cdac-helix-steps.yml
@@ -38,9 +38,11 @@ steps:
 
     $queue = switch ("$(osGroup)_$(archType)") {
         "windows_x64"  { "$(helix_windows_x64)" }
+        "windows_x86"  { "$(helix_windows_x86)" }
         "windows_arm64" { "$(helix_windows_arm64)" }
         "linux_x64"    { "$(helix_linux_x64_oldest)" }
         "linux_arm64"  { "$(helix_linux_arm64_oldest)" }
+        "linux_arm"    { "$(helix_linux_arm32_oldest)" }
         "osx_x64"     { "$(helix_macos_x64)" }
         "osx_arm64"   { "$(helix_macos_arm64)" }
         default        { Write-Error "Unsupported platform: $(osGroup)_$(archType)"; exit 1 }
diff --git a/eng/pipelines/helix-platforms.yml b/eng/pipelines/helix-platforms.yml
index e1ddcef6681bd8..3eacd890f6bc49 100644
--- a/eng/pipelines/helix-platforms.yml
+++ b/eng/pipelines/helix-platforms.yml
@@ -257,6 +257,10 @@ variables:
   - name: helix_windows_arm64_oldest_internal
     value: Windows.10.Arm64
 
+  # Windows x86 (runs on x64 machines via WoW64)
+  - name: helix_windows_x86
+    value: Windows.10.Amd64.Open
+
   # ===========================================
   # Browser/WASM Platforms
   # ===========================================
diff --git a/eng/pipelines/runtime-diagnostics.yml b/eng/pipelines/runtime-diagnostics.yml
index ceed70726cd270..1cb58e018c0d20 100644
--- a/eng/pipelines/runtime-diagnostics.yml
+++ b/eng/pipelines/runtime-diagnostics.yml
@@ -10,9 +10,11 @@ parameters:
   type: object
   default:
     - windows_x64
+    - windows_x86
     - linux_x64
     - windows_arm64
     - linux_arm64
+    - linux_arm
     # TODO: Re-enable osx once disk space issue is resolved.
     # macOS full dumps are ~5.7GB each; with 8+ full-dump debuggees the Helix
     # machines run out of disk space (~45GB total). See PR #124782 for details.

From 54a72fb74a2aee2b73e19675cb9f45f14de8d57b Mon Sep 17 00:00:00 2001
From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com>
Date: Thu, 19 Mar 2026 14:59:11 -0400
Subject: [PATCH 02/10] Quote HelixTargetQueues in sendParams for bash safety

The containerized ARM32 queue name contains parentheses which bash
interprets as subshell syntax. Quoting the /p:HelixTargetQueues
argument prevents this.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/pipelines/runtime-diagnostics.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/runtime-diagnostics.yml b/eng/pipelines/runtime-diagnostics.yml
index 1cb58e018c0d20..6b7abde51df171 100644
--- a/eng/pipelines/runtime-diagnostics.yml
+++ b/eng/pipelines/runtime-diagnostics.yml
@@ -218,7 +218,7 @@ extends:
               - template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml
                 parameters:
                   displayName: 'Send cDAC Dump Tests to Helix'
-                  sendParams: $(Build.SourcesDirectory)/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj /t:Test /p:TargetOS=$(osGroup) /p:TargetArchitecture=$(archType) /p:HelixTargetQueues=$(CdacHelixQueue) /p:TestHostPayload=$(TestHostPayloadDir) /p:DumpTestsPayload=$(Build.SourcesDirectory)/artifacts/helixPayload/cdac /bl:$(Build.SourcesDirectory)/artifacts/log/SendToHelix.binlog
+                  sendParams: $(Build.SourcesDirectory)/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj /t:Test /p:TargetOS=$(osGroup) /p:TargetArchitecture=$(archType) "/p:HelixTargetQueues=$(CdacHelixQueue)" /p:TestHostPayload=$(TestHostPayloadDir) /p:DumpTestsPayload=$(Build.SourcesDirectory)/artifacts/helixPayload/cdac /bl:$(Build.SourcesDirectory)/artifacts/log/SendToHelix.binlog
                   environment:
                     _Creator: dotnet-bot
                     SYSTEM_ACCESSTOKEN: $(System.AccessToken)
@@ -255,7 +255,7 @@ extends:
               - template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml
                 parameters:
                   displayName: 'Send cDAC Dump Gen to Helix'
-                  sendParams: $(Build.SourcesDirectory)/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj /t:Test /p:DumpOnly=true /p:TargetOS=$(osGroup) /p:TargetArchitecture=$(archType) /p:HelixTargetQueues=$(CdacHelixQueue) /p:TestHostPayload=$(TestHostPayloadDir) /p:DumpTestsPayload=$(Build.SourcesDirectory)/artifacts/helixPayload/cdac /bl:$(Build.SourcesDirectory)/artifacts/log/SendDumpGenToHelix.binlog
+                  sendParams: $(Build.SourcesDirectory)/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj /t:Test /p:DumpOnly=true /p:TargetOS=$(osGroup) /p:TargetArchitecture=$(archType) "/p:HelixTargetQueues=$(CdacHelixQueue)" /p:TestHostPayload=$(TestHostPayloadDir) /p:DumpTestsPayload=$(Build.SourcesDirectory)/artifacts/helixPayload/cdac /bl:$(Build.SourcesDirectory)/artifacts/log/SendDumpGenToHelix.binlog
                   environment:
                     _Creator: dotnet-bot
                     SYSTEM_ACCESSTOKEN: $(System.AccessToken)
@@ -331,7 +331,7 @@ extends:
               - template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml
                 parameters:
                   displayName: 'Send cDAC X-Plat Dump Tests to Helix'
-                  sendParams: $(Build.SourcesDirectory)/src/native/managed/cdac/tests/DumpTests/cdac-dump-xplat-test-helix.proj /t:Test /p:TargetOS=$(osGroup) /p:TargetArchitecture=$(archType) /p:HelixTargetQueues=$(CdacHelixQueue) /p:TestHostPayload=$(TestHostPayloadDir) /p:DumpTestsPayload=$(Build.SourcesDirectory)/artifacts/helixPayload/cdac /bl:$(Build.SourcesDirectory)/artifacts/log/SendXPlatTestToHelix.binlog
+                  sendParams: $(Build.SourcesDirectory)/src/native/managed/cdac/tests/DumpTests/cdac-dump-xplat-test-helix.proj /t:Test /p:TargetOS=$(osGroup) /p:TargetArchitecture=$(archType) "/p:HelixTargetQueues=$(CdacHelixQueue)" /p:TestHostPayload=$(TestHostPayloadDir) /p:DumpTestsPayload=$(Build.SourcesDirectory)/artifacts/helixPayload/cdac /bl:$(Build.SourcesDirectory)/artifacts/log/SendXPlatTestToHelix.binlog
                   environment:
                     _Creator: dotnet-bot
                     SYSTEM_ACCESSTOKEN: $(System.AccessToken)

From d05aff6f2b6531994d2b85d99dc25c72def9a2e3 Mon Sep 17 00:00:00 2001
From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com>
Date: Thu, 19 Mar 2026 17:14:29 -0400
Subject: [PATCH 03/10] Publish dump artifacts on test failure in single-leg
 mode

Tar and upload dumps from Helix back to the agent so they can be
published as pipeline artifacts for local investigation. The tar
runs unconditionally after tests, but the artifact is only published
when the job fails.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/pipelines/runtime-diagnostics.yml                    | 7 +++++++
 .../managed/cdac/tests/DumpTests/cdac-dump-helix.proj    | 9 ++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/runtime-diagnostics.yml b/eng/pipelines/runtime-diagnostics.yml
index 6b7abde51df171..2713cf287caf6d 100644
--- a/eng/pipelines/runtime-diagnostics.yml
+++ b/eng/pipelines/runtime-diagnostics.yml
@@ -223,6 +223,13 @@ extends:
                     _Creator: dotnet-bot
                     SYSTEM_ACCESSTOKEN: $(System.AccessToken)
                     NUGET_PACKAGES: $(Build.SourcesDirectory)$(dir).packages
+              - task: PublishPipelineArtifact@1
+                inputs:
+                  targetPath: $(Build.SourcesDirectory)/artifacts/helixresults
+                  artifactName: CdacDumps_$(osGroup)_$(archType)
+                displayName: 'Publish Dump Artifacts'
+                condition: failed()
+                continueOnError: true
               - pwsh: |
                   if ("$(Agent.JobStatus)" -ne "Succeeded") {
                     Write-Error "One or more cDAC dump test failures were detected. Failing the job."
diff --git a/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj b/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
index 9b89de9084d17e..c6a6e5ab1b40f8 100644
--- a/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
+++ b/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
@@ -83,7 +83,8 @@
   <!-- Windows: test mode tail command -->
   <PropertyGroup Condition="'$(TargetOS)' == 'windows' AND '$(DumpOnly)' != 'true'">
     <_TestCommand>%HELIX_CORRELATION_PAYLOAD%\dotnet.exe exec --runtimeconfig %HELIX_WORKITEM_PAYLOAD%\tests\Microsoft.Diagnostics.DataContractReader.DumpTests.runtimeconfig.json --depsfile %HELIX_WORKITEM_PAYLOAD%\tests\Microsoft.Diagnostics.DataContractReader.DumpTests.deps.json %HELIX_WORKITEM_PAYLOAD%\tests\xunit.console.dll %HELIX_WORKITEM_PAYLOAD%\tests\Microsoft.Diagnostics.DataContractReader.DumpTests.dll -xml testResults.xml -nologo</_TestCommand>
-    <_FullCommand>$(_DumpGenCommands) &amp; $(_DumpInfoCommand) &amp; $(_TestCommand)</_FullCommand>
+    <_TarCommand>tar -czf %HELIX_WORKITEM_UPLOAD_ROOT%\dumps.tar.gz -C %HELIX_WORKITEM_PAYLOAD%\dumps .</_TarCommand>
+    <_FullCommand>$(_DumpGenCommands) &amp; $(_DumpInfoCommand) &amp; $(_TestCommand) &amp; $(_TarCommand)</_FullCommand>
   </PropertyGroup>
 
   <!-- Windows: DumpOnly mode tail command -->
@@ -101,7 +102,8 @@
   <!-- Unix: test mode tail command -->
   <PropertyGroup Condition="'$(TargetOS)' != 'windows' AND '$(DumpOnly)' != 'true'">
     <_TestCommand>$HELIX_CORRELATION_PAYLOAD/dotnet exec --runtimeconfig $HELIX_WORKITEM_PAYLOAD/tests/Microsoft.Diagnostics.DataContractReader.DumpTests.runtimeconfig.json --depsfile $HELIX_WORKITEM_PAYLOAD/tests/Microsoft.Diagnostics.DataContractReader.DumpTests.deps.json $HELIX_WORKITEM_PAYLOAD/tests/xunit.console.dll $HELIX_WORKITEM_PAYLOAD/tests/Microsoft.Diagnostics.DataContractReader.DumpTests.dll -xml testResults.xml -nologo</_TestCommand>
-    <_FullCommand>$(_DumpGenCommands) &amp;&amp; $(_DumpInfoCommand) &amp;&amp; $(_TestCommand)</_FullCommand>
+    <_TarCommand>tar -czf $HELIX_WORKITEM_UPLOAD_ROOT/dumps.tar.gz -C $HELIX_WORKITEM_PAYLOAD/dumps .</_TarCommand>
+    <_FullCommand>$(_DumpGenCommands) &amp;&amp; $(_DumpInfoCommand) &amp;&amp; $(_TestCommand) ; $(_TarCommand)</_FullCommand>
   </PropertyGroup>
 
   <!-- Unix: DumpOnly mode tail command -->
@@ -133,12 +135,13 @@
     <HelixPreCommands>@(HelixPreCommand)</HelixPreCommands>
   </PropertyGroup>
 
-  <!-- Test mode: generate dumps then run tests -->
+  <!-- Test mode: generate dumps, run tests, then tar dumps for download on failure -->
   <ItemGroup Condition="'$(DumpOnly)' != 'true'">
     <HelixWorkItem Include="CdacDumpTests">
       <PayloadDirectory>$(DumpTestsPayload)</PayloadDirectory>
       <Command>$(_FullCommand)</Command>
       <Timeout>$(WorkItemTimeout)</Timeout>
+      <DownloadFilesFromResults>dumps.tar.gz</DownloadFilesFromResults>
     </HelixWorkItem>
   </ItemGroup>
 

From 3011ff901332bbf26df2ea774c532bfaa46df0a2 Mon Sep 17 00:00:00 2001
From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com>
Date: Fri, 20 Mar 2026 09:25:10 -0400
Subject: [PATCH 04/10] Fix dump publish condition to trigger on
 SucceededWithIssues

shouldContinueOnError causes Helix failures to report as
SucceededWithIssues, not Failed. Use Agent.JobStatus check
instead of failed() so dumps are published on any non-success.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/pipelines/runtime-diagnostics.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/runtime-diagnostics.yml b/eng/pipelines/runtime-diagnostics.yml
index 2713cf287caf6d..87f93adfb62a85 100644
--- a/eng/pipelines/runtime-diagnostics.yml
+++ b/eng/pipelines/runtime-diagnostics.yml
@@ -228,7 +228,7 @@ extends:
                   targetPath: $(Build.SourcesDirectory)/artifacts/helixresults
                   artifactName: CdacDumps_$(osGroup)_$(archType)
                 displayName: 'Publish Dump Artifacts'
-                condition: failed()
+                condition: and(always(), ne(variables['Agent.JobStatus'], 'Succeeded'))
                 continueOnError: true
               - pwsh: |
                   if ("$(Agent.JobStatus)" -ne "Succeeded") {

From 6d51b303821d53cfdd2624720c041296c7c57a93 Mon Sep 17 00:00:00 2001
From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com>
Date: Fri, 20 Mar 2026 11:05:16 -0400
Subject: [PATCH 05/10] Use same Helix queue for windows_x86 as windows_x64

The Windows.10.Amd64.Open queue may have different permissions
for the DAC registry key needed for heap dumps. Use the same
Windows.11.Amd64.Client.Open queue that windows_x64 uses.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/pipelines/cdac/prepare-cdac-helix-steps.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/cdac/prepare-cdac-helix-steps.yml b/eng/pipelines/cdac/prepare-cdac-helix-steps.yml
index ad221189952f0f..ce8e01605987ae 100644
--- a/eng/pipelines/cdac/prepare-cdac-helix-steps.yml
+++ b/eng/pipelines/cdac/prepare-cdac-helix-steps.yml
@@ -38,7 +38,7 @@ steps:
 
     $queue = switch ("$(osGroup)_$(archType)") {
         "windows_x64"  { "$(helix_windows_x64)" }
-        "windows_x86"  { "$(helix_windows_x86)" }
+        "windows_x86"  { "$(helix_windows_x64)" }
         "windows_arm64" { "$(helix_windows_arm64)" }
         "linux_x64"    { "$(helix_linux_x64_oldest)" }
         "linux_arm64"  { "$(helix_linux_arm64_oldest)" }

From 0ba94b3ecf7fda1f746bd7dec532236b97ea5fc7 Mon Sep 17 00:00:00 2001
From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com>
Date: Fri, 20 Mar 2026 14:28:45 -0400
Subject: [PATCH 06/10] Extract unsigned DAC registry logic into shared
 EnableUnsignedDac.props

Move the DisableAuxProviderSignatureCheck registry key logic into a
shared props file imported by both DumpTests.targets and
cdac-dump-helix.proj. Add /reg:32 to also set the key in the WoW64
registry view so x86 processes find it under WOW6432Node.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../cdac/tests/DumpTests/DumpTests.targets    | 19 ++---------
 .../tests/DumpTests/EnableUnsignedDac.props   | 33 +++++++++++++++++++
 .../cdac/tests/DumpTests/cdac-dump-helix.proj |  5 ++-
 3 files changed, 39 insertions(+), 18 deletions(-)
 create mode 100644 src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.props

diff --git a/src/native/managed/cdac/tests/DumpTests/DumpTests.targets b/src/native/managed/cdac/tests/DumpTests/DumpTests.targets
index 5ee2d6b3b0db04..3962b1f38d1f69 100644
--- a/src/native/managed/cdac/tests/DumpTests/DumpTests.targets
+++ b/src/native/managed/cdac/tests/DumpTests/DumpTests.targets
@@ -62,23 +62,8 @@
     <DumpRuntimeVersion Include="$(DumpVersions)" />
   </ItemGroup>
 
-  <!--
-    On Windows, heap dumps (type 2) require the DAC (mscordaccore.dll) which is unsigned
-    in local/CI builds. Set the DisableAuxProviderSignatureCheck registry value so that
-    MiniDumpWriteDump accepts the unsigned DAC. Windows 11+ / Server 2022+ only.
-
-    This is opt-in via /p:SetDisableAuxProviderSignatureCheck=true to avoid surprising
-    machine-wide registry changes during a normal build.
-  -->
-  <Target Name="_EnableUnsignedDacWindows"
-          BeforeTargets="GenerateAllDumps"
-          Condition="'$(HostOS)' == 'windows' AND '$(SetDisableAuxProviderSignatureCheck)' == 'true'">
-    <Exec Command="reg add &quot;HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\MiniDumpSettings&quot; /v DisableAuxProviderSignatureCheck /t REG_DWORD /d 1 /f"
-          IgnoreExitCode="true"
-          IgnoreStandardErrorWarningFormat="true" />
-    <Message Text="Note: If heap dump generation fails on Windows, ensure the DisableAuxProviderSignatureCheck registry key is set. Run as admin or set manually: reg add &quot;HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\MiniDumpSettings&quot; /v DisableAuxProviderSignatureCheck /t REG_DWORD /d 1 /f"
-             Importance="normal" />
-  </Target>
+  <!-- Unsigned DAC registry key for heap dumps (shared with cdac-dump-helix.proj) -->
+  <Import Project="EnableUnsignedDac.props" />
 
   <!-- Filter out Windows-only debuggees on non-Windows platforms. Debuggees opt in
        by setting <WindowsOnly>true</WindowsOnly> in their csproj. -->
diff --git a/src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.props b/src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.props
new file mode 100644
index 00000000000000..2ebdfd8a95da5c
--- /dev/null
+++ b/src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.props
@@ -0,0 +1,33 @@
+<Project>
+
+  <!--
+    On Windows, heap dumps (type 2) require the DAC (mscordaccore.dll) which is unsigned
+    in local/CI builds. Set the DisableAuxProviderSignatureCheck registry value so that
+    MiniDumpWriteDump accepts the unsigned DAC. Windows 11+ / Server 2022+ only.
+
+    The key must be set in both the native (64-bit) and WoW64 (32-bit) registry views.
+    Without /reg:32, x86 processes running under WoW64 read from
+    HKLM\SOFTWARE\WOW6432Node\... and miss the key, producing degraded dumps.
+  -->
+
+  <PropertyGroup>
+    <_DacRegKey>HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\MiniDumpSettings</_DacRegKey>
+    <_DacRegAdd>reg add &quot;$(_DacRegKey)&quot; /v DisableAuxProviderSignatureCheck /t REG_DWORD /d 1 /f</_DacRegAdd>
+    <_DacRegAdd32>$(_DacRegAdd) /reg:32</_DacRegAdd32>
+  </PropertyGroup>
+
+  <!--
+    MSBuild target for local/CI builds (opt-in via /p:SetDisableAuxProviderSignatureCheck=true).
+  -->
+  <Target Name="_EnableUnsignedDacWindows"
+          BeforeTargets="GenerateAllDumps"
+          Condition="'$(HostOS)' == 'windows' AND '$(SetDisableAuxProviderSignatureCheck)' == 'true'">
+    <Exec Command="$(_DacRegAdd)" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" />
+    <!-- WoW64 view only needed for x86 processes -->
+    <Exec Command="$(_DacRegAdd32)" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true"
+          Condition="'$(TargetArchitecture)' == 'x86'" />
+    <Message Text="Note: If heap dump generation fails on Windows, ensure the DisableAuxProviderSignatureCheck registry key is set. Run as admin or set manually: $(_DacRegAdd)"
+             Importance="normal" />
+  </Target>
+
+</Project>
diff --git a/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj b/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
index c6a6e5ab1b40f8..8254b909449ae6 100644
--- a/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
+++ b/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
@@ -63,6 +63,7 @@
     derived from each debuggee's DumpTypes property (Heap->heap/2, Full->full/4).
   -->
   <Import Project="$(DumpTestsPayload)/debuggee-metadata.props" />
+  <Import Project="$(MSBuildThisFileDirectory)EnableUnsignedDac.props" />
 
   <!--
     Helix work item command: generate dumps then run tests (or tar + upload).
@@ -115,7 +116,9 @@
   <!-- Pre-commands: enable dump generation -->
   <ItemGroup Condition="'$(TargetOS)' == 'windows'">
     <!-- Allow heap dump generation with the unsigned locally-built DAC -->
-    <HelixPreCommand Include="reg add &quot;HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\MiniDumpSettings&quot; /v DisableAuxProviderSignatureCheck /t REG_DWORD /d 1 /f 2&gt;nul || (echo DisableAuxProviderSignatureCheck registry write skipped &amp; exit /b 0)" />
+    <HelixPreCommand Include="$(_DacRegAdd) 2&gt;nul || (echo DisableAuxProviderSignatureCheck registry write skipped &amp; exit /b 0)" />
+    <!-- WoW64 view only needed for x86 processes -->
+    <HelixPreCommand Condition="'$(TargetArchitecture)' == 'x86'" Include="$(_DacRegAdd32) 2&gt;nul || (echo DisableAuxProviderSignatureCheck /reg:32 registry write skipped &amp; exit /b 0)" />
     <HelixPreCommand Include="set DOTNET_DbgEnableMiniDump=1" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetOS)' != 'windows'">

From 8fd98e733170fb3989dcdff267b641f8aa929e2d Mon Sep 17 00:00:00 2001
From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com>
Date: Tue, 24 Mar 2026 10:45:11 -0400
Subject: [PATCH 07/10] Address review comments: preserve test exit code, fix
 comment, remove unused variable

- Windows: save test ERRORLEVEL before tar runs, exit /b 1 if tests failed
- Unix: capture test exit code in _rc before tar, exit with it after
- Fix comment that incorrectly said tar runs only on failure
- Remove unused helix_windows_x86 variable from helix-platforms.yml

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/pipelines/helix-platforms.yml                           | 4 ----
 .../managed/cdac/tests/DumpTests/cdac-dump-helix.proj       | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/eng/pipelines/helix-platforms.yml b/eng/pipelines/helix-platforms.yml
index d582ecc7bbf4b3..9c699e5f1a8160 100644
--- a/eng/pipelines/helix-platforms.yml
+++ b/eng/pipelines/helix-platforms.yml
@@ -257,10 +257,6 @@ variables:
   - name: helix_windows_arm64_oldest_internal
     value: Windows.10.Arm64
 
-  # Windows x86 (runs on x64 machines via WoW64)
-  - name: helix_windows_x86
-    value: Windows.10.Amd64.Open
-
   # ===========================================
   # Browser/WASM Platforms
   # ===========================================
diff --git a/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj b/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
index 8254b909449ae6..d08f1240ae25e0 100644
--- a/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
+++ b/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
@@ -85,7 +85,7 @@
   <PropertyGroup Condition="'$(TargetOS)' == 'windows' AND '$(DumpOnly)' != 'true'">
     <_TestCommand>%HELIX_CORRELATION_PAYLOAD%\dotnet.exe exec --runtimeconfig %HELIX_WORKITEM_PAYLOAD%\tests\Microsoft.Diagnostics.DataContractReader.DumpTests.runtimeconfig.json --depsfile %HELIX_WORKITEM_PAYLOAD%\tests\Microsoft.Diagnostics.DataContractReader.DumpTests.deps.json %HELIX_WORKITEM_PAYLOAD%\tests\xunit.console.dll %HELIX_WORKITEM_PAYLOAD%\tests\Microsoft.Diagnostics.DataContractReader.DumpTests.dll -xml testResults.xml -nologo</_TestCommand>
     <_TarCommand>tar -czf %HELIX_WORKITEM_UPLOAD_ROOT%\dumps.tar.gz -C %HELIX_WORKITEM_PAYLOAD%\dumps .</_TarCommand>
-    <_FullCommand>$(_DumpGenCommands) &amp; $(_DumpInfoCommand) &amp; $(_TestCommand) &amp; $(_TarCommand)</_FullCommand>
+    <_FullCommand>$(_DumpGenCommands) &amp; $(_DumpInfoCommand) &amp; $(_TestCommand) &amp; if errorlevel 1 set _FAIL=1 &amp; $(_TarCommand) &amp; if defined _FAIL exit /b 1</_FullCommand>
   </PropertyGroup>
 
   <!-- Windows: DumpOnly mode tail command -->
@@ -104,7 +104,7 @@
   <PropertyGroup Condition="'$(TargetOS)' != 'windows' AND '$(DumpOnly)' != 'true'">
     <_TestCommand>$HELIX_CORRELATION_PAYLOAD/dotnet exec --runtimeconfig $HELIX_WORKITEM_PAYLOAD/tests/Microsoft.Diagnostics.DataContractReader.DumpTests.runtimeconfig.json --depsfile $HELIX_WORKITEM_PAYLOAD/tests/Microsoft.Diagnostics.DataContractReader.DumpTests.deps.json $HELIX_WORKITEM_PAYLOAD/tests/xunit.console.dll $HELIX_WORKITEM_PAYLOAD/tests/Microsoft.Diagnostics.DataContractReader.DumpTests.dll -xml testResults.xml -nologo</_TestCommand>
     <_TarCommand>tar -czf $HELIX_WORKITEM_UPLOAD_ROOT/dumps.tar.gz -C $HELIX_WORKITEM_PAYLOAD/dumps .</_TarCommand>
-    <_FullCommand>$(_DumpGenCommands) &amp;&amp; $(_DumpInfoCommand) &amp;&amp; $(_TestCommand) ; $(_TarCommand)</_FullCommand>
+    <_FullCommand>$(_DumpGenCommands) &amp;&amp; $(_DumpInfoCommand) &amp;&amp; $(_TestCommand); _rc=$?; $(_TarCommand); exit $_rc</_FullCommand>
   </PropertyGroup>
 
   <!-- Unix: DumpOnly mode tail command -->
@@ -138,7 +138,7 @@
     <HelixPreCommands>@(HelixPreCommand)</HelixPreCommands>
   </PropertyGroup>
 
-  <!-- Test mode: generate dumps, run tests, then tar dumps for download on failure -->
+  <!-- Test mode: generate dumps, run tests, then tar dumps for download -->
   <ItemGroup Condition="'$(DumpOnly)' != 'true'">
     <HelixWorkItem Include="CdacDumpTests">
       <PayloadDirectory>$(DumpTestsPayload)</PayloadDirectory>

From 71f856735b31b3bb117f9a4db6136074a7f357d3 Mon Sep 17 00:00:00 2001
From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com>
Date: Wed, 25 Mar 2026 10:39:33 -0400
Subject: [PATCH 08/10] Rename EnableUnsignedDac.props to .targets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The file contains a Target element, so .targets is the correct
extension per MSBuild convention. It's a separate file because
both DumpTests.targets and cdac-dump-helix.proj import it — the
former uses the target for local builds, the latter uses the
properties for Helix pre-commands.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/native/managed/cdac/tests/DumpTests/DumpTests.targets       | 2 +-
 .../{EnableUnsignedDac.props => EnableUnsignedDac.targets}      | 0
 src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj    | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/native/managed/cdac/tests/DumpTests/{EnableUnsignedDac.props => EnableUnsignedDac.targets} (100%)

diff --git a/src/native/managed/cdac/tests/DumpTests/DumpTests.targets b/src/native/managed/cdac/tests/DumpTests/DumpTests.targets
index 3962b1f38d1f69..6a6cafefb39462 100644
--- a/src/native/managed/cdac/tests/DumpTests/DumpTests.targets
+++ b/src/native/managed/cdac/tests/DumpTests/DumpTests.targets
@@ -63,7 +63,7 @@
   </ItemGroup>
 
   <!-- Unsigned DAC registry key for heap dumps (shared with cdac-dump-helix.proj) -->
-  <Import Project="EnableUnsignedDac.props" />
+  <Import Project="EnableUnsignedDac.targets" />
 
   <!-- Filter out Windows-only debuggees on non-Windows platforms. Debuggees opt in
        by setting <WindowsOnly>true</WindowsOnly> in their csproj. -->
diff --git a/src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.props b/src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.targets
similarity index 100%
rename from src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.props
rename to src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.targets
diff --git a/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj b/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
index d08f1240ae25e0..5679b9635a8b24 100644
--- a/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
+++ b/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
@@ -63,7 +63,7 @@
     derived from each debuggee's DumpTypes property (Heap->heap/2, Full->full/4).
   -->
   <Import Project="$(DumpTestsPayload)/debuggee-metadata.props" />
-  <Import Project="$(MSBuildThisFileDirectory)EnableUnsignedDac.props" />
+  <Import Project="$(MSBuildThisFileDirectory)EnableUnsignedDac.targets" />
 
   <!--
     Helix work item command: generate dumps then run tests (or tar + upload).

From 4acae8c3d8b154b6b06009d3d6885eba338e995e Mon Sep 17 00:00:00 2001
From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com>
Date: Wed, 25 Mar 2026 10:44:28 -0400
Subject: [PATCH 09/10] Convert EnableUnsignedDac to props-only, move target
 back to DumpTests.targets

EnableUnsignedDac.props now contains only shared properties
(DacRegAdd, DacRegAdd32) without the underscore prefix since
they are the public interface. The _EnableUnsignedDacWindows
target stays in DumpTests.targets where it belongs.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../cdac/tests/DumpTests/DumpTests.targets    | 20 +++++++++--
 .../tests/DumpTests/EnableUnsignedDac.props   | 19 +++++++++++
 .../tests/DumpTests/EnableUnsignedDac.targets | 33 -------------------
 .../cdac/tests/DumpTests/cdac-dump-helix.proj |  6 ++--
 4 files changed, 40 insertions(+), 38 deletions(-)
 create mode 100644 src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.props
 delete mode 100644 src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.targets

diff --git a/src/native/managed/cdac/tests/DumpTests/DumpTests.targets b/src/native/managed/cdac/tests/DumpTests/DumpTests.targets
index 6a6cafefb39462..f403b4590a8d96 100644
--- a/src/native/managed/cdac/tests/DumpTests/DumpTests.targets
+++ b/src/native/managed/cdac/tests/DumpTests/DumpTests.targets
@@ -62,8 +62,24 @@
     <DumpRuntimeVersion Include="$(DumpVersions)" />
   </ItemGroup>
 
-  <!-- Unsigned DAC registry key for heap dumps (shared with cdac-dump-helix.proj) -->
-  <Import Project="EnableUnsignedDac.targets" />
+  <!-- Unsigned DAC registry commands (shared with cdac-dump-helix.proj) -->
+  <Import Project="EnableUnsignedDac.props" />
+
+  <!--
+    On Windows, set the DisableAuxProviderSignatureCheck registry key so that
+    MiniDumpWriteDump accepts the unsigned locally-built DAC for heap dumps.
+    Opt-in via /p:SetDisableAuxProviderSignatureCheck=true.
+  -->
+  <Target Name="_EnableUnsignedDacWindows"
+          BeforeTargets="GenerateAllDumps"
+          Condition="'$(HostOS)' == 'windows' AND '$(SetDisableAuxProviderSignatureCheck)' == 'true'">
+    <Exec Command="$(DacRegAdd)" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" />
+    <!-- WoW64 view only needed for x86 processes -->
+    <Exec Command="$(DacRegAdd32)" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true"
+          Condition="'$(TargetArchitecture)' == 'x86'" />
+    <Message Text="Note: If heap dump generation fails on Windows, ensure the DisableAuxProviderSignatureCheck registry key is set. Run as admin or set manually: $(DacRegAdd)"
+             Importance="normal" />
+  </Target>
 
   <!-- Filter out Windows-only debuggees on non-Windows platforms. Debuggees opt in
        by setting <WindowsOnly>true</WindowsOnly> in their csproj. -->
diff --git a/src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.props b/src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.props
new file mode 100644
index 00000000000000..7113634e8667d7
--- /dev/null
+++ b/src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.props
@@ -0,0 +1,19 @@
+<Project>
+
+  <!--
+    On Windows, heap dumps (type 2) require the DAC (mscordaccore.dll) which is unsigned
+    in local/CI builds. Set the DisableAuxProviderSignatureCheck registry value so that
+    MiniDumpWriteDump accepts the unsigned DAC. Windows 11+ / Server 2022+ only.
+
+    The key must be set in both the native (64-bit) and WoW64 (32-bit) registry views.
+    Without /reg:32, x86 processes running under WoW64 read from
+    HKLM\SOFTWARE\WOW6432Node\... and miss the key, producing degraded dumps.
+  -->
+
+  <PropertyGroup>
+    <DacRegKey>HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\MiniDumpSettings</DacRegKey>
+    <DacRegAdd>reg add &quot;$(DacRegKey)&quot; /v DisableAuxProviderSignatureCheck /t REG_DWORD /d 1 /f</DacRegAdd>
+    <DacRegAdd32>$(DacRegAdd) /reg:32</DacRegAdd32>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.targets b/src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.targets
deleted file mode 100644
index 2ebdfd8a95da5c..00000000000000
--- a/src/native/managed/cdac/tests/DumpTests/EnableUnsignedDac.targets
+++ /dev/null
@@ -1,33 +0,0 @@
-<Project>
-
-  <!--
-    On Windows, heap dumps (type 2) require the DAC (mscordaccore.dll) which is unsigned
-    in local/CI builds. Set the DisableAuxProviderSignatureCheck registry value so that
-    MiniDumpWriteDump accepts the unsigned DAC. Windows 11+ / Server 2022+ only.
-
-    The key must be set in both the native (64-bit) and WoW64 (32-bit) registry views.
-    Without /reg:32, x86 processes running under WoW64 read from
-    HKLM\SOFTWARE\WOW6432Node\... and miss the key, producing degraded dumps.
-  -->
-
-  <PropertyGroup>
-    <_DacRegKey>HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\MiniDumpSettings</_DacRegKey>
-    <_DacRegAdd>reg add &quot;$(_DacRegKey)&quot; /v DisableAuxProviderSignatureCheck /t REG_DWORD /d 1 /f</_DacRegAdd>
-    <_DacRegAdd32>$(_DacRegAdd) /reg:32</_DacRegAdd32>
-  </PropertyGroup>
-
-  <!--
-    MSBuild target for local/CI builds (opt-in via /p:SetDisableAuxProviderSignatureCheck=true).
-  -->
-  <Target Name="_EnableUnsignedDacWindows"
-          BeforeTargets="GenerateAllDumps"
-          Condition="'$(HostOS)' == 'windows' AND '$(SetDisableAuxProviderSignatureCheck)' == 'true'">
-    <Exec Command="$(_DacRegAdd)" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" />
-    <!-- WoW64 view only needed for x86 processes -->
-    <Exec Command="$(_DacRegAdd32)" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true"
-          Condition="'$(TargetArchitecture)' == 'x86'" />
-    <Message Text="Note: If heap dump generation fails on Windows, ensure the DisableAuxProviderSignatureCheck registry key is set. Run as admin or set manually: $(_DacRegAdd)"
-             Importance="normal" />
-  </Target>
-
-</Project>
diff --git a/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj b/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
index 5679b9635a8b24..9def584915c05e 100644
--- a/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
+++ b/src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
@@ -63,7 +63,7 @@
     derived from each debuggee's DumpTypes property (Heap->heap/2, Full->full/4).
   -->
   <Import Project="$(DumpTestsPayload)/debuggee-metadata.props" />
-  <Import Project="$(MSBuildThisFileDirectory)EnableUnsignedDac.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)EnableUnsignedDac.props" />
 
   <!--
     Helix work item command: generate dumps then run tests (or tar + upload).
@@ -116,9 +116,9 @@
   <!-- Pre-commands: enable dump generation -->
   <ItemGroup Condition="'$(TargetOS)' == 'windows'">
     <!-- Allow heap dump generation with the unsigned locally-built DAC -->
-    <HelixPreCommand Include="$(_DacRegAdd) 2&gt;nul || (echo DisableAuxProviderSignatureCheck registry write skipped &amp; exit /b 0)" />
+    <HelixPreCommand Include="$(DacRegAdd) 2&gt;nul || (echo DisableAuxProviderSignatureCheck registry write skipped &amp; exit /b 0)" />
     <!-- WoW64 view only needed for x86 processes -->
-    <HelixPreCommand Condition="'$(TargetArchitecture)' == 'x86'" Include="$(_DacRegAdd32) 2&gt;nul || (echo DisableAuxProviderSignatureCheck /reg:32 registry write skipped &amp; exit /b 0)" />
+    <HelixPreCommand Condition="'$(TargetArchitecture)' == 'x86'" Include="$(DacRegAdd32) 2&gt;nul || (echo DisableAuxProviderSignatureCheck /reg:32 registry write skipped &amp; exit /b 0)" />
     <HelixPreCommand Include="set DOTNET_DbgEnableMiniDump=1" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetOS)' != 'windows'">

From ad0ef9c37b22718b31d0ae7d15a9ef7c7c0d833d Mon Sep 17 00:00:00 2001
From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com>
Date: Wed, 25 Mar 2026 12:10:09 -0400
Subject: [PATCH 10/10] Update
 src/native/managed/cdac/tests/DumpTests/DumpTests.targets

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 src/native/managed/cdac/tests/DumpTests/DumpTests.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/native/managed/cdac/tests/DumpTests/DumpTests.targets b/src/native/managed/cdac/tests/DumpTests/DumpTests.targets
index f403b4590a8d96..55a35856f398f4 100644
--- a/src/native/managed/cdac/tests/DumpTests/DumpTests.targets
+++ b/src/native/managed/cdac/tests/DumpTests/DumpTests.targets
@@ -77,7 +77,7 @@
     <!-- WoW64 view only needed for x86 processes -->
     <Exec Command="$(DacRegAdd32)" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true"
           Condition="'$(TargetArchitecture)' == 'x86'" />
-    <Message Text="Note: If heap dump generation fails on Windows, ensure the DisableAuxProviderSignatureCheck registry key is set. Run as admin or set manually: $(DacRegAdd)"
+    <Message Text="Note: If heap dump generation fails on Windows, ensure the DisableAuxProviderSignatureCheck registry key is set. Run as admin or set manually: $(DacRegAdd) (and for x86: $(DacRegAdd32))"
              Importance="normal" />
   </Target>