aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Dependency/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/Dependency/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/Dependency/wixlib')
-rw-r--r--src/ext/Dependency/wixlib/DependencyExtension_Platform.wxi14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/ext/Dependency/wixlib/DependencyExtension_Platform.wxi b/src/ext/Dependency/wixlib/DependencyExtension_Platform.wxi
index e1feea28..5b88b13f 100644
--- a/src/ext/Dependency/wixlib/DependencyExtension_Platform.wxi
+++ b/src/ext/Dependency/wixlib/DependencyExtension_Platform.wxi
@@ -3,25 +3,29 @@
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 <CustomAction Id="$(var.Prefix)DependencyRequire$(var.Suffix)" DllEntry="WixDependencyRequire" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" /> 8 <CustomAction Id="$(var.Prefix)DependencyRequire$(var.Suffix)" DllEntry="WixDependencyRequire" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" />
9 <InstallExecuteSequence> 9 <InstallExecuteSequence>
10 <Custom Action="$(var.Prefix)DependencyRequire$(var.Suffix)" Before="$(var.Prefix)DependencyCheck$(var.Suffix)" Overridable="yes" Condition="NOT DISABLEDEPENDENCYCHECK" /> 10 <Custom Action="virtual $(var.Prefix)DependencyRequire$(var.Suffix)" Before="$(var.Prefix)DependencyCheck$(var.Suffix)" Condition="NOT DISABLEDEPENDENCYCHECK" />
11 </InstallExecuteSequence> 11 </InstallExecuteSequence>
12
12 <UIRef Id="WixDependencyErrors" /> 13 <UIRef Id="WixDependencyErrors" />
14
13 <PropertyRef Id="DISABLEDEPENDENCYCHECK" /> 15 <PropertyRef Id="DISABLEDEPENDENCYCHECK" />
14 </Fragment> 16 </Fragment>
15 17
16 <Fragment> 18 <Fragment>
17 <CustomAction Id="$(var.Prefix)DependencyCheck$(var.Suffix)" DllEntry="WixDependencyCheck" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" /> 19 <CustomAction Id="$(var.Prefix)DependencyCheck$(var.Suffix)" DllEntry="WixDependencyCheck" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" />
18 <InstallExecuteSequence> 20 <InstallExecuteSequence>
19 <Custom Action="$(var.Prefix)DependencyCheck$(var.Suffix)" Before="InstallInitialize" Overridable="yes" Condition="(REMOVE OR MsiPatchRemovalList) AND NOT (UPGRADINGPRODUCTCODE OR IGNOREDEPENDENCIES=&quot;ALL&quot;)" /> 21 <Custom Action="virtual $(var.Prefix)DependencyCheck$(var.Suffix)" Before="InstallInitialize" Condition="(REMOVE OR MsiPatchRemovalList) AND NOT (UPGRADINGPRODUCTCODE OR IGNOREDEPENDENCIES=&quot;ALL&quot;)" />
20 </InstallExecuteSequence> 22 </InstallExecuteSequence>
23
21 <UIRef Id="WixDependencyErrors" /> 24 <UIRef Id="WixDependencyErrors" />
25
22 <PropertyRef Id="IGNOREDEPENDENCIES" /> 26 <PropertyRef Id="IGNOREDEPENDENCIES" />
23 </Fragment> 27 </Fragment>
24 28
25 <Fragment> 29 <Fragment>
26 <Binary Id="DependencyCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))dependencyca.dll" /> 30 <Binary Id="DependencyCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))dependencyca.dll" />
27 </Fragment> 31 </Fragment>