From 2b113e4db030af049d1136852f3b1a102a6cf1c0 Mon Sep 17 00:00:00 2001
From: dbuechel <damian.buechel@let.ethz.ch>
Date: Thu, 7 Nov 2019 10:05:59 +0100
Subject: [PATCH] SEBWIN-344: Updated setup bundle to automatically install the
 correct setup and C++ runtime for a specific platform.

---
 Setup/Product.wxs                |  7 +------
 SetupBundle/Bundle.wxs           |  7 +++++--
 SetupBundle/Resources/Theme.wxl  |  2 +-
 SetupBundle/VisualCppRuntime.wxs | 20 +++++++++++++++-----
 appveyor-release.yml             | 23 ++++++++++++++++++-----
 appveyor-test.yml                |  6 +++---
 6 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/Setup/Product.wxs b/Setup/Product.wxs
index a7ca5a7c..d987139e 100644
--- a/Setup/Product.wxs
+++ b/Setup/Product.wxs
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <?if $(var.Platform) = x64 ?>
-    <?define Bitness = "(64-bit)" ?>
-    <?else ?>
-    <?define Bitness = "(32-bit)" ?>
-    <?endif ?>
-    <Product Name="Safe Exam Browser $(var.Bitness)" Manufacturer="ETH Zürich" Language="1033" Codepage="1252"
+    <Product Name="Safe Exam Browser ($(var.Platform))" Manufacturer="ETH Zürich" Language="1033" Codepage="1252"
              Id="*" Version="!(bind.fileVersion.MainExecutable)" UpgradeCode="97A8B13E-48FB-4BE1-A7C2-DD1863F95CCB">
         <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
         <MediaTemplate EmbedCab="yes" />
diff --git a/SetupBundle/Bundle.wxs b/SetupBundle/Bundle.wxs
index 523be3c3..cf7c051c 100644
--- a/SetupBundle/Bundle.wxs
+++ b/SetupBundle/Bundle.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
-    <Bundle Name="!(bind.packageName.Setup)" Version="!(bind.packageVersion.Setup)" Manufacturer="!(bind.packageManufacturer.Setup)"
+    <Bundle Name="Safe Exam Browser" Version="!(bind.packageVersion.SetupX86)" Manufacturer="!(bind.packageManufacturer.SetupX86)"
             UpgradeCode="26C1045A-99CC-4479-987B-376390379441" IconSourceFile="$(var.Setup.ProjectDir)Resources\Application.ico">
         <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLargeLicense">
             <bal:WixStandardBootstrapperApplication LicenseFile="$(var.Setup.ProjectDir)Resources\License.rtf" ThemeFile="Resources\Theme.xml"
@@ -9,7 +9,10 @@
         <Chain>
             <PackageGroupRef Id="DotNetFramework" />
             <PackageGroupRef Id="VisualCppRuntime" />
-            <MsiPackage Id="Setup" SourceFile="$(var.Setup.TargetPath)" Compressed="yes" DisplayInternalUI="no" Vital="yes" />
+            <MsiPackage Id="SetupX64" InstallCondition='VersionNT64' SourceFile="$(var.Setup.ProjectDir)bin\x64\Release\$(var.Setup.TargetFileName)"
+                        Compressed="yes" DisplayInternalUI="no" Vital="yes" />
+            <MsiPackage Id="SetupX86" InstallCondition='NOT VersionNT64' SourceFile="$(var.Setup.ProjectDir)bin\x86\Release\$(var.Setup.TargetFileName)"
+                        Compressed="yes" DisplayInternalUI="no" Vital="yes" />
         </Chain>
     </Bundle>
 </Wix>
diff --git a/SetupBundle/Resources/Theme.wxl b/SetupBundle/Resources/Theme.wxl
index 7c73b962..cb5fbfb9 100644
--- a/SetupBundle/Resources/Theme.wxl
+++ b/SetupBundle/Resources/Theme.wxl
@@ -18,7 +18,7 @@
 /norestart   - suppress any attempts to restart. By default UI will prompt before restart.
 /log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String>
   <String Id="HelpCloseButton">&amp;Close</String>
-  <String Id="InstallDescription">This setup bundle will install [WixBundleName] version [WixBundleVersion] and all required frameworks on your computer.</String>
+  <String Id="InstallDescription">This setup bundle will install [WixBundleName] version [WixBundleVersion] and all required components on your computer.</String>
   <String Id="InstallEulaInstructions">Please read the following license agreement carefully:</String>
   <String Id="InstallAcceptCheckbox">I &amp;agree to the license terms and conditions</String>
   <String Id="InstallOptionsButton">&amp;Options</String>
diff --git a/SetupBundle/VisualCppRuntime.wxs b/SetupBundle/VisualCppRuntime.wxs
index 50b2b087..77788585 100644
--- a/SetupBundle/VisualCppRuntime.wxs
+++ b/SetupBundle/VisualCppRuntime.wxs
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
     <Fragment>
-        <!-- Must be the same as the version specified by the RemotePayload -->
+        <!-- Must be the same value as the version specified by the RemotePayload -->
         <Variable Name="VisualCppMinimumVersion" Type="version" Value="14.0.24215.1" />
-        <util:ProductSearch Variable="VisualCppInstalledVersion" UpgradeCode="65E5BD06-6392-3027-8C26-853107D3CF1A" />
+        <util:ProductSearch Variable="VisualCppInstalledVersionX64" UpgradeCode="36F68A90-239C-34DF-B58C-64B30153CE35" Condition="VersionNT64" />
+        <util:ProductSearch Variable="VisualCppInstalledVersionX86" UpgradeCode="65E5BD06-6392-3027-8C26-853107D3CF1A" Condition="NOT VersionNT64" />
         <PackageGroup Id="VisualCppRuntime">
-            <ExePackage Id="VisualCppPackage" Name="vc_redist.x86.exe" DisplayName="Microsoft Visual C++ 2015 Redistributable (x86) - 14.0.24215" Cache="no"
-                        Compressed="no" PerMachine="yes" Permanent="yes" Vital="yes" DetectCondition="VisualCppInstalledVersion >= VisualCppMinimumVersion"
-                        DownloadUrl="https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81CC-ED5963AEAD48/vc_redist.x86.exe"
+            <ExePackage Name="vc_redist.x64.exe" DisplayName="Microsoft Visual C++ 2015 Redistributable (x64) - 14.0.24215" Cache="no"
+                        Compressed="no" PerMachine="yes" Permanent="yes" Vital="yes" DetectCondition="VisualCppInstalledVersionX64 >= VisualCppMinimumVersion"
+                        DownloadUrl="https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81CC-ED5963AEAD48/vc_redist.x64.exe" InstallCondition="VersionNT64"
+                        InstallCommand="/install /quiet /norestart" RepairCommand="/repair /quiet /norestart" UninstallCommand="/uninstall /quiet /norestart" >
+                <!-- Must be generated with the following command: "heat payload vc_redist.x64.exe -out vc_redist.x64.wxs" -->
+                <RemotePayload CertificatePublicKey="371DD003A37769487A2A89A5A9DDB3026451B906" CertificateThumbprint="98ED99A67886D020C564923B7DF25E9AC019DF26"
+                               Description="Microsoft Visual C++ 2015 Redistributable (x64) - 14.0.24215" Hash="10B1683EA3FF5F36F225769244BF7E7813D54AD0"
+                               ProductName="Microsoft Visual C++ 2015 Redistributable (x64) - 14.0.24215" Size="15301888" Version="14.0.24215.1" />
+            </ExePackage>
+            <ExePackage Name="vc_redist.x86.exe" DisplayName="Microsoft Visual C++ 2015 Redistributable (x86) - 14.0.24215" Cache="no"
+                        Compressed="no" PerMachine="yes" Permanent="yes" Vital="yes" DetectCondition="VisualCppInstalledVersionX86 >= VisualCppMinimumVersion"
+                        DownloadUrl="https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81CC-ED5963AEAD48/vc_redist.x86.exe" InstallCondition="NOT VersionNT64"
                         InstallCommand="/install /quiet /norestart" RepairCommand="/repair /quiet /norestart" UninstallCommand="/uninstall /quiet /norestart">
                 <!-- Must be generated with the following command: "heat payload vc_redist.x86.exe -out vc_redist.x86.wxs" -->
                 <RemotePayload CertificatePublicKey="371DD003A37769487A2A89A5A9DDB3026451B906" CertificateThumbprint="98ED99A67886D020C564923B7DF25E9AC019DF26"
diff --git a/appveyor-release.yml b/appveyor-release.yml
index dbdfbb80..75c75730 100644
--- a/appveyor-release.yml
+++ b/appveyor-release.yml
@@ -2,8 +2,8 @@ version: '3.0.0.{build}'
 image: Windows
 configuration: Release
 platform:
-  - x86
   - x64
+  - x86
 matrix:
   fast_finish: true
 max_jobs: 1
@@ -12,14 +12,27 @@ assembly_info:
   file: AssemblyInfo.*
   assembly_version: '{version}'
   assembly_file_version: '{version}'
-  assembly_informational_version: '3.0.0 Base'
+  assembly_informational_version: '3.0.0 Base ($(platform))'
 install:
  - appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
 before_build:
  - nuget restore
 build_script:
  - msbuild /verbosity:minimal "SafeExamBrowser.sln"
-after_build:
- - appveyor PushArtifact "Setup\bin\%PLATFORM%\%CONFIGURATION%\Setup.msi" -FileName "SEB_%APPVEYOR_BUILD_VERSION%_%PLATFORM%_Setup.msi" -DeploymentName "SEB %APPVEYOR_BUILD_VERSION% Setup (%PLATFORM%)"
- - appveyor PushArtifact "SetupBundle\bin\%PLATFORM%\%CONFIGURATION%\SetupBundle.exe" -FileName "SEB_%APPVEYOR_BUILD_VERSION%_%PLATFORM%_SetupBundle.exe" -DeploymentName "SEB %APPVEYOR_BUILD_VERSION% Setup Bundle (%PLATFORM%)"
 test: off
+
+for:
+-
+  matrix:
+    only:
+      - platform: x86
+  after_build:
+   - appveyor PushArtifact "Setup\bin\%PLATFORM%\%CONFIGURATION%\Setup.msi" -FileName "SEB_%APPVEYOR_BUILD_VERSION%_%PLATFORM%_Setup.msi" -DeploymentName "SEB %APPVEYOR_BUILD_VERSION% Setup (%PLATFORM%)"
+   - appveyor PushArtifact "SetupBundle\bin\%PLATFORM%\%CONFIGURATION%\SetupBundle.exe" -FileName "SEB_%APPVEYOR_BUILD_VERSION%_SetupBundle.exe" -DeploymentName "SEB %APPVEYOR_BUILD_VERSION% Setup Bundle"
+
+-
+  matrix:
+    only:
+      - platform: x64
+  after_build:
+   - appveyor PushArtifact "Setup\bin\%PLATFORM%\%CONFIGURATION%\Setup.msi" -FileName "SEB_%APPVEYOR_BUILD_VERSION%_%PLATFORM%_Setup.msi" -DeploymentName "SEB %APPVEYOR_BUILD_VERSION% Setup (%PLATFORM%)"
\ No newline at end of file
diff --git a/appveyor-test.yml b/appveyor-test.yml
index 68ddbb0f..2ba6225a 100644
--- a/appveyor-test.yml
+++ b/appveyor-test.yml
@@ -1,9 +1,9 @@
 version: '{build}'
 image: Visual Studio 2017
-platform:
-  - x86
-  - x64
 configuration: Debug
+platform:
+  - x64
+  - x86
 matrix:
   fast_finish: true
 before_build: