diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-09-02 14:15:32 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-09-02 14:28:54 -0400 |
| commit | eb25f452c1ca1afb53c102e2619148092829cfe5 (patch) | |
| tree | b31afd21c3e6e315629af8059dc3170c7e3cf210 /src/wixlib | |
| parent | ecb774445b177c739864cbd0f6ad441c7864e3be (diff) | |
| download | wix-eb25f452c1ca1afb53c102e2619148092829cfe5.tar.gz wix-eb25f452c1ca1afb53c102e2619148092829cfe5.tar.bz2 wix-eb25f452c1ca1afb53c102e2619148092829cfe5.zip | |
Fix Condition authoring.
Diffstat (limited to 'src/wixlib')
| -rw-r--r-- | src/wixlib/HttpExtension_Platform.wxi | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/wixlib/HttpExtension_Platform.wxi b/src/wixlib/HttpExtension_Platform.wxi index 28b3afe1..9722e2e7 100644 --- a/src/wixlib/HttpExtension_Platform.wxi +++ b/src/wixlib/HttpExtension_Platform.wxi | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
| 3 | 2 | ||
| 4 | 3 | ||
| 5 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| @@ -8,12 +7,12 @@ | |||
| 8 | <Fragment> | 7 | <Fragment> |
| 9 | <UIRef Id="WixHttpErrors" /> | 8 | <UIRef Id="WixHttpErrors" /> |
| 10 | <UI> | 9 | <UI> |
| 11 | <ProgressText Action="$(var.Prefix)SchedHttpUrlReservationsInstall$(var.Suffix)">!(loc.WixSchedHttpUrlReservationsInstall)</ProgressText> | 10 | <ProgressText Action="$(var.Prefix)SchedHttpUrlReservationsInstall$(var.Suffix)" Message="!(loc.WixSchedHttpUrlReservationsInstall)" /> |
| 12 | <ProgressText Action="$(var.Prefix)SchedHttpUrlReservationsUninstall$(var.Suffix)">!(loc.WixSchedHttpUrlReservationsUninstall)</ProgressText> | 11 | <ProgressText Action="$(var.Prefix)SchedHttpUrlReservationsUninstall$(var.Suffix)" Message="!(loc.WixSchedHttpUrlReservationsUninstall)" /> |
| 13 | <ProgressText Action="$(var.Prefix)RollbackHttpUrlReservationsInstall$(var.Suffix)">!(loc.WixRollbackHttpUrlReservationsInstall)</ProgressText> | 12 | <ProgressText Action="$(var.Prefix)RollbackHttpUrlReservationsInstall$(var.Suffix)" Message="!(loc.WixRollbackHttpUrlReservationsInstall)" /> |
| 14 | <ProgressText Action="$(var.Prefix)ExecHttpUrlReservationsInstall$(var.Suffix)">!(loc.WixExecHttpUrlReservationsInstall)</ProgressText> | 13 | <ProgressText Action="$(var.Prefix)ExecHttpUrlReservationsInstall$(var.Suffix)" Message="!(loc.WixExecHttpUrlReservationsInstall)" /> |
| 15 | <ProgressText Action="$(var.Prefix)RollbackHttpUrlReservationsUninstall$(var.Suffix)">!(loc.WixRollbackHttpUrlReservationsUninstall)</ProgressText> | 14 | <ProgressText Action="$(var.Prefix)RollbackHttpUrlReservationsUninstall$(var.Suffix)" Message="!(loc.WixRollbackHttpUrlReservationsUninstall)" /> |
| 16 | <ProgressText Action="$(var.Prefix)ExecHttpUrlReservationsUninstall$(var.Suffix)">!(loc.WixExecHttpUrlReservationsUninstall)</ProgressText> | 15 | <ProgressText Action="$(var.Prefix)ExecHttpUrlReservationsUninstall$(var.Suffix)" Message="!(loc.WixExecHttpUrlReservationsUninstall)" /> |
| 17 | </UI> | 16 | </UI> |
| 18 | 17 | ||
| 19 | <CustomAction Id="$(var.Prefix)SchedHttpUrlReservationsInstall$(var.Suffix)" BinaryKey="HttpCA$(var.Suffix)" DllEntry="SchedHttpUrlReservationsInstall" Execute="immediate" Return="check" SuppressModularization="yes" /> | 18 | <CustomAction Id="$(var.Prefix)SchedHttpUrlReservationsInstall$(var.Suffix)" BinaryKey="HttpCA$(var.Suffix)" DllEntry="SchedHttpUrlReservationsInstall" Execute="immediate" Return="check" SuppressModularization="yes" /> |
| @@ -27,12 +26,8 @@ | |||
| 27 | We need the HTTP server on Windows XP SP2 or later. | 26 | We need the HTTP server on Windows XP SP2 or later. |
| 28 | --> | 27 | --> |
| 29 | <InstallExecuteSequence> | 28 | <InstallExecuteSequence> |
| 30 | <Custom Action="$(var.Prefix)SchedHttpUrlReservationsUninstall$(var.Suffix)" Before="RemoveFiles" Overridable="yes"> | 29 | <Custom Action="$(var.Prefix)SchedHttpUrlReservationsUninstall$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="VersionNT >= 600 OR (VersionNT >= 501 AND ((MsiNTProductType = 1 AND ServicePackLevel >= 2) OR (MsiNTProductType > 1)))" /> |
| 31 | <![CDATA[ VersionNT >= 600 OR (VersionNT >= 501 AND ((MsiNTProductType = 1 AND ServicePackLevel >= 2) OR (MsiNTProductType > 1))) ]]> | 30 | <Custom Action="$(var.Prefix)SchedHttpUrlReservationsInstall$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT >= 600 OR (VersionNT >= 501 AND ((MsiNTProductType = 1 AND ServicePackLevel >= 2) OR (MsiNTProductType > 1)))" /> |
| 32 | </Custom> | ||
| 33 | <Custom Action="$(var.Prefix)SchedHttpUrlReservationsInstall$(var.Suffix)" After="InstallFiles" Overridable="yes"> | ||
| 34 | <![CDATA[ VersionNT >= 600 OR (VersionNT >= 501 AND ((MsiNTProductType = 1 AND ServicePackLevel >= 2) OR (MsiNTProductType > 1))) ]]> | ||
| 35 | </Custom> | ||
| 36 | </InstallExecuteSequence> | 31 | </InstallExecuteSequence> |
| 37 | </Fragment> | 32 | </Fragment> |
| 38 | 33 | ||