Remove SHIBSP_SCHEMAS on any type of 2.5 install

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index b75a4c2..7343d13 100644 (file)
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -148,6 +148,9 @@
           <Directory Id='var_cache_shibboleth' Name='shibboleth'>\r
             <Component Id='var_cache_shibboleth_folder' Guid='{6C978639-DDCF-40BD-90F8-690B3E05586C}'>\r
               <CreateFolder />\r
+              <!-- Kill off old env variable from pre 2.5 install.\r
+                   Do it here so it is in the correct tables -->\r
+              <Environment Id='SHIBSP_SCHEMAS' Action='remove' Name='SHIBSP_SCHEMAS'/>\r
             </Component>\r
           </Directory><!-- var_cache_shibboleth -->\r
         </Directory><!-- var_cache -->\r

diff --git a/msi/WiX/ShibbolethSP-registry-x64.wxs b/msi/WiX/ShibbolethSP-registry-x64.wxs
index a77d341..5d8360a 100644 (file)
--- 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' />\r
       </Component>\r
 \r
-      <Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'>\r
+      <Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'  Permanent='yes'>\r
         <File Id='shib64.ico' KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico'/>\r
         <RegistryValue Id='DisplayIcon64' Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' \r
                        Name='DisplayIcon' Value='[#shib64.ico],0' Type='string' />\r