From 07ada7424c8273079567084b01012b1ec94d0309 Mon Sep 17 00:00:00 2001
From: Maxhy <maxime.chamley@leosac.com>
Date: Wed, 16 Aug 2023 17:00:47 +0200
Subject: [PATCH] Upgrade WiX from v3 to v4, then add French translations

---
 KeyManager.Setup/KeyManager.Setup.wixproj |  50 +------
 KeyManager.Setup/Product.en-us.wxl        |  16 +++
 KeyManager.Setup/Product.fr-fr.wxl        |  16 +++
 KeyManager.Setup/Product.wxs              | 158 +++++++++++-----------
 KeyManager.Setup/config.wxi               |  17 +--
 5 files changed, 118 insertions(+), 139 deletions(-)
 create mode 100644 KeyManager.Setup/Product.en-us.wxl
 create mode 100644 KeyManager.Setup/Product.fr-fr.wxl

diff --git a/KeyManager.Setup/KeyManager.Setup.wixproj b/KeyManager.Setup/KeyManager.Setup.wixproj
index ad3e2b2..dd11362 100644
--- a/KeyManager.Setup/KeyManager.Setup.wixproj
+++ b/KeyManager.Setup/KeyManager.Setup.wixproj
@@ -1,41 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>3.10</ProductVersion>
-    <ProjectGuid>6d7024d4-f698-4c90-98fe-a3e609d7014f</ProjectGuid>
-    <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>KeyManager.Setup</OutputName>
-    <OutputType>Package</OutputType>
-  </PropertyGroup>
+<Project Sdk="WixToolset.Sdk/4.0.1">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Product.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>$(WixToolPath)WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\KeyManager.Library.KeyStore.File.UI\KeyManager.Library.KeyStore.File.UI.csproj">
       <Name>KeyManager.Library.KeyStore.File.UI</Name>
@@ -150,17 +119,8 @@
     <Content Include="leosac.ico" />
     <Content Include="leosac_key.ico" />
   </ItemGroup>
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' AND ('$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Release')">
-    <Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
-  </Target>
-  <!--
-	To modify your build process, add your task inside one of the targets below and uncomment it.
-	Other similar extension points exist, see Wix.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Netfx.wixext" Version="4.0.1" />
+    <PackageReference Include="WixToolset.UI.wixext" Version="4.0.1" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/KeyManager.Setup/Product.en-us.wxl b/KeyManager.Setup/Product.en-us.wxl
new file mode 100644
index 0000000..69e1d94
--- /dev/null
+++ b/KeyManager.Setup/Product.en-us.wxl
@@ -0,0 +1,16 @@
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
+
+  <String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />
+  <String Id="DotNetRequiredError" Value="[ProductName] requires Microsoft .NET 7 Desktop." />
+  <String Id="LaunchApp" Value="Launch [ProductName] when setup exits." />
+  <String Id="ProductDescr" Value="The [ProductName] application" />
+  <String Id="Translations" Value="Translations" />
+  <String Id="TranslationsDescr" Value="Available application translations" />
+  <String Id="FrenchTranslation" Value="French Translation" />
+  <String Id="FrenchTranslationDescr" Value="The application French translation" />
+  <String Id="RFIDMiddleware" Value="LibLogicalAccess" />
+  <String Id="RFIDMiddlewareDescr" Value="The RFID/SmartCard middleware" />
+  <String Id="StartMenuShortcut" Value="Start Menu Shortcut" />
+  <String Id="DesktopShortcut" Value="Desktop Shortcut" />
+
+</WixLocalization>
diff --git a/KeyManager.Setup/Product.fr-fr.wxl b/KeyManager.Setup/Product.fr-fr.wxl
new file mode 100644
index 0000000..0abf26d
--- /dev/null
+++ b/KeyManager.Setup/Product.fr-fr.wxl
@@ -0,0 +1,16 @@
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="fr-FR">
+
+  <String Id="DowngradeError" Value="Une version plus récente de [ProductName] est déjà installée." />
+  <String Id="DotNetRequiredError" Value="[ProductName] nécessite Microsoft .NET 7 Desktop." />
+  <String Id="LaunchApp" Value="Démarrer [ProductName] à la fin de l'installation." />
+  <String Id="ProductDescr" Value="L'application [ProductName]" />
+  <String Id="Translations" Value="Traductions" />
+  <String Id="TranslationsDescr" Value="Traductions disponibles pour l'application" />
+  <String Id="FrenchTranslation" Value="Langue Française" />
+  <String Id="FrenchTranslationDescr" Value="Les ressources françaises pour l'application" />
+  <String Id="RFIDMiddleware" Value="LibLogicalAccess" />
+  <String Id="RFIDMiddlewareDescr" Value="Le middleware RFID/SmartCard" />
+  <String Id="StartMenuShortcut" Value="Raccourci dans le menu démarrer" />
+  <String Id="DesktopShortcut" Value="Raccourci sur le bureau" />
+
+</WixLocalization>
diff --git a/KeyManager.Setup/Product.wxs b/KeyManager.Setup/Product.wxs
index 26d19dd..6e0da74 100644
--- a/KeyManager.Setup/Product.wxs
+++ b/KeyManager.Setup/Product.wxs
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?include config.wxi ?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="$(var.Version)" Manufacturer="$(var.Manufacturer)" UpgradeCode="fd14ef4f-fe2a-44ce-a744-9d0103039487">
-		<Package InstallerVersion="200" Compressed="yes" />
+<?include config.wxi ?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui" xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
+	<Package Name="$(var.ProductName)" Version="$(var.Version)" Manufacturer="$(var.Manufacturer)" UpgradeCode="fd14ef4f-fe2a-44ce-a744-9d0103039487" InstallerVersion="200">
+		
 
-		<MajorUpgrade DowngradeErrorMessage="A newer version of $(var.ProductName) is already installed." />
+		<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
     <MediaTemplate EmbedCab="yes" />
     <Icon Id="leosac_key.ico" SourceFile="leosac_key.ico" />
 
-		<Feature Id="ProductFeature" Title="$(var.ProductName)" Description="The $(var.ProductName) application" Absent="disallow" Level="1">
+		<Feature Id="ProductFeature" Title="$(var.ProductName)" Description="!(loc.ProductDescr)" Level="1" AllowAbsent="no">
 			<ComponentGroupRef Id="KeyManagerComponents" />
       <ComponentGroupRef Id="FilePluginComponents" />
       <ComponentGroupRef Id="HSM_PKCS11PluginComponents" />
@@ -20,26 +19,26 @@
       <ComponentGroupRef Id="HSM_PKCS11PluginDependenciesComponents" />
       <ComponentGroupRef Id="NXP_SAMPluginDependenciesComponents" />
 		</Feature>
-    <Feature Id="LibLogicalAccessFeature" Title="LibLogicalAccess" Description="The RFID/SmartCard middleware" Absent="disallow" Level="1">
+    <Feature Id="LibLogicalAccessFeature" Title="!(loc.RFIDMiddleware)" Description="!(loc.RFIDMiddlewareDescr)" Level="1" AllowAbsent="no">
       <MergeRef Id="LLAMSM" />
     </Feature>
-    <Feature Id="TranslationsFeature" Title="Translations" Description="Available application translations" Level="1">
-      <Feature Id="FrenchTranslation" Title="French Translation" Description="The application French translation" Level="1">
+    <Feature Id="TranslationsFeature" Title="!(loc.Translations)" Description="!(loc.TranslationsDescr)" Level="1">
+      <Feature Id="FrenchTranslation" Title="!(loc.FrenchTranslation)" Description="!(loc.FrenchTranslationDescr)" Level="1">
         <ComponentGroupRef Id="KeyManagerResourcesFR" />
-        <ComponentGroupRef Id="DependenciesResourcesFR"/>
+        <ComponentGroupRef Id="DependenciesResourcesFR" />
         <ComponentGroupRef Id="FilePluginResourcesFR" />
         <ComponentGroupRef Id="HSM_PKCS11PluginResourcesFR" />
         <ComponentGroupRef Id="NXP_SAMPluginResourcesFR" />
       </Feature>
     </Feature>
-    <Feature Id="StartMenuShortcut" Title="Start Menu Shortcut" Level="1">
+    <Feature Id="StartMenuShortcut" Title="!(loc.StartMenuShortcut)" Level="1">
       <ComponentRef Id="ProgramMenuDir" />
     </Feature>
-    <Feature Id="DesktopShortcut" Title="Desktop Shortcut" Level="1">
+    <Feature Id="DesktopShortcut" Title="!(loc.DesktopShortcut)" Level="1">
       <ComponentRef Id="ApplicationShortcutDesktop" />
     </Feature>
 
-    <UIRef Id="WixUI_Advanced" />
+    <ui:WixUI Id="WixUI_Advanced" />
 
     <!-- The about link that appears in Add & Remove Programs. -->
     <Property Id="ARPURLINFOABOUT" Value="$(var.AboutURL)" />
@@ -54,7 +53,7 @@
     <Property Id="Platform" Value="$(var.Platform)" />
     <Property Id="WixAppFolder" Value="WixPerUserFolder" />
     <Property Id="APPLICATIONFOLDER">
-      <RegistrySearch Id="FindInstallRegDir" Type="raw" Root="HKLM" Win64="$(var.Win64)" Key="Software\$(var.Manufacturer)\$(var.ProductName)" Name="InstallDir" />
+      <RegistrySearch Id="FindInstallRegDir" Type="raw" Root="HKLM" Key="Software\$(var.Manufacturer)\$(var.ProductName)" Name="InstallDir" />
     </Property>
 
 
@@ -63,23 +62,23 @@
     <WixVariable Id="WixUIDialogBmp" Value="dialog.bmp" />
     <WixVariable Id="WixUIInfoIco" Value="leosac.ico" />
 
+    <netfx:DotNetCompatibilityCheck RuntimeType="desktop" Platform="$(var.Platform)" RollForward="latestMinor" Version ="7.0.0" Property="NETCORESTATUS" />
+    <Launch Condition="Installed OR NETCORESTATUS=&quot;0&quot;" Message="!(loc.DotNetRequiredError)" />
+
     <!-- Launch the application after setup exits -->
-    <CustomAction Id = "StartAppOnExit" FileKey = "___var.KeyManagerExe.TargetPath_" ExeCommand = "" Execute = "immediate" Impersonate = "yes" Return = "asyncNoWait" />
-    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch Leosac Key Manager when setup exits." />
+    <CustomAction Id="StartAppOnExit" ExeCommand="" Execute="immediate" Impersonate="yes" Return="asyncNoWait" FileRef="___var.KeyManagerExe.TargetPath_" />
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="!(loc.LaunchApp)" />
     <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1" />
 
     <UI>
-      <Publish Dialog = "ExitDialog" Control = "Finish" Order = "1" Event = "DoAction" Value = "StartAppOnExit">
-        WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed
-      </Publish>
+      <Publish Dialog="ExitDialog" Control="Finish" Order="1" Event="DoAction" Value="StartAppOnExit" Condition="WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed" />
     </UI>
 
 
-  </Product>
+  </Package>
 
 	<Fragment>
-		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="$(var.PlatformProgramFilesFolder)" Name="PFiles">
+      <StandardDirectory Id="ProgramFiles6432Folder">
         <Directory Id="COMPANYFOLDER" Name="$(var.Manufacturer)">
           <Directory Id="APPLICATIONFOLDER" Name="$(var.ProductName)">
             <Directory Id="RESOURCESFR" Name="fr" />
@@ -108,185 +107,180 @@
             <Merge Id="LLAMSM" Language="1033" DiskId="1" SourceFile="$(var.LLAMSMPath)" />
           </Directory>
         </Directory>
-			</Directory>
+			</StandardDirectory>
 
-      <Directory Id="ProgramMenuFolder" Name="Programs">
+      <StandardDirectory Id="ProgramMenuFolder">
         <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)">
-          <Component Id="ProgramMenuDir" Guid="*" Win64="$(var.Win64)">
-            <Shortcut Id="ProgramMenuDirShortcut" Name="$(var.ProductName)" Description="$(var.ProductName)"
-                    Target="[APPLICATIONFOLDER]KeyManager.exe" WorkingDirectory="APPLICATIONFOLDER"/>
-            <RemoveFolder Id="ProgramMenuDir" On="uninstall"/>
-            <RegistryValue Root="HKCU" Key="Software\$(var.Manufacturer)\$(var.ProductName)"
-                           Type="integer" Value="1" Name="startmenu_installed" KeyPath="yes" />
+          <Component Id="ProgramMenuDir">
+            <Shortcut Id="ProgramMenuDirShortcut" Name="$(var.ProductName)" Description="$(var.ProductName)" Target="[APPLICATIONFOLDER]KeyManager.exe" WorkingDirectory="APPLICATIONFOLDER" />
+            <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
+            <RegistryValue Root="HKCU" Key="Software\$(var.Manufacturer)\$(var.ProductName)" Type="integer" Value="1" Name="startmenu_installed" KeyPath="yes" />
           </Component>
         </Directory>
-      </Directory>
+      </StandardDirectory>
 
-      <Directory Id="DesktopFolder" Name="Desktop">
-        <Component Id="ApplicationShortcutDesktop" Guid="*" Win64="$(var.Win64)">
-          <Shortcut Id="ApplicationDesktopShortcut" Name="$(var.ProductName)" Description="$(var.ProductName)"
-                    Target="[APPLICATIONFOLDER]KeyManager.exe" WorkingDirectory="APPLICATIONFOLDER"/>
-          <RemoveFolder Id="DesktopFolder" On="uninstall"/>
-          <RegistryValue Root="HKCU" Key="Software\$(var.Manufacturer)\$(var.ProductName)"
-                         Name="dekstop_installed" Type="integer" Value="1" KeyPath="yes"/>
+      <StandardDirectory Id="DesktopFolder">
+        <Component Id="ApplicationShortcutDesktop">
+          <Shortcut Id="ApplicationDesktopShortcut" Name="$(var.ProductName)" Description="$(var.ProductName)" Target="[APPLICATIONFOLDER]KeyManager.exe" WorkingDirectory="APPLICATIONFOLDER" />
+          <RemoveFolder Id="DesktopFolder" On="uninstall" />
+          <RegistryValue Root="HKCU" Key="Software\$(var.Manufacturer)\$(var.ProductName)" Name="dekstop_installed" Type="integer" Value="1" KeyPath="yes" />
         </Component>
-      </Directory>
-		</Directory>
-	</Fragment>
+      </StandardDirectory>
+		</Fragment>
 
   <Fragment>
     <ComponentGroup Id="KeyManagerComponents" Directory="APPLICATIONFOLDER">
-      <Component Id="InstallRegDir" Guid="$(var.CompInstallRegDir)" DiskId="1" Win64="$(var.Win64)">
-        <RegistryKey Id="RegInstallDir" Root="HKLM" Key="Software\$(var.Manufacturer)\$(var.ProductName)" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" >
+      <Component Id="InstallRegDir" Guid="$(var.CompInstallRegDir)" DiskId="1">
+        <RegistryKey Id="RegInstallDir" Root="HKLM" Key="Software\$(var.Manufacturer)\$(var.ProductName)" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
           <RegistryValue Name="InstallDir" Type="string" Value="[APPLICATIONFOLDER]" />
         </RegistryKey>
       </Component>
-      <Component Id="KeyManagerComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerComponent">
         <File Id="___var.KeyManager.TargetPath_" Source="$(var.KeyManager.TargetPath)" />
       </Component>
-      <Component Id="KeyManagerExeComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerExeComponent">
         <File Id="___var.KeyManagerExe.TargetPath_" Source="$(var.KeyManager.TargetDir)\KeyManager.exe" />
       </Component>
-      <Component Id="KeyManagerDepsComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerDepsComponent">
         <File Id="___var.KeyManager.deps.TargetPath_" Source="$(var.KeyManager.TargetDir)\KeyManager.deps.json" />
       </Component>
-      <Component Id="KeyManagerRuntimeconfigComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerRuntimeconfigComponent">
         <File Id="___var.KeyManager.runtimeconfig.TargetPath_" Source="$(var.KeyManager.TargetDir)\KeyManager.runtimeconfig.json" />
       </Component>
-      <Component Id="KeyManagerLibraryComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryComponent">
         <File Id="___var.KeyManager.Library.TargetPath_" Source="$(var.KeyManager.Library.TargetPath)" />
       </Component>
-      <Component Id="KeyManagerLibraryPluginComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryPluginComponent">
         <File Id="___var.KeyManager.Library.Plugin.TargetPath_" Source="$(var.KeyManager.Library.Plugin.TargetPath)" />
       </Component>
-      <Component Id="KeyManagerLibraryPluginUIComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryPluginUIComponent">
         <File Id="___var.KeyManager.Library.Plugin.UI.TargetPath_" Source="$(var.KeyManager.Library.Plugin.UI.TargetPath)" />
       </Component>
-      <Component Id="KeyManagerLibraryUIComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryUIComponent">
         <File Id="___var.KeyManager.Library.UI.TargetPath_" Source="$(var.KeyManager.Library.UI.TargetPath)" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="FilePluginComponents" Directory="FILEPLUGIN">
-      <Component Id="KeyManagerLibraryKeyStoreFileComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryKeyStoreFileComponent">
         <File Id="___var.KeyManager.Library.KeyStore.File.TargetPath_" Source="$(var.KeyManager.Library.KeyStore.File.TargetPath)" />
       </Component>
-      <Component Id="KeyManagerLibraryKeyStoreFileUIComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryKeyStoreFileUIComponent">
         <File Id="___var.KeyManager.Library.KeyStore.File.UI.TargetPath_" Source="$(var.KeyManager.Library.KeyStore.File.UI.TargetPath)" />
       </Component>
     </ComponentGroup>
     <ComponentGroup Id="HSM_PKCS11PluginComponents" Directory="HSM_PKCS11PLUGIN">
-      <Component Id="KeyManagerLibraryHSM_PKCS11Component" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryHSM_PKCS11Component">
         <File Id="___var.KeyManager.Library.KeyStore.HSM_PKCS11.TargetPath_" Source="$(var.KeyManager.Library.KeyStore.HSM_PKCS11.TargetPath)" />
       </Component>
-      <Component Id="KeyManagerLibraryHSM_PKCS11UIComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryHSM_PKCS11UIComponent">
         <File Id="___var.KeyManager.Library.KeyStore.HSM_PKCS11.UI.TargetPath_" Source="$(var.KeyManager.Library.KeyStore.HSM_PKCS11.UI.TargetPath)" />
       </Component>
     </ComponentGroup>
     <ComponentGroup Id="MemoryPluginComponents" Directory="MEMORYPLUGIN">
-      <Component Id="KeyManagerLibraryMemoryComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryMemoryComponent">
         <File Id="___var.KeyManager.Library.KeyStore.Memory.TargetPath_" Source="$(var.KeyManager.Library.KeyStore.Memory.TargetPath)" />
       </Component>
-      <Component Id="KeyManagerLibraryMemoryUIComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryMemoryUIComponent">
         <File Id="___var.KeyManager.Library.KeyStore.Memory.UI.TargetPath_" Source="$(var.KeyManager.Library.KeyStore.Memory.UI.TargetPath)" />
       </Component>
     </ComponentGroup>
     <ComponentGroup Id="NXP_SAMPluginComponents" Directory="NXP_SAMPLUGIN">
-      <Component Id="KeyManagerLibraryNXP_SAMComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryNXP_SAMComponent">
         <File Id="___var.KeyManager.Library.KeyStore.NXP_SAM.TargetPath_" Source="$(var.KeyManager.Library.KeyStore.NXP_SAM.TargetPath)" />
       </Component>
-      <Component Id="KeyManagerLibraryNXP_SAMUIComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryNXP_SAMUIComponent">
         <File Id="___var.KeyManager.Library.KeyStore.NXP_SAM.UI.TargetPath_" Source="$(var.KeyManager.Library.KeyStore.NXP_SAM.UI.TargetPath)" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="KeyManagerResourcesFR" Directory="RESOURCESFR">
-      <Component Id="KeyManagerResourcesFRComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerResourcesFRComponent">
         <File Id="___var.KeyManager.ResourcesFR_" Source="$(var.KeyManager.TargetDir)\fr\KeyManager.resources.dll" />
       </Component>
-      <Component Id="KeyManagerLibraryUIResourcesFRComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryUIResourcesFRComponent">
         <File Id="___var.KeyManager.Library.UI.ResourcesFR_" Source="$(var.KeyManager.Library.UI.TargetDir)\fr\KeyManager.Library.UI.resources.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="FilePluginResourcesFR" Directory="FILEPLUGINFR">
-      <Component Id="KeyManagerLibraryKeyStoreFileUIResourcesFRComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryKeyStoreFileUIResourcesFRComponent">
         <File Id="___var.KeyManager.Library.KeyStore.File.UI.ResourcesFR_" Source="$(var.KeyManager.Library.KeyStore.File.UI.TargetDir)\fr\KeyManager.Library.KeyStore.File.UI.resources.dll" />
       </Component>
     </ComponentGroup>
     <ComponentGroup Id="HSM_PKCS11PluginResourcesFR" Directory="HSM_PKCS11PLUGINFR">
-      <Component Id="KeyManagerLibraryKeyStoreHSM_PKCS11UIResourcesFRComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryKeyStoreHSM_PKCS11UIResourcesFRComponent">
         <File Id="___var.KeyManager.Library.KeyStore.HSM_PKCS11.UI.ResourcesFR_" Source="$(var.KeyManager.Library.KeyStore.HSM_PKCS11.UI.TargetDir)\fr\KeyManager.Library.KeyStore.HSM_PKCS11.UI.resources.dll" />
       </Component>
     </ComponentGroup>
     <ComponentGroup Id="NXP_SAMPluginResourcesFR" Directory="NXP_SAMPLUGINFR">
-      <Component Id="KeyManagerLibraryKeyStoreNXP_SAMUIResourcesFRComponent" Win64="$(var.Win64)">
+      <Component Id="KeyManagerLibraryKeyStoreNXP_SAMUIResourcesFRComponent">
         <File Id="___var.KeyManager.Library.KeyStore.NXP_SAM.UI.ResourcesFR_" Source="$(var.KeyManager.Library.KeyStore.NXP_SAM.UI.TargetDir)\fr\KeyManager.Library.KeyStore.NXP_SAM.UI.resources.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="DependenciesResourcesFR" Directory="RESOURCESFR">
-      <Component Id="WpfAppResourcesFRComponent" Win64="$(var.Win64)">
+      <Component Id="WpfAppResourcesFRComponent">
         <File Id="___var.WpfApp.ResourcesFR_" Source="$(var.KeyManager.TargetDir)\fr\WpfApp.resources.dll" />
       </Component>
     </ComponentGroup>
     
     <ComponentGroup Id="DependenciesComponents" Directory="APPLICATIONFOLDER">
-      <Component Id="BouncyCastleCryptographyComponent" Win64="$(var.Win64)">
+      <Component Id="BouncyCastleCryptographyComponent">
         <File Id="___var.BouncyCastle.Cryptography.dll_" Source="$(var.KeyManager.TargetDir)\BouncyCastle.Cryptography.dll" />
       </Component>
-      <Component Id="Crc32NETComponent" Win64="$(var.Win64)">
+      <Component Id="Crc32NETComponent">
         <File Id="___var.Crc32.NET.dll_" Source="$(var.KeyManager.TargetDir)\Crc32.NET.dll" />
       </Component>
-      <Component Id="log4netComponent" Win64="$(var.Win64)">
+      <Component Id="log4netComponent">
         <File Id="___var.log4net.dll_" Source="$(var.KeyManager.TargetDir)\log4net.dll" />
       </Component>
-      <Component Id="log4netconfigComponent" Win64="$(var.Win64)">
+      <Component Id="log4netconfigComponent">
         <File Id="___var.log4net.config_" Source="$(var.KeyManager.TargetDir)\log4net.config" />
       </Component>
-      <Component Id="MaterialDesignColorsComponent" Win64="$(var.Win64)">
+      <Component Id="MaterialDesignColorsComponent">
         <File Id="___var.MaterialDesignColors.dll_" Source="$(var.KeyManager.TargetDir)\MaterialDesignColors.dll" />
       </Component>
-      <Component Id="MaterialDesignThemesWpfComponent" Win64="$(var.Win64)">
+      <Component Id="MaterialDesignThemesWpfComponent">
         <File Id="___var.MaterialDesignThemes.Wpf.dll_" Source="$(var.KeyManager.TargetDir)\MaterialDesignThemes.Wpf.dll" />
       </Component>
-      <Component Id="MicrosoftXamlBehaviorsComponent" Win64="$(var.Win64)">
+      <Component Id="MicrosoftXamlBehaviorsComponent">
         <File Id="___var.Microsoft.Xaml.Behaviors.dll_" Source="$(var.KeyManager.TargetDir)\Microsoft.Xaml.Behaviors.dll" />
       </Component>
-      <Component Id="NewtonsoftJsonComponent" Win64="$(var.Win64)">
+      <Component Id="NewtonsoftJsonComponent">
         <File Id="___var.Newtonsoft.Json.dll_" Source="$(var.KeyManager.TargetDir)\Newtonsoft.Json.dll" />
       </Component>
-      <Component Id="QrCodeGeneratorComponent" Win64="$(var.Win64)">
+      <Component Id="QrCodeGeneratorComponent">
         <File Id="___var.QrCodeGenerator.dll_" Source="$(var.KeyManager.TargetDir)\QrCodeGenerator.dll" />
       </Component>
-      <Component Id="SecretSharingDotNetComponent" Win64="$(var.Win64)">
+      <Component Id="SecretSharingDotNetComponent">
         <File Id="___var.SecretSharingDotNet.dll_" Source="$(var.KeyManager.TargetDir)\SecretSharingDotNet.dll" />
       </Component>
-      <Component Id="SkiaSharpComponent" Win64="$(var.Win64)">
+      <Component Id="SkiaSharpComponent">
         <File Id="___var.SkiaSharp.dll_" Source="$(var.KeyManager.TargetDir)\SkiaSharp.dll" />
       </Component>
-      <Component Id="WpfAppComponent" Win64="$(var.Win64)">
+      <Component Id="WpfAppComponent">
         <File Id="___var.WpfApp.dll_" Source="$(var.KeyManager.TargetDir)\WpfApp.dll" />
       </Component>
     </ComponentGroup>
     <ComponentGroup Id="NativeWinx64RuntimeComponents" Directory="RUNTIMEWINX64NATIVE">
-      <Component Id="libSkiaSharp_winx64Component" Win64="$(var.Win64)">
+      <Component Id="libSkiaSharp_winx64Component">
         <File Id="___var.libSkiaSharp_winx64.dll_" Source="$(var.KeyManager.TargetDir)\runtimes\win-x64\native\libSkiaSharp.dll" />
       </Component>
     </ComponentGroup>
     <ComponentGroup Id="NativeWinx86RuntimeComponents" Directory="RUNTIMEWINX86NATIVE">
-      <Component Id="libSkiaSharp_winx86Component" Win64="$(var.Win64)">
+      <Component Id="libSkiaSharp_winx86Component">
         <File Id="___var.libSkiaSharp_winx86.dll_" Source="$(var.KeyManager.TargetDir)\runtimes\win-x86\native\libSkiaSharp.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="HSM_PKCS11PluginDependenciesComponents" Directory="HSM_PKCS11PLUGIN">
-      <Component Id="Pkcs11InteropComponent" Win64="$(var.Win64)">
+      <Component Id="Pkcs11InteropComponent">
         <File Id="___var.Pkcs11Interop.dll_" Source="$(var.KeyManager.Library.KeyStore.HSM_PKCS11.TargetDir)\Pkcs11Interop.dll" />
       </Component>
     </ComponentGroup>
     <ComponentGroup Id="NXP_SAMPluginDependenciesComponents" Directory="NXP_SAMPLUGIN">
-      <Component Id="LibLogicalAccessNetComponent" Win64="$(var.Win64)">
+      <Component Id="LibLogicalAccessNetComponent">
         <File Id="___var.LibLogicalAccessNet.dll_" Source="$(var.KeyManager.Library.KeyStore.NXP_SAM.TargetDir)\LibLogicalAccessNet.dll" />
       </Component>
     </ComponentGroup>
diff --git a/KeyManager.Setup/config.wxi b/KeyManager.Setup/config.wxi
index a88bad8..5870e61 100644
--- a/KeyManager.Setup/config.wxi
+++ b/KeyManager.Setup/config.wxi
@@ -1,23 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-  <Include>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define Manufacturer = "Leosac" ?>
     <?define ProductName = "Leosac Key Manager" ?>
-	<?define Version = "1.6.0.0" ?>
+	  <?define Version = "1.6.0.0" ?>
     <?define AboutURL = "https://www.leosac.com" ?>
     <?define SupportURL = "https://www.leosac.com" ?>
     <?define UpdatesURL = "https://www.leosac.com" ?>
 
     <?if $(var.Platform) = "x64" ?>
-      <?define Win64 = "yes" ?>
-      <?define PlatformString = "64-bit"?>
-      <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
       <?define LLAMSMPath = "packages\liblogicalaccess-swig\msm\LibLogicalAccessNetCEMerge-x64.msm" ?>
-    <?else ?>
-      <?define Win64 = "no" ?>
-      <?define PlatformString = "32-bit"?>
-      <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
-      <?define LLAMSMPath = "packages\liblogicalaccess-swig\msm\LibLogicalAccessNetCEMerge-x86.msm" ?>?>
-    <?endif ?>
+    <?else?>
+      <?define LLAMSMPath = "packages\liblogicalaccess-swig\msm\LibLogicalAccessNetCEMerge-x86.msm" ?>
+    <?endif?>
     
     <?define BaseGuid = "4a0e1d81-8dab-4a42-a5af-671b018926" ?>
     <?define CompInstallRegDir = "$(var.BaseGuid)10" ?>