Delay deleting the tool directory at VM-Uninstall-With-Uninstaller

mandiant · Jun 12, 2024 · cd50854 · cd50854
1 parent 1f70a3e
commit cd50854
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/common.vm/common.vm.nuspec b/packages/common.vm/common.vm.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>common.vm</id>
-    <version>0.0.0.20240607</version>
+    <version>0.0.0.20240612</version>
     <description>Common libraries for VM-packages</description>
     <authors>Mandiant</authors>
   </metadata>

diff --git a/packages/common.vm/tools/vm.common/vm.common.psm1 b/packages/common.vm/tools/vm.common/vm.common.psm1
@@ -791,10 +791,6 @@ function VM-Uninstall-With-Uninstaller {
     # Remove tool shortcut
     VM-Remove-Tool-Shortcut $toolName $category
 
-    # Remove tool files
-    $toolDir = Join-Path ${Env:RAW_TOOLS_DIR} $toolName
-    Remove-Item $toolDir -Recurse -Force -ea 0 | Out-Null
-
     # Attempt to find and execute the uninstaller, may need to use wildcards
     # See: https://docs.chocolatey.org/en-us/create/functions/get-uninstallregistrykey
     [array]$key = Get-UninstallRegistryKey -SoftwareName $toolName
@@ -821,6 +817,10 @@ function VM-Uninstall-With-Uninstaller {
         $key | ForEach-Object {VM-Write-Log "WARN" " - $($_.DisplayName)"}
         VM-Write-Log "WARN" "Now allowing Chocolatey's auto uninstaller a chance to run."
     }
+
+    # Remove tool files
+    $toolDir = Join-Path ${Env:RAW_TOOLS_DIR} $toolName
+    Remove-Item $toolDir -Recurse -Force -ea 0 | Out-Null
 }
 
 function VM-Write-Log-Exception {