[cpp-sp] branch master updated: SSPCPP-807 Uninstall the IIS plugins on real uninstall

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=3ae7376a1fe61bd2696a37f09cc48122bed5a4ff

The following commit(s) were added to refs/heads/master by this push:
       new  3ae7376   SSPCPP-807 Uninstall the IIS plugins on real uninstall
3ae7376 is described below

commit 3ae7376a1fe61bd2696a37f09cc48122bed5a4ff
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jun 4 17:18:33 2018 +0100

    SSPCPP-807 Uninstall the IIS plugins on real uninstall
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-807
    
    The trick involves not doing so on upgrades (which are like uninstalls after
    installs), so use the same predicate that service deletion uses.
---
 msi/WiX/ShibbolethSP-main-x64.wxs | 20 ++++++++++++++++++++
 msi/WiX/ShibbolethSP-main-x86.wxs | 13 ++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 70c151b..1e9415b 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -211,6 +211,12 @@
     <CustomAction Id="QtInstallIIS32" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Impersonate="no" />
     <CustomAction Id="QtInstallIIS64" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Impersonate="no" />
 
+    <!-- Uninstall -->
+    <CustomAction Id="SetQtUninstallIIS32" Property="QtUninstallIIS32" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" uninstall module ShibNative32" />
+    <CustomAction Id="SetQtUninstallIIS64" Property="QtUninstallIIS64" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" uninstall module ShibNative" />
+    <CustomAction Id="QtUninstallIIS32" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" />
+    <CustomAction Id="QtUninstallIIS64" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" />
+
     <InstallExecuteSequence>
       <!-- Install IIS if
            - this is an install
@@ -229,6 +235,20 @@
       <Custom Action="QtInstallIIS64" After="SetQtInstallIIS64">
         (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
       </Custom>
+
+      <Custom Action="SetQtUninstallIIS32" After="StopServices">
+        Installed AND IISMAJORVERSION  AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
+      </Custom>
+      <Custom Action="SetQtUninstallIIS64" After="StopServices">
+        Installed AND IISMAJORVERSION  AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
+      </Custom>
+      <Custom Action="QtUninstallIIS32" After="SetQtUninstallIIS32">
+        Installed AND IISMAJORVERSION  AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
+      </Custom>
+      <Custom Action="QtUninstallIIS64" After="SetQtUninstallIIS64">
+        Installed AND IISMAJORVERSION  AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
+      </Custom>
+
       <ScheduleReboot Before="InstallFinalize">
         (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
       </ScheduleReboot>
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 06d3543..b7ba7b4 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -116,9 +116,11 @@
          between 32 and 64 bit registration -->
 
     <CustomAction Id="SetQtInstallIIS" Property="QtInstallIIS" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" install module /name:ShibNative /image:"[#iis7_shib.dll]"" />
-
     <CustomAction Id="QtInstallIIS" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
 
+    <CustomAction Id="SetQtUninstallIIS" Property="QtUninstallIIS" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" uninstall module ShibNative" />
+    <CustomAction Id="QtUninstallIIS" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
+
     <InstallExecuteSequence>
       <!-- Install IIS if
            - this is an install
@@ -131,6 +133,15 @@
       <Custom Action="QtInstallIIS" After="SetQtInstallIIS">
         (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
       </Custom>
+
+      <Custom Action="SetQtUninstallIIS" After="StopServices">
+        Installed AND IISMAJORVERSION  AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
+      </Custom>
+
+      <Custom Action="QtUninstallIIS" After="SetQtUninstallIIS">
+          Installed AND IISMAJORVERSION  AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
+      </Custom>
+
       <ScheduleReboot Before="InstallFinalize">
         (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
       </ScheduleReboot>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.