[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: ShibbolethSP-main-x64.wxs ShibbolethSP-main-x86.wxs

[noreply at shibboleth.net]

Author: rdw
Date: Fri Jul 17 05:01:57 2015
New Revision: 3930

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3930&view=rev
Log:
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.

Modified:
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs?rev=3930&r1=3929&r2=3930&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs	(original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs	Fri Jul 17 05:01:57 2015
@@ -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'/>

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs?rev=3930&r1=3929&r2=3930&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs	(original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs	Fri Jul 17 05:01:57 2015
@@ -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'/>