From 84ed3ff123b5ae92cd3350d64677434f9b397b76 Mon Sep 17 00:00:00 2001
From: Vitali <31886478+l3m0nqu1z@users.noreply.github.com>
Date: Mon, 10 Jul 2023 23:33:43 +0200
Subject: [PATCH] fix: re-enable changeDir step for assisted, perMachine
 installs (#7648)

---
 .changeset/sweet-monkeys-listen.md                  | 5 +++++
 packages/app-builder-lib/templates/msi/template.xml | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/sweet-monkeys-listen.md

diff --git a/.changeset/sweet-monkeys-listen.md b/.changeset/sweet-monkeys-listen.md
new file mode 100644
index 00000000000..10d6cdef129
--- /dev/null
+++ b/.changeset/sweet-monkeys-listen.md
@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+fix: re-enable changeDir step for assisted, perMachine installs
diff --git a/packages/app-builder-lib/templates/msi/template.xml b/packages/app-builder-lib/templates/msi/template.xml
index 9d1c583d329..2d5cd3cc5c1 100644
--- a/packages/app-builder-lib/templates/msi/template.xml
+++ b/packages/app-builder-lib/templates/msi/template.xml
@@ -16,6 +16,7 @@
     <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage='A newer version of "[ProductName]" is already installed.'/>
     <MediaTemplate CompressionLevel="${compressionLevel}" EmbedCab="yes"/>
 
+    <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER"/>
     <Property Id="ApplicationFolderName" Value="${installationDirectoryWixName}"/>
     <Property Id="WixAppFolder" Value="WixPerUserFolder"/>
     <Property Id="DISABLEADVTSHORTCUTS" Value="1"/>
@@ -69,7 +70,11 @@
         <Publish Dialog="InstallScopeDlg" Control="Next" Property="ALLUSERS" Value="1" Order="4">WixAppFolder = "WixPerMachineFolder"</Publish>
         <!-- Run 'FindRelatedProducts' again after changing the install scope, because its first run might have ignored an existing installation based on the default scope at the time. https://stackoverflow.com/a/35064434 -->
         <Publish Dialog="InstallScopeDlg" Control="Next" Event="DoAction" Value="FindRelatedProducts" Order="5">1</Publish>
-        <Publish Dialog="InstallScopeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="6">1</Publish>
+        <Publish Dialog="InstallScopeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="6">WixAppFolder = "WixPerUserFolder"</Publish>
+        <Publish Dialog="InstallScopeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="7">WixAppFolder = "WixPerMachineFolder"</Publish>
+
+        <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="InstallScopeDlg" Order="2">1</Publish>
+        <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="2">1</Publish>
 
         <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallScopeDlg" Order="2">NOT Installed</Publish>
       </UI>