diff options
| author | Bob Arnson <bob@firegiant.com> | 2024-02-16 18:34:12 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2024-02-16 19:20:19 -0500 |
| commit | 3fa17617b89d62103cc35b37424ab6fa5b9f08be (patch) | |
| tree | 4ffc6886599280ae558c2175f63ccb66419b1dea /src/ext/Http | |
| parent | eb2f85d7ee5ad5c91af0943ffe936ee8ccfdab0d (diff) | |
| download | wix-3fa17617b89d62103cc35b37424ab6fa5b9f08be.tar.gz wix-3fa17617b89d62103cc35b37424ab6fa5b9f08be.tar.bz2 wix-3fa17617b89d62103cc35b37424ab6fa5b9f08be.zip | |
Switch to `virtual` access modifiers...
...from `Overridable="yes"`.
Fixes https://github.com/wixtoolset/issues/issues/7981 for WiX v5.
Diffstat (limited to 'src/ext/Http')
| -rw-r--r-- | src/ext/Http/wixlib/HttpExtension_Platform.wxi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ext/Http/wixlib/HttpExtension_Platform.wxi b/src/ext/Http/wixlib/HttpExtension_Platform.wxi index 49d39c02..d0a1b33d 100644 --- a/src/ext/Http/wixlib/HttpExtension_Platform.wxi +++ b/src/ext/Http/wixlib/HttpExtension_Platform.wxi | |||
| @@ -26,8 +26,8 @@ | |||
| 26 | We need the HTTP server on Windows XP SP2 or later. | 26 | We need the HTTP server on Windows XP SP2 or later. |
| 27 | --> | 27 | --> |
| 28 | <InstallExecuteSequence> | 28 | <InstallExecuteSequence> |
| 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)))" /> | 29 | <Custom Action="virtual $(var.Prefix)SchedHttpUrlReservationsUninstall$(var.Suffix)" Before="RemoveFiles" Condition="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)))" /> | 30 | <Custom Action="virtual $(var.Prefix)SchedHttpUrlReservationsInstall$(var.Suffix)" After="InstallFiles" Condition="VersionNT >= 600 OR (VersionNT >= 501 AND ((MsiNTProductType = 1 AND ServicePackLevel >= 2) OR (MsiNTProductType > 1)))" /> |
| 31 | </InstallExecuteSequence> | 31 | </InstallExecuteSequence> |
| 32 | </Fragment> | 32 | </Fragment> |
| 33 | 33 | ||
| @@ -53,8 +53,8 @@ | |||
| 53 | We need HTTP.SYS on Windows 8 or later for SNI SSL support. | 53 | We need HTTP.SYS on Windows 8 or later for SNI SSL support. |
| 54 | --> | 54 | --> |
| 55 | <InstallExecuteSequence> | 55 | <InstallExecuteSequence> |
| 56 | <Custom Action="$(var.Prefix)SchedHttpSniSslCertsUninstall$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="VersionNT >= 602" /> | 56 | <Custom Action="virtual $(var.Prefix)SchedHttpSniSslCertsUninstall$(var.Suffix)" Before="RemoveFiles" Condition="VersionNT >= 602" /> |
| 57 | <Custom Action="$(var.Prefix)SchedHttpSniSslCertsInstall$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT >= 602" /> | 57 | <Custom Action="virtual $(var.Prefix)SchedHttpSniSslCertsInstall$(var.Suffix)" After="InstallFiles" Condition="VersionNT >= 602" /> |
| 58 | </InstallExecuteSequence> | 58 | </InstallExecuteSequence> |
| 59 | </Fragment> | 59 | </Fragment> |
| 60 | 60 | ||