From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Fri, 17 Jul 2015 09:01:57 +0000 (+0000)
Subject: SSPCPP-662 Set AllowSameVersionUpgrades to 'yes'
X-Git-Tag: 2.5.5~4
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=6241494cfd153e0e7106d743e4b02e6a53ac9170

SSPCPP-662 Set AllowSameVersionUpgrades to 'yes'

https://issues.shibboleth.net/jira/browse/SSPCPP-662

The patching strategy for the SP moving forward will follow
the IDP (sub-sub version change for non shib bundled product
revisions).

Since the 4th digit doesnt count towards the version stragety this
becomes a same version upgrade.  Which we need to allow.
---

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 3905ca3..10716aa 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -24,7 +24,7 @@
            Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <MajorUpgrade DowngradeErrorMessage='A later version of [ProductName] is already installed. Setup will now exit.'
-           MigrateFeatures='yes' Schedule='afterInstallExecute' />
+           MigrateFeatures='yes' Schedule='afterInstallExecute' AllowSameVersionUpgrades='yes' />
 
     <PropertyRef Id='SHIB_OLDVERSION_64'/>
     <PropertyRef Id='SHIB_OLDVERSION'/>
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index fc61b26..db15f46 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -24,7 +24,7 @@
            Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
 
     <MajorUpgrade DowngradeErrorMessage='A later version of [ProductName] is already installed. Setup will now exit.'
-           MigrateFeatures='yes' Schedule='afterInstallExecute' />
+           MigrateFeatures='yes' Schedule='afterInstallExecute' AllowSameVersionUpgrades='yes'/>
 
     <PropertyRef Id='SHIB_OLDVERSION'/>