Switch to `virtual` access modifiers...
...from `Overridable="yes"`. Fixes https://github.com/wixtoolset/issues/issues/7981 for WiX v5.
Bob Arnson committed
Feb 16, 2024 at 18:34 UTC
3fa17617b89d62103cc35b37424ab6fa5b9f08be
11 files changed
+79
-74
src/ext/ComPlus/wixlib/ComPlusExtension_Platform.wxi
+2
-2
@@ -33,8 +33,8 @@
33
<Property Id="$(var.Prefix)ComPlusUninstallCommit$(var.Suffix)" Hidden="yes" SuppressModularization="yes" />
34
35
<InstallExecuteSequence>
36
- <Custom Action="$(var.Prefix)ConfigureComPlusUninstall$(var.Suffix)" After="DeleteServices" Overridable="yes" Condition="VersionNT >= 500" />
37
- <Custom Action="$(var.Prefix)ConfigureComPlusInstall$(var.Suffix)" Before="InstallServices" Overridable="yes" Condition="VersionNT >= 500" />
36
+ <Custom Action="virtual $(var.Prefix)ConfigureComPlusUninstall$(var.Suffix)" After="DeleteServices" Condition="VersionNT >= 500" />
37
+ <Custom Action="virtual $(var.Prefix)ConfigureComPlusInstall$(var.Suffix)" Before="InstallServices" Condition="VersionNT >= 500" />
38
</InstallExecuteSequence>
39
</Fragment>
40
src/ext/Dependency/wixlib/DependencyExtension_Platform.wxi
+9
-5
@@ -3,25 +3,29 @@
3
4
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
<?include ..\..\caDecor.wxi ?>
6
-
6
+
7
<Fragment>
8
<CustomAction Id="$(var.Prefix)DependencyRequire$(var.Suffix)" DllEntry="WixDependencyRequire" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" />
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>
12
+
13
<UIRef Id="WixDependencyErrors" />
14
+
15
<PropertyRef Id="DISABLEDEPENDENCYCHECK" />
16
</Fragment>
15
-
17
+
18
<Fragment>
19
<CustomAction Id="$(var.Prefix)DependencyCheck$(var.Suffix)" DllEntry="WixDependencyCheck" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" />
20
<InstallExecuteSequence>
19
- <Custom Action="$(var.Prefix)DependencyCheck$(var.Suffix)" Before="InstallInitialize" Overridable="yes" Condition="(REMOVE OR MsiPatchRemovalList) AND NOT (UPGRADINGPRODUCTCODE OR IGNOREDEPENDENCIES="ALL")" />
21
+ <Custom Action="virtual $(var.Prefix)DependencyCheck$(var.Suffix)" Before="InstallInitialize" Condition="(REMOVE OR MsiPatchRemovalList) AND NOT (UPGRADINGPRODUCTCODE OR IGNOREDEPENDENCIES="ALL")" />
22
</InstallExecuteSequence>
23
+
24
<UIRef Id="WixDependencyErrors" />
25
+
26
<PropertyRef Id="IGNOREDEPENDENCIES" />
27
</Fragment>
24
-
28
+
29
<Fragment>
30
<Binary Id="DependencyCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))dependencyca.dll" />
31
</Fragment>
src/ext/DirectX/wixlib/DirectXExtension_Platform.wxi
+3
-3
@@ -11,13 +11,13 @@
11
12
<Fragment>
13
<CustomAction Id="$(var.Prefix)QueryDirectXCaps$(var.Suffix)" DllEntry="WixQueryDirectXCaps" Return="ignore" BinaryRef="$(var.Prefix)DXCA$(var.Suffix)" />
14
-
14
+
15
<InstallUISequence>
16
- <Custom Action="$(var.Prefix)QueryDirectXCaps$(var.Suffix)" Before="LaunchConditions" Overridable="yes" />
16
+ <Custom Action="virtual $(var.Prefix)QueryDirectXCaps$(var.Suffix)" Before="LaunchConditions" />
17
</InstallUISequence>
18
19
<InstallExecuteSequence>
20
- <Custom Action="$(var.Prefix)QueryDirectXCaps$(var.Suffix)" Before="LaunchConditions" Overridable="yes" />
20
+ <Custom Action="virtual $(var.Prefix)QueryDirectXCaps$(var.Suffix)" Before="LaunchConditions" />
21
</InstallExecuteSequence>
22
</Fragment>
23
</Include>
src/ext/Firewall/wixlib/FirewallExtension_Platform.wxi
+4
-3
@@ -5,6 +5,7 @@
5
6
<Fragment>
7
<UIRef Id="WixFirewallErrors" />
8
+
9
<UI>
10
<ProgressText Action="$(var.Prefix5)SchedFirewallExceptionsInstall$(var.Suffix)" Message="!(loc.WixSchedFirewallExceptionsInstall)" />
11
<ProgressText Action="$(var.Prefix5)SchedFirewallExceptionsUninstall$(var.Suffix)" Message="!(loc.WixSchedFirewallExceptionsUninstall)" />
@@ -22,11 +23,11 @@
23
<CustomAction Id="$(var.Prefix5)ExecFirewallExceptionsUninstall$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix5)FWCA$(var.Suffix)" />
24
25
<!--
25
- We need the firewall on Windows Vista or later.
26
+ We need the firewall on Windows Vista or later.
27
-->
28
<InstallExecuteSequence>
28
- <Custom Action="$(var.Prefix5)SchedFirewallExceptionsUninstall$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="VersionNT >= 600" />
29
- <Custom Action="$(var.Prefix5)SchedFirewallExceptionsInstall$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT >= 600" />
29
+ <Custom Action="virtual $(var.Prefix5)SchedFirewallExceptionsUninstall$(var.Suffix)" Before="RemoveFiles" Condition="VersionNT >= 600" />
30
+ <Custom Action="virtual $(var.Prefix5)SchedFirewallExceptionsInstall$(var.Suffix)" After="InstallFiles" Condition="VersionNT >= 600" />
31
</InstallExecuteSequence>
32
</Fragment>
33
src/ext/Http/wixlib/HttpExtension_Platform.wxi
+4
-4
@@ -26,8 +26,8 @@
26
We need the HTTP server on Windows XP SP2 or later.
27
-->
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)))" />
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)))" />
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="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>
32
</Fragment>
33
@@ -53,8 +53,8 @@
53
We need HTTP.SYS on Windows 8 or later for SNI SSL support.
54
-->
55
<InstallExecuteSequence>
56
- <Custom Action="$(var.Prefix)SchedHttpSniSslCertsUninstall$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="VersionNT >= 602" />
57
- <Custom Action="$(var.Prefix)SchedHttpSniSslCertsInstall$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT >= 602" />
56
+ <Custom Action="virtual $(var.Prefix)SchedHttpSniSslCertsUninstall$(var.Suffix)" Before="RemoveFiles" Condition="VersionNT >= 602" />
57
+ <Custom Action="virtual $(var.Prefix)SchedHttpSniSslCertsInstall$(var.Suffix)" After="InstallFiles" Condition="VersionNT >= 602" />
58
</InstallExecuteSequence>
59
</Fragment>
60
src/ext/Iis/wixlib/IIsExtension_Platform.wxi
+4
-4
@@ -3,7 +3,7 @@
3
4
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
<?include ..\..\caDecor.wxi ?>
6
-
6
+
7
<Fragment>
8
<UIRef Id="WixIIsErrors" />
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)" />
36
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>
40
</Fragment>
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)" />
59
60
<InstallExecuteSequence>
61
- <Custom Action="$(var.Prefix)UninstallCertificates$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="VersionNT > 400" />
62
- <Custom Action="$(var.Prefix)InstallCertificates$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT > 400" />
61
+ <Custom Action="virtual $(var.Prefix)UninstallCertificates$(var.Suffix)" Before="RemoveFiles" Condition="VersionNT > 400" />
62
+ <Custom Action="virtual $(var.Prefix)InstallCertificates$(var.Suffix)" After="InstallFiles" Condition="VersionNT > 400" />
63
</InstallExecuteSequence>
64
</Fragment>
65
src/ext/Msmq/wixlib/MsmqExtension_Platform.wxi
+2
-2
@@ -15,8 +15,8 @@
15
<CustomAction Id="$(var.Prefix)MessageQueuingRollbackUninstall$(var.Suffix)" DllEntry="MessageQueuingRollbackUninstall" Execute="rollback" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="$(var.Prefix)MsmqCA$(var.Suffix)" />
16
17
<InstallExecuteSequence>
18
- <Custom Action="$(var.Prefix)MessageQueuingUninstall$(var.Suffix)" After="DeleteServices" Overridable="yes" Condition="VersionNT >= 500" />
19
- <Custom Action="$(var.Prefix)MessageQueuingInstall$(var.Suffix)" Before="InstallServices" Overridable="yes" Condition="VersionNT >= 500" />
18
+ <Custom Action="virtual $(var.Prefix)MessageQueuingUninstall$(var.Suffix)" After="DeleteServices" Condition="VersionNT >= 500" />
19
+ <Custom Action="virtual $(var.Prefix)MessageQueuingInstall$(var.Suffix)" Before="InstallServices" Condition="VersionNT >= 500" />
20
</InstallExecuteSequence>
21
</Fragment>
22
src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi
+7
-7
@@ -12,11 +12,11 @@
12
<CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" DllEntry="ExecNetFx" Execute="commit" Impersonate="no" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" />
13
14
<InstallExecuteSequence>
15
- <Custom Action="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" Before="InstallFiles" Overridable="yes" />
16
- <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" After="MsiPublishAssemblies" Overridable="yes" Condition="RollbackDisabled <> 1" />
17
- <Custom Action="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled = 1" />
18
- <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled <> 1" />
19
- <Custom Action="$(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled = 1" />
15
+ <Custom Action="virtual $(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" Before="InstallFiles" />
16
+ <Custom Action="virtual $(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" After="MsiPublishAssemblies" Condition="RollbackDisabled <> 1" />
17
+ <Custom Action="virtual $(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" Condition="RollbackDisabled = 1" />
18
+ <Custom Action="virtual $(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" Condition="RollbackDisabled <> 1" />
19
+ <Custom Action="virtual $(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" Condition="RollbackDisabled = 1" />
20
</InstallExecuteSequence>
21
</Fragment>
22
@@ -28,11 +28,11 @@
28
<CustomAction Id="$(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" DllEntry="DotNetCompatibilityCheck" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" />
29
30
<InstallExecuteSequence>
31
- <Custom Action="$(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" Before="LaunchConditions" Overridable="yes" />
31
+ <Custom Action="virtual $(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" Before="LaunchConditions" />
32
</InstallExecuteSequence>
33
34
<InstallUISequence>
35
- <Custom Action="$(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" Before="LaunchConditions" Overridable="yes" />
35
+ <Custom Action="virtual $(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" Before="LaunchConditions" />
36
</InstallUISequence>
37
38
<Binary Id="$(var.Prefix)NetCheck_x86" SourceFile="!(bindpath.x86)NetCoreCheck.exe" />
src/ext/Sql/wixlib/SqlExtension.wxi
+2
-2
@@ -23,8 +23,8 @@
23
<CustomAction Id="$(var.Prefix)RollbackExecuteSqlStrings$(var.Suffix)" DllEntry="ExecuteSqlStrings" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" BinaryRef="SqlCA$(var.Suffix)" />
24
25
<InstallExecuteSequence>
26
- <Custom Action="$(var.Prefix)UninstallSqlData$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="NOT SKIPUNINSTALLSQLDATA AND VersionNT > 400" />
27
- <Custom Action="$(var.Prefix)InstallSqlData$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="NOT SKIPINSTALLSQLDATA AND VersionNT > 400" />
26
+ <Custom Action="virtual $(var.Prefix)UninstallSqlData$(var.Suffix)" Before="RemoveFiles" Condition="NOT SKIPUNINSTALLSQLDATA AND VersionNT > 400" />
27
+ <Custom Action="virtual $(var.Prefix)InstallSqlData$(var.Suffix)" After="InstallFiles" Condition="NOT SKIPINSTALLSQLDATA AND VersionNT > 400" />
28
</InstallExecuteSequence>
29
</Fragment>
30
src/ext/Util/wixlib/UtilExtension_Platform.wxi
+40
-40
@@ -8,7 +8,7 @@
8
<CustomAction Id="$(var.Prefix)FailWhenDeferred$(var.Suffix)" DllEntry="WixFailWhenDeferred" Execute="deferred" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
9
10
<InstallExecuteSequence>
11
- <Custom Action="$(var.Prefix)FailWhenDeferred$(var.Suffix)" Before="InstallFinalize" Overridable="yes" Condition="WIXFAILWHENDEFERRED=1 AND VersionNT > 400" />
11
+ <Custom Action="virtual $(var.Prefix)FailWhenDeferred$(var.Suffix)" Before="InstallFinalize" Condition="WIXFAILWHENDEFERRED=1 AND VersionNT > 400" />
12
</InstallExecuteSequence>
13
</Fragment>
14
@@ -16,7 +16,7 @@
16
<CustomAction Id="$(var.Prefix)WaitForEvent$(var.Suffix)" DllEntry="WixWaitForEvent" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
17
18
<InstallExecuteSequence>
19
- <Custom Action="$(var.Prefix)WaitForEvent$(var.Suffix)" Before="InstallFinalize" Overridable="yes" />
19
+ <Custom Action="virtual $(var.Prefix)WaitForEvent$(var.Suffix)" Before="InstallFinalize" />
20
</InstallExecuteSequence>
21
</Fragment>
22
@@ -24,7 +24,7 @@
24
<CustomAction Id="$(var.Prefix)WaitForEventDeferred$(var.Suffix)" DllEntry="WixWaitForEvent" Execute="deferred" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
25
26
<InstallExecuteSequence>
27
- <Custom Action="$(var.Prefix)WaitForEventDeferred$(var.Suffix)" After="InstallInitialize" Overridable="yes" />
27
+ <Custom Action="virtual $(var.Prefix)WaitForEventDeferred$(var.Suffix)" After="InstallInitialize" />
28
</InstallExecuteSequence>
29
</Fragment>
30
@@ -32,7 +32,7 @@
32
<CustomAction Id="$(var.Prefix)ExitEarlyWithSuccess$(var.Suffix)" DllEntry="WixExitEarlyWithSuccess" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
33
34
<InstallExecuteSequence>
35
- <Custom Action="$(var.Prefix)ExitEarlyWithSuccess$(var.Suffix)" After="FindRelatedProducts" Overridable="yes" Condition="NEWERVERSIONDETECTED AND VersionNT > 400" />
35
+ <Custom Action="virtual $(var.Prefix)ExitEarlyWithSuccess$(var.Suffix)" After="FindRelatedProducts" Condition="NEWERVERSIONDETECTED AND VersionNT > 400" />
36
</InstallExecuteSequence>
37
</Fragment>
38
@@ -56,7 +56,7 @@
56
<CustomAction Id="$(var.Prefix)BroadcastSettingChange$(var.Suffix)" DllEntry="WixBroadcastSettingChange" Execute="immediate" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
57
58
<InstallExecuteSequence>
59
- <Custom Action="$(var.Prefix)BroadcastSettingChange$(var.Suffix)" After="InstallFinalize" Overridable="yes" />
59
+ <Custom Action="virtual $(var.Prefix)BroadcastSettingChange$(var.Suffix)" After="InstallFinalize" />
60
</InstallExecuteSequence>
61
</Fragment>
62
@@ -64,7 +64,7 @@
64
<CustomAction Id="$(var.Prefix)BroadcastEnvironmentChange$(var.Suffix)" DllEntry="WixBroadcastEnvironmentChange" Execute="immediate" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
65
66
<InstallExecuteSequence>
67
- <Custom Action="$(var.Prefix)BroadcastEnvironmentChange$(var.Suffix)" After="InstallFinalize" Overridable="yes" />
67
+ <Custom Action="virtual $(var.Prefix)BroadcastEnvironmentChange$(var.Suffix)" After="InstallFinalize" />
68
</InstallExecuteSequence>
69
</Fragment>
70
@@ -110,7 +110,7 @@
110
111
<InstallExecuteSequence>
112
<!-- Condition this so it runs on install and MMode, but not uninstall -->
113
- <Custom Action="$(var.Prefix)CheckRebootRequired$(var.Suffix)" After="InstallFinalize" Overridable="yes" Condition="NOT REMOVE~="ALL" AND VersionNT > 400" />
113
+ <Custom Action="virtual $(var.Prefix)CheckRebootRequired$(var.Suffix)" After="InstallFinalize" Condition="NOT REMOVE~="ALL" AND VersionNT > 400" />
114
</InstallExecuteSequence>
115
</Fragment>
116
@@ -120,7 +120,7 @@
120
<CustomActionRef Id="$(var.Prefix)CheckRebootRequired$(var.Suffix)" />
121
122
<InstallExecuteSequence>
123
- <Custom Action="$(var.Prefix)CloseApplications$(var.Suffix)" Before="InstallFiles" Overridable="yes" Condition="VersionNT > 400" />
123
+ <Custom Action="virtual $(var.Prefix)CloseApplications$(var.Suffix)" Before="InstallFiles" Condition="VersionNT > 400" />
124
</InstallExecuteSequence>
125
</Fragment>
126
@@ -128,7 +128,7 @@
128
<CustomAction Id="$(var.Prefix)RegisterRestartResources$(var.Suffix)" DllEntry="WixRegisterRestartResources" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
129
130
<InstallExecuteSequence>
131
- <Custom Action="$(var.Prefix)RegisterRestartResources$(var.Suffix)" Before="InstallValidate" Overridable="yes" />
131
+ <Custom Action="virtual $(var.Prefix)RegisterRestartResources$(var.Suffix)" Before="InstallValidate" />
132
</InstallExecuteSequence>
133
</Fragment>
134
@@ -142,7 +142,7 @@
142
<CustomAction Id="$(var.Prefix)RemoveUser$(var.Suffix)" DllEntry="RemoveUser" Impersonate="no" Execute="commit" Return="ignore" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
143
144
<InstallExecuteSequence>
145
- <Custom Action="$(var.Prefix)ConfigureUsers$(var.Suffix)" Before="InstallFiles" Overridable="yes" Condition="VersionNT > 400" />
145
+ <Custom Action="virtual $(var.Prefix)ConfigureUsers$(var.Suffix)" Before="InstallFiles" Condition="VersionNT > 400" />
146
</InstallExecuteSequence>
147
</Fragment>
148
@@ -157,8 +157,8 @@
157
<CustomAction Id="$(var.Prefix)DropSmbRollback$(var.Suffix)" DllEntry="CreateSmb" Impersonate="no" Execute="rollback" Return="ignore" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
158
159
<InstallExecuteSequence>
160
- <Custom Action="$(var.Prefix)ConfigureSmbInstall$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT > 400" />
161
- <Custom Action="$(var.Prefix)ConfigureSmbUninstall$(var.Suffix)" After="RemoveFiles" Overridable="yes" Condition="VersionNT > 400" />
160
+ <Custom Action="virtual $(var.Prefix)ConfigureSmbInstall$(var.Suffix)" After="InstallFiles" Condition="VersionNT > 400" />
161
+ <Custom Action="virtual $(var.Prefix)ConfigureSmbUninstall$(var.Suffix)" After="RemoveFiles" Condition="VersionNT > 400" />
162
</InstallExecuteSequence>
163
</Fragment>
164
@@ -173,8 +173,8 @@
173
<CustomAction Id="$(var.Prefix)RollbackUnregisterPerfCounterData$(var.Suffix)" DllEntry="RegisterPerfCounterData" Impersonate="no" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
174
175
<InstallExecuteSequence>
176
- <Custom Action="$(var.Prefix)InstallPerfCounterData$(var.Suffix)" After="WriteRegistryValues" Overridable="yes" Condition="VersionNT > 400" />
177
- <Custom Action="$(var.Prefix)UninstallPerfCounterData$(var.Suffix)" Before="RemoveRegistryValues" Overridable="yes" Condition="VersionNT > 400" />
176
+ <Custom Action="virtual $(var.Prefix)InstallPerfCounterData$(var.Suffix)" After="WriteRegistryValues" Condition="VersionNT > 400" />
177
+ <Custom Action="virtual $(var.Prefix)UninstallPerfCounterData$(var.Suffix)" Before="RemoveRegistryValues" Condition="VersionNT > 400" />
178
</InstallExecuteSequence>
179
</Fragment>
180
@@ -189,8 +189,8 @@
189
<CustomAction Id="$(var.Prefix)RollbackUnregisterPerfmon$(var.Suffix)" DllEntry="RegisterPerfmon" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
190
191
<InstallExecuteSequence>
192
- <Custom Action="$(var.Prefix)ConfigurePerfmonInstall$(var.Suffix)" After="WriteRegistryValues" Overridable="yes" Condition="VersionNT > 400" />
193
- <Custom Action="$(var.Prefix)ConfigurePerfmonUninstall$(var.Suffix)" Before="RemoveRegistryValues" Overridable="yes" Condition="VersionNT > 400" />
192
+ <Custom Action="virtual $(var.Prefix)ConfigurePerfmonInstall$(var.Suffix)" After="WriteRegistryValues" Condition="VersionNT > 400" />
193
+ <Custom Action="virtual $(var.Prefix)ConfigurePerfmonUninstall$(var.Suffix)" Before="RemoveRegistryValues" Condition="VersionNT > 400" />
194
</InstallExecuteSequence>
195
</Fragment>
196
@@ -203,8 +203,8 @@
203
<CustomAction Id="$(var.Prefix)RollbackUnregisterPerfmonManifest$(var.Suffix)" DllEntry="WixQuietExec" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
204
205
<InstallExecuteSequence>
206
- <Custom Action="$(var.Prefix)ConfigurePerfmonManifestRegister$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT > 400" />
207
- <Custom Action="$(var.Prefix)ConfigurePerfmonManifestUnregister$(var.Suffix)" After="RemoveRegistryValues" Overridable="yes" Condition="VersionNT > 400" />
206
+ <Custom Action="virtual $(var.Prefix)ConfigurePerfmonManifestRegister$(var.Suffix)" After="InstallFiles" Condition="VersionNT > 400" />
207
+ <Custom Action="virtual $(var.Prefix)ConfigurePerfmonManifestUnregister$(var.Suffix)" After="RemoveRegistryValues" Condition="VersionNT > 400" />
208
</InstallExecuteSequence>
209
</Fragment>
210
@@ -217,8 +217,8 @@
217
<CustomAction Id="$(var.Prefix)RollbackUnregisterEventManifest$(var.Suffix)" DllEntry="WixQuietExec" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
218
219
<InstallExecuteSequence>
220
- <Custom Action="$(var.Prefix)ConfigureEventManifestRegister$(var.Suffix)" After="$(var.Prefix)SchedXmlFile$(var.Suffix)" Overridable="yes" Condition="VersionNT > 400" />
221
- <Custom Action="$(var.Prefix)ConfigureEventManifestUnregister$(var.Suffix)" After="RemoveRegistryValues" Overridable="yes" Condition="VersionNT > 400" />
220
+ <Custom Action="virtual $(var.Prefix)ConfigureEventManifestRegister$(var.Suffix)" After="$(var.Prefix)SchedXmlFile$(var.Suffix)" Condition="VersionNT > 400" />
221
+ <Custom Action="virtual $(var.Prefix)ConfigureEventManifestUnregister$(var.Suffix)" After="RemoveRegistryValues" Condition="VersionNT > 400" />
222
</InstallExecuteSequence>
223
</Fragment>
224
@@ -229,7 +229,7 @@
229
230
<InstallExecuteSequence>
231
<!-- Condition this so it runs on install and MMode, but not uninstall -->
232
- <Custom Action="$(var.Prefix)SchedServiceConfig$(var.Suffix)" After="InstallServices" Overridable="yes" Condition="NOT REMOVE~="ALL" AND VersionNT > 400" />
232
+ <Custom Action="virtual $(var.Prefix)SchedServiceConfig$(var.Suffix)" After="InstallServices" Condition="NOT REMOVE~="ALL" AND VersionNT > 400" />
233
</InstallExecuteSequence>
234
</Fragment>
235
@@ -240,8 +240,8 @@
240
<CustomAction Id="$(var.Prefix)RollbackTouchFile$(var.Suffix)" DllEntry="WixExecuteTouchFile" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
241
242
<InstallExecuteSequence>
243
- <Custom Action="$(var.Prefix)TouchFileDuringUninstall$(var.Suffix)" Before="RemoveFiles" Overridable="yes" />
244
- <Custom Action="$(var.Prefix)TouchFileDuringInstall$(var.Suffix)" After="InstallFiles" Overridable="yes" />
243
+ <Custom Action="virtual $(var.Prefix)TouchFileDuringUninstall$(var.Suffix)" Before="RemoveFiles" />
244
+ <Custom Action="virtual $(var.Prefix)TouchFileDuringInstall$(var.Suffix)" After="InstallFiles" />
245
</InstallExecuteSequence>
246
</Fragment>
247
@@ -253,7 +253,7 @@
253
<CustomAction Id="$(var.Prefix)ExecXmlFileRollback$(var.Suffix)" DllEntry="ExecXmlFileRollback" Execute="rollback" Impersonate="no" Return="check" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
254
255
<InstallExecuteSequence>
256
- <Custom Action="$(var.Prefix)SchedXmlFile$(var.Suffix)" After="DuplicateFiles" Overridable="yes" Condition="VersionNT > 400" />
256
+ <Custom Action="virtual $(var.Prefix)SchedXmlFile$(var.Suffix)" After="DuplicateFiles" Condition="VersionNT > 400" />
257
</InstallExecuteSequence>
258
</Fragment>
259
@@ -265,7 +265,7 @@
265
<CustomAction Id="$(var.Prefix)ExecXmlConfigRollback$(var.Suffix)" DllEntry="ExecXmlConfigRollback" Execute="rollback" Impersonate="no" Return="check" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
266
267
<InstallExecuteSequence>
268
- <Custom Action="$(var.Prefix)SchedXmlConfig$(var.Suffix)" After="DuplicateFiles" Overridable="yes" Condition="VersionNT > 400" />
268
+ <Custom Action="virtual $(var.Prefix)SchedXmlConfig$(var.Suffix)" After="DuplicateFiles" Condition="VersionNT > 400" />
269
</InstallExecuteSequence>
270
</Fragment>
271
@@ -275,9 +275,9 @@
275
<CustomAction Id="$(var.Prefix)CreateInternetShortcuts$(var.Suffix)" DllEntry="WixCreateInternetShortcuts" Impersonate="no" Execute="deferred" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
276
277
<InstallExecuteSequence>
278
- <Custom Action="$(var.Prefix)SchedInternetShortcuts$(var.Suffix)" Before="RemoveFolders" Overridable="yes" Condition="VersionNT > 400" />
279
- <Custom Action="$(var.Prefix)RollbackInternetShortcuts$(var.Suffix)" Before="$(var.Prefix)CreateInternetShortcuts$(var.Suffix)" Overridable="yes" Condition="VersionNT > 400" />
280
- <Custom Action="$(var.Prefix)CreateInternetShortcuts$(var.Suffix)" After="CreateShortcuts" Overridable="yes" Condition="VersionNT > 400" />
278
+ <Custom Action="virtual $(var.Prefix)SchedInternetShortcuts$(var.Suffix)" Before="RemoveFolders" Condition="VersionNT > 400" />
279
+ <Custom Action="virtual $(var.Prefix)RollbackInternetShortcuts$(var.Suffix)" Before="$(var.Prefix)CreateInternetShortcuts$(var.Suffix)" Condition="VersionNT > 400" />
280
+ <Custom Action="virtual $(var.Prefix)CreateInternetShortcuts$(var.Suffix)" After="CreateShortcuts" Condition="VersionNT > 400" />
281
</InstallExecuteSequence>
282
</Fragment>
283
@@ -291,8 +291,8 @@
291
292
<InstallExecuteSequence>
293
<!-- Condition this so it runs on install and MMode, but not uninstall -->
294
- <Custom Action="$(var.Prefix)SchedSecureObjects$(var.Suffix)" After="InstallServices" Overridable="yes" Condition="NOT REMOVE~="ALL" AND VersionNT > 400" />
295
- <Custom Action="$(var.Prefix)SchedSecureObjectsRollback$(var.Suffix)" After="UnpublishFeatures" Overridable="yes" Condition="VersionNT > 400" />
294
+ <Custom Action="virtual $(var.Prefix)SchedSecureObjects$(var.Suffix)" After="InstallServices" Condition="NOT REMOVE~="ALL" AND VersionNT > 400" />
295
+ <Custom Action="virtual $(var.Prefix)SchedSecureObjectsRollback$(var.Suffix)" After="UnpublishFeatures" Condition="VersionNT > 400" />
296
</InstallExecuteSequence>
297
</Fragment>
298
@@ -310,11 +310,11 @@
310
<CustomAction Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" DllEntry="WixQueryOsInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
311
312
<InstallExecuteSequence>
313
- <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
313
+ <Custom Action="virtual $(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
314
</InstallExecuteSequence>
315
316
<InstallUISequence>
317
- <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
317
+ <Custom Action="virtual $(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
318
</InstallUISequence>
319
</Fragment>
320
@@ -322,11 +322,11 @@
322
<CustomAction Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" DllEntry="WixQueryOsDirs" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
323
324
<InstallExecuteSequence>
325
- <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
325
+ <Custom Action="virtual $(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
326
</InstallExecuteSequence>
327
328
<InstallUISequence>
329
- <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
329
+ <Custom Action="virtual $(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
330
</InstallUISequence>
331
</Fragment>
332
@@ -334,11 +334,11 @@
334
<CustomAction Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" DllEntry="WixQueryOsWellKnownSID" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
335
336
<InstallExecuteSequence>
337
- <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
337
+ <Custom Action="virtual $(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
338
</InstallExecuteSequence>
339
340
<InstallUISequence>
341
- <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
341
+ <Custom Action="virtual $(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
342
</InstallUISequence>
343
</Fragment>
344
@@ -346,11 +346,11 @@
346
<CustomAction Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" DllEntry="WixQueryOsDriverInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
347
348
<InstallExecuteSequence>
349
- <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
349
+ <Custom Action="virtual $(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
350
</InstallExecuteSequence>
351
352
<InstallUISequence>
353
- <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
353
+ <Custom Action="virtual $(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
354
</InstallUISequence>
355
</Fragment>
356
@@ -358,11 +358,11 @@
358
<CustomAction Id="$(var.Prefix)QueryNativeMachine$(var.Suffix)" DllEntry="WixQueryNativeMachine" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
359
360
<InstallExecuteSequence>
361
- <Custom Action="$(var.Prefix)QueryNativeMachine$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
361
+ <Custom Action="virtual $(var.Prefix)QueryNativeMachine$(var.Suffix)" After="AppSearch" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
362
</InstallExecuteSequence>
363
364
<InstallUISequence>
365
- <Custom Action="$(var.Prefix)QueryNativeMachine$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
365
+ <Custom Action="virtual $(var.Prefix)QueryNativeMachine$(var.Suffix)" After="AppSearch" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
366
</InstallUISequence>
367
</Fragment>
368
src/ext/VisualStudio/wixlib/VSExtension_Platform.wxi
+2
-2
@@ -6,10 +6,10 @@
6
<Fragment>
7
<CustomAction Id="$(var.Prefix)VSFindInstances$(var.Suffix)" DllEntry="FindInstances" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="VSCA$(var.Suffix)" />
8
<InstallExecuteSequence>
9
- <Custom Action="$(var.Prefix)VSFindInstances$(var.Suffix)" Before="AppSearch" Overridable="yes" />
9
+ <Custom Action="virtual $(var.Prefix)VSFindInstances$(var.Suffix)" Before="AppSearch" />
10
</InstallExecuteSequence>
11
<InstallUISequence>
12
- <Custom Action="$(var.Prefix)VSFindInstances$(var.Suffix)" Before="AppSearch" Overridable="yes" />
12
+ <Custom Action="virtual $(var.Prefix)VSFindInstances$(var.Suffix)" Before="AppSearch" />
13
</InstallUISequence>
14
</Fragment>
15