From 50be07e8ac79af70cfe571a11fb6d774bb39d2bf Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Mon, 5 Sep 2022 17:23:49 +0100
Subject: [PATCH] installer: SxS: WIP

---
 build/VStudio/installer/Product.wxs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/build/VStudio/installer/Product.wxs b/build/VStudio/installer/Product.wxs
index 84def35f..c88216d4 100644
--- a/build/VStudio/installer/Product.wxs
+++ b/build/VStudio/installer/Product.wxs
@@ -42,7 +42,6 @@
                 Type="raw" />
         </Property>
 
-        <Property Id="P.LauncherName">$(var.MyProductName).Launcher</Property>
         <Property Id="P.LauncherRegistryKey">Software\$(var.MyProductName)\Services</Property>
         <Property Id="P.RegistryKey">Software\$(var.MyProductName)</Property>
         <Property Id="INSTALLDIR">
@@ -184,14 +183,14 @@
                 <File Id="FILE.launcher_a64.exe.a64" Name="launcher-a64.exe" KeyPath="yes" />
                 <ServiceInstall
                     Id="launcher_a64.exe.a64"
-                    Name="[P.LauncherName]"
+                    Name="$(var.MyProductName).Launcher"
                     Description="$(var.MyDescription)"
                     Type="ownProcess"
                     Start="auto"
                     ErrorControl="ignore" />
                 <ServiceControl
                     Id="launcher_a64.exe.a64"
-                    Name="[P.LauncherName]"
+                    Name="$(var.MyProductName).Launcher"
                     Start="install"
                     Stop="both"
                     Remove="uninstall" />
@@ -215,14 +214,14 @@
                 <File Id="FILE.launcher_x64.exe.x64" Name="launcher-x64.exe" KeyPath="yes" />
                 <ServiceInstall
                     Id="launcher_x64.exe.x64"
-                    Name="[P.LauncherName]"
+                    Name="$(var.MyProductName).Launcher"
                     Description="$(var.MyDescription)"
                     Type="ownProcess"
                     Start="auto"
                     ErrorControl="ignore" />
                 <ServiceControl
                     Id="launcher_x64.exe.x64"
-                    Name="[P.LauncherName]"
+                    Name="$(var.MyProductName).Launcher"
                     Start="install"
                     Stop="both"
                     Remove="uninstall" />
@@ -246,14 +245,14 @@
                 <File Id="FILE.launcher_x86.exe.x86" Name="launcher-x86.exe" KeyPath="yes" />
                 <ServiceInstall
                     Id="launcher_x86.exe.x86"
-                    Name="[P.LauncherName]"
+                    Name="$(var.MyProductName).Launcher"
                     Description="$(var.MyDescription)"
                     Type="ownProcess"
                     Start="auto"
                     ErrorControl="ignore" />
                 <ServiceControl
                     Id="launcher_x86.exe.x86"
-                    Name="[P.LauncherName]"
+                    Name="$(var.MyProductName).Launcher"
                     Start="install"
                     Stop="both"
                     Remove="uninstall" />