From bcac56b5ae70de54f58d4c77bbbddcc6425528fa Mon Sep 17 00:00:00 2001
From: Dakota Paasman <122491662+dpaasman00@users.noreply.github.com>
Date: Mon, 4 Nov 2024 08:49:46 -0500
Subject: [PATCH] fix(Agent v2): Persist `supervisor_storage` on uninstall for
 windows (#1920)

preserve supervisor_storage dir on uninstall
---
 windows/templates/product.wxs | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/windows/templates/product.wxs b/windows/templates/product.wxs
index d27207c73..39aed7d1f 100644
--- a/windows/templates/product.wxs
+++ b/windows/templates/product.wxs
@@ -215,13 +215,6 @@
 
       <CustomAction Id="CustomExecRemoveSupervisorYaml" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
 
-      <CustomAction Id="CustomExecRemoveSupervisorStorage_set"
-            Property="CustomExecRemoveSupervisorStorage"
-            Value="&quot;[CMDEXE]&quot; \C del -r &quot;[INSTALLDIR]supervisor_storage&quot;"
-            Execute="immediate"/>
-
-      <CustomAction Id="CustomExecRemoveSupervisorStorage" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
-
       <InstallExecuteSequence>
          {{range $i, $h := .Hooks}}
          <Custom Action="CustomExec{{$i}}" {{if eq $h.When "install"}} After="InstallFiles" {{else if eq $h.Execute "immediate"}} Before="InstallValidate" {{else}} After="InstallInitialize" {{end}}>
@@ -254,14 +247,6 @@
         <Custom Action="CustomExecRemoveSupervisorYaml" Before="RemoveFiles" >
             <![CDATA[(VersionNT >= 603 OR VersionNT64 >= 603) and REMOVE="ALL" and not UPGRADINGPRODUCTCODE]]>
         </Custom>
-
-        <!-- Schedule the action that removes the supervisor_storage dir on final uninstall -->
-        <Custom Action="CustomExecRemoveSupervisorStorage_set" After="InstallInitialize" >
-            <![CDATA[(VersionNT >= 603 OR VersionNT64 >= 603) and REMOVE="ALL" and not UPGRADINGPRODUCTCODE]]>
-        </Custom>
-        <Custom Action="CustomExecRemoveSupervisorStorage" Before="RemoveFiles" >
-            <![CDATA[(VersionNT >= 603 OR VersionNT64 >= 603) and REMOVE="ALL" and not UPGRADINGPRODUCTCODE]]>
-        </Custom>
       </InstallExecuteSequence>
 
       <Feature Id="DefaultFeature" Level="1">