Merge pull request #9 from nblumhardt/f-revertto64bit

Revert to wholly x64 binaries/installer
datalust · Jun 19, 2016 · bd521bc · bd521bc
2 parents 0bd3247 + 954f3cb
commit bd521bc
Show file tree

Hide file tree

Showing 11 changed files with 123 additions and 111 deletions.
diff --git a/Build.ps1 b/Build.ps1
@@ -33,7 +33,7 @@ function Update-WixVersion($version)
 
 function Execute-MSBuild
 {
-	& msbuild ./seq-forwarder.sln /t:Rebuild /p:Configuration=Release /p:Platform=x86
+	& msbuild ./seq-forwarder.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64
 }
 
 function Execute-Tests
@@ -44,7 +44,7 @@ function Execute-Tests
 function Publish-Artifacts($version)
 {
 	mkdir ./artifacts
-	mv ./setup/SeqForwarder/bin/Release/SeqForwarder.msi ./artifacts/SeqForwarder-$version.msi
+	mv ./setup/SeqForwarder/bin/Release/SeqForwarder.msi ./artifacts/SeqForwarder-$version-pre.msi
 }
 
 Push-Location $PSScriptRoot

diff --git a/seq-forwarder.sln b/seq-forwarder.sln
@@ -41,25 +41,26 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SeqForwarder", "setup\SeqFo
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{206FCC39-00A9-4C3D-998F-E0D3538E4786}.Debug|x86.ActiveCfg = Debug|x86
-		{206FCC39-00A9-4C3D-998F-E0D3538E4786}.Debug|x86.Build.0 = Debug|x86
-		{206FCC39-00A9-4C3D-998F-E0D3538E4786}.Release|x86.ActiveCfg = Release|x86
-		{206FCC39-00A9-4C3D-998F-E0D3538E4786}.Release|x86.Build.0 = Release|x86
-		{88984363-1BD7-4E60-99B9-7D07666990B8}.Debug|x86.ActiveCfg = Debug|x86
-		{88984363-1BD7-4E60-99B9-7D07666990B8}.Debug|x86.Build.0 = Debug|x86
-		{88984363-1BD7-4E60-99B9-7D07666990B8}.Release|x86.ActiveCfg = Release|x86
-		{88984363-1BD7-4E60-99B9-7D07666990B8}.Release|x86.Build.0 = Release|x86
-		{D9FB0CF3-65D4-4FDC-A43D-39F795D89371}.Debug|x86.ActiveCfg = Debug|x86
-		{D9FB0CF3-65D4-4FDC-A43D-39F795D89371}.Debug|x86.Build.0 = Debug|x86
-		{D9FB0CF3-65D4-4FDC-A43D-39F795D89371}.Release|x86.ActiveCfg = Release|x86
-		{D9FB0CF3-65D4-4FDC-A43D-39F795D89371}.Release|x86.Build.0 = Release|x86
-		{F3A1944B-FF13-4250-A7F1-581CBB99A9BF}.Debug|x86.ActiveCfg = Debug|x86
-		{F3A1944B-FF13-4250-A7F1-581CBB99A9BF}.Release|x86.ActiveCfg = Release|x86
-		{F3A1944B-FF13-4250-A7F1-581CBB99A9BF}.Release|x86.Build.0 = Release|x86
+		{206FCC39-00A9-4C3D-998F-E0D3538E4786}.Debug|x64.ActiveCfg = Debug|x64
+		{206FCC39-00A9-4C3D-998F-E0D3538E4786}.Debug|x64.Build.0 = Debug|x64
+		{206FCC39-00A9-4C3D-998F-E0D3538E4786}.Release|x64.ActiveCfg = Release|x64
+		{206FCC39-00A9-4C3D-998F-E0D3538E4786}.Release|x64.Build.0 = Release|x64
+		{88984363-1BD7-4E60-99B9-7D07666990B8}.Debug|x64.ActiveCfg = Debug|x64
+		{88984363-1BD7-4E60-99B9-7D07666990B8}.Debug|x64.Build.0 = Debug|x64
+		{88984363-1BD7-4E60-99B9-7D07666990B8}.Release|x64.ActiveCfg = Release|x64
+		{88984363-1BD7-4E60-99B9-7D07666990B8}.Release|x64.Build.0 = Release|x64
+		{D9FB0CF3-65D4-4FDC-A43D-39F795D89371}.Debug|x64.ActiveCfg = Debug|x64
+		{D9FB0CF3-65D4-4FDC-A43D-39F795D89371}.Debug|x64.Build.0 = Debug|x64
+		{D9FB0CF3-65D4-4FDC-A43D-39F795D89371}.Release|x64.ActiveCfg = Release|x64
+		{D9FB0CF3-65D4-4FDC-A43D-39F795D89371}.Release|x64.Build.0 = Release|x64
+		{F3A1944B-FF13-4250-A7F1-581CBB99A9BF}.Debug|x64.ActiveCfg = Debug|x64
+		{F3A1944B-FF13-4250-A7F1-581CBB99A9BF}.Debug|x64.Build.0 = Debug|x64
+		{F3A1944B-FF13-4250-A7F1-581CBB99A9BF}.Release|x64.ActiveCfg = Release|x64
+		{F3A1944B-FF13-4250-A7F1-581CBB99A9BF}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/setup/SeqForwarder/Product.wxs b/setup/SeqForwarder/Product.wxs
@@ -8,6 +8,7 @@
            Manufacturer="Datalust Pty Ltd" UpgradeCode="EABD21DF-7646-4684-ACD3-FEC86B738CD1">
 
     <Package InstallerVersion="200"
+         Platform="x64"
          Compressed="yes"
          InstallScope="perMachine"
          InstallPrivileges="elevated" />
@@ -52,7 +53,7 @@
 
 	<Fragment>
 		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="ProgramFilesFolder">
+			<Directory Id="ProgramFiles64Folder">
 				<Directory Id="INSTALLFOLDER" Name="Seq Forwarder" />
 			</Directory>
       <Directory Id="ProgramMenuFolder">

diff --git a/setup/SeqForwarder/SeqForwarder.wixproj b/setup/SeqForwarder/SeqForwarder.wixproj
@@ -13,20 +13,20 @@
     <CompilerAdditionalOptions>-arch x64</CompilerAdditionalOptions>
     <DefineConstants>Version=$(Version)</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug;Version=$(Version)</DefineConstants>
-    <CompilerAdditionalOptions>-arch x86</CompilerAdditionalOptions>
+    <CompilerAdditionalOptions>-arch x64</CompilerAdditionalOptions>
     <SuppressIces>
     </SuppressIces>
     <LinkerAdditionalOptions>
     </LinkerAdditionalOptions>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <CompilerAdditionalOptions>-arch x86</CompilerAdditionalOptions>
+    <CompilerAdditionalOptions>-arch x64</CompilerAdditionalOptions>
     <DefineConstants>Version=$(Version)</DefineConstants>
     <LinkerAdditionalOptions>
     </LinkerAdditionalOptions>