From 1520c533142b611f12cb5c221a01faba32078cbe Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Mon, 22 Oct 2012 15:20:43 +0000
Subject: [PATCH] SSPCPP-506 - Continue exbedding Components into variables
 suitable to be passed in from the command line

https://issues.shibboleth.net/jira/browse/SSPCPP-506
---
 msi/WiX/MergeModules/OpenSAML-x64.wxs   |  2 +-
 msi/WiX/MergeModules/OpenSSL-x64.wxs    | 12 ++++++++----
 msi/WiX/MergeModules/OpenSSL-x86.wxs    | 12 ++++++++----
 msi/WiX/MergeModules/Shibboleth-x64.wxs | 12 ++++++++----
 msi/WiX/MergeModules/Shibboleth-x86.wxs | 12 ++++++++----
 msi/WiX/MergeModules/Xerces-x64.wxs     |  6 ++++--
 msi/WiX/MergeModules/Xerces-x86.wxs     |  6 ++++--
 msi/WiX/MergeModules/XmlSec-x64.wxs     |  6 ++++--
 msi/WiX/MergeModules/XmlSec-x86.wxs     |  6 ++++--
 msi/WiX/MergeModules/Zlib-x64.wxs       |  6 ++++--
 msi/WiX/MergeModules/Zlib-x86.wxs       |  6 ++++--
 11 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index 35aa5a9..6da5f11 100644
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -22,7 +22,7 @@
 <?define XMLToolingLiteComponent64='{060F61B9-36E9-4F33-9B5B-C59A43709052}' ?> 
 <?define XMLToolingLiteComponent64d='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' ?>
 <?define SamlComponent64='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' ?>
-<?define SamlComponent64d='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6} ?>
+<?define SamlComponent64d='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}' ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='OpenSAMLMergeModule_x64' Language='1033' Version='$(var.OpenSAMLVersion)'>
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index 23d161b..a7fb823 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -17,6 +17,10 @@
    permissions and limitations under the License.  -->
 
 <?include ..\Versions.wxi ?>
+<?define LibEay64Component='{DCB83813-11B4-469D-BD26-5DBF9815AC36}' ?>
+<?define SSlEay64Component='{EAC28C6F-C98E-454F-BFE7-076D7C0A5CF1}' ?>
+<?define LibEay64Componentd='{D6E409C6-2F1C-42BA-8759-CF898C62C9A9}' ?>
+<?define SSlEay64Componentd='{8FBB6D41-0044-4969-AA27-813EF2606C7A}' ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='OpenSSLMergeModule_x64' Language='1033' Version='$(var.OpenSSLVersion)'>
@@ -28,20 +32,20 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\' >
-              <Component Id='libeay32.dll' Guid='{DCB83813-11B4-469D-BD26-5DBF9815AC36}' Win64='yes'>
+              <Component Id='libeay32.dll' Guid='$(var.LibEay64Component)' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />
               </Component>
-              <Component Id='ssleay32.dll' Guid='{EAC28C6F-C98E-454F-BFE7-076D7C0A5CF1}' Win64='yes'>
+              <Component Id='ssleay32.dll' Guid='$(var.SSlEay64Component)' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />
               </Component>
               <Component Id='openssl.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes' Name='openssl.exe' />
               </Component>
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'>
-                <Component Id='libeay32D.dll' Guid='{D6E409C6-2F1C-42BA-8759-CF898C62C9A9}' Win64='yes'>
+                <Component Id='libeay32D.dll' Guid='$(var.LibEay64Componentd)' Win64='yes'>
                   <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />
                 </Component>
-                <Component Id='ssleay32D.dll' Guid='{8FBB6D41-0044-4969-AA27-813EF2606C7A}' Win64='yes'>
+                <Component Id='ssleay32D.dll' Guid='$(var.SSlEay64Componentd)' Win64='yes'>
                   <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
                 </Component>
                 <Component Id='openssl.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='yes'>
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index 2942c06..b9ffaf4 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -17,6 +17,10 @@
    permissions and limitations under the License.  -->
 
 <?include ..\Versions.wxi ?>
+<?define LibEay32Component='{1DE4C235-0F1E-41EF-B7B8-9F3FD03A8F26}' ?>
+<?define SSlEay32Component='{9D0D75C3-69B6-4A29-9890-EF3DD939B6CA}' ?>
+<?define LibEay32Componentd='{53BCB6F4-77DC-4B6C-9798-EC10796D3C59}' ?>
+<?define SSlEay32Componentd='{A9583DF6-F075-4F43-991C-3611B31036DF}' ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>
@@ -28,20 +32,20 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\'>
-              <Component Id='libeay32.dll' Guid='{1DE4C235-0F1E-41EF-B7B8-9F3FD03A8F26}'>
+              <Component Id='libeay32.dll' Guid='$(var.LibEay32Component)'>
                 <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />
               </Component>
-              <Component Id='ssleay32.dll' Guid='{9D0D75C3-69B6-4A29-9890-EF3DD939B6CA}'>
+              <Component Id='ssleay32.dll' Guid='$(var.SSlEay32Component)'>
                 <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />
               </Component>
               <Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>
                 <File KeyPath='yes' Checksum='yes' Name='openssl.exe' />
               </Component>
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\' >
-                <Component Id='libeay32D.dll' Guid='{53BCB6F4-77DC-4B6C-9798-EC10796D3C59}'>
+                <Component Id='libeay32D.dll' Guid='$(var.LibEay32Componentd)'>
                   <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />
                 </Component>
-                <Component Id='ssleay32D.dll' Guid='{A9583DF6-F075-4F43-991C-3611B31036DF}'>
+                <Component Id='ssleay32D.dll' Guid='$(var.SSlEay32Componentd)'>
                   <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
                 </Component>
                 <Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>
diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
index 006523f..3c78729 100644
--- a/msi/WiX/MergeModules/Shibboleth-x64.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -16,6 +16,10 @@
    permissions and limitations under the License.  -->
 
 <?include ..\Versions.wxi ?>
+<?define ShibDll64Component='{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}' ?>
+<?define ShibDllLite64Component='{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}' ?>
+<?define ShibDll64Componentd='{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}' ?>
+<?define ShibDllLite64Componentd='{5EF6FF17-0510-484B-9F24-523B29EB416C}' ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethDllVersion)'>
@@ -28,17 +32,17 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release'>
-              <Component Id='shibsp.dll' Guid='{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}' Win64='yes'>
+              <Component Id='shibsp.dll' Guid='$(var.ShibDll64Component)' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion).dll' />
               </Component>
-              <Component Id='shibsp_lite.dll' Guid='{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}' Win64='yes'>
+              <Component Id='shibsp_lite.dll' Guid='$(var.ShibDllLite64Component)' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' />
               </Component>
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Debug' >
-                <Component Id='shibspD.dll' Guid='{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}' Win64='yes'>
+                <Component Id='shibspD.dll' Guid='$(var.ShibDll64Componentd)' Win64='yes'>
                   <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' />
                 </Component>
-                <Component Id='shibsp_liteD.dll' Guid='{5EF6FF17-0510-484B-9F24-523B29EB416C}' Win64='yes'>
+                <Component Id='shibsp_liteD.dll' Guid='$(var.ShibDllLite64Componentd)' Win64='yes'>
                   <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' />
                 </Component>
               </Directory><!-- lib_debug -->
diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index 90b5cc6..1f08fd2 100644
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -16,6 +16,10 @@
    permissions and limitations under the License.  -->
 
 <?include ..\Versions.wxi ?>
+<?define ShibDll32Component='{9DE384BF-C286-4A72-AED9-AA34384005C0}' ?>
+<?define ShibDllLite32Component='{10475E33-434D-4805-B983-195092549BED}' ?>
+<?define ShibDll32Componentd='{4196D799-1162-4D62-9F7A-1F59E90F19F1}' ?>
+<?define ShibDllLite32Componentd='{8E070220-2992-4D45-BF98-459022CD268F}' ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethDllVersion)'>
@@ -28,17 +32,17 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release'>
-              <Component Id='shibsp.dll' Guid='{9DE384BF-C286-4A72-AED9-AA34384005C0}'>
+              <Component Id='shibsp.dll' Guid='$(var.ShibDll32Component)'>
                 <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion).dll' />
               </Component>
-              <Component Id='shibsp_lite.dll' Guid='{10475E33-434D-4805-B983-195092549BED}'>
+              <Component Id='shibsp_lite.dll' Guid='$(var.ShibDllLite32Component)'>
                 <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' />
               </Component>
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >
-                <Component Id='shibspD.dll' Guid='{4196D799-1162-4D62-9F7A-1F59E90F19F1}'>
+                <Component Id='shibspD.dll' Guid='$(var.ShibDll32Componentd)'>
                   <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' />
                 </Component>
-                <Component Id='shibsp_liteD.dll' Guid='{8E070220-2992-4D45-BF98-459022CD268F}'>
+                <Component Id='shibsp_liteD.dll' Guid='$(var.ShibDllLite32Componentd)'>
                   <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' />
                 </Component>
               </Directory><!-- lib_debug -->
diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index 57f6d25..b3c156f 100644
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -17,6 +17,8 @@
    permissions and limitations under the License.  -->
 
 <?include ..\Versions.wxi ?>
+<?define Xerces64Component='{5C2BA2C6-36EC-4EB3-A343-8C1C9D499B9C}' ?>
+<?define Xerces64Componentd='{236B6A7F-73C0-4EBF-9C06-90C1BE160ACE}' ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>
@@ -28,12 +30,12 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib'>
-              <Component Id='xercesc.dll' Guid='{5C2BA2C6-36EC-4EB3-A343-8C1C9D499B9C}' Win64='yes'>
+              <Component Id='xercesc.dll' Guid='$(var.Xerces64Component)' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes'
                       Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
-                <Component Id='xercescD.dll' Guid='{236B6A7F-73C0-4EBF-9C06-90C1BE160ACE}' Win64='yes'>
+                <Component Id='xercescD.dll' Guid='$(var.Xerces64Componentd)' Win64='yes'>
                   <File KeyPath='yes' Checksum='yes'
                         Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>
                 </Component>
diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index 5807820..915132e 100644
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -17,6 +17,8 @@
    permissions and limitations under the License.  -->
 
 <?include ..\Versions.wxi ?>
+<?define Xerces32Component='{64C16FA9-685C-4612-B9C2-0B56C84A69E1}' ?>
+<?define Xerces32Componentd='{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}' ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>
@@ -28,12 +30,12 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib'>
-              <Component Id='xercesc.dll' Guid='{64C16FA9-685C-4612-B9C2-0B56C84A69E1}'>
+              <Component Id='xercesc.dll' Guid='$(var.Xerces32Component)'>
                 <File KeyPath='yes' Checksum='yes'
                       Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
-                <Component Id='xercescD.dll' Guid='{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}'>
+                <Component Id='xercescD.dll' Guid='$(var.Xerces32Componentd)'>
                   <File KeyPath='yes' Checksum='yes'
                         Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>
                 </Component>
diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index 8f8ed34..b959022 100644
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -17,6 +17,8 @@
      permissions and limitations under the License.  -->
 
 <?include ..\Versions.wxi ?>
+<?define XmlSec64Component='{DF5FEFC9-9B95-42B1-A6BD-053E0D0BD8E8}' ?>
+<?define XmlSec64Componentd='{D97E1B5C-B020-4621-94CE-F10FCFF765C5}' ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='XmlSecmergemodule_x64' Language='1033' Version='$(var.XmlSecVersion)'>
@@ -29,7 +31,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='{DF5FEFC9-9B95-42B1-A6BD-053E0D0BD8E8}' Win64='yes'>
+              <Component Id='xsec.dll' Guid='$(var.XmlSec64Component)' 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 +54,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='{D97E1B5C-B020-4621-94CE-F10FCFF765C5}' Win64='yes'>
+                <Component Id='xsecD.dll' Guid='$(var.XmlSec64Componentd)' 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'>
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index cda4d3c..f4d1dc1 100644
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -17,6 +17,8 @@
      permissions and limitations under the License.  -->
 
 <?include ..\Versions.wxi ?>
+<?define XmlSec32Component='{761CE697-2701-4149-ACD5-A693EBB45B33}' ?>
+<?define XmlSec32Componentd='{34D437A1-3008-433F-A86F-F69E4852069F}' ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='XmlSecMergeModule_x86' Language='1033' Version='$(var.XmlSecVersion)'>
@@ -29,7 +31,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='{761CE697-2701-4149-ACD5-A693EBB45B33}'>
+              <Component Id='xsec.dll' Guid='$(var.XmlSec32Component)'>
                 <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
               </Component>
               <Component Id='c14n.exe' Guid='{576EB311-AADA-49D3-B444-7EDC37C715F3}'>
@@ -52,7 +54,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='{34D437A1-3008-433F-A86F-F69E4852069F}'>
+                <Component Id='xsecD.dll' Guid='$(var.XmlSec32Componentd)'>
                   <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
                 </Component>
                 <Component Id='c14n.exe_debug' Guid='{20506FEA-CCFF-46A2-9753-DBBA8A967003}'>
diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs b/msi/WiX/MergeModules/Zlib-x64.wxs
index 7f74c89..c93b056 100644
--- a/msi/WiX/MergeModules/Zlib-x64.wxs
+++ b/msi/WiX/MergeModules/Zlib-x64.wxs
@@ -16,6 +16,8 @@
    permissions and limitations under the License.  -->
 
 <?include ..\Versions.wxi ?>
+<?define Zlib64Component='{792D44C3-3DCE-465D-AAFF-520AB2F20DA2}' ?>
+<?define Zlib64Componentd='{74D67C6F-655E-4E4D-A147-39F32DB6E796}' ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>
@@ -28,12 +30,12 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib'>
-              <Component Id='zlib1.dll' Guid='{792D44C3-3DCE-465D-AAFF-520AB2F20DA2}' Win64='yes'>
+              <Component Id='zlib1.dll' Guid='$(var.Zlib64Component)' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes'
                       Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\x64\Release\zlib$(var.ZlibFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
-                <Component Id='zlib1d.dll' Guid='{74D67C6F-655E-4E4D-A147-39F32DB6E796}' Win64='yes'>
+                <Component Id='zlib1d.dll' Guid='$(var.Zlib64Componentd)' Win64='yes'>
                   <File KeyPath='yes' Checksum='yes'
                         Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\x64\Debug\zlib$(var.ZlibFileVersion)d.dll'/>
                 </Component>
diff --git a/msi/WiX/MergeModules/Zlib-x86.wxs b/msi/WiX/MergeModules/Zlib-x86.wxs
index db78883..9156d14 100644
--- a/msi/WiX/MergeModules/Zlib-x86.wxs
+++ b/msi/WiX/MergeModules/Zlib-x86.wxs
@@ -16,6 +16,8 @@
    permissions and limitations under the License.  -->
 
 <?include ..\Versions.wxi ?>
+<?define Zlib32Component='{059557A8-7311-47BB-8A5F-CC85F72AE495}' ?>
+<?define Zlib32Componentd='{3DA71CD4-F204-49D5-A689-7B1B4C2D395A}' ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>
@@ -28,12 +30,12 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib'>
-              <Component Id='zlib1.dll' Guid='{059557A8-7311-47BB-8A5F-CC85F72AE495}'>
+              <Component Id='zlib1.dll' Guid='$(var.Zlib32Component)'>
                 <File KeyPath='yes' Checksum='yes'
                       Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Release\zlib$(var.ZlibFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
-                <Component Id='zlib1d.dll' Guid='{3DA71CD4-F204-49D5-A689-7B1B4C2D395A}'>
+                <Component Id='zlib1d.dll' Guid='$(var.Zlib32Componentd)'>
                   <File KeyPath='yes' Checksum='yes'
                         Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Debug\zlib$(var.ZlibFileVersion)d.dll'/>
                 </Component>
-- 
2.1.4