MSI: Only call custom action if REMOVE=ALL is specified, this avoids...

MSI: Only call custom action if REMOVE=ALL is specified, this avoids accidential removing services if feature states are modified (reported by Iggy)

MSI: Only call custom action if REMOVE=ALL is specified, this avoids...
MSI: Only call custom action if REMOVE=ALL is specified, this avoids accidential removing services if feature states are modified (reported by Iggy)
3e11fe23 · Vladislav Vaintroub · 91ad155c · 3e11fe23
Commit 3e11fe23 authored Nov 24, 2010 by Vladislav Vaintroub
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

packaging/WiX/mysql_server.wxs.in packaging/WiX/mysql_server.wxs.in +4 -4

No files found.
--- a/packaging/WiX/mysql_server.wxs.in
+++ b/packaging/WiX/mysql_server.wxs.in
@@ -128,10 +128,10 @@
                  Impersonate="no"
                  Return="check" />
    <InstallExecuteSequence>
-      <Custom Action="UnregisterProperty" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE</Custom>
+      <Custom Action="UnregisterProperty" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
-      <Custom Action="UnregisterPropertySilent" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE</Custom>
+      <Custom Action="UnregisterPropertySilent" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
-      <Custom Action="UnregisterService" After="UnregisterProperty">Installed And Not UPGRADINGPRODUCTCODE And UILevel&gt;4</Custom>
+      <Custom Action="UnregisterService" After="UnregisterProperty">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&gt;4</Custom>
-      <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And UILevel&lt;=4</Custom>
+      <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&lt;=4</Custom>
    </InstallExecuteSequence>
    <!-- Installation root-->