From: Scott Cantor <cantor.2@osu.edu>
Date: Sat, 18 Jul 2015 02:43:32 +0000 (+0000)
Subject: Finish adding patch level to package versions and strings
X-Git-Tag: 2.5.5~1
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=dc3731db3c5d96742840c34b4d0b96edbcf77349

Finish adding patch level to package versions and strings
---

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 10716aa..e2cbb2b 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -19,8 +19,8 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Product Id='$(var.ShibbolethId64)' Language='1033' 
            Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' 
-           UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
-    <Package Description='Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion)' Compressed='yes'
+           UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion).$(var.ShibbolethPatchVersion)'>
+    <Package Description='Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion) Patch Level $(var.ShibbolethPatchVersion)' Compressed='yes'
            Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <MajorUpgrade DowngradeErrorMessage='A later version of [ProductName] is already installed. Setup will now exit.'
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 912a628..d9850cb 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -20,7 +20,7 @@
   <Product Id='$(var.ShibbolethId32)' Language='1033' 
            Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion).$(var.ShibbolethPatchVersion)'>
-    <Package Description='Shibboleth SP (x86) V$(var.ShibbolethVersion)' Compressed='yes'
+    <Package Description='Shibboleth SP (x86) V$(var.ShibbolethVersion) Patch Level $(var.ShibbolethPatchVersion)' Compressed='yes'
            Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
 
     <MajorUpgrade DowngradeErrorMessage='A later version of [ProductName] is already installed. Setup will now exit.'