From 39cf3f51cc27f62458f8db7c915e35f8bfb4b16a Mon Sep 17 00:00:00 2001
From: AMZN-Phil <pconroy@amazon.com>
Date: Wed, 6 Oct 2021 11:43:41 -0700
Subject: [PATCH] Update wix installer folders to match the new binary
 locations.

Signed-off-by: AMZN-Phil <pconroy@amazon.com>
---
 .../Platform/Windows/Packaging/Bootstrapper.wxs  |  2 +-
 cmake/Platform/Windows/Packaging/Shortcuts.wxs   | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
index 079c20e212..f3af199bc2 100644
--- a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
+++ b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
@@ -20,7 +20,7 @@
         <!-- special variable name that auto maps to a WixStandardBootstrapperApplication attribute of the same name -->
         <Variable Name="LaunchTarget"
             Type="string"
-            Value="[InstallFolder]\bin\Windows\profile\o3de.exe"/>
+            Value="[InstallFolder]\bin\Windows\profile\Default\o3de.exe"/>
 
         <PayloadGroup Id="Images">
             <Payload Id="warning.png" SourceFile="$(var.CPACK_RESOURCE_PATH)/warning.png" Compressed="yes"/>
diff --git a/cmake/Platform/Windows/Packaging/Shortcuts.wxs b/cmake/Platform/Windows/Packaging/Shortcuts.wxs
index fefd15294a..fbfa174d06 100644
--- a/cmake/Platform/Windows/Packaging/Shortcuts.wxs
+++ b/cmake/Platform/Windows/Packaging/Shortcuts.wxs
@@ -18,7 +18,9 @@
         <DirectoryRef Id="INSTALL_ROOT">
             <Directory Id="root.bin" Name="bin">
                 <Directory Id="root.bin.Windows" Name="Windows">
-                    <Directory Id="root.bin.Windows.profile" Name="profile" />
+                    <Directory Id="root.bin.Windows.profile" Name="profile">
+                        <Directory Id="root.bin.Windows.profile.Default" Name="Default" />
+                    </Directory>
                 </Directory>
             </Directory>
         </DirectoryRef>
@@ -52,18 +54,18 @@
             <Component Id="StartMenuShortcuts" Guid="{E6447F0F-A46E-4A72-83D8-600707B590E8}">
 
                 <Shortcut Id="StartMenuShortcut_Editor"
-                    Target="[root.bin.Windows.profile]Editor.exe"
-                    WorkingDirectory="root.bin.Windows.profile"
+                    Target="[root.bin.Windows.profile.Default]Editor.exe"
+                    WorkingDirectory="root.bin.Windows.profile.Default"
                     Name="$(var.CPACK_PACKAGE_NAME) Editor" />
 
                 <Shortcut Id="StartMenuShortcut_MaterialEditor"
-                    Target="[root.bin.Windows.profile]MaterialEditor.exe"
-                    WorkingDirectory="root.bin.Windows.profile"
+                    Target="[root.bin.Windows.profile.Default]MaterialEditor.exe"
+                    WorkingDirectory="root.bin.Windows.profile.Default"
                     Name="$(var.CPACK_PACKAGE_NAME) Material Editor" />
 
                 <Shortcut Id="StartMenuShortcut_ProjectManager"
-                    Target="[root.bin.Windows.profile]o3de.exe"
-                    WorkingDirectory="root.bin.Windows.profile"
+                    Target="[root.bin.Windows.profile.Default]o3de.exe"
+                    WorkingDirectory="root.bin.Windows.profile.Default"
                     Name="$(var.CPACK_PACKAGE_NAME) Project Manager" />
 
                 <RemoveFolder Id="RemoveVersionedApplicationProgramsFolder" Directory='VersionedApplicationProgramsFolder' On="uninstall"/>