From 7905859b9c74c237700ba7de5860dd3bfdd0e808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Fi=C5=A1era?= <mara@neptuo.com>
Date: Thu, 25 Apr 2024 14:36:07 +0200
Subject: [PATCH 1/2] Build in serie

---
 src/libraries/sendtohelix.proj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj
index 17aa91b1597bb..59bb2be8494fd 100644
--- a/src/libraries/sendtohelix.proj
+++ b/src/libraries/sendtohelix.proj
@@ -127,6 +127,8 @@
     <PropertyGroup>
       <_BuildInParallel>false</_BuildInParallel>
       <_BuildInParallel Condition=" '@(_ProjectsToBuild->Count())' &gt; '1' ">true</_BuildInParallel>
+      <!-- We stage multiple correlation payloads in parallel which is race condition -->
+      <_BuildInParallel Condition="'$(TargetArchitecture)' == 'wasm'">false</_BuildInParallel>
     </PropertyGroup>
 
     <!-- Invoke MSBuild once for each Scenario (because of the "batching" defined in "_ProjectsToBuild").

From 605d5c0356d1f85f83e0086cd2e6e026620cc804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Fi=C5=A1era?= <mara@neptuo.com>
Date: Thu, 25 Apr 2024 14:41:52 +0200
Subject: [PATCH 2/2] Remove debug output

---
 src/libraries/sendtohelix-wasi.targets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/libraries/sendtohelix-wasi.targets b/src/libraries/sendtohelix-wasi.targets
index f89da35e17e3e..f16c74a09ae47 100644
--- a/src/libraries/sendtohelix-wasi.targets
+++ b/src/libraries/sendtohelix-wasi.targets
@@ -106,8 +106,6 @@
   <Target Name="PrepareHelixCorrelationPayload_Wasi">
     <Error Condition="'$(Scenario)' == '' or '$(Scenario)' == 'normal'" Text="Only supported scenario is WasmTestOnWasmtime and BuildWasmApps at the moment." />
     <Error Text="Cannot find %24(WasmtimeDir)=$(WasmtimeDir)" Condition="'$(WasmtimeDir)' == '' or !Exists($(WasmtimeDir))" />
-    <Exec Command="ls -lsa $(WasmtimeDir)" Condition="'$(HostOS)' == 'linux'" />
-    <Exec Command="ls -lsa $(WasmtimeDirForHelixPayload)" Condition="'$(HostOS)' == 'linux'" />
     <ItemGroup>
       <HelixCorrelationPayload Include="$(WasmtimeDirForHelixPayload)" Destination="wasmtime" Condition="'$(NeedsWasmtime)' == 'true'" />