From eff6ee7118018ffdb9237a6d6309fc0731514193 Mon Sep 17 00:00:00 2001
From: Mattias Gustavsson <mattias.gustavsson@symphony.com>
Date: Wed, 14 Oct 2020 09:08:49 +0200
Subject: [PATCH] SDA-2516 Extract programs folder location into property

---
 installer/win/WixSharpInstaller/Symphony.cs   | 3 ++-
 installer/win/WixSharpInstaller/WelcomeDlg.cs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/installer/win/WixSharpInstaller/Symphony.cs b/installer/win/WixSharpInstaller/Symphony.cs
index b13a7a9c..f0c88de8 100644
--- a/installer/win/WixSharpInstaller/Symphony.cs
+++ b/installer/win/WixSharpInstaller/Symphony.cs
@@ -157,7 +157,8 @@ class Script
             new PublicProperty("OPEN_EXTERNAL", "true"),
             new PublicProperty("POD_URL", "https://my.symphony.com"),
             new PublicProperty("POINTER_LOCK", "true"),
-            new Property("MSIINSTALLPERUSER", "1")
+            new Property("MSIINSTALLPERUSER", "1"),
+            new Property("PROGRAMSFOLDER", System.Environment.ExpandEnvironmentVariables(@"%PROGRAMFILES%"))
         };
 
         // Define the custom actions we want to run, and at what point of the installation we want to execute them.
diff --git a/installer/win/WixSharpInstaller/WelcomeDlg.cs b/installer/win/WixSharpInstaller/WelcomeDlg.cs
index 90eb0579..9169abc8 100644
--- a/installer/win/WixSharpInstaller/WelcomeDlg.cs
+++ b/installer/win/WixSharpInstaller/WelcomeDlg.cs
@@ -51,7 +51,7 @@ namespace Symphony
             {
                 // Install for all users
                 Runtime.Session["MSIINSTALLPERUSER"] = ""; // per-machine
-                Runtime.Session["INSTALLDIR"] = System.Environment.ExpandEnvironmentVariables(@"%PROGRAMFILES%\" + Runtime.ProductName);
+                Runtime.Session["INSTALLDIR"] = Runtime.Session["PROGRAMSFOLDER"] + @"\" + Runtime.ProductName;
             }
 
             Shell.GoNext();