[cpp-sp] 02/02: Sanitize some Santuario refs.

Scott Cantor cantor.2 at osu.edu
Wed Oct 9 18:31:55 UTC 2024


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=c8ec8efcd762ab2515673c3cc8e209880de5dc08

commit c8ec8efcd762ab2515673c3cc8e209880de5dc08
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Oct 9 14:31:39 2024 -0400

    Sanitize some Santuario refs.
---
 msi/WiX/MergeModules/XmlSec-x64.wxs | 6 +++---
 msi/WiX/MergeModules/XmlSec-x86.wxs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index b3eea16b..b9e23049 100644
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -18,7 +18,7 @@
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Module Id="XmlSecmergemodule_x64" Language="1033" Version="$(var.XmlSecVersion)">
-    <Package Id="{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}" Description="Merge Module for Santuario (x64)" Comments="This module is built by the Shibboleth Consortium. Includes several executable utilities." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
+    <Package Id="{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}" Description="Merge Module for XmlSec (x64)" Comments="This module is built by the Shibboleth Consortium. Includes several executable utilities." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
         <Directory Id="shibboleth" Name="Shibboleth">
@@ -86,8 +86,8 @@
               <?endif ?>
             </Directory><!-- lib -->
             <Directory Id="doc" Name="doc">
-              <Component Id="SANTUARIO.LICENSE" Guid="{07288B10-ED5A-443F-BC90-CFD987C798C4}" Win64="yes">
-                <File KeyPath="yes" Name="SANTUARIO.LICENSE" Source="$(var.BuildDirectory)\$(var.xmlsec)\LICENSE.txt" />
+              <Component Id="XMLSEC.LICENSE" Guid="{07288B10-ED5A-443F-BC90-CFD987C798C4}" Win64="yes">
+                <File KeyPath="yes" Name="XMLSEC.LICENSE" Source="$(var.BuildDirectory)\$(var.xmlsec)\LICENSE.txt" />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index 29b3fb4b..34193396 100644
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -18,7 +18,7 @@
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Module Id="XmlSecMergeModule_x86" Language="1033" Version="$(var.XmlSecVersion)">
-    <Package Id="{D1678DAE-81D9-4756-ABE6-7D1218F0D350}" Description="Merge Module for Santuario (x86)" Comments="This module is built by the Shibboleth Consortium. Includes Several executable utilities." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
+    <Package Id="{D1678DAE-81D9-4756-ABE6-7D1218F0D350}" Description="Merge Module for XmlSec (x86)" Comments="This module is built by the Shibboleth Consortium. Includes Several executable utilities." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder" Name="ProgramFiles">
         <Directory Id="shibboleth" Name="Shibboleth">
@@ -86,8 +86,8 @@
               <?endif ?>
             </Directory><!-- lib -->
             <Directory Id="doc" Name="doc">
-              <Component Id="SANTUARIO.LICENSE" Guid="{FF81AD29-36DF-42BD-AFC9-211F083D9872}">
-                <File KeyPath="yes" Name="SANTUARIO.LICENSE" Source="$(var.BuildDirectory)\$(var.xmlsec)\LICENSE.txt" />
+              <Component Id="XMLSEC.LICENSE" Guid="{FF81AD29-36DF-42BD-AFC9-211F083D9872}">
+                <File KeyPath="yes" Name="XMLSEC.LICENSE" Source="$(var.BuildDirectory)\$(var.xmlsec)\LICENSE.txt" />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list