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/Iis/wixlib | |
| 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/Iis/wixlib')
| -rw-r--r-- | src/ext/Iis/wixlib/IIsExtension_Platform.wxi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ext/Iis/wixlib/IIsExtension_Platform.wxi b/src/ext/Iis/wixlib/IIsExtension_Platform.wxi index d3a52b80..92439f5b 100644 --- a/src/ext/Iis/wixlib/IIsExtension_Platform.wxi +++ b/src/ext/Iis/wixlib/IIsExtension_Platform.wxi | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 5 | <?include ..\..\caDecor.wxi ?> | 5 | <?include ..\..\caDecor.wxi ?> |
| 6 | 6 | ||
| 7 | <Fragment> | 7 | <Fragment> |
| 8 | <UIRef Id="WixIIsErrors" /> | 8 | <UIRef Id="WixIIsErrors" /> |
| 9 | <UI> | 9 | <UI> |
| @@ -35,7 +35,7 @@ | |||
| 35 | <CustomAction Id="$(var.Prefix)WriteIIS7ConfigChanges$(var.Suffix)" DllEntry="WriteIIS7ConfigChanges" Impersonate="no" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" BinaryRef="IisCA$(var.Suffix)" /> | 35 | <CustomAction Id="$(var.Prefix)WriteIIS7ConfigChanges$(var.Suffix)" DllEntry="WriteIIS7ConfigChanges" Impersonate="no" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" BinaryRef="IisCA$(var.Suffix)" /> |
| 36 | 36 | ||
| 37 | <InstallExecuteSequence> | 37 | <InstallExecuteSequence> |
| 38 | <Custom Action="$(var.Prefix)ConfigureIIs$(var.Suffix)" Before="RegisterUser" Overridable="yes" Condition="NOT SKIPCONFIGUREIIS AND VersionNT > 400" /> | 38 | <Custom Action="virtual $(var.Prefix)ConfigureIIs$(var.Suffix)" Before="RegisterUser" Condition="NOT SKIPCONFIGUREIIS AND VersionNT > 400" /> |
| 39 | </InstallExecuteSequence> | 39 | </InstallExecuteSequence> |
| 40 | </Fragment> | 40 | </Fragment> |
| 41 | 41 | ||
| @@ -58,8 +58,8 @@ | |||
| 58 | <CustomAction Id="$(var.Prefix)RollbackDeleteMachineCertificate$(var.Suffix)" DllEntry="AddMachineCertificate" Impersonate="no" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" BinaryRef="IisCA$(var.Suffix)" /> | 58 | <CustomAction Id="$(var.Prefix)RollbackDeleteMachineCertificate$(var.Suffix)" DllEntry="AddMachineCertificate" Impersonate="no" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" BinaryRef="IisCA$(var.Suffix)" /> |
| 59 | 59 | ||
| 60 | <InstallExecuteSequence> | 60 | <InstallExecuteSequence> |
| 61 | <Custom Action="$(var.Prefix)UninstallCertificates$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="VersionNT > 400" /> | 61 | <Custom Action="virtual $(var.Prefix)UninstallCertificates$(var.Suffix)" Before="RemoveFiles" Condition="VersionNT > 400" /> |
| 62 | <Custom Action="$(var.Prefix)InstallCertificates$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT > 400" /> | 62 | <Custom Action="virtual $(var.Prefix)InstallCertificates$(var.Suffix)" After="InstallFiles" Condition="VersionNT > 400" /> |
| 63 | </InstallExecuteSequence> | 63 | </InstallExecuteSequence> |
| 64 | </Fragment> | 64 | </Fragment> |
| 65 | 65 | ||