SSPCPP-489: Hardwire the INSATLL_32BIT property's value by architecture

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 6244002..53badc3 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -41,6 +41,7 @@
 \r
     <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->\r
     <Property Id='IS64BITINSTALL' Value='TRUE'/>\r
+    <Property Id='INSTALL_32BIT' Secure='yes' />\r
     <UIRef Id='ShibbolethInstallDir'/>\r
 \r
 \r

diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 64d94cb..d531086 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -42,6 +42,7 @@
 \r
     <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->\r
     <Property Id='IS64BITINSTALL' Value='FALSE'/>\r
+    <Property Id='INSTALL_32BIT' Secure='yes' Value='TRUE' />\r
 \r
     <UIRef Id='ShibbolethInstallDir'/>\r
 \r

diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index 0f455ca..552cd65 100644 (file)
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -29,7 +29,6 @@
   </Property>\r
   \r
   <!-- On 64 bit systems: 64 bit or 32bit service and DLLS, also used to swap in the 64 bit service -->\r
-  <Property Id='INSTALL_32BIT' Secure='yes' />\r
 \r
   <Property Id='ARPCONTACT' Value='contact@shibboleth.net' />\r
   <Property Id='ARPHELPLINK' Value='https://wiki.shibboleth.net/confluence/display/SHIB2/Installation+and+Configuration' />\r