From 658eed954f7af61465f31c7060881f0505ebebe7 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Tue, 8 Oct 2024 02:24:19 -0400
Subject: [PATCH 1/3] Retry tests if msbuild crashes

Issue: https://github.com/dotnet/aspire/issues/6163
---
 eng/test-configuration.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/test-configuration.json b/eng/test-configuration.json
index 06a4bdbca64..b77e097afc6 100644
--- a/eng/test-configuration.json
+++ b/eng/test-configuration.json
@@ -4,6 +4,7 @@
   "localRerunCount": 1,
   "retryOnRules": [
     { "testName": { "contains": "Aspire.Elastic.Clients.Elasticsearch.Tests.ConformanceTests.HealthCheckReportsExpectedStatus" } },
-    { "testAssembly": { "contains": "Aspire.Elastic.Clients.Elasticsearch.Tests" }, "failureMessage": { "contains": "RemoteExecutionException : Half-way through waiting for remote process." } }
+    { "testAssembly": { "contains": "Aspire.Elastic.Clients.Elasticsearch.Tests" }, "failureMessage": { "contains": "RemoteExecutionException : Half-way through waiting for remote process." } },
+    { "failureMessage" : { "contains" : "MSBUILD : error MSB4166: Child node" } }
   ]
 }

From 37945e853a93e3963e5eb9ccaef22bc9ca67530f Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Fri, 11 Oct 2024 16:16:54 -0400
Subject: [PATCH 2/3] Set MSBUILDDEBUGPATH to help with debugging crashes

---
 tests/helix/send-to-helix-inner.proj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/helix/send-to-helix-inner.proj b/tests/helix/send-to-helix-inner.proj
index aaaba5eaafe..06ee7687b76 100644
--- a/tests/helix/send-to-helix-inner.proj
+++ b/tests/helix/send-to-helix-inner.proj
@@ -141,6 +141,8 @@
     <!-- Disable playwright tests on helix/linux. Issue: https://github.com/dotnet/aspire/issues/4623 -->
     <HelixPreCommand Condition="'$(DisablePlaywrightTests)' == 'true'" Include="$(_EnvVarSetKeyword) DISABLE_PLAYWRIGHT_TESTS=true" />
 
+    <HelixPreCommand Include="$(_EnvVarSetKeyword) MSBUILDDEBUGPATH=$(_HelixCorrelationPayloadEnvVar)/msbuild-debug" />
+
     <HelixPreCommand Condition="'$(OS)' == 'Windows_NT'" Include="dotnet dev-certs https --trust" />
 
     <HelixPostCommand Include="$(_CleanupProcessesCommand)" />

From 62567da387b273b6128c4971c194d348ec96e33b Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Fri, 11 Oct 2024 16:17:27 -0400
Subject: [PATCH 3/3] add comment

---
 tests/helix/send-to-helix-inner.proj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/helix/send-to-helix-inner.proj b/tests/helix/send-to-helix-inner.proj
index 06ee7687b76..467ccecb17d 100644
--- a/tests/helix/send-to-helix-inner.proj
+++ b/tests/helix/send-to-helix-inner.proj
@@ -141,6 +141,7 @@
     <!-- Disable playwright tests on helix/linux. Issue: https://github.com/dotnet/aspire/issues/4623 -->
     <HelixPreCommand Condition="'$(DisablePlaywrightTests)' == 'true'" Include="$(_EnvVarSetKeyword) DISABLE_PLAYWRIGHT_TESTS=true" />
 
+    <!-- Issue: https://github.com/dotnet/aspire/pull/6181 -->
     <HelixPreCommand Include="$(_EnvVarSetKeyword) MSBUILDDEBUGPATH=$(_HelixCorrelationPayloadEnvVar)/msbuild-debug" />
 
     <HelixPreCommand Condition="'$(OS)' == 'Windows_NT'" Include="dotnet dev-certs https --trust" />