diff --git a/contrib/windows/packaging/MSI_main-v2.wxs.tt b/contrib/windows/packaging/MSI_main-v2.wxs.tt
index 1a416ddf4..eba3aa442 100644
--- a/contrib/windows/packaging/MSI_main-v2.wxs.tt
+++ b/contrib/windows/packaging/MSI_main-v2.wxs.tt
@@ -314,80 +314,80 @@
"" OR CMDLINE_CONFIG="reset"]]>
- NOT DEBUG
- NOT LOGGER
- NOT LOGFILE_MAXSIZE
- NOT NO_HTTPD
- NOT HTTPD_IP
- NOT HTTPD_PORT
- NOT HTTPD_TRUST
- NOT SCAN_HOMEDIRS
- NOT SCAN_PROFILES
- NOT TIMEOUT
- NOT DELAYTIME
- NOT NO_COMPRESSION
- NOT NO_P2P
- NOT REMOTE_WORKERS
- NOT HTML
- NOT JSON
- NOT LAZY
- NOT LISTEN
- NOT NO_SSL_CHECK
- NOT CONF_RELOAD_INTERVAL
- NOT BACKEND_COLLECT_TIMEOUT
+ "1" AND DEBUG<>"2")]]>
+
+
+ "1"]]>
+
+
+
+ "1"]]>
+ "1"]]>
+
+
+ "1"]]>
+ "1"]]>
+
+ "1"]]>
+ "1"]]>
+ "0"]]>
+ "1"]]>
+ "1"]]>
+
+
- NOT QUICKINSTALL
- NOT ADD_FIREWALL_EXCEPTION
- NOT EXECMODE
- NOT RUNNOW
- NOT AGENTMONITOR
- NOT TASK_FREQUENCY
- NOT TASK_MINUTE_MODIFIER
- NOT TASK_HOURLY_MODIFIER
- NOT TASK_DAILY_MODIFIER
+ "0"]]>
+ "0"]]>
+ "2" AND EXECMODE<>"3")]]>
+ "1"]]>
+ "1"]]>
+
+
+
+
- "1"]]>
- "0"]]>
- "1"]]>
- "1" AND EXECMODE<>"2" AND EXECMODE<>"3")]]>
-
-
- "1"]]>
- "1"]]>
- "1"]]>
- "1"]]>
- "1"]]>
- "1"]]>
- "1"]]>
+ "1"]]>
+ "0"]]>
+ "1"]]>
+ "1" AND EXECMODE<>"2" AND EXECMODE<>"3")]]>
+
+
+ "1"]]>
+ "1"]]>
+ "1"]]>
+ "1"]]>
+ "1"]]>
+ "1"]]>
+ "1"]]>
- "1"]]>
- "0"]]>
- "1"]]>
-
- "1"]]>
- "1"]]>
- "1"]]>
- "1"]]>
- "1"]]>
- "1"]]>
- "1"]]>
- "1"]]>
- "1"]]>
- "1"]]>
- "1"]]>
-
- "minute" AND TASK_FREQUENCY<>"hourly" AND TASK_FREQUENCY<>"daily")]]>
- 1439]]>
- 23]]>
- 365]]>
+ "1"]]>
+ "0"]]>
+ "1"]]>
+
+ "1"]]>
+ "1"]]>
+ "1"]]>
+ "1"]]>
+ "1"]]>
+ "1"]]>
+ "1"]]>
+ "1"]]>
+ "1"]]>
+ "1"]]>
+ "1"]]>
+
+ "minute" AND TASK_FREQUENCY<>"hourly" AND TASK_FREQUENCY<>"daily")]]>
+ 1439]]>
+ 23]]>
+ 365]]>
-
-
-
+
+
+
@@ -439,8 +439,8 @@
- NOT LOGFILE
- NOT VARDIR
+
+
@@ -457,23 +457,23 @@
EXECMODE=1
EXECMODE=1
- EXECMODE=1 AND NOT REMOVE~="ALL"
+
- EXECMODE=2 AND TASK_FREQUENCY~="minute" AND NOT REMOVE~="ALL"
- EXECMODE=2 AND TASK_FREQUENCY~="minute" AND NOT REMOVE~="ALL"
- EXECMODE=2 AND TASK_FREQUENCY~="hourly" AND NOT REMOVE~="ALL"
- EXECMODE=2 AND TASK_FREQUENCY~="hourly" AND NOT REMOVE~="ALL"
- EXECMODE=2 AND TASK_FREQUENCY~="daily" AND NOT REMOVE~="ALL"
- EXECMODE=2 AND TASK_FREQUENCY~="daily" AND NOT REMOVE~="ALL"
+
+
+
+
+
+
- RUNNOW=1 AND NOT REMOVE~="ALL"
- RUNNOW=1 AND NOT REMOVE~="ALL"
+
+
- RUNNOW=1 AND NOT EXECMODE=1 AND NOT REMOVE~="ALL"
- RUNNOW=1 AND NOT EXECMODE=1 AND NOT REMOVE~="ALL"
+
+
@@ -486,15 +486,15 @@
- ADD_FIREWALL_EXCEPTION=1 AND NOT REMOVE~="ALL"
- ADD_FIREWALL_EXCEPTION=1 AND NOT REMOVE~="ALL"
- ADD_FIREWALL_EXCEPTION=1 AND NOT REMOVE~="ALL"
- ADD_FIREWALL_EXCEPTION=1 AND NOT REMOVE~="ALL"
+
+
+
+
- UPGRADINGPRODUCTCODE AND UPGRADEDIR
+
@@ -502,8 +502,8 @@
- VersionNT
- VersionNT > 500
+
+ 500]]>
@@ -541,11 +541,11 @@
1
1
- NOT WIXUI_DONTVALIDATEPATH
+
"1"]]>
1
1
- WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"
+
1
1
@@ -558,16 +558,16 @@
NOT Installed
1
- WixUI_InstallMode = "InstallCustom" OR WixUI_InstallMode = "Change"
- WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"
+
+
1
- QUICKINSTALL
- NOT QUICKINSTALL AND SERVER
- NOT QUICKINSTALL AND NOT SERVER
- NOT LOCAL
- LOCAL
- NOT WIXUI_DONTVALIDATEPATH
- NOT WIXUI_DONTVALIDATEPATH
+
+
+
+
+
+
+
"1"]]>
1
@@ -577,16 +577,16 @@
1
1
- SERVER
- NOT SERVER
+
+
"2"]]>
- _EXECMODE_RADIO_BUTTON="2"
+
1
1
"2"]]>
- _EXECMODE_RADIO_BUTTON="2"
+
1
1
@@ -598,9 +598,9 @@
1
1
- WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"
- QUICKINSTALL
- NOT QUICKINSTALL
+
+
+
1
@@ -621,7 +621,7 @@
- !(wix.WixUICostingPopupOptOut) OR CostingComplete = 1
+