From 144721ad078d33f455d3abc0bcad137ab1edd425 Mon Sep 17 00:00:00 2001
From: Stefan Markovic <57057282+stefansjfw@users.noreply.github.com>
Date: Mon, 27 Mar 2023 15:21:06 +0200
Subject: [PATCH] Fix folders not being deleted on uninstall (#25021)

Add missing MouseJumpUI dlls
---
 installer/PowerToysSetup/MouseUtils.wxs | 2 +-
 installer/PowerToysSetup/Product.wxs    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/installer/PowerToysSetup/MouseUtils.wxs b/installer/PowerToysSetup/MouseUtils.wxs
index 913ac7b504..44260d14b4 100644
--- a/installer/PowerToysSetup/MouseUtils.wxs
+++ b/installer/PowerToysSetup/MouseUtils.wxs
@@ -4,7 +4,7 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define MouseJumpUIComponentFiles=PowerToys.MouseJumpUI.deps.json;PowerToys.MouseJumpUI.dll;PowerToys.MouseJumpUI.exe;PowerToys.MouseJumpUI.runtimeconfig.json;WinRT.Runtime.dll;PowerToys.ManagedCommon.dll;PowerToys.GPOWrapper.dll;PowerToys.ManagedTelemetry.dll;Ijwhost.dll;System.Management.dll?>
+  <?define MouseJumpUIComponentFiles=Microsoft.Windows.SDK.NET.dll;System.IO.Abstractions.dll;PowerToys.MouseJumpUI.deps.json;PowerToys.MouseJumpUI.dll;PowerToys.MouseJumpUI.exe;PowerToys.MouseJumpUI.runtimeconfig.json;WinRT.Runtime.dll;PowerToys.ManagedCommon.dll;PowerToys.GPOWrapper.dll;PowerToys.ManagedTelemetry.dll;Ijwhost.dll;System.Management.dll?>
 
   <Fragment>
     <!-- MouseUtils -->
diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
index 090aa98c8c..daed766bcc 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -178,7 +178,8 @@
       <Custom Action="DeleteWinAppSDKHardlinks" Before="RemoveFiles">
         Installed AND (REMOVE="ALL")
       </Custom>
-      <Custom Action="DeletePTInteropHardlinks" Before="CreatePTInteropHardlinks" />
+
+      <Custom Action="DeletePTInteropHardlinks" After="InstallInitialize" />
 
       <Custom Action="DeleteDotnetRuntimeHardlinks" Before="RemoveFiles">
         Installed AND (REMOVE="ALL")