From 7f45211cbeb816948969feb8df2403a3ae4e9dce Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Tue, 17 Sep 2024 10:51:56 -0700
Subject: [PATCH 1/4] [TEST] Upload windows event logs

---
 eng/targets/Helix.targets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index 43bf0cb7f7f1..b1439389735a 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -4,6 +4,11 @@
     <HelixPreCommand Condition="'$(IsWindowsHelixQueue)' != 'true' AND '$(IsMacHelixQueue)' != 'true'" Include="./installjdk.sh 10.0.2 x64 &amp;&amp; if [ &quot;%24JAVA_HOME&quot; = &quot;&quot; ]%3B then export JAVA_HOME=%24PWD/java%3B fi" />
   </ItemGroup>
 
+  <ItemGroup>
+    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' == 'true'" Include="xcopy /s C:\Windows\System32\winevt\Logs %HELIX_WORKITEM_UPLOAD_ROOT%25" />
+  </ItemGroup>
+
+
   <ItemGroup Condition="'$(TestDependsOnMssql)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true' AND '$(IsArm64HelixQueue)' != 'true'">
     <HelixPreCommand Include="call RunPowershell.cmd mssql\InstallSqlServerLocalDB.ps1 || exit /b 1" />
   </ItemGroup>

From fe5d8c919810c18890d55b42c2ea9acf545f840a Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Tue, 17 Sep 2024 10:56:32 -0700
Subject: [PATCH 2/4] Fix typo

---
 eng/targets/Helix.targets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index b1439389735a..ea7e020ffefc 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -5,10 +5,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' == 'true'" Include="xcopy /s C:\Windows\System32\winevt\Logs %HELIX_WORKITEM_UPLOAD_ROOT%25" />
+    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' == 'true'" Include="xcopy /s C:\Windows\System32\winevt\Logs %25HELIX_WORKITEM_UPLOAD_ROOT%25" />
   </ItemGroup>
 
-
   <ItemGroup Condition="'$(TestDependsOnMssql)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true' AND '$(IsArm64HelixQueue)' != 'true'">
     <HelixPreCommand Include="call RunPowershell.cmd mssql\InstallSqlServerLocalDB.ps1 || exit /b 1" />
   </ItemGroup>

From 05659096fa393e3348a50148988a3edf9209949f Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 19 Sep 2024 09:54:08 -0700
Subject: [PATCH 3/4] Update Helix.targets

---
 eng/targets/Helix.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index ea7e020ffefc..c4d91c4523c5 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -5,6 +5,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' == 'true'" Include="wevtutil el" />
     <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' == 'true'" Include="xcopy /s C:\Windows\System32\winevt\Logs %25HELIX_WORKITEM_UPLOAD_ROOT%25" />
   </ItemGroup>
 

From 8cd63f031dc1ce8591be55f91d0bcb024001e6e3 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Fri, 20 Sep 2024 13:40:20 -0700
Subject: [PATCH 4/4] Update Helix.targets

---
 eng/targets/Helix.targets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index c4d91c4523c5..642ec7a38c1b 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -5,8 +5,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' == 'true'" Include="wevtutil el" />
-    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' == 'true'" Include="xcopy /s C:\Windows\System32\winevt\Logs %25HELIX_WORKITEM_UPLOAD_ROOT%25" />
+    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' == 'true'" Include="wevtutil epl EndpointMapper %25HELIX_WORKITEM_UPLOAD_ROOT%25\EndpointMapper.evtx" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TestDependsOnMssql)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true' AND '$(IsArm64HelixQueue)' != 'true'">