Anchor various GUI entities and the merge modules so the build stops being tied to...

[shibboleth/cpp-sp.git] / msi / WiX / ShibbolethSP-registry-x64.wxs

diff --git a/msi/WiX/ShibbolethSP-registry-x64.wxs b/msi/WiX/ShibbolethSP-registry-x64.wxs
index a77d341..99e1cf2 100644 (file)
--- a/msi/WiX/ShibbolethSP-registry-x64.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x64.wxs
@@ -62,11 +62,6 @@
                       Name='InstallDir' Type='directory' Win64='yes'/>\r
     </Property>\r
 \r
-    <Property Id='OLD_INSTALL_SHIBD_SERVICE64' Secure='yes'>\r
-      <RegistrySearch Id='OldInstallShibd64' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                      Name='InstallShibd' Type='raw' Win64='yes'/>\r
-    </Property>\r
-\r
     <Property Id='OLD_INSTALL_ISAPI_FILTER64' Secure='yes'>\r
       <RegistrySearch Id='OldInstallIsapi64' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
                       Name='InstallIsapi' Type='raw' Win64='yes'/>\r
@@ -85,11 +80,6 @@
                        Name='InstallDir' Value='[INSTALLDIR]' Type='string' KeyPath='yes' />\r
       </Component>\r
 \r
-      <Component Id='InstallShibd64' Guid='{7834C30C-DCAB-4C7E-9C75-396EFB759AC9}' Win64='yes'>\r
-        <RegistryValue Id='InstallShibd64'  Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                       Name='InstallShibd' Value='[INSTALL_SHIBD_SERVICE]' Type='string' KeyPath='yes' />\r
-      </Component>\r
-\r
       <Component Id='Install32Bit64' Guid='{9A0181FE-6252-4C2E-8828-70281DCC3825}' Win64='yes'>\r
         <RegistryValue Id='Install32Bit64'  Root='HKLM' Key='SOFTWARE\Shibboleth' \r
                        Name='Install32Bit' Value='[INSTALL_32BIT]' Type='string' KeyPath='yes' />\r
@@ -107,7 +97,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