aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Firewall/wixlib
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2024-02-16 18:34:12 -0500
committerBob Arnson <github@bobs.org>2024-02-16 19:20:19 -0500
commit3fa17617b89d62103cc35b37424ab6fa5b9f08be (patch)
tree4ffc6886599280ae558c2175f63ccb66419b1dea /src/ext/Firewall/wixlib
parenteb2f85d7ee5ad5c91af0943ffe936ee8ccfdab0d (diff)
downloadwix-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/Firewall/wixlib')
-rw-r--r--src/ext/Firewall/wixlib/FirewallExtension_Platform.wxi7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ext/Firewall/wixlib/FirewallExtension_Platform.wxi b/src/ext/Firewall/wixlib/FirewallExtension_Platform.wxi
index 736a54b0..e78a7fcc 100644
--- a/src/ext/Firewall/wixlib/FirewallExtension_Platform.wxi
+++ b/src/ext/Firewall/wixlib/FirewallExtension_Platform.wxi
@@ -5,6 +5,7 @@
5 5
6 <Fragment> 6 <Fragment>
7 <UIRef Id="WixFirewallErrors" /> 7 <UIRef Id="WixFirewallErrors" />
8
8 <UI> 9 <UI>
9 <ProgressText Action="$(var.Prefix5)SchedFirewallExceptionsInstall$(var.Suffix)" Message="!(loc.WixSchedFirewallExceptionsInstall)" /> 10 <ProgressText Action="$(var.Prefix5)SchedFirewallExceptionsInstall$(var.Suffix)" Message="!(loc.WixSchedFirewallExceptionsInstall)" />
10 <ProgressText Action="$(var.Prefix5)SchedFirewallExceptionsUninstall$(var.Suffix)" Message="!(loc.WixSchedFirewallExceptionsUninstall)" /> 11 <ProgressText Action="$(var.Prefix5)SchedFirewallExceptionsUninstall$(var.Suffix)" Message="!(loc.WixSchedFirewallExceptionsUninstall)" />
@@ -22,11 +23,11 @@
22 <CustomAction Id="$(var.Prefix5)ExecFirewallExceptionsUninstall$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix5)FWCA$(var.Suffix)" /> 23 <CustomAction Id="$(var.Prefix5)ExecFirewallExceptionsUninstall$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix5)FWCA$(var.Suffix)" />
23 24
24 <!-- 25 <!--
25 We need the firewall on Windows Vista or later. 26 We need the firewall on Windows Vista or later.
26 --> 27 -->
27 <InstallExecuteSequence> 28 <InstallExecuteSequence>
28 <Custom Action="$(var.Prefix5)SchedFirewallExceptionsUninstall$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="VersionNT &gt;= 600" /> 29 <Custom Action="virtual $(var.Prefix5)SchedFirewallExceptionsUninstall$(var.Suffix)" Before="RemoveFiles" Condition="VersionNT &gt;= 600" />
29 <Custom Action="$(var.Prefix5)SchedFirewallExceptionsInstall$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT &gt;= 600" /> 30 <Custom Action="virtual $(var.Prefix5)SchedFirewallExceptionsInstall$(var.Suffix)" After="InstallFiles" Condition="VersionNT &gt;= 600" />
30 </InstallExecuteSequence> 31 </InstallExecuteSequence>
31 </Fragment> 32 </Fragment>
32 33