From d89370eafa49f221b02abeadefc4379f10d4d821 Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Mon, 11 Jun 2012 05:47:41 +0000
Subject: [PATCH] Remove SHIBSP_SCHEMAS on any type of 2.5 install

---
 msi/WiX/ShibbolethSP-noarch.wxs       | 3 +++
 msi/WiX/ShibbolethSP-registry-x64.wxs | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index b75a4c2..7343d13 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -148,6 +148,9 @@
           <Directory Id='var_cache_shibboleth' Name='shibboleth'>
             <Component Id='var_cache_shibboleth_folder' Guid='{6C978639-DDCF-40BD-90F8-690B3E05586C}'>
               <CreateFolder />
+              <!-- Kill off old env variable from pre 2.5 install.
+                   Do it here so it is in the correct tables -->
+              <Environment Id='SHIBSP_SCHEMAS' Action='remove' Name='SHIBSP_SCHEMAS'/>
             </Component>
           </Directory><!-- var_cache_shibboleth -->
         </Directory><!-- var_cache -->
diff --git a/msi/WiX/ShibbolethSP-registry-x64.wxs b/msi/WiX/ShibbolethSP-registry-x64.wxs
index a77d341..5d8360a 100644
--- a/msi/WiX/ShibbolethSP-registry-x64.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x64.wxs
@@ -107,7 +107,7 @@
                        Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />
       </Component>
 
-      <Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'>
+      <Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'  Permanent='yes'>
         <File Id='shib64.ico' KeyPath='yes' Source='$(var.SPBuildDirectory)\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' />
-- 
2.1.4