Add a ShibbolethPatchVersion variable to the MSI builds.

[shibboleth/cpp-sp.git] / msi / WiX / ShibbolethSP-main-x86.wxs

diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index d98d9b0..912a628 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -16,17 +16,15 @@
    implied.  See the License for the specific language governing
    permissions and limitations under the License.  -->
 
-<?include Versions.wxi ?>
-
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Product Id='{68D3C057-1C6D-4C3C-9E5B-7A6A8CA0BA74}' Language='1033' 
+  <Product Id='$(var.ShibbolethId32)' Language='1033' 
            Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' 
-           UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
+           UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion).$(var.ShibbolethPatchVersion)'>
     <Package Description='Shibboleth SP (x86) V$(var.ShibbolethVersion)' Compressed='yes'
            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'/>