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 (file)
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -225,13 +225,13 @@
     <CustomAction Id='EditCatalogSAML20' BinaryKey='EditCatalogFileSrc' VBScriptCall=''\r
       Execute='deferred' Impersonate='no' />\r
     <CustomAction Id='SetEditXMLToolingCatalog' Property='EditXMLToolingCatalog'\r
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />\r
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />\r
     <CustomAction Id='SetEditCatalogSAML10' Property='EditCatalogSAML10'\r
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />\r
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />\r
     <CustomAction Id='SetEditCatalogSAML11' Property='EditCatalogSAML11'\r
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />\r
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />\r
     <CustomAction Id='SetEditCatalogSAML20' Property='EditCatalogSAML20'\r
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />\r
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />\r
     <InstallExecuteSequence>\r
       <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
       <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>\r

diff --git a/msi/WiX/MergeModules/Shibboleth-schemas.wxs b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
index d866cb3..1908edc 100644 (file)
--- a/msi/WiX/MergeModules/Shibboleth-schemas.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
@@ -72,7 +72,7 @@
     <CustomAction Id='EditShibbolethCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
                   Execute='deferred' Impersonate='no' />\r
     <CustomAction Id='SetEditShibbolethCatalog' Property='EditShibbolethCatalog' \r
-                  Value='[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />\r
+                  Value='%PROGRAMDATA%\Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />\r
     <InstallExecuteSequence>\r
       <Custom Action='SetEditShibbolethCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
       <Custom Action='EditShibbolethCatalog' After='InstallFiles'>NOT Installed</Custom>\r

diff --git a/msi/WiX/Versions.wxi b/msi/WiX/Versions.wxi
index 7ccf024..4de06c2 100644 (file)
--- 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' -->\r
   <?define XmlSecFileVersion='1_7' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
 \r
-  <?define XmlToolingVersion='1.5.0' ?>\r
+  <?define XmlToolingVersion='1.5.1' ?>\r
   <?define XmlToolingFileVersion='1_5' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->\r
 \r
   <?define ZlibVersion='1.2.7' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Release\zlib$(var.ZlibFileVersion).dll'-->\r