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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jul 27 16:28:30 2012
New Revision: 3735

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3735&view=rev
Log:
Bump xmlsec version, and set same-version upgrade flag

Modified:
    branches/REL_2/msi/WiX/MergeModules/XmlSec-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/XmlSec-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
    branches/REL_2/msi/WiX/Versions.wxi

Modified: branches/REL_2/msi/WiX/MergeModules/XmlSec-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/XmlSec-x64.wxs?rev=3735&r1=3734&r2=3735&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/XmlSec-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/XmlSec-x64.wxs Fri Jul 27 16:28:30 2012
@@ -29,7 +29,7 @@
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib' 
                        FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan'>
-              <Component Id='xsec.dll' Guid='{3EB5B168-1FB1-476D-8E7C-2469D9B55162}' Win64='yes'>
+              <Component Id='xsec.dll' Guid='{DF5FEFC9-9B95-42B1-A6BD-053E0D0BD8E8}' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
               </Component>
               <Component Id='c14n.exe' Guid='{DE820D93-BC4F-48B5-9C1F-3CD34E34D10C}' Win64='yes'>
@@ -52,7 +52,7 @@
               </Component>
               <Directory Id='lib_debug' Name='debug' 
                          FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Debug No Xalan'>
-                <Component Id='xsecD.dll' Guid='{EC1CCD0D-028D-4C92-846D-88C1C24B66E6}' Win64='yes'>
+                <Component Id='xsecD.dll' Guid='{D97E1B5C-B020-4621-94CE-F10FCFF765C5}' Win64='yes'>
                   <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
                 </Component>
                 <Component Id='c14n.exe_debug' Guid='{ED9BB341-C5D2-4234-B720-483D86D340F9}' Win64='yes'>

Modified: branches/REL_2/msi/WiX/MergeModules/XmlSec-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/XmlSec-x86.wxs?rev=3735&r1=3734&r2=3735&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/XmlSec-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/XmlSec-x86.wxs Fri Jul 27 16:28:30 2012
@@ -29,7 +29,7 @@
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib' 
                        FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan'>
-              <Component Id='xsec.dll' Guid='{8920023D-92CA-4012-8BF8-6D80D791375D}'>
+              <Component Id='xsec.dll' Guid='{761CE697-2701-4149-ACD5-A693EBB45B33}'>
                 <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
               </Component>
               <Component Id='c14n.exe' Guid='{576EB311-AADA-49D3-B444-7EDC37C715F3}'>
@@ -52,7 +52,7 @@
               </Component>
               <Directory Id='lib_debug' Name='debug' 
                          FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan'>
-                <Component Id='xsecD.dll' Guid='{9FF121C0-9C75-428E-A8A2-5DD0F499CA73}'>
+                <Component Id='xsecD.dll' Guid='{34D437A1-3008-433F-A86F-F69E4852069F}'>
                   <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
                 </Component>
                 <Component Id='c14n.exe_debug' Guid='{20506FEA-CCFF-46A2-9753-DBBA8A967003}'>

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=3735&r1=3734&r2=3735&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs Fri Jul 27 16:28:30 2012
@@ -22,11 +22,11 @@
   <Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' 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) Beta 1' Compressed='yes'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
+    <Package Description='Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion) RC 1' Compressed='yes'
+           Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
-    <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." 

[... 57 lines stripped ...]