Build support for x64 MSI

The only difference between x64 and x86 is the default install folder. For some reason the x86 version of the MSI prevents the user from installing to regular "Program Files" on x64 systems. git-svn-id: https://duplicati.googlecode.com/svn/trunk@563 59da171f-624f-0410-aa54-27559c288bec
2010-10-27 20:11:42 +00:00
parent c9ee03975d
commit d130d7cf10
8 changed files with 140 additions and 27 deletions
@@ -120,6 +120,11 @@ namespace WixProjBuilder
            string compile_args = "\"" + string.Join("\" \"", includes.ToArray()) + "\"";
            compile_args += " -out \"" + objdir.Replace("\\", "\\\\") + "\"";

+            if (options.ContainsKey("platform") && options["platform"] == "x64")
+                compile_args += " -dPlatform=x64 -dWin64=yes";
+            else
+                compile_args += " -dPlatform=x86 -dWin64=no";
+
            int res = Execute(
                System.IO.Path.Combine(wixpath, "candle.exe"), 
                projdir,
@@ -44,7 +44,7 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="..\Duplicati\CommandLine\CommandLineParser.cs">
+    <Compile Include="..\..\Duplicati\CommandLine\CommandLineParser.cs">
      <Link>CommandLineParser.cs</Link>
    </Compile>
    <Compile Include="Program.cs" />
@@ -3,10 +3,28 @@
 <?include UpgradeData.wxi ?>

 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="$(var.ProductCode)" Name="Duplicati" Language="1033" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
-		<Package InstallerVersion="200" Compressed="yes" Id="$(var.PackageCode)" />

-		<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
+    <!-- Various nice-to-have shorthands for x64/x32 -->
+	<?if $(var.Platform) = "x64" ?>
+		<?define SystemFolder = "System64Folder" ?>
+		<?define SystemFolderX86 = "SystemFolder" ?>
+		<?define SoftwareKey = "Software" ?>
+		<?define SoftwareKeyX86 = "Software\Wow6432Node" ?>
+		<?define ProgramFilesFolder = "ProgramFiles64Folder" ?>
+		<?define ProgramFilesFolderX86 = "ProgramFilesFolder" ?>
+		<?define DisplayName = "Duplicati (x64)" ?>
+	<?else?>
+		<?define SystemFolder = "SystemFolder" ?>
+		<?define SystemFolderX86 = "SystemFolder" ?>
+		<?define SoftwareKey = "Software" ?>
+		<?define SoftwareKeyX86 = "Software" ?>
+		<?define ProgramFilesFolder = "ProgramFilesFolder" ?>
+		<?define DisplayName = "Duplicati" ?>
+	<?endif?>
+	
+  <Product Id="$(var.ProductCode)" Name="$(var.DisplayName)" Language="1033" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
+	<Package InstallerVersion="200" Compressed="yes" Id="$(var.PackageCode)" Platform="$(var.Platform)" />
+	<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />

    <PropertyRef Id="NETFRAMEWORK20"/>
    <Condition Message="The .NET Framework 2.0 must be installed ([NETFRAMEWORK20])">
@@ -53,19 +71,11 @@
    <Directory Id="TARGETDIR" Name="SourceDir">
      <Directory Id="ProgramMenuFolder" Name="Programs"/>
      <Directory Id="DesktopFolder" Name="Desktop"/>
-      <!-- 
-      <Directory Id="ProgramFiles64Folder">
-      <Directory Id="INSTALLLOCATION64" Name="Duplicati" />
-      </Directory> 
-      -->
-        <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLLOCATION" Name="Duplicati">
-          <!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
-          <!-- <Component Id="ProductComponent" Guid="931b7759-4503-43c0-b4cf-9cdafc349147"> -->
-          <!-- TODO: Insert files, registry keys, and other resources here. -->
-          <!-- </Component> -->
-        </Directory>
-      </Directory>
+	  
+  	  <Directory Id="$(var.ProgramFilesFolder)">
+	    <Directory Id="INSTALLLOCATION" Name="Duplicati" />
+	  </Directory>
+		
    </Directory>

    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" />
@@ -34,8 +34,11 @@ xcopy /I /Y /E ..\..\..\..\Duplicati\Localization\Compiled\fr-FR fr-FR
 xcopy /I /Y /E ..\..\..\..\Duplicati\Localization\Compiled\pt-BR pt-BR

 cd ..
-del ..\Duplicati.msi
-del ..\Duplicati.zip
+del ..\Duplicati.msi /Q
+del ..\Duplicati.x86.msi /Q
+del ..\Duplicati.x64.msi /Q
+del ..\Duplicati.zip /Q
+

 "%PROGRAMFILES%\7-zip\7z.exe" a -r Duplicati.zip Duplicati

@@ -43,7 +46,7 @@ cd ..\..

 REM Create incBinFiles.wxs if required
 REM Does NOT set the FILE_DUPLICATI_MAIN_EXE id on the main file, which is required to build the MSI
-if not exist incBinFiles.wxs paraffin -dir bin\Release\Duplicati -groupname DUPLICATIBIN -dirref INSTALLLOCATION -ext .pdb -ext .0 -alias bin\Release\Duplicati -norootdirectory -multiple  incBinFiles.wxs 
+if not exist incBinFiles.wxs paraffin -dir bin\Release\Duplicati -groupname DUPLICATIBIN -dirref INSTALLLOCATION -ext .pdb -ext .0 -alias bin\Release\Duplicati -norootdirectory -multiple -Win64var "$(var.Win64)" incBinFiles.wxs 

 REM Update version
 if exist incBinFiles.PARAFFIN del incBinFiles.PARAFFIN
@@ -52,4 +55,7 @@ if exist incBinFiles.PARAFFIN xcopy /I /Y incBinFiles.PARAFFIN incBinFiles.wxs
 if exist incBinFiles.PARAFFIN del incBinFiles.PARAFFIN

 WixProjBuilder.exe --wixpath="C:\Program Files (x86)\Windows Installer XML v3\bin" WixInstaller.wixproj
+move "bin\Release\Duplicati.msi" "bin\Release\Duplicati.x86.msi"
+WixProjBuilder.exe --wixpath="C:\Program Files (x86)\Windows Installer XML v3\bin" --platform=x64 WixInstaller.wixproj
+move "bin\Release\Duplicati.msi" "bin\Release\Duplicati.x64.msi"
 pause
@@ -5,12 +5,18 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixInstaller", "WixInstalle
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AB757800-A4CB-478B-A359-33786D0E8A9C}.Debug|x64.ActiveCfg = Debug|x64
+		{AB757800-A4CB-478B-A359-33786D0E8A9C}.Debug|x64.Build.0 = Debug|x64
 		{AB757800-A4CB-478B-A359-33786D0E8A9C}.Debug|x86.ActiveCfg = Debug|x86
 		{AB757800-A4CB-478B-A359-33786D0E8A9C}.Debug|x86.Build.0 = Debug|x86
+		{AB757800-A4CB-478B-A359-33786D0E8A9C}.Release|x64.ActiveCfg = Release|x64
+		{AB757800-A4CB-478B-A359-33786D0E8A9C}.Release|x64.Build.0 = Release|x64
 		{AB757800-A4CB-478B-A359-33786D0E8A9C}.Release|x86.ActiveCfg = Release|x86
 		{AB757800-A4CB-478B-A359-33786D0E8A9C}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
@@ -12,11 +12,30 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <OutputPath>bin\$(Configuration)\</OutputPath>
    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug</DefineConstants>
+    <DefineConstants>Debug;Win64=no</DefineConstants>
+    <WixVariables>
+    </WixVariables>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    <OutputPath>bin\$(Configuration)\</OutputPath>
    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <WixVariables>
+    </WixVariables>
+    <DefineConstants>Win64=no</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DefineConstants>Debug;Win64=yes</DefineConstants>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+    <WixVariables>
+    </WixVariables>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+    <WixVariables>
+    </WixVariables>
+    <DefineConstants>Win64=yes</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="Duplicati.wxs" />
@@ -3,12 +3,12 @@
  <!--<CommandLineOptions>
  <Producer>Autogenerated by Paraffin - Wintellect - John Robbins - john@wintellect.com</Producer>
  <WARNING>Manual changes to this file may cause incorrect behavior.</WARNING>
-  <CreatedOn>12-05-2010 12:05</CreatedOn>
+  <CreatedOn>25-10-2010 09:55</CreatedOn>
  <ParaffinFileVersion>2</ParaffinFileVersion>
  <GroupName>DUPLICATIBIN</GroupName>
  <Directory>bin\Release\Duplicati\</Directory>
  <DirAlias>bin\Release\Duplicati\</DirAlias>
-  <Win64></Win64>
+  <Win64>$(var.Win64)</Win64>
  <Multiple>true</Multiple>
  <Norecurse>false</Norecurse>
  <NoRootDirectory>true</NoRootDirectory>
@@ -23,18 +23,27 @@
  <Fragment>
    <ComponentGroup Id="DUPLICATIBIN">
      <ComponentRef Id="comp_2F257D6E521E467CBDEDCCBBFFEFDE3F" />
+      <ComponentRef Id="comp_0530C13F86D74E0D996E56CBE7AE634B" />
+      <ComponentRef Id="comp_D23FB67903224B64810FCD4909C0274B" />
+      <ComponentRef Id="comp_FD14DE4C0A884E169A5A2BAB02740A48" />
+      <ComponentRef Id="comp_9E21C8984BBF4EA590B6FF53388AE371" />
      <ComponentRef Id="comp_F014E8B59F1C4F30B1691C46494B25BD" />
      <ComponentRef Id="comp_9AFD6C8AB2C7473F83856604557B0A74" />
      <ComponentRef Id="comp_383E15C7CE6E4045AE2C6040BD714886" />
    </ComponentGroup>
    <DirectoryRef Id="INSTALLLOCATION">
-      <Component Id="comp_2F257D6E521E467CBDEDCCBBFFEFDE3F" DiskId="1" KeyPath="yes" Guid="5829ACFF-9CE9-4A83-B665-A7BA66AB9F89">
+      <Component Id="comp_2F257D6E521E467CBDEDCCBBFFEFDE3F" DiskId="1" KeyPath="yes" Guid="5829ACFF-9CE9-4A83-B665-A7BA66AB9F89" Win64="$(var.Win64)">
        <File Id="file_787AC436549F40E4A8C6894CE17D9D13" Checksum="yes" Source="bin\Release\Duplicati\Affirma.ThreeSharp.dll" />
+        <File Id="file_41365EE0D9E74046B824E364F19EB30A" Checksum="yes" Source="bin\Release\Duplicati\AlphaFS.dll" />
+        <File Id="file_7861DA76020A40DCB0C644CBCDC23F6F" Source="bin\Release\Duplicati\AlphaFS.xml" />
+        <File Id="file_106ECD6A262C444992A01795C10E9985" Checksum="yes" Source="bin\Release\Duplicati\AlphaVSS.Common.dll" />
+        <File Id="file_8F76A083A163479A92D04530E624E382" Source="bin\Release\Duplicati\AlphaVSS.Common.xml" />
        <File Id="file_B78FF6F1B27545798145D750983CCE98" Checksum="yes" Source="bin\Release\Duplicati\Datamodel.dll" />
        <File Id="file_7FB07E6CB0564DACA9ABD1A12E73D0AE" Checksum="yes" Source="bin\Release\Duplicati\DiffieHellman.dll" />
        <File Id="file_ABC66D2722854C31BC5B4D5F2BDBEC0D" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.CommandLine.BackendTester.exe" />
        <File Id="file_909AF4E8C8D7405DBE350591F77DED12" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.CommandLine.Decrypter.exe" />
        <File Id="file_62468D5742DF477D9859D4AC441FBEBF" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.CommandLine.exe" />
+        <File Id="file_7667015F752743DB849E2943EB06F41D" Source="bin\Release\Duplicati\Duplicati.CommandLine.exe.config" />
        <File Id="FILE_DUPLICATI_MAIN_EXE" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.exe" />
        <File Id="file_D61FCE5C0A894730B113ACDA6D67BC27" Source="bin\Release\Duplicati\Duplicati.exe.config" />
        <File Id="file_1C6A6608CDAB466288709680FBBA93AE" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.Library.Backend.BackendInterface.dll" />
@@ -47,10 +56,13 @@
        <File Id="file_58D3616C1A5A4997871A06BA27528D6E" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.Library.Backend.WEBDAV.dll" />
        <File Id="file_6B3D8BE4032340DFA70C3B59B445DC89" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.Library.Compression.dll" />
        <File Id="file_6ECE979751EF4FBC80816080FA5EE618" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.Library.Core.dll" />
+        <File Id="file_E6F0149D13C941C890A1AB5FB8493EC8" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.Library.DynamicLoader.dll" />
        <File Id="file_0929F159B19543008E1E6CDAB5936AF2" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.Library.Encryption.dll" />
+        <File Id="file_D01F5A2E793D4A48950B43A5393CFB86" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.Library.Interface.dll" />
        <File Id="file_E6079C6F05A54EEFAB6C3C078180C24F" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.Library.Logging.dll" />
        <File Id="file_2CFD310BEAE145D29DFFDB193566CDBE" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.Library.Main.dll" />
        <File Id="file_18DE56A52867437F91AC4B65878220F0" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.Library.SharpRSync.dll" />
+        <File Id="file_C9AA0C82BE8A4FC5899899496F22A301" Checksum="yes" Source="bin\Release\Duplicati\Duplicati.Library.Snapshots.dll" />
        <File Id="file_1DD5C89DD78B45A59D43FA711012F21F" Checksum="yes" Source="bin\Release\Duplicati\ICSharpCode.SharpZipLib.dll" />
        <File Id="file_A8DEE766CD13429EA42D5F56FB69CD40" Checksum="yes" Source="bin\Release\Duplicati\LightDatamodel.dll" />
        <File Id="file_41D74B5C27E6448C96ABCEB51CAA2958" Source="bin\Release\Duplicati\linux-readme.txt" />
@@ -60,19 +72,74 @@
        <File Id="file_59AB09DC127346078E17028A06E7F0E5" Checksum="yes" Source="bin\Release\Duplicati\System.Windows.Forms.Wizard.dll" />
        <File Id="file_346E3E76805F4FD48FA051D3C0A10B5D" Checksum="yes" Source="bin\Release\Duplicati\Tamir.SharpSSH.dll" />
      </Component>
+      <Directory Id="dir_90D7577F97274B508F88BE44E01E78AC" Name="alphavss">
+        <Component Id="comp_0530C13F86D74E0D996E56CBE7AE634B" DiskId="1" KeyPath="yes" Guid="A174A839-9F24-4141-A908-0E9FB6B78433" Win64="$(var.Win64)">
+          <File Id="file_7B9E604E39BC47659201E0A7F95CD274" Checksum="yes" Source="bin\Release\Duplicati\alphavss\AlphaVSS.Win2003.x64.dll" />
+          <File Id="file_ADE19146DADA46F5BC07B955A9054098" Checksum="yes" Source="bin\Release\Duplicati\alphavss\AlphaVSS.Win2003.x86.dll" />
+          <File Id="file_418761D138EB45899D791AE9CC20B957" Checksum="yes" Source="bin\Release\Duplicati\alphavss\AlphaVSS.Win2008.x64.dll" />
+          <File Id="file_92D65640637B449F97527D88472FDB54" Checksum="yes" Source="bin\Release\Duplicati\alphavss\AlphaVSS.Win2008.x86.dll" />
+          <File Id="file_9C8C19BB6F7246DBB8C65E134455A7BB" Checksum="yes" Source="bin\Release\Duplicati\alphavss\AlphaVSS.WinXP.x64.dll" />
+          <File Id="file_36624E77E0F148228C33FAF284BA4683" Checksum="yes" Source="bin\Release\Duplicati\alphavss\AlphaVSS.WinXP.x86.dll" />
+        </Component>
+      </Directory>
+      <Directory Id="dir_56A6DAFF77F54C98BED7CF77E1A6C8A6" Name="fr-FR">
+        <Component Id="comp_D23FB67903224B64810FCD4909C0274B" DiskId="1" KeyPath="yes" Guid="B1FD207A-6AAF-4A58-90B9-A2436704ED59" Win64="$(var.Win64)">
+          <File Id="file_CA4FCE3CD22A403EBDE01CC9874EA41A" Checksum="yes" Source="bin\Release\Duplicati\fr-FR\Duplicati.CommandLine.resources.dll" />
+          <File Id="file_D136D6EE774D47848F0A998EC7A7B2C0" Checksum="yes" Source="bin\Release\Duplicati\fr-FR\Duplicati.Library.Backend.CloudFiles.resources.dll" />
+          <File Id="file_665F7FDFDED54EF9AA82DD4848FC04F3" Checksum="yes" Source="bin\Release\Duplicati\fr-FR\Duplicati.Library.Backend.File.resources.dll" />
+          <File Id="file_E692A5EAB8514B99B7F23B6DB2FD07CC" Checksum="yes" Source="bin\Release\Duplicati\fr-FR\Duplicati.Library.Backend.FTP.resources.dll" />
+          <File Id="file_5D8A7EC4FB034F96B5BE46CCC1A3D07D" Checksum="yes" Source="bin\Release\Duplicati\fr-FR\Duplicati.Library.Backend.S3.resources.dll" />
+          <File Id="file_4A43670B9722409985E3DFD3AA8F2751" Checksum="yes" Source="bin\Release\Duplicati\fr-FR\Duplicati.Library.Backend.SSH.resources.dll" />
+          <File Id="file_2F8DF9D876E44A098CE839858EC0AF8C" Checksum="yes" Source="bin\Release\Duplicati\fr-FR\Duplicati.Library.Backend.WEBDAV.resources.dll" />
+          <File Id="file_42A1A8C0F6E74901A09F7BD1598D89F3" Checksum="yes" Source="bin\Release\Duplicati\fr-FR\Duplicati.Library.Compression.resources.dll" />
+          <File Id="file_8E2156C0A5B146EF9E141CAB9740D864" Checksum="yes" Source="bin\Release\Duplicati\fr-FR\Duplicati.Library.Core.resources.dll" />
+          <File Id="file_3C02DC50304C4814B27848BDCCE1DF9E" Checksum="yes" Source="bin\Release\Duplicati\fr-FR\Duplicati.Library.Encryption.resources.dll" />
+          <File Id="file_A5F195DE5E8344E6970F9DEFE8FBC59F" Checksum="yes" Source="bin\Release\Duplicati\fr-FR\Duplicati.Library.Main.resources.dll" />
+          <File Id="file_613715DA3A4F4AC684C8E1A2AFAAF3DC" Checksum="yes" Source="bin\Release\Duplicati\fr-FR\Duplicati.Library.SharpRSync.resources.dll" />
+          <File Id="file_4A5EF30A684744F383111D9CA52E2E0C" Checksum="yes" Source="bin\Release\Duplicati\fr-FR\Duplicati.resources.dll" />
+          <File Id="file_2E506EA545B04C33808746F86A8C5475" Checksum="yes" Source="bin\Release\Duplicati\fr-FR\System.Windows.Forms.Wizard.resources.dll" />
+        </Component>
+      </Directory>
+      <Directory Id="dir_CE98D626BA9842608DA2988F56399206" Name="lvm-scripts">
+        <Component Id="comp_FD14DE4C0A884E169A5A2BAB02740A48" DiskId="1" KeyPath="yes" Guid="A2082262-CCF3-49A8-80C9-7CAC372E5A7F" Win64="$(var.Win64)">
+          <File Id="file_8FCD4C6D39DD4262B42B1F719138D416" Source="bin\Release\Duplicati\lvm-scripts\create-lvm-snapshot.sh" />
+          <File Id="file_E7661F821849443F81086509C8D16621" Source="bin\Release\Duplicati\lvm-scripts\find-volume.sh" />
+          <File Id="file_0F5EADFC089C4AC294D3F52CDD53D6B1" Source="bin\Release\Duplicati\lvm-scripts\remove-lvm-snapshot.sh" />
+        </Component>
+      </Directory>
+      <Directory Id="dir_1329D26547F1431AADF5A6A34A8AEF93" Name="pt-BR">
+        <Component Id="comp_9E21C8984BBF4EA590B6FF53388AE371" DiskId="1" KeyPath="yes" Guid="6D3D3E86-24AB-42B3-B6C1-5D2E12981777" Win64="$(var.Win64)">
+          <File Id="file_E7E1973DC4234C20AB2D4125B7A9C4FA" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.CommandLine.resources.dll" />
+          <File Id="file_C6E80560CBEF447D8C329F7F03E2E55E" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.Library.Backend.BackendInterface.resources.dll" />
+          <File Id="file_B14257380EDC4649B2373787D1B59E58" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.Library.Backend.BackendLoader.resources.dll" />
+          <File Id="file_E38ACA11D8A541849D6911D8850B65B7" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.Library.Backend.CloudFiles.resources.dll" />
+          <File Id="file_C96943A574AB4AFDA4345A82CD88CD5F" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.Library.Backend.File.resources.dll" />
+          <File Id="file_E7C02273CEAD489EA30552E602E78DED" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.Library.Backend.FTP.resources.dll" />
+          <File Id="file_084F9E1147D3472591C7D8E0DD191F36" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.Library.Backend.S3.resources.dll" />
+          <File Id="file_1651B40B1E434966A418B949EF4943D3" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.Library.Backend.SSH.resources.dll" />
+          <File Id="file_A74A80CC77E24A29A8185C7014FA9A48" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.Library.Backend.WEBDAV.resources.dll" />
+          <File Id="file_C1652A3915ED4EAC8540D3CDA0543967" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.Library.Compression.resources.dll" />
+          <File Id="file_1C1AA51F8283443A9774A3174329093D" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.Library.Core.resources.dll" />
+          <File Id="file_418B461AB64F4CE1B416110EF6CB4406" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.Library.Encryption.resources.dll" />
+          <File Id="file_EFFCA9750C604078AE98748A5551BD57" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.Library.Main.resources.dll" />
+          <File Id="file_239E77CBF3FA4DF693067D8799B8A2C8" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.Library.SharpRSync.resources.dll" />
+          <File Id="file_6BA8D379355E4AA78E43AD2AFEC462CB" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\Duplicati.resources.dll" />
+          <File Id="file_0A4286EC145D4A558EA365228C006371" Checksum="yes" Source="bin\Release\Duplicati\pt-BR\System.Windows.Forms.Wizard.resources.dll" />
+        </Component>
+      </Directory>
      <Directory Id="dir_28D412D118364C33B095B33BB9BF2EDB" Name="SQLite">
        <Directory Id="dir_158F567052254262B0033F217CEF3E08" Name="pinvoke">
-          <Component Id="comp_F014E8B59F1C4F30B1691C46494B25BD" DiskId="1" KeyPath="yes" Guid="252A40E0-5097-49B5-8ED9-49ACA961AEA2">
+          <Component Id="comp_F014E8B59F1C4F30B1691C46494B25BD" DiskId="1" KeyPath="yes" Guid="252A40E0-5097-49B5-8ED9-49ACA961AEA2" Win64="$(var.Win64)">
            <File Id="file_9C221A5889CF469EA6EE7D71512C25B2" Checksum="yes" Source="bin\Release\Duplicati\SQLite\pinvoke\System.Data.SQLite.dll" />
          </Component>
        </Directory>
        <Directory Id="dir_02989B8A616C490991FC62598375F022" Name="win32">
-          <Component Id="comp_9AFD6C8AB2C7473F83856604557B0A74" DiskId="1" KeyPath="yes" Guid="BFF9C068-5DAF-4BF5-83CF-2592F5810025">
+          <Component Id="comp_9AFD6C8AB2C7473F83856604557B0A74" DiskId="1" KeyPath="yes" Guid="BFF9C068-5DAF-4BF5-83CF-2592F5810025" Win64="$(var.Win64)">
            <File Id="file_3D1F4093E6024B4E9E59F6869C20867E" Checksum="yes" Source="bin\Release\Duplicati\SQLite\win32\System.Data.SQLite.dll" />
          </Component>
        </Directory>
        <Directory Id="dir_B3534C5C35184690B22320DFC3679E77" Name="win64">
-          <Component Id="comp_383E15C7CE6E4045AE2C6040BD714886" DiskId="1" KeyPath="yes" Guid="D8A85420-61D4-4B08-8395-8E52AF75ECA8">
+          <Component Id="comp_383E15C7CE6E4045AE2C6040BD714886" DiskId="1" KeyPath="yes" Guid="D8A85420-61D4-4B08-8395-8E52AF75ECA8" Win64="$(var.Win64)">
            <File Id="file_24F2F19DA9504122815E8E458E1C3803" Checksum="yes" Source="bin\Release\Duplicati\SQLite\win64\System.Data.SQLite.dll" />
          </Component>
        </Directory>