Skip to content

Commit

Permalink
fix(Agent v2): Persist supervisor_storage on uninstall for windows (#…
Browse files Browse the repository at this point in the history
…1920)

preserve supervisor_storage dir on uninstall
  • Loading branch information
dpaasman00 authored Nov 4, 2024
1 parent 694741f commit bcac56b
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions windows/templates/product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -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}}>
Expand Down Expand Up @@ -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">
Expand Down

0 comments on commit bcac56b

Please sign in to comment.