From: Scott Cantor <cantor.2@osu.edu>
Date: Thu, 6 Sep 2012 16:33:28 +0000 (+0000)
Subject: https://issues.shibboleth.net/jira/browse/SSPCPP-498
X-Git-Tag: 2.5.1~70
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=4559a0adef649a13669e7e491f56b77e0937472d

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

diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
index b97ae4f..87317eb 100644
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -225,13 +225,13 @@
     <CustomAction Id='EditCatalogSAML20' BinaryKey='EditCatalogFileSrc' VBScriptCall=''
       Execute='deferred' Impersonate='no' />
     <CustomAction Id='SetEditXMLToolingCatalog' Property='EditXMLToolingCatalog'
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />
     <CustomAction Id='SetEditCatalogSAML10' Property='EditCatalogSAML10'
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />
     <CustomAction Id='SetEditCatalogSAML11' Property='EditCatalogSAML11'
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />
     <CustomAction Id='SetEditCatalogSAML20' Property='EditCatalogSAML20'
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />
     <InstallExecuteSequence>
       <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>
       <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>
diff --git a/msi/WiX/MergeModules/Shibboleth-schemas.wxs b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
index d866cb3..1908edc 100644
--- a/msi/WiX/MergeModules/Shibboleth-schemas.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
@@ -72,7 +72,7 @@
     <CustomAction Id='EditShibbolethCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
                   Execute='deferred' Impersonate='no' />
     <CustomAction Id='SetEditShibbolethCatalog' Property='EditShibbolethCatalog' 
-                  Value='[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />
+                  Value='%PROGRAMDATA%\Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />
     <InstallExecuteSequence>
       <Custom Action='SetEditShibbolethCatalog' Before='CostInitialize'>NOT Installed</Custom>
       <Custom Action='EditShibbolethCatalog' After='InstallFiles'>NOT Installed</Custom>
diff --git a/msi/WiX/Versions.wxi b/msi/WiX/Versions.wxi
index 7ccf024..4de06c2 100644
--- a/msi/WiX/Versions.wxi
+++ b/msi/WiX/Versions.wxi
@@ -50,7 +50,7 @@
   <?define XmlSecVersion='1.7.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->
   <?define XmlSecFileVersion='1_7' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
-  <?define XmlToolingVersion='1.5.0' ?>
+  <?define XmlToolingVersion='1.5.1' ?>
   <?define XmlToolingFileVersion='1_5' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->
 
   <?define ZlibVersion='1.2.7' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Release\zlib$(var.ZlibFileVersion).dll'-->