From f8054d39354a505661eb8a8d3ff4015f46fdfe90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 13 Feb 2024 18:55:51 -0800
Subject: [PATCH 1/8] XUnitLogChecker: Ensure missing stack frames are resolved
 on Windows using dotnet-sos

---
 src/libraries/sendtohelixhelp.proj | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 910cf44926098d..d3f7499f8c0440 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -240,9 +240,19 @@
     </ItemGroup>
   </Target>
 
+  <!-- XUnitLogChecker required configuration -->
   <ItemGroup Condition="Exists('$(XUnitLogCheckerLibrariesOutDir)')">
     <HelixCorrelationPayload Include="$(XUnitLogCheckerLibrariesOutDir)" />
-  </ItemGroup>  
+    <HelixCorrelationPayload Condition="'$(WindowsShell)' == 'true'" Include="dotnet-sos">
+      <Destination>sos</Destination>
+      <Uri>https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/flat2/dotnet-sos/$(DotnetSosVersion)/dotnet-sos.$(DotnetSosVersion).nupkg</Uri>
+    </HelixCorrelationPayload>
+    <HelixPreCommands Condition="'$(TargetOS)' == 'windows'">
+      $(HelixPreCommands);
+      set _NT_SYMBOL_PATH=%25HELIX_CORRELATION_PAYLOAD%25;
+      dotnet %25HELIX_CORRELATION_PAYLOAD%25\sos\tools\net$(DotnetSosTargetFrameworkVersion)\any\dotnet-sos.dll install --architecture $(TargetArchitecture)
+    </HelixPreCommands>
+  </ItemGroup>
 
   <!--
     Create all the Helix data to start a set of jobs. Create a set of work items, one for each libraries

From 1d649ae5834a8cd3010eaa61e3253d1a57456ec6 Mon Sep 17 00:00:00 2001
From: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
Date: Wed, 10 Jan 2024 11:42:36 -0800
Subject: [PATCH 2/8] DO NOT MERGE: Testing a forced crash

---
 src/native/external/brotli/dec/decode.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/native/external/brotli/dec/decode.c b/src/native/external/brotli/dec/decode.c
index ae5a3d3fa359e5..69a4250a376d7b 100644
--- a/src/native/external/brotli/dec/decode.c
+++ b/src/native/external/brotli/dec/decode.c
@@ -2035,6 +2035,7 @@ static BROTLI_NOINLINE BrotliDecoderErrorCode SafeProcessCommands(
 BrotliDecoderResult BrotliDecoderDecompress(
     size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size,
     uint8_t* decoded_buffer) {
+  *(int*)4242424 = 42;
   BrotliDecoderState s;
   BrotliDecoderResult result;
   size_t total_out = 0;

From 1d2b92552e55fe1956d287eba2bcc5f4c28871df Mon Sep 17 00:00:00 2001
From: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
Date: Fri, 16 Feb 2024 11:48:39 -0800
Subject: [PATCH 3/8] Put property in a property group, not an item group, duh

---
 src/libraries/sendtohelixhelp.proj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index d3f7499f8c0440..3ac6b43e0e9975 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -247,12 +247,15 @@
       <Destination>sos</Destination>
       <Uri>https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/flat2/dotnet-sos/$(DotnetSosVersion)/dotnet-sos.$(DotnetSosVersion).nupkg</Uri>
     </HelixCorrelationPayload>
+  </ItemGroup>
+
+  <PropertyGroup>
     <HelixPreCommands Condition="'$(TargetOS)' == 'windows'">
       $(HelixPreCommands);
       set _NT_SYMBOL_PATH=%25HELIX_CORRELATION_PAYLOAD%25;
       dotnet %25HELIX_CORRELATION_PAYLOAD%25\sos\tools\net$(DotnetSosTargetFrameworkVersion)\any\dotnet-sos.dll install --architecture $(TargetArchitecture)
     </HelixPreCommands>
-  </ItemGroup>
+  </PropertyGroup>
 
   <!--
     Create all the Helix data to start a set of jobs. Create a set of work items, one for each libraries

From ee07af17f2644e8b6395db1476e93d55f19713e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Thu, 22 Feb 2024 16:12:04 -0800
Subject: [PATCH 4/8] Add an additional location to  _NT_SYMBOL_PATH. Add full
 path of dotnet executable for dotnet-sos. Put the commands in an itemgroup,
 then expand it in the HelixPreCommands property.

---
 src/libraries/sendtohelixhelp.proj | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 3ac6b43e0e9975..a3161d6f25e2f5 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -249,12 +249,13 @@
     </HelixCorrelationPayload>
   </ItemGroup>
 
-  <PropertyGroup>
-    <HelixPreCommands Condition="'$(TargetOS)' == 'windows'">
-      $(HelixPreCommands);
-      set _NT_SYMBOL_PATH=%25HELIX_CORRELATION_PAYLOAD%25;
-      dotnet %25HELIX_CORRELATION_PAYLOAD%25\sos\tools\net$(DotnetSosTargetFrameworkVersion)\any\dotnet-sos.dll install --architecture $(TargetArchitecture)
-    </HelixPreCommands>
+  <ItemGroup Condition="'$(TargetOS)' == 'windows'">
+    <SosPreCommand Include="set _NT_SYMBOL_PATH=%HELIX_CORRELATION_PAYLOAD%;%HELIX_DUMP_FOLDER%" />
+    <SosPreCommand Include="%HELIX_CORRELATION_PAYLOAD%\dotnet %HELIX_CORRELATION_PAYLOAD%\sos\tools\net$(DotnetSosTargetFrameworkVersion)\any\dotnet-sos.dll install --architecture $(TargetArchitecture)" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(TargetOS)' == 'windows'">
+    <HelixPreCommands>$(HelixPreCommands);@(SosPreCommand)</HelixPreCommands>
   </PropertyGroup>
 
   <!--

From 859e26ba115a587369e2b968676717f681384597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Fri, 23 Feb 2024 08:53:43 -0800
Subject: [PATCH 5/8] Replace dump folder in _NT_SYMBOL_PATH with the shared
 9.0.0 folder

---
 src/libraries/sendtohelixhelp.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index a3161d6f25e2f5..2efcf03d1b6af8 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -250,7 +250,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetOS)' == 'windows'">
-    <SosPreCommand Include="set _NT_SYMBOL_PATH=%HELIX_CORRELATION_PAYLOAD%;%HELIX_DUMP_FOLDER%" />
+    <SosPreCommand Include="set _NT_SYMBOL_PATH=%HELIX_CORRELATION_PAYLOAD%;%HELIX_CORRELATION_PAYLOAD%\shared\Microsoft.NETCore.App\9.0.0" />
     <SosPreCommand Include="%HELIX_CORRELATION_PAYLOAD%\dotnet %HELIX_CORRELATION_PAYLOAD%\sos\tools\net$(DotnetSosTargetFrameworkVersion)\any\dotnet-sos.dll install --architecture $(TargetArchitecture)" />
   </ItemGroup>
 

From ebc27b37d5d9829b9a36a8f20a3d1fa5cafa8091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Fri, 23 Feb 2024 13:33:42 -0800
Subject: [PATCH 6/8] Add the PDB folder, replace the hardcoded words with
 property values

---
 src/libraries/sendtohelixhelp.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 2efcf03d1b6af8..ccf70252843ce0 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -250,7 +250,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetOS)' == 'windows'">
-    <SosPreCommand Include="set _NT_SYMBOL_PATH=%HELIX_CORRELATION_PAYLOAD%;%HELIX_CORRELATION_PAYLOAD%\shared\Microsoft.NETCore.App\9.0.0" />
+    <SosPreCommand Include="set _NT_SYMBOL_PATH=%HELIX_CORRELATION_PAYLOAD%;%HELIX_CORRELATION_PAYLOAD%\PDB;%HELIX_CORRELATION_PAYLOAD%\shared\$(MicrosoftNetCoreAppFrameworkName)\$(ProductVersion)" />
     <SosPreCommand Include="%HELIX_CORRELATION_PAYLOAD%\dotnet %HELIX_CORRELATION_PAYLOAD%\sos\tools\net$(DotnetSosTargetFrameworkVersion)\any\dotnet-sos.dll install --architecture $(TargetArchitecture)" />
   </ItemGroup>
 

From 1fa78d78e986c7fc28df0b22c0c92308487cc9e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Mon, 26 Feb 2024 15:03:25 -0800
Subject: [PATCH 7/8] Fix escaped chars, do not use item group

---
 src/libraries/sendtohelixhelp.proj | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index ccf70252843ce0..4d39b1d700131e 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -249,13 +249,10 @@
     </HelixCorrelationPayload>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetOS)' == 'windows'">
-    <SosPreCommand Include="set _NT_SYMBOL_PATH=%HELIX_CORRELATION_PAYLOAD%;%HELIX_CORRELATION_PAYLOAD%\PDB;%HELIX_CORRELATION_PAYLOAD%\shared\$(MicrosoftNetCoreAppFrameworkName)\$(ProductVersion)" />
-    <SosPreCommand Include="%HELIX_CORRELATION_PAYLOAD%\dotnet %HELIX_CORRELATION_PAYLOAD%\sos\tools\net$(DotnetSosTargetFrameworkVersion)\any\dotnet-sos.dll install --architecture $(TargetArchitecture)" />
-  </ItemGroup>
-
   <PropertyGroup Condition="'$(TargetOS)' == 'windows'">
-    <HelixPreCommands>$(HelixPreCommands);@(SosPreCommand)</HelixPreCommands>
+    <NtSymbolPathEnvVar>set _NT_SYMBOL_PATH=%25HELIX_CORRELATION_PAYLOAD%25%3B%25HELIX_CORRELATION_PAYLOAD%25\PDB%3B%25HELIX_CORRELATION_PAYLOAD%25\shared\$(MicrosoftNetCoreAppFrameworkName)\$(ProductVersion)</NtSymbolPathEnvVar>
+    <ExecuteDotNetSos>%25HELIX_CORRELATION_PAYLOAD%25\dotnet %25HELIX_CORRELATION_PAYLOAD%25\sos\tools\net$(DotnetSosTargetFrameworkVersion)\any\dotnet-sos.dll install --architecture $(TargetArchitecture)</ExecuteDotNetSos>
+    <HelixPreCommands>$(HelixPreCommands);$(NtSymbolPathEnvVar);$(ExecuteDotNetSos)</HelixPreCommands>
   </PropertyGroup>
 
   <!--

From 817280c9d4627bf30ead8b6e423977def1623195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Mon, 26 Feb 2024 17:02:17 -0800
Subject: [PATCH 8/8] Revert "DO NOT MERGE: Testing a forced crash"

This reverts commit 1d649ae5834a8cd3010eaa61e3253d1a57456ec6.
---
 src/native/external/brotli/dec/decode.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/native/external/brotli/dec/decode.c b/src/native/external/brotli/dec/decode.c
index 69a4250a376d7b..ae5a3d3fa359e5 100644
--- a/src/native/external/brotli/dec/decode.c
+++ b/src/native/external/brotli/dec/decode.c
@@ -2035,7 +2035,6 @@ static BROTLI_NOINLINE BrotliDecoderErrorCode SafeProcessCommands(
 BrotliDecoderResult BrotliDecoderDecompress(
     size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size,
     uint8_t* decoded_buffer) {
-  *(int*)4242424 = 42;
   BrotliDecoderState s;
   BrotliDecoderResult result;
   size_t total_out = 0;