From dad0750ef65af0d17f2e1d441bebaa8209908f79 Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Sat, 5 May 2012 16:39:45 +0000
Subject: [PATCH] More WiX. Fragments and include files to allow us to build an
 x64 installer (not yet tested)

---
 msi/WiX/Compile.bat                     |  20 ++++
 msi/WiX/MergeModules/Curl-x86.wxs       |   2 +-
 msi/WiX/MergeModules/Shibboleth-x64.wxs |  10 +-
 msi/WiX/MergeModules/Shibboleth-x86.wxs |  10 +-
 msi/WiX/ShibbolethSP-exe-x64.wxs        | 138 ++++++++++++++++++++++
 msi/WiX/ShibbolethSP-exe-x86.wxs        | 124 ++++++++++----------
 msi/WiX/ShibbolethSP-main-x64.wxs       | 200 ++++++++++++++++++++++++++++++++
 msi/WiX/ShibbolethSP-noarch.wxs         | 126 +++++---------------
 msi/WiX/ShibbolethSP-properties.wxi     |  52 +++++++++
 msi/WiX/ShibbolethSP-registry-x64.wxs   |  78 +++++++++++++
 msi/WiX/ShibbolethSP-registry-x86.wxs   |  86 ++++++++++++++
 msi/WiX/Versions.wxi                    |  18 ++-
 msi/WiX/tes.wxs                         |  40 +++++++
 msi/WiX/testInstall.wxs                 |   2 +-
 14 files changed, 721 insertions(+), 185 deletions(-)
 create mode 100644 msi/WiX/Compile.bat
 create mode 100644 msi/WiX/ShibbolethSP-exe-x64.wxs
 create mode 100644 msi/WiX/ShibbolethSP-main-x64.wxs
 create mode 100644 msi/WiX/ShibbolethSP-properties.wxi
 create mode 100644 msi/WiX/ShibbolethSP-registry-x64.wxs
 create mode 100644 msi/WiX/ShibbolethSP-registry-x86.wxs
 create mode 100644 msi/WiX/tes.wxs

diff --git a/msi/WiX/Compile.bat b/msi/WiX/Compile.bat
new file mode 100644
index 0000000..8ba5b9c
--- /dev/null
+++ b/msi/WiX/Compile.bat
@@ -0,0 +1,20 @@
+wixcop -indent:2 ShibbolethSP-exe-x64.wxs
+candle ShibbolethSP-exe-x64.wxs
+
+wixcop -indent:2 ShibbolethSP-registry-x64.wxs
+candle ShibbolethSP-registry-x64.wxs
+
+wixcop -indent:2 ShibbolethSP-noarch.wxs
+candle ShibbolethSP-noarch.wxs
+
+wixcop -indent:2 ShibbolethSP-exe-x86.wxs
+candle ShibbolethSP-exe-x86.wxs
+
+wixcop -indent:2 ShibbolethSP-registry-x86.wxs
+candle ShibbolethSP-registry-x86.wxs
+
+wixcop -indent:2 ShibbolethSP-main-x64.wxs
+candle ShibbolethSP-main-x64.wxs
+light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj
+
+
diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index 0432343..784092a 100644
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -22,7 +22,7 @@
   <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
     <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
index c0a52fd..ee12b84 100644
--- a/msi/WiX/MergeModules/Shibboleth-x64.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -18,7 +18,7 @@
 <?include ..\Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethVersion)'>
+  <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethDllVersion)'>
     <Package Id='{DF6FAD40-5EF8-43F2-BBE1-BD42B9E9ACAB}' Description='Merge Module for Shibboleth DLLs (x64)'
              Comments='This module is built by the Shibboleth Consortium.'
              Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
@@ -30,18 +30,18 @@
             <Directory Id='lib' Name='lib' 
                        FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Release'>
               <Component Id='shibsplite.dll' Guid='{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}' Win64='yes'>
-                <File Name='shibsp-lite$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />
+                <File Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />
               </Component>
               <Component Id='shibsp.dll' Guid='{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}' Win64='yes'>
-                <File Name='shibsp$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />
+                <File Name='shibsp$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />
               </Component>
               <Directory Id='lib_debug' Name='debug' 
                          FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >
                 <Component Id='shibspliteD.dll' Guid='{5EF6FF17-0510-484B-9F24-523B29EB416C}' Win64='yes'>
-                  <File Name='shibsp-lite$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />
+                  <File Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />
                 </Component>
                 <Component Id='shibspD.dll' Guid='{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}' Win64='yes'>
-                  <File Name='shibsp$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />
+                  <File Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />
                 </Component>
               </Directory><!-- lib_debug -->
             </Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index f34695d..31843e1 100644
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -18,7 +18,7 @@
 <?include ..\Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethVersion)'>
+  <Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethDllVersion)'>
     <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth DLLs (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
              Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
@@ -30,18 +30,18 @@
             <Directory Id='lib' Name='lib' 
                        FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release'>
               <Component Id='shibsplite.dll' Guid='{10475E33-434D-4805-B983-195092549BED}'>
-                <File Name='shibsp-lite$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />
+                <File Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />
               </Component>
               <Component Id='shibsp.dll' Guid='{9DE384BF-C286-4A72-AED9-AA34384005C0}'>
-                <File Name='shibsp$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />
+                <File Name='shibsp$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />
               </Component>
               <Directory Id='lib_debug' Name='debug' 
                          FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >
                 <Component Id='shibspliteD.dll' Guid='{8E070220-2992-4D45-BF98-459022CD268F}'>
-                  <File Name='shibsp-lite$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />
+                  <File Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />
                 </Component>
                 <Component Id='shibspD.dll' Guid='{4196D799-1162-4D62-9F7A-1F59E90F19F1}'>
-                  <File Name='shibsp$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />
+                  <File Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />
                 </Component>
               </Directory><!-- lib_debug -->
             </Directory><!-- lib -->
diff --git a/msi/WiX/ShibbolethSP-exe-x64.wxs b/msi/WiX/ShibbolethSP-exe-x64.wxs
new file mode 100644
index 0000000..5726550
--- /dev/null
+++ b/msi/WiX/ShibbolethSP-exe-x64.wxs
@@ -0,0 +1,138 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the 'License'); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an 'AS IS' BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!-- This is where we put all executables & so & dlls which make up the SP X86 installer
+       -->
+  <Fragment>
+    <!-- Configuration, licenses and documentation -->
+    <DirectoryRef Id='INSTALLDIR'>
+      <Directory Id='bin64' Name='bin64' 
+                 FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Release' >
+        <Component Id='resolvertest64.exe' Guid='{C29672B6-971D-4828-BB51-1190C0877381}' Win64='yes'>
+          <File Id='resolvertest64.exe' Name='resolvertest.exe' KeyPath='yes' />
+        </Component>
+        <Component Id='mdquery64.exe' Guid='{3645630B-3991-4693-8664-A49242B9CF05}' Win64='yes'>
+          <File Id='mdquery64.exe' Name='mdquery.exe' KeyPath='yes' />
+        </Component>
+        <Directory Id='bin64_debug' Name='debug' 
+                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >
+          <Component Id='resolvertest64.exe_debug' Guid='{58C98426-8C96-41EE-B956-A6BBAEAE5A10}' Win64='yes'>
+            <File Id='resolvertest64.exe_debug' Name='resolvertest.exe' KeyPath='yes'/>
+          </Component>
+          <Component Id='mdquery64.exe_debug' Guid='{2153EDFC-9962-4AF4-8071-40D0FF497BF9}' Win64='yes'>
+            <File Id='mdquery64.exe_debug' Name='mdquery.exe' KeyPath='yes' />
+          </Component>
+        </Directory><!-- bin_debug -->
+      </Directory><!-- bin -->
+
+      <Directory Id='lib64' Name='lib64' >
+        <Directory Id='lib64_shibboleth' Name='shibboleth' 
+                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Release' >
+          <Component Id='adfs64.so' Guid='{2891ECDC-F507-4CEC-8A65-8B20FB93F4B7}' Win64='yes'>
+            <File Id='adfs64.so' Name='adfs.so' KeyPath='yes' />
+          </Component>
+          <Component Id='adfslite64.so' Guid='{1162CDA0-C3F8-4599-B01E-9EDAA73B2C0B}' Win64='yes'>
+            <File Id='adfslite64.so' Name='adfs-lite.so' KeyPath='yes' />
+          </Component>
+          <Component Id='isapi_shib64.dll' Guid='{3BC7260B-D035-4F79-A39E-EDA0181BBB1B}' Win64='yes'>
+            <File Id='isapi_shib64.dll' Name='isapi_shib.dll' KeyPath='yes' />
+          </Component>
+          <Component Id='mod_shib_2264.so' Guid='{3C8F67F5-C7C2-40DB-94AB-A26266C113C8}' Win64='yes'>
+            <File Id='mod_shib_2264.so' Name='mod_shib_22.so' KeyPath='yes' />
+          </Component>
+          <Component Id='odbcstore64.so' Guid='{D9CF6BD3-4BDB-4BC5-9EB3-6C68CA7544B6}' Win64='yes'>
+            <File Id='odbcstore64.so' Name='odbc-store.so' KeyPath='yes' />
+          </Component>
+          <Component Id='shibauthorizer64.exe' Guid='{5A323F4F-AE87-451A-9253-1965E46C9C5F}' Win64='yes'>
+            <File Id='shibauthorizer64.exe' Name='shibauthorizer.exe' KeyPath='yes' />
+          </Component>
+          <Component Id='shibresponder64.exe' Guid='{538D6EEC-1AE1-400B-94AF-2B7791BFEBDA}' Win64='yes'>
+            <File Id='shibresponder64.exe' Name='shibresponder.exe' KeyPath='yes' />
+          </Component>
+          <Directory Id='lib64_shibboleth_debug' Name='debug' 
+                     FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >
+            <Component Id='adfsD64.so' Guid='{BFF58DDD-CF04-49B1-A172-C84087705D2A}' Win64='yes'>
+              <File Id='adfsD64.so' Name='adfs.so' KeyPath='yes' />
+            </Component>
+            <Component Id='adfsliteD64.so' Guid='{2A3D71BE-BF8F-4CBD-B890-B25F391B09FA}' Win64='yes'>
+              <File Id='adfs_liteD64.so' Name='adfs-lite.so' KeyPath='yes' />
+            </Component>
+            <Component Id='isapi_shibD64.dll' Guid='{60BC5679-A40E-42E5-9FC0-CCE924E660ED}' Win64='yes'>
+              <File Id='isapi_shibD64.dll' Name='isapi_shib.dll' KeyPath='yes' />
+            </Component>
+            <Component Id='mod_shib_22D64.so' Guid='{59FE3C18-1920-48A0-80BC-7ECF8579E441}' Win64='yes'>
+              <File Id='mod_shib_22D64.so' Name='mod_shib_22.so' KeyPath='yes' />
+            </Component>
+            <Component Id='odbcstoreD64.so' Guid='{586CE55A-F089-4541-96D5-5EE26F8FC471}' Win64='yes'>
+              <File Id='odbc_storeD64.so' Name='odbc-store.so' KeyPath='yes' />
+            </Component>
+            <Component Id='shibauthorizerD64.exe' Guid='{642C9137-66C8-4E2E-A76C-4D9F65B17157}' Win64='yes'>
+              <File Id='shibauthorizer64.exe_Debug' Name='shibauthorizer.exe' KeyPath='yes' />
+            </Component>
+            <Component Id='shibresponderD64.exe' Guid='{7947F31A-1429-44FC-85B2-BF1E7AA50D20}' Win64='yes'>
+              <File Id='shibresponder64.exe_Debug' Name='shibresponder.exe' KeyPath='yes' />
+            </Component>
+          </Directory><!-- lib_shibboleth_debug -->
+        </Directory><!-- lib_shibboleth -->
+      </Directory><!-- lib -->
+      <!-- the service bin -->
+      <Directory Id='sbin64' Name='sbin64'
+                 FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Release' >
+        <Component Id='shibd64.exe' Guid='{707B57A2-CCA0-48A6-9F66-275EB04474AA}' Win64='yes'>
+          <File Id='shibd64.exe' Name='shibd.exe' KeyPath='yes' />
+        </Component>
+        <Directory Id='sbin64_debug' Name='debug'
+                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >
+          <Component Id='shibdD64.exe' Guid='{657A1902-0104-47C7-84A7-AEB5F736B02F}' Win64='yes'>
+            <File Id='shibd64.exe_debug' Name='shibd.exe' KeyPath='yes' />
+          </Component>
+        </Directory><!-- sbin_debug -->
+      </Directory><!-- sbin -->
+    </DirectoryRef><!-- INSTALLDIR -->
+
+    <!-- Components
+         <ComponentRef Id='resolvertest64.exe'/>
+         <ComponentRef Id='mdquery64.exe'/>
+         <ComponentRed Id='resolvertest64.exe_debug'/>
+         <ComponentRef Id='mdquery64.exe_debug' />
+
+         <ComponentRef Id='adfs64.so'/>
+         <ComponentRef Id='adfslite64.so'/>
+         <ComponentRef Id='isapi_shib64.dll'/>
+         <ComponentRef Id='mod_shib_2264.so'/>
+         <ComponentRef Id='odbcstore64.so'/>
+         <ComponentRef Id='shibauthorizer64.exe'/>
+         <ComponentRef Id='shibresponder64.exe'/>
+
+         <ComponentRef Id='adfsD64.so'/>
+         <ComponentRef Id='adfsliteD64.so'/>
+         <ComponentRef Id='isapi_shibD64.dll'/>
+         <ComponentRef Id='mod_shib_22D64.so'/>
+         <ComponentRef Id='odbcstoreD64.so'/>
+         <ComponentRef Id='shibauthorizerD64.exe'/>
+         <ComponentRef Id='shibresponderD64.exe'/>
+
+         <ComponentRef Id='shibd64.exe'/>
+         <ComponentRef Id='shibdD64.exe'/>
+         -->
+
+  </Fragment>
+</Wix>
diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
index d16228e..cdfd854 100644
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -16,8 +16,7 @@
    implied.  See the License for the specific language governing
    permissions and limitations under the License.  -->
 
-<?define BuildDirectory='G:\Downloads\shib\' ?>
-<?define ShibbolethSPFileVersion='1_4' ?>
+<?include Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <!-- This is where we put all executables & so & dlls which make up the SP X86 installer
@@ -27,88 +26,87 @@
     <DirectoryRef Id='INSTALLDIR'>
       <Directory Id='bin' Name='bin' 
                  FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >
-        <Component Id="resolvertest.exe" Guid="{D381B6FA-2971-457B-804E-F08DD517866F}">
-          <File Name="resolvertest.exe" KeyPath="yes" />
+        <Component Id='resolvertest.exe' Guid='{D381B6FA-2971-457B-804E-F08DD517866F}'>
+          <File Name='resolvertest.exe' KeyPath='yes' />
         </Component>
-        <Component Id="mdquery.exe" Guid="{AA3655D7-D498-4FEE-A1C4-437C82AA1C2A}">
-          <File Name="mdquery.exe" KeyPath="yes" />
+        <Component Id='mdquery.exe' Guid='{5F322597-3B26-48E5-95BA-CF991CF6D6DB}'>
+          <File Name='mdquery.exe' KeyPath='yes' />
         </Component>
         <Directory Id='bin_debug' Name='debug' 
-                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >
-          <Component Id="resolvertest.exe_debug" Guid="{4FA03A33-961A-42E5-8D7A-5F2E207757DD}">
-            <File Name="resolvertest.exe" Id="resolvertest.exe_debug" KeyPath="yes"/>
+                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >
+          <Component Id='resolvertest.exe_debug' Guid='{4FA03A33-961A-42E5-8D7A-5F2E207757DD}'>
+            <File Name='resolvertest.exe' Id='resolvertest.exe_debug' KeyPath='yes'/>
           </Component>
-          <Component Id="mdquery.exe_debug" Guid="{C7A4A6A5-3DAF-4254-9C29-1511AB3ABC62}">
-            <File Name="mdquery.exe" Id="mdquery.exe_debug" KeyPath="yes" />
+          <Component Id='mdquery.exe_debug' Guid='{C7A4A6A5-3DAF-4254-9C29-1511AB3ABC62}'>
+            <File Name='mdquery.exe' Id='mdquery.exe_debug' KeyPath='yes' />
           </Component>
         </Directory><!-- bin_debug -->
       </Directory><!-- bin -->
 
-      <Directory Id='lib' Name='lib' 
-                 FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >
+      <Directory Id='lib' Name='lib' >
         <Directory Id='lib_shibboleth' Name='shibboleth' 
                    FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >
-          <Component Id="adfs.so" Guid="{9C92C803-E905-4B43-8723-05678DC73B88}">
-            <File Name="adfs.so" KeyPath="yes" />
+          <Component Id='adfs.so' Guid='{9C92C803-E905-4B43-8723-05678DC73B88}'>
+            <File Name='adfs.so' KeyPath='yes' />
           </Component>
-          <Component Id="adfslite.so" Guid="{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}">
-            <File Name="adfs-lite.so" KeyPath="yes" />
+          <Component Id='adfslite.so' Guid='{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}'>
+            <File Name='adfs-lite.so' KeyPath='yes' />
           </Component>
-          <Component Id="isapi_shib.dll" Guid="{716D6F4F-4185-4219-B1BA-1D15F867926E}">
-            <File Name="isapi_shib.dll" KeyPath="yes" />
+          <Component Id='isapi_shib.dll' Guid='{716D6F4F-4185-4219-B1BA-1D15F867926E}'>
+            <File Name='isapi_shib.dll' KeyPath='yes' />
           </Component>
-          <Component Id="mod_shib_13.so" Guid="{5C85940B-7644-4AA4-9948-9EFFC1729EFB}">
-            <File Name="mod_shib_13.so" KeyPath="yes" />
+          <Component Id='mod_shib_13.so' Guid='{5C85940B-7644-4AA4-9948-9EFFC1729EFB}'>
+            <File Name='mod_shib_13.so' KeyPath='yes' />
           </Component>
-          <Component Id="mod_shib_20.so" Guid="{FFC2D560-FD06-42BB-9EA7-B0CC988AC4A6}">
-            <File Name="mod_shib_20.so" KeyPath="yes" />
+          <Component Id='mod_shib_20.so' Guid='{FFC2D560-FD06-42BB-9EA7-B0CC988AC4A6}'>
+            <File Name='mod_shib_20.so' KeyPath='yes' />
           </Component>
-          <Component Id="mod_shib_22.so" Guid="{BB889066-3EF2-43C5-BC4D-CD6B1DC4AE7B}">
-            <File Name="mod_shib_22.so" KeyPath="yes" />
+          <Component Id='mod_shib_22.so' Guid='{BB889066-3EF2-43C5-BC4D-CD6B1DC4AE7B}'>
+            <File Name='mod_shib_22.so' KeyPath='yes' />
           </Component>
-          <Component Id="nsapi_shib.dll" Guid="{F199DD8A-292F-4C7D-AACB-7283852D6335}">
-            <File Name="nsapi_shib.dll" KeyPath="yes" />
+          <Component Id='nsapi_shib.dll' Guid='{F199DD8A-292F-4C7D-AACB-7283852D6335}'>
+            <File Name='nsapi_shib.dll' KeyPath='yes' />
           </Component>
-          <Component Id="odbcstore.so" Guid="{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}">
-            <File Name="odbc-store.so" KeyPath="yes" />
+          <Component Id='odbcstore.so' Guid='{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}'>
+            <File Name='odbc-store.so' KeyPath='yes' />
           </Component>
-          <Component Id="shibauthorizer.exe" Guid="{7C7C1C24-902A-4003-AE59-599E79161782}">
-            <File Name="shibauthorizer.exe" KeyPath="yes" />
+          <Component Id='shibauthorizer.exe' Guid='{7C7C1C24-902A-4003-AE59-599E79161782}'>
+            <File Name='shibauthorizer.exe' KeyPath='yes' />
           </Component>
-          <Component Id="shibresponder.exe" Guid="{510267D9-61F2-47EF-99D2-CB3D21CB14EB}">
-            <File Name="shibresponder.exe" KeyPath="yes" />
+          <Component Id='shibresponder.exe' Guid='{510267D9-61F2-47EF-99D2-CB3D21CB14EB}'>
+            <File Name='shibresponder.exe' KeyPath='yes' />
           </Component>
           <Directory Id='lib_shibboleth_debug' Name='debug' 
                      FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >
-            <Component Id="adfsD.so" Guid="{9B8E071F-B251-4373-A786-8966FD0D22EF}">
-              <File Id="adfsD.so" Name="adfs.so" KeyPath="yes" />
+            <Component Id='adfsD.so' Guid='{9B8E071F-B251-4373-A786-8966FD0D22EF}'>
+              <File Id='adfsD.so' Name='adfs.so' KeyPath='yes' />
             </Component>
-            <Component Id="adfsliteD.so" Guid="{680F510A-FFDA-4AE2-8C5D-DD9D62C90DDC}">
-              <File Id="adfs_liteD.so" Name="adfs-lite.so" KeyPath="yes" />
+            <Component Id='adfsliteD.so' Guid='{680F510A-FFDA-4AE2-8C5D-DD9D62C90DDC}'>
+              <File Id='adfs_liteD.so' Name='adfs-lite.so' KeyPath='yes' />
             </Component>
-            <Component Id="isapi_shibD.dll" Guid="{F8212D30-0BA8-4F02-B595-E8E5D312342B}">
-              <File Id="isapi_shibD.dll" Name="isapi_shib.dll" KeyPath="yes" />
+            <Component Id='isapi_shibD.dll' Guid='{F8212D30-0BA8-4F02-B595-E8E5D312342B}'>
+              <File Id='isapi_shibD.dll' Name='isapi_shib.dll' KeyPath='yes' />
             </Component>
-            <Component Id="mod_shib_13D.so" Guid="{E8B798AB-D772-428D-8033-2A77CB437CF0}">
-              <File Id="mod_shib_13D.so" Name="mod_shib_13.so" KeyPath="yes" />
+            <Component Id='mod_shib_13D.so' Guid='{E8B798AB-D772-428D-8033-2A77CB437CF0}'>
+              <File Id='mod_shib_13D.so' Name='mod_shib_13.so' KeyPath='yes' />
             </Component>
-            <Component Id="mod_shib_20D.so" Guid="{468806BF-6924-47D5-B319-608C2D63FDDC}">
-              <File Id="mod_shib_20D.so" Name="mod_shib_20.so" KeyPath="yes" />
+            <Component Id='mod_shib_20D.so' Guid='{468806BF-6924-47D5-B319-608C2D63FDDC}'>
+              <File Id='mod_shib_20D.so' Name='mod_shib_20.so' KeyPath='yes' />
             </Component>
-            <Component Id="mod_shib_22D.so" Guid="{3DA4492F-C0EA-4286-9C37-13F82342FA67}">
-              <File Id="mod_shib_22D.so" Name="mod_shib_22.so" KeyPath="yes" />
+            <Component Id='mod_shib_22D.so' Guid='{3DA4492F-C0EA-4286-9C37-13F82342FA67}'>
+              <File Id='mod_shib_22D.so' Name='mod_shib_22.so' KeyPath='yes' />
             </Component>
-            <Component Id="nsapi_shibD.dll" Guid="{492A5D72-4FE0-417E-9023-311E1BF34816}">
-              <File Id="nsapi_shibD.dll" Name="nsapi_shib.dll" KeyPath="yes" />
+            <Component Id='nsapi_shibD.dll' Guid='{492A5D72-4FE0-417E-9023-311E1BF34816}'>
+              <File Id='nsapi_shibD.dll' Name='nsapi_shib.dll' KeyPath='yes' />
             </Component>
-            <Component Id="odbcstoreD.so" Guid="{F217D7CF-91C1-4318-901D-709C710803C6}">
-              <File Id="odbc_storeD.so" Name="odbc-store.so" KeyPath="yes" />
+            <Component Id='odbcstoreD.so' Guid='{F217D7CF-91C1-4318-901D-709C710803C6}'>
+              <File Id='odbc_storeD.so' Name='odbc-store.so' KeyPath='yes' />
             </Component>
-            <Component Id="shibauthorizerD.exe" Guid="{83360639-DDC0-4B76-8168-21FB77EE6CD6}">
-              <File Id="shibauthorizer.exe_Debug" Name="shibauthorizer.exe" KeyPath="yes" />
+            <Component Id='shibauthorizerD.exe' Guid='{83360639-DDC0-4B76-8168-21FB77EE6CD6}'>
+              <File Id='shibauthorizer.exe_Debug' Name='shibauthorizer.exe' KeyPath='yes' />
             </Component>
-            <Component Id="shibresponderD.exe" Guid="{760124EA-67E5-4393-B3DF-657DCC92F04C}">
-              <File Id="shibresponder.exe_Debug" Name="shibresponder.exe" KeyPath="yes" />
+            <Component Id='shibresponderD.exe' Guid='{760124EA-67E5-4393-B3DF-657DCC92F04C}'>
+              <File Id='shibresponder.exe_Debug' Name='shibresponder.exe' KeyPath='yes' />
             </Component>
           </Directory><!-- lib_shibboleth_debug -->
         </Directory><!-- lib_shibboleth -->
@@ -116,13 +114,18 @@
       <!-- the service bin -->
       <Directory Id='sbin' Name='sbin'
                  FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >
-        <Component Id="shibd.exe" Guid="{2476BB80-9384-4026-86F5-E1569A685187}">
-          <File Name="shibd.exe" KeyPath="yes" />
+        <Component Id='shibd.exe' Guid='{2476BB80-9384-4026-86F5-E1569A685187}'>
+          <File Name='shibd.exe' KeyPath='yes' />
+          <ServiceInstall Id='shibd' Name='shibd_Default' 
+                          DisplayName='Shibboleth 2 Daemon (Default)' Type='ownProcess' 
+                          Start='auto' ErrorControl='ignore' />
+          <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='uninstall'  
+                          Remove='uninstall' Wait='yes' />
         </Component>
-        <Directory Id="sbin_debug" Name="debug"
+        <Directory Id='sbin_debug' Name='debug'
                    FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >
-          <Component Id="shibdD.exe" Guid="{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}">
-            <File Id="shibd.exe_debug" Name="shibd.exe" KeyPath="yes" />
+          <Component Id='shibdD.exe' Guid='{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}'>
+            <File Id='shibd.exe_debug' Name='shibd.exe' KeyPath='yes' />
           </Component>
         </Directory><!-- sbin_debug -->
       </Directory><!-- sbin -->
@@ -135,11 +138,6 @@
          <ComponentRef Id='resolvertest.exe_debug'/>
          <ComponentRef Id='mdquery.exe_debug'/>
 
-         <ComponentRef Id='shibsplite.dll'/>
-         <ComponentRef Id='shibsp.dll'/>
-         <ComponentRef Id='shibspliteD.dll'/>
-         <ComponentRef Id='shibspD.dll'/>
-
          <ComponentRef Id='adfs.so'/>
          <ComponentRef Id='adfslite.so'/>
          <ComponentRef Id='isapi_shib.dll'/>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
new file mode 100644
index 0000000..e47afb5
--- /dev/null
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -0,0 +1,200 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the 'License'); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an 'AS IS' BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' 
+           Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' 
+           UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
+    <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+
+    <PropertyRef Id='SHIB_OLDVERSION_64'/>
+    <PropertyRef Id='SHIB_OLDVERSION'/>
+
+    <Condition Message='Shibboleth requires Windows XP SP2 or later.'>NOT VersionNT OR (VersionNT &gt;= 501)</Condition>
+    <Condition Message='Shibboleth requires a Windows NT-based operating system.'>NOT Version9X</Condition>
+    <Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the &quot;Change&quot; option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>(SHIB_OLDVERSION = "none") AND (SHIB_OLDVERSION_64 = "none")</Condition>
+
+    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
+
+    <?include ShibbolethSP-properties.wxi?>
+
+    <!-- Files -->
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <!-- The test bit -->
+      <Directory Id='OPT' Name='opt'>
+        <Directory Id='INSTALLDIR' Name='shibboleth-sp'/>
+      </Directory>
+
+      <Directory Id='ProgramFilesFolder' Name='PFiles'>
+        <!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->
+        <Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='MergeModules\Curl-x86.msm' DiskId='1' />
+        <Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='MergeModules\FastCGI-x86.msm' DiskId='1' />
+        <Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='MergeModules\Log4Shib-x86.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSAML-x86.msm' DiskId='1' />
+        <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />
+        <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />
+        <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />
+        <Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />
+        <Merge Id='XmlToolingMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlTooling-x86.msm' DiskId='1' />
+        <Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='MergeModules\Zlib-x86.msm' DiskId='1' />
+
+        <Merge Id='Microsoft_VC100_DebugCRT_x86' Language='1033' 
+               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm' DiskId='1' />
+        <Merge Id='Microsoft_VC100_CRT_x86' Language='1033' 
+               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm' DiskId='1' />
+      </Directory><!--ProgramFilesFolder-->
+
+      <Directory Id='ProgramFiles64Folder' Name='PFiles'>
+        <!-- 64 bit merge modules notionally go to "Program Files" -->
+        <Merge Id='CurlMergeModule_x64' Language='1033' SourceFile='MergeModules\Curl-x64.msm' DiskId='1' />
+        <Merge Id='FastCGIMergeModule_x64' Language='1033' SourceFile='MergeModules\FastCGI-x64.msm' DiskId='1' />
+        <Merge Id='Log4ShibMergeModule_x64' Language='1033' SourceFile='MergeModules\Log4Shib-x64.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSAML-x64.msm' DiskId='1' />
+        <Merge Id='OpenSSLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSSL-x64.msm' DiskId='1' />
+        <Merge Id='ShibbolethMergeModule_x64' Language='1033' SourceFile='MergeModules\Shibboleth-x64.msm' DiskId='1' />
+        <Merge Id='XercesMergeModule_x64' Language='1033' SourceFile='MergeModules\Xerces-x64.msm' DiskId='1' />
+        <Merge Id='XmlSecMergeModule_x64' Language='1033' SourceFile='MergeModules\XmlSec-x64.msm' DiskId='1' />
+        <Merge Id='XmlToolingMergeModule_x64' Language='1033' SourceFile='MergeModules\XmlTooling-x64.msm' DiskId='1' />
+        <Merge Id='ZlibMergeModule_x64' Language='1033' SourceFile='MergeModules\Zlib-x64.msm' DiskId='1' />
+
+        <Merge Id='Microsoft_VC100_DebugCRT_x64' Language='1033' 
+               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x64.msm' DiskId='1' />
+        <Merge Id='Microsoft_VC100_CRT_x64' Language='1033' 
+               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x64.msm' DiskId='1' />
+      </Directory><!--ProgramFiles64Folder-->
+    </Directory><!--TARGETDIR-->
+
+    <Feature Id='Shibboleth' Title='Shibboleth' Level='1'>
+      <MergeRef Id='CurlMergeModule_x86'/>
+      <MergeRef Id='FastCGIMergeModule_x86'/>
+      <MergeRef Id='Log4ShibMergeModule_x86'/>
+      <MergeRef Id='OpenSAMLMergeModule_x86'/>
+      <MergeRef Id='OpenSSLMergeModule_x86'/>
+      <MergeRef Id='ShibbolethMergeModule_x86'/>
+      <MergeRef Id='XercesMergeModule_x86'/>
+      <MergeRef Id='XmlSecMergeModule_x86'/>
+      <MergeRef Id='XmlToolingMergeModule_x86'/>
+      <MergeRef Id='ZlibMergeModule_x86'/>
+
+      <MergeRef Id='Microsoft_VC100_DebugCRT_x86'/>
+      <MergeRef Id='Microsoft_VC100_CRT_x86' />
+
+      <MergeRef Id='CurlMergeModule_x64'/>
+      <MergeRef Id='FastCGIMergeModule_x64'/>
+      <MergeRef Id='Log4ShibMergeModule_x64'/>
+      <MergeRef Id='OpenSAMLMergeModule_x64'/>
+      <MergeRef Id='OpenSSLMergeModule_x64'/>
+      <MergeRef Id='ShibbolethMergeModule_x64'/>
+      <MergeRef Id='XercesMergeModule_x64'/>
+      <MergeRef Id='XmlSecMergeModule_x64'/>
+      <MergeRef Id='XmlToolingMergeModule_x64'/>
+      <MergeRef Id='ZlibMergeModule_x64'/>
+
+      <MergeRef Id='Microsoft_VC100_DebugCRT_x64'/>
+      <MergeRef Id='Microsoft_VC100_CRT_x64' />
+
+      <!-- ShibbolethSP-exe-x64-->
+
+      <ComponentRef Id='resolvertest64.exe'/>
+      <ComponentRef Id='mdquery64.exe'/>
+      <ComponentRef Id='resolvertest64.exe_debug'/>
+      <ComponentRef Id='mdquery64.exe_debug' />
+
+      <ComponentRef Id='adfs64.so'/>
+      <ComponentRef Id='adfslite64.so'/>
+      <ComponentRef Id='isapi_shib64.dll'/>
+      <ComponentRef Id='mod_shib_2264.so'/>
+      <ComponentRef Id='odbcstore64.so'/>
+      <ComponentRef Id='shibauthorizer64.exe'/>
+      <ComponentRef Id='shibresponder64.exe'/>
+
+      <ComponentRef Id='adfsD64.so'/>
+      <ComponentRef Id='adfsliteD64.so'/>
+      <ComponentRef Id='isapi_shibD64.dll'/>
+      <ComponentRef Id='mod_shib_22D64.so'/>
+      <ComponentRef Id='odbcstoreD64.so'/>
+      <ComponentRef Id='shibauthorizerD64.exe'/>
+      <ComponentRef Id='shibresponderD64.exe'/>
+
+      <ComponentRef Id='shibd64.exe'/>
+      <ComponentRef Id='shibdD64.exe'/>
+
+      <!-- ShibbolethSP-registry-x64 -->
+
+      <ComponentRef Id='file_extension64'/>
+      <ComponentRef Id='shib64.ico' />
+
+      <!-- ShibbolethSP-noarch-x64 -->
+
+      <ComponentRef Id='doc_shibboleth'/>
+      <ComponentRef Id='etc_shibboleth_perm'/>
+      <ComponentRef Id='etc_shibboleth_nonperm'/>
+      <ComponentRef Id='dist_noperm'/>
+      <ComponentRef Id='accessError.html'/>
+      <ComponentRef Id='apache.config'/>
+      <ComponentRef Id='apache2.config'/>
+      <ComponentRef Id='metadataError.html'/>
+      <ComponentRef Id='native.logger'/>
+      <ComponentRef Id='sessionError.html'/>
+      <ComponentRef Id='shibd.logger'/>
+      <ComponentRef Id='var_log_shibboleth_folder'/>
+      <ComponentRef Id='share_xml_shibboleth'/>
+      <ComponentRef Id='share_xml_shibboleth_xsd'/>
+
+      <!-- ShibbolethSP-exe-x64-->
+
+      <ComponentRef Id='resolvertest.exe'/>
+      <ComponentRef Id='mdquery.exe'/>
+      <ComponentRef Id='resolvertest.exe_debug'/>
+      <ComponentRef Id='mdquery.exe_debug'/>
+
+      <ComponentRef Id='adfs.so'/>
+      <ComponentRef Id='adfslite.so'/>
+      <ComponentRef Id='isapi_shib.dll'/>
+      <ComponentRef Id='mod_shib_13.so'/>
+      <ComponentRef Id='mod_shib_20.so'/>
+      <ComponentRef Id='mod_shib_22.so'/>
+      <ComponentRef Id='nsapi_shib.dll'/>
+      <ComponentRef Id='odbcstore.so'/>
+      <ComponentRef Id='shibauthorizer.exe'/>
+      <ComponentRef Id='shibresponder.exe'/>
+
+      <ComponentRef Id='adfsD.so'/>
+      <ComponentRef Id='adfsliteD.so'/>
+      <ComponentRef Id='isapi_shibD.dll'/>
+      <ComponentRef Id='mod_shib_13D.so'/>
+      <ComponentRef Id='mod_shib_20D.so'/>
+      <ComponentRef Id='mod_shib_22D.so'/>
+      <ComponentRef Id='nsapi_shibD.dll'/>
+      <ComponentRef Id='odbcstoreD.so'/>
+      <ComponentRef Id='shibauthorizerD.exe'/>
+      <ComponentRef Id='shibresponderD.exe'/>
+
+      <ComponentRef Id='shibd.exe'/>
+      <ComponentRef Id='shibdD.exe'/>
+
+      <!-- ShibbolethSP-registry-x64 -->
+      <ComponentRef Id='file_extension'/>
+      <ComponentRef Id='shib.ico' />
+
+    </Feature>
+  </Product>
+</Wix>
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index edc0df1..3ff4d54 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -16,8 +16,7 @@
    implied.  See the License for the specific language governing
    permissions and limitations under the License.  -->
 
-<?define BuildDirectory='G:\Downloads\shib\' ?>
-<?define OpenSSLDirVersion='1.0.0a' ?>
+<?include Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <!-- This is where we put all the architecture neutral bits of the
@@ -113,105 +112,32 @@
           <Directory Id='var_run_shibboleth' Name='shibboleth' />
         </Directory><!-- var_run -->
       </Directory><!-- var -->
+      <!-- Schemas -->
+      <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
+        <Directory Id='common_shibboleth' Name='Shibboleth' >
+          <Directory Id='common_sp' Name='SP' >
+            <Directory Id='common_doc' Name='doc' 
+                       FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas' >
+              <Component Id='share_xml_shibboleth' Guid='{69FCD385-B31D-43FB-B8A7-6F8D30391661}'>
+                <File Name='shibboleth-metadata-1.0.xsd' KeyPath='yes' />
+                <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />
+                <File Name='shibboleth-2.0-attribute-map.xsd' />
+                <File Name='shibboleth-2.0-afp.xsd' />
+                <File Name='shibboleth-2.0-afp-mf-saml.xsd' />
+                <File Name='WS-Trust.xsd' />
+                <File Name='shibboleth-2.0-sp-notify.xsd' />
+                <File Name='shibboleth-2.0-native-sp-config.xsd' />
+                <File Name='shibboleth-2.0-afp-mf-basic.xsd' />
+                <File Name='shibboleth-2.0-native-sp-protocols.xsd' />
+              </Component>
+              <Component Id='share_xml_shibboleth_xsd' Guid='{8C5B6416-5BE3-4D4D-BF8B-B677365DA58C}'>
+                <File Name='shibboleth.xsd' KeyPath='yes' />
+              </Component>
+            </Directory><!--common_doc-->
+          </Directory><!--common_sp-->
+        </Directory><!--common_shibboleth-->
+      </Directory><!--CommonAppDataFolder-->
     </DirectoryRef>
-    <!-- Schemas -->
-    <DirectoryRef Id='SHARE_DIR'><!-- \opt\shibboleth-sp\share -->
-      <Directory Id='share_xml' Name='xml'>
-        <Directory Id='share_xml_shibboleth' Name='shibboleth'
-                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas' >
-          <Component Id='share_xml_shibboleth' Guid='{69FCD385-B31D-43FB-B8A7-6F8D30391661}'>
-            <File Name='shibboleth-metadata-1.0.xsd' KeyPath='yes' />
-            <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />
-            <File Name='shibboleth-2.0-attribute-map.xsd' />
-            <File Name='shibboleth-2.0-afp.xsd' />
-            <File Name='shibboleth-2.0-afp-mf-saml.xsd' />
-            <File Name='WS-Trust.xsd' />
-            <File Name='shibboleth-2.0-sp-notify.xsd' />
-            <File Name='shibboleth-2.0-native-sp-config.xsd' />
-            <File Name='shibboleth-2.0-afp-mf-basic.xsd' />
-            <File Name='shibboleth-2.0-native-sp-protocols.xsd' />
-          </Component>
-          <Component Id='share_xml_shibboleth_xsd' Guid='{8C5B6416-5BE3-4D4D-BF8B-B677365DA58C}'>
-            <File Name='shibboleth.xsd' KeyPath='yes' />
-          </Component>
-        </Directory><!-- share_xml_shibboleth -->
-      </Directory><!-- share_xml -->
-    </DirectoryRef><!-- share -->
-    <!-- Previous version search -->
-    <Property Id='SHIB_OLDVERSION' Value='none' Secure='yes'>
-      <!-- 32 bit -->
-      <RegistrySearch Id='SP2_2_1' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2A19CDBC-E0DA-452C-8B38-1AA9DB4D579F}' 
-                      Name='DisplayVersion' Type='raw' />
-      <RegistrySearch Id='SP2_4_1_32' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A5D2DE8D-2A4A-4D74-98B5-BA448DD4DC39}' 
-                      Name='DisplayVersion' Type='raw' />
-      <RegistrySearch Id='SP2_4_2_32' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8280E58C-D290-42CD-9425-BCC0BA439649}' 
-                      Name='DisplayVersion' Type='raw' />
-      <RegistrySearch Id='SP2_4_3_32' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{7B9F4513-3141-4270-B1F5-43A467235B6B}' 
-                      Name='DisplayVersion' Type='raw' />
-      <RegistrySearch Id='SP2_2_0_32' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EAAAD296-3942-4535-B39B-81A57E94FCF7}' 
-                      Name='DisplayVersion' Type='raw' />
-      <RegistrySearch Id='SP2_3_0_32' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{790EE9BA-BB63-43D3-9080-F9AF7AC43114}' 
-                      Name='DisplayVersion' Type='raw' />
-      <RegistrySearch Id='SP2_1_0_32' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2E80BF81-72BC-4E9C-8A79-D7D7EA20AAE4}' 
-                      Name='DisplayVersion' Type='raw' />
-      <RegistrySearch Id='AppReg2' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A9A0D770-C658-4659-BC75-6F8289DDEAA3}' 
-                      Name='DisplayVersion' Type='raw' />
-      <RegistrySearch Id='SP2_4_0_32' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{56028A6A-D5A3-47C5-9494-092E1C840A8F}' 
-                      Name='DisplayName' Type='raw' />
-      <RegistrySearch Id='AppReg1' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{6E62498D-162E-45AA-87C7-157308552043}' 
-                      Name='DisplayVersion' Type='raw' />
-      <RegistrySearch Id='SP2_0_0_32' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{D62F990B-2A8A-442B-BF85-7FE075B2CE0C}' 
-                      Name='DisplayVersion' Type='raw' />
-      <RegistrySearch Id='SP2_3_1' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E4FA3B6C-6347-4B58-A07D-F9E388B3944B}' 
-                      Name='DisplayVersion' Type='raw' />
-
-      <!-- 64 bit 
-      <RegistrySearch Id='SP_2_2_1_64' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5492935D-7D97-42FE-A916-5190C3F8C403}' 
-                      Name='DisplayVersion' Type='raw' Win64='yes' />
-      <RegistrySearch Id='SP2_4_1_64' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{3936DF1B-DFF2-4A02-8A2C-8AB893718397}' 
-                      Name='DisplayVersion' Type='raw' Win64='yes' />
-      <RegistrySearch Id='SP2_4_2_64' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1081BC03-B61E-4F3C-ACD9-4C8C7D3E9928}' 
-                      Name='DisplayVersion' Type='raw' Win64='yes' />
-      <RegistrySearch Id='SP_2_4_3_64' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9367CC0C-D76D-4DA8-AF51-0DD144430DD8}' 
-                      Name='DisplayVersion' Type='raw' Win64='yes' />
-      <RegistrySearch Id='SP2_3_0_64' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C7F88000-9E35-4B23-86AD-997F90B04DEE}' 
-                      Name='DisplayVersion' Type='raw' Win64='yes' />
-      <RegistrySearch Id='SP2_4_0_64' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8F0834E5-A3C8-4B7F-B8DF-30BC90331C03}' 
-                      Name='DisplayName' Type='raw' Win64='yes' />
-      <RegistrySearch Id='SP2_1_0_64' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A8C641B8-0924-4264-BEBD-8D20F8B3EB79}' 
-                      Name='DisplayVersion' Type='raw' Win64='yes' />
-      <RegistrySearch Id='SP2_2_0_64' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DDEEB7B2-A639-4513-8437-83564FECAFD3}' 
-                      Name='DisplayVersion' Type='raw' Win64='yes' />
-      <RegistrySearch Id='SP2_3_1_64' Root='HKLM' 
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{CFF81891-E7C4-47C3-B173-87CF1B947D05}' 
-                      Name='DisplayVersion' Type='raw' Win64='yes' /> -->
-    </Property>
-
-    <Property Id="SHIBD_PORT" Value="1600" Secure="yes" />
-
-    <Condition Message='Shibboleth requires Windows XP SP2 or later.'>NOT VersionNT OR (VersionNT &gt;= 501)</Condition>
-    <Condition Message='Shibboleth requires a Windows NT-based operating system.'>NOT Version9X</Condition>
-    <Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the &quot;Change&quot; option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>SHIB_OLDVERSION = "none"</Condition>
 
     <!-- The actions to perform after the files have been copied -->
     <Binary Id='EditConfigFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_config_files.vbs-wix' />
diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
new file mode 100644
index 0000000..15e3931
--- /dev/null
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -0,0 +1,52 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+     Development, Inc. (UCAID) under one or more contributor license
+     agreements.  See the NOTICE file distributed with this work for
+     additional information regarding copyright ownership. The UCAID
+     licenses this file to You under the Apache License, Version 2.0
+     (the 'License'); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
+     
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an 'AS IS' BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied.  See the License for the specific language governing
+     permissions and limitations under the License.  -->
+
+<!-- <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+   This is where we put all the configuration properties we will
+       used to drive the install.  The GUI will change them as required,
+       but the GUI is not required.  -->
+<Include>
+
+  <Property Id="OPT"  Secure="yes" Value="opt" />
+  <Property Id="INSTALLDIR" Secure="yes" Value="Shibboleth-SP" />
+
+  <!-- Are we installing IIS, if so what extension to used -->
+  <Property Id="SHIB_FILE_EXTENSION" Value=".sso" Secure="yes">
+    <RegistrySearch Id="AppReg" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="FileExtension" Type="raw" />
+  </Property>
+  
+  <!-- IIS install -->
+  <Property Id="INSTALL_ISAPI_FILTER" Value="TRUE" Secure="yes" />
+  <!-- Install shibd_service -->
+  <Property Id="INSTALL_SHIBD_SERVICE" Value="TRUE" Secure="yes" />
+  <!-- 64 bit or 32bit service and DLLS, also used to swap in the 64 bit service -->
+  <Property Id="OUR_DLL_PATH" Secure="yes" />
+  <Property Id="SHIBD_PORT" Value="1600" Secure="yes" />
+
+  <Property Id="ARPCONTACT" Value="contact@shibboleth.net" />
+  <Property Id="ARPHELPLINK" Value="https://wiki.shibboleth.net/confluence/display/SHIB2/Installation+and+Configuration" />
+  <Property Id="ARPURLUPDATEINFO" Value="https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPWindowsUpgrade" />
+  <Property Id="ARPURLINFOABOUT" Value="http://www.shibboleth.net/" />
+
+  <!-- UPGRADINGPRODUCTCODE set in the uninstall if this is an upgrade uninstall -->
+
+  <Upgrade Id='$(var.ShibbolethUpgradeCode)'>
+    <UpgradeVersion ExcludeLanguages="yes" IncludeMaximum="yes" Maximum="2.5.0" Minimum="0.0.1" OnlyDetect="yes" Property="ALREADYINSTALLED"/>
+  </Upgrade>
+</Include>
+
diff --git a/msi/WiX/ShibbolethSP-registry-x64.wxs b/msi/WiX/ShibbolethSP-registry-x64.wxs
new file mode 100644
index 0000000..789afdc
--- /dev/null
+++ b/msi/WiX/ShibbolethSP-registry-x64.wxs
@@ -0,0 +1,78 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the 'License'); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an 'AS IS' BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!-- This is where we put all the architecture neutral bits of the
+       Shibboleth install.  It turns out that it may not be all the
+       architecture insenstive stuff since some GUIDS may have moved
+       -->
+  <Fragment>
+
+    <!-- Previous version search -->
+    <Property Id='SHIB_OLDVERSION_64' Value='none' Secure='yes'>
+      <RegistrySearch Id='SP_2_2_1_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5492935D-7D97-42FE-A916-5190C3F8C403}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_4_1_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{3936DF1B-DFF2-4A02-8A2C-8AB893718397}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_4_2_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1081BC03-B61E-4F3C-ACD9-4C8C7D3E9928}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP_2_4_3_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9367CC0C-D76D-4DA8-AF51-0DD144430DD8}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_3_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C7F88000-9E35-4B23-86AD-997F90B04DEE}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_4_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8F0834E5-A3C8-4B7F-B8DF-30BC90331C03}' 
+                      Name='DisplayName' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_1_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A8C641B8-0924-4264-BEBD-8D20F8B3EB79}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_2_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DDEEB7B2-A639-4513-8437-83564FECAFD3}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_3_1_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{CFF81891-E7C4-47C3-B173-87CF1B947D05}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+    </Property>
+
+    <DirectoryRef Id='bin64'>
+      <Component Id='file_extension64' Guid='{F17BED16-5988-4F9E-82E0-1D4DCB69EC26}' Win64='yes'>
+        <Condition>INSTALL_ISAPI_FILTER = "TRUE"</Condition>
+        <RegistryValue Id='FileExtension64' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'>
+        <File Id='shib64.ico' KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\shib.ico'/>
+        <RegistryValue Id='DisplayIcon64' Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' 
+                       Name='DisplayIcon' Value='[#shib64.ico],0' Type='string' />
+      </Component>
+    </DirectoryRef>
+  <!--
+     <ComponentRef Id='file_extension64'/>
+     <ComponentRef Id='shib64.ico' />
+     -->
+
+  </Fragment>
+</Wix>
diff --git a/msi/WiX/ShibbolethSP-registry-x86.wxs b/msi/WiX/ShibbolethSP-registry-x86.wxs
new file mode 100644
index 0000000..712a3ba
--- /dev/null
+++ b/msi/WiX/ShibbolethSP-registry-x86.wxs
@@ -0,0 +1,86 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the 'License'); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an 'AS IS' BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!-- This is where we put all the architecture neutral bits of the
+       Shibboleth install.  It turns out that it may not be all the
+       architecture insenstive stuff since some GUIDS may have moved
+       -->
+  <Fragment>
+    <!-- Previous version search -->
+    <Property Id='SHIB_OLDVERSION' Value='none' Secure='yes'>
+      <RegistrySearch Id='SP2_2_1' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2A19CDBC-E0DA-452C-8B38-1AA9DB4D579F}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_1_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A5D2DE8D-2A4A-4D74-98B5-BA448DD4DC39}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_2_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8280E58C-D290-42CD-9425-BCC0BA439649}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_3_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{7B9F4513-3141-4270-B1F5-43A467235B6B}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_2_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EAAAD296-3942-4535-B39B-81A57E94FCF7}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_3_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{790EE9BA-BB63-43D3-9080-F9AF7AC43114}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_1_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2E80BF81-72BC-4E9C-8A79-D7D7EA20AAE4}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='AppReg2' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A9A0D770-C658-4659-BC75-6F8289DDEAA3}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{56028A6A-D5A3-47C5-9494-092E1C840A8F}' 
+                      Name='DisplayName' Type='raw' />
+      <RegistrySearch Id='AppReg1' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{6E62498D-162E-45AA-87C7-157308552043}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_0_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{D62F990B-2A8A-442B-BF85-7FE075B2CE0C}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_3_1' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E4FA3B6C-6347-4B58-A07D-F9E388B3944B}' 
+                      Name='DisplayVersion' Type='raw' />
+
+    </Property>
+    <DirectoryRef Id='bin'>
+      <Component Id='file_extension' Guid='{88D0BEF3-6E15-4688-8492-9FF23B6221DF}'>
+        <Condition>INSTALL_ISAPI_FILTER = "TRUE"</Condition>
+        <RegistryValue Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='shib.ico' Guid='{FA0F86A1-0731-4D66-8216-BC74D231B598}'>
+        <File KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\shib.ico' />
+        <RegistryValue Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' 
+                       Name='DisplayIcon' Value='[#shib.ico],0' Type='string' />
+      </Component>
+    </DirectoryRef>
+  <!--
+     <ComponentRef Id='file_extension'/>
+     <ComponentRef Id='shib.ico' />
+     -->
+
+  </Fragment>
+</Wix>
diff --git a/msi/WiX/Versions.wxi b/msi/WiX/Versions.wxi
index cb02534..a4cc1bf 100644
--- a/msi/WiX/Versions.wxi
+++ b/msi/WiX/Versions.wxi
@@ -2,6 +2,11 @@
 <Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <?define BuildDirectory='G:\Downloads\shib\' ?>
 
+  <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->
+  <?define ShibbolethVersion='2.4.186'?>
+  <!-- DO NOT CHANGE UpgradeCode -->
+  <?define ShibbolethUpgradeCode='{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}' ?>
+
   <?define CurlVersion='7.21.2' ?>
 
   <?define FastCGIVersion='2.4.0' ?>
@@ -13,15 +18,13 @@
   <?define OpenSAMLVersion='2.4.3' ?> 
   <?define OpenSAMLFileVersion='2_4' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->
 
-
   <?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->
   <?define OpenSSLDirVersion='1.0.0a' ?><!-- '$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'> -->
   <?define OpenSSLFileVersion='1_0_0' ?><!-- 'libeay32_$(var.OpenSSLFileVersion)D.dll' -->
 
-
-  <?define ShibbolethSPFileVersion='1_4' ?><!-- 'shibsp-lite$(var.ShibbolethSPFileVersion).dll'  -->
-  <?define ShibbolethVersion='1.4.2' ?>
-
+  <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->
+  <?define ShibbolethDllFileVersion='1_4' ?><!-- 'shibsp-lite$(var.ShibbolethSPFileVersion).dll'  -->
+  <?define ShibbolethDllVersion='1.4.2' ?>
 
   <?define XercesVersion='3.1.1' ?><!-- $(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll' -->
   <?define XercesFileVersion='3_1' ?>
@@ -29,14 +32,9 @@
   <?define XmlSecVersion='1.6.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->
   <?define XmlSecFileVersion='1_6' ?><!--'xsec_$(var.XmlSecFileVersion).dll'-->
 
-
   <?define XmlToolingVersion='1.4.2' ?>
-
   <?define XmlToolingFileVersion='1_4' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->
 
-
   <?define ZlibVersion='1.2.5' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'-->
   <?define ZlibFileVersion='1' ?>
-
-
 </Include>
diff --git a/msi/WiX/tes.wxs b/msi/WiX/tes.wxs
new file mode 100644
index 0000000..02ebb6c
--- /dev/null
+++ b/msi/WiX/tes.wxs
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Product Id='C59417F2-CCCA-4668-A39E-E7227D295D59' Name='Test Package1' Language='1033'
+           Version='1.0.0.0' Manufacturer='Shibboleth Consortium'>
+    <Package Description='TEST Windows Installer package'
+             Comments='Ignore Ignore Ignore Ignore'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Compressed='yes' />
+
+    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
+    <!-- Files -->
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='SystemFolder' >
+        <Merge Id='Microsoft_VC100_CRT_x86' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm' DiskId='1' />
+      </Directory>
+    </Directory>
+
+    <!-- Feature -->
+    <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>
+      <MergeRef Id='Microsoft_VC100_CRT_x86' />
+<!--      <MergeRef Id='Microsoft_VC100_DebugCRT_x86' /> -->
+    </Feature>
+  </Product>
+</Wix>
diff --git a/msi/WiX/testInstall.wxs b/msi/WiX/testInstall.wxs
index 6b29b61..068aee3 100644
--- a/msi/WiX/testInstall.wxs
+++ b/msi/WiX/testInstall.wxs
@@ -27,7 +27,7 @@
     <!-- Files -->
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <!-- The test bit -->
-      <Directory Id='Opt' Name='opt'>
+      <Directory Id='OPT' Name='opt'>
         <Directory Id='INSTALLDIR' Name='shibboleth-sp'>
           <Component Id='MyComponent' Guid='74DBAA41-4C46-4944-80F6-27F925991CB2'>
             <File Source='FileCounts.txt' />
-- 
2.1.4