From 5da4f64bbbddde0f2467c1f52b019bf89a593c40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Fi=C5=A1era?= <mara@neptuo.com>
Date: Wed, 8 Oct 2025 17:35:10 +0200
Subject: [PATCH 1/4] Identify HelixJob URLs with human readable marker

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

diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj
index c121c3c009d51b..2c6e1439ee4855 100644
--- a/src/libraries/sendtohelix.proj
+++ b/src/libraries/sendtohelix.proj
@@ -120,7 +120,8 @@
           TestUsingWorkloads=%(_TestUsingCrossProductValues.Workloads);
           WasmEnableWebcil=%(_TestUsingCrossProductValues.Webcil);
           WasmFingerprintAssets=%(_TestUsingCrossProductValues.Fingerprinting);
-          WasmBundlerFriendlyBootConfig=%(_TestUsingCrossProductValues.BundlerFriendly)
+          WasmBundlerFriendlyBootConfig=%(_TestUsingCrossProductValues.BundlerFriendly);
+          HelixJobMarker=$(WorkItemPrefix)
         </AdditionalProperties>
         <AdditionalProperties Condition="'$(NeedsToBuildWasmAppsOnHelix)' != ''">%(_BuildWasmAppsProjectsToBuild.AdditionalProperties);NeedsToBuildWasmAppsOnHelix=$(NeedsToBuildWasmAppsOnHelix)</AdditionalProperties>
       </_BuildWasmAppsProjectsToBuild>

From 8347238333405b82ca2b8489ff269dfff7ec83dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Fi=C5=A1era?= <mara@neptuo.com>
Date: Thu, 9 Oct 2025 10:24:15 +0200
Subject: [PATCH 2/4] Set HelixJobName

---
 src/libraries/sendtohelix.proj     | 3 +--
 src/libraries/sendtohelixhelp.proj | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj
index 2c6e1439ee4855..c121c3c009d51b 100644
--- a/src/libraries/sendtohelix.proj
+++ b/src/libraries/sendtohelix.proj
@@ -120,8 +120,7 @@
           TestUsingWorkloads=%(_TestUsingCrossProductValues.Workloads);
           WasmEnableWebcil=%(_TestUsingCrossProductValues.Webcil);
           WasmFingerprintAssets=%(_TestUsingCrossProductValues.Fingerprinting);
-          WasmBundlerFriendlyBootConfig=%(_TestUsingCrossProductValues.BundlerFriendly);
-          HelixJobMarker=$(WorkItemPrefix)
+          WasmBundlerFriendlyBootConfig=%(_TestUsingCrossProductValues.BundlerFriendly)
         </AdditionalProperties>
         <AdditionalProperties Condition="'$(NeedsToBuildWasmAppsOnHelix)' != ''">%(_BuildWasmAppsProjectsToBuild.AdditionalProperties);NeedsToBuildWasmAppsOnHelix=$(NeedsToBuildWasmAppsOnHelix)</AdditionalProperties>
       </_BuildWasmAppsProjectsToBuild>
diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index f8a80017cd5ff9..03f4cee1e01bad 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -288,6 +288,7 @@
         $(HelixPreCommands);
         find $HELIX_CORRELATION_PAYLOAD -name createdump | xargs -n 1 codesign -s - -f --preserve-metadata=entitlements
       </HelixPreCommands>
+      <HelixJobName>$(WorkItemPrefix)</HelixJobName>
     </PropertyGroup>
 
     <Error Condition="'$(NeedsWorkload)' == 'true' and '$(TestUsingWorkloads)' == 'true' and ('$(SdkWithWorkloadForTestingPath)' == '' or !Exists($(SdkWithWorkloadForTestingPath)))"

From bf0b02536af9492e4cd107d8ec740eabab85c9ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Fi=C5=A1era?= <mara@neptuo.com>
Date: Thu, 9 Oct 2025 17:12:32 +0200
Subject: [PATCH 3/4] Add WorkItemPrefix as HelixProperty

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

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 03f4cee1e01bad..dbd8e05eaa6395 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -173,6 +173,7 @@
   <ItemGroup>
     <HelixProperties Condition="'$(RuntimeFlavor)' != ''" Include="runtimeFlavor" Value="$(RuntimeFlavor)" />
     <HelixProperties Condition="'$(Scenario)' != ''" Include="scenario" Value="$(Scenario)" />
+    <HelixProperties Condition="'$(WorkItemPrefix)' != ''" Include="jobName" Value="$(WorkItemPrefix)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(RunGrpcTestsOnly)' == 'true' and '$(BuildGrpcServerDockerImage)' == 'true'">

From e00099298bbf258a4662ebcee2ae5813e36baf68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Fi=C5=A1era?= <mara@neptuo.com>
Date: Fri, 24 Oct 2025 11:06:00 +0200
Subject: [PATCH 4/4] Trim

---
 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 dbd8e05eaa6395..e1931942e5afa2 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -289,7 +289,7 @@
         $(HelixPreCommands);
         find $HELIX_CORRELATION_PAYLOAD -name createdump | xargs -n 1 codesign -s - -f --preserve-metadata=entitlements
       </HelixPreCommands>
-      <HelixJobName>$(WorkItemPrefix)</HelixJobName>
+      <HelixJobName>$(WorkItemPrefix.Trim())</HelixJobName>
     </PropertyGroup>
 
     <Error Condition="'$(NeedsWorkload)' == 'true' and '$(TestUsingWorkloads)' == 'true' and ('$(SdkWithWorkloadForTestingPath)' == '' or !Exists($(SdkWithWorkloadForTestingPath)))"