From 3fa17617b89d62103cc35b37424ab6fa5b9f08be Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Fri, 16 Feb 2024 18:34:12 -0500
Subject: Switch to `virtual` access modifiers...

...from `Overridable="yes"`.

Fixes https://github.com/wixtoolset/issues/issues/7981 for WiX v5.
---
 .../ComPlus/wixlib/ComPlusExtension_Platform.wxi   |  4 +-
 .../wixlib/DependencyExtension_Platform.wxi        | 14 ++--
 .../DirectX/wixlib/DirectXExtension_Platform.wxi   |  6 +-
 .../Firewall/wixlib/FirewallExtension_Platform.wxi |  7 +-
 src/ext/Http/wixlib/HttpExtension_Platform.wxi     |  8 +--
 src/ext/Iis/wixlib/IIsExtension_Platform.wxi       |  8 +--
 src/ext/Msmq/wixlib/MsmqExtension_Platform.wxi     |  4 +-
 src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi   | 14 ++--
 src/ext/Sql/wixlib/SqlExtension.wxi                |  4 +-
 src/ext/Util/wixlib/UtilExtension_Platform.wxi     | 80 +++++++++++-----------
 .../VisualStudio/wixlib/VSExtension_Platform.wxi   |  4 +-
 11 files changed, 79 insertions(+), 74 deletions(-)

diff --git a/src/ext/ComPlus/wixlib/ComPlusExtension_Platform.wxi b/src/ext/ComPlus/wixlib/ComPlusExtension_Platform.wxi
index 7edae031..b0256ae1 100644
--- a/src/ext/ComPlus/wixlib/ComPlusExtension_Platform.wxi
+++ b/src/ext/ComPlus/wixlib/ComPlusExtension_Platform.wxi
@@ -33,8 +33,8 @@
     <Property Id="$(var.Prefix)ComPlusUninstallCommit$(var.Suffix)" Hidden="yes" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
-      <Custom Action="$(var.Prefix)ConfigureComPlusUninstall$(var.Suffix)" After="DeleteServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
-      <Custom Action="$(var.Prefix)ConfigureComPlusInstall$(var.Suffix)" Before="InstallServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
+      <Custom Action="virtual $(var.Prefix)ConfigureComPlusUninstall$(var.Suffix)" After="DeleteServices" Condition="VersionNT &gt;= 500" />
+      <Custom Action="virtual $(var.Prefix)ConfigureComPlusInstall$(var.Suffix)" Before="InstallServices" Condition="VersionNT &gt;= 500" />
     </InstallExecuteSequence>
   </Fragment>
 
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 @@
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?include ..\..\caDecor.wxi ?>
-    
+
     <Fragment>
         <CustomAction Id="$(var.Prefix)DependencyRequire$(var.Suffix)" DllEntry="WixDependencyRequire" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" />
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)DependencyRequire$(var.Suffix)" Before="$(var.Prefix)DependencyCheck$(var.Suffix)" Overridable="yes" Condition="NOT DISABLEDEPENDENCYCHECK" />
+            <Custom Action="virtual $(var.Prefix)DependencyRequire$(var.Suffix)" Before="$(var.Prefix)DependencyCheck$(var.Suffix)" Condition="NOT DISABLEDEPENDENCYCHECK" />
         </InstallExecuteSequence>
+
         <UIRef Id="WixDependencyErrors" />
+
         <PropertyRef Id="DISABLEDEPENDENCYCHECK" />
     </Fragment>
-    
+
     <Fragment>
         <CustomAction Id="$(var.Prefix)DependencyCheck$(var.Suffix)" DllEntry="WixDependencyCheck" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" />
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)DependencyCheck$(var.Suffix)" Before="InstallInitialize" Overridable="yes" Condition="(REMOVE OR MsiPatchRemovalList) AND NOT (UPGRADINGPRODUCTCODE OR IGNOREDEPENDENCIES=&quot;ALL&quot;)" />
+            <Custom Action="virtual $(var.Prefix)DependencyCheck$(var.Suffix)" Before="InstallInitialize" Condition="(REMOVE OR MsiPatchRemovalList) AND NOT (UPGRADINGPRODUCTCODE OR IGNOREDEPENDENCIES=&quot;ALL&quot;)" />
         </InstallExecuteSequence>
+
         <UIRef Id="WixDependencyErrors" />
+
         <PropertyRef Id="IGNOREDEPENDENCIES" />
     </Fragment>
-    
+
     <Fragment>
         <Binary Id="DependencyCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))dependencyca.dll" />
     </Fragment>
diff --git a/src/ext/DirectX/wixlib/DirectXExtension_Platform.wxi b/src/ext/DirectX/wixlib/DirectXExtension_Platform.wxi
index 317e75d4..efcaaad2 100644
--- a/src/ext/DirectX/wixlib/DirectXExtension_Platform.wxi
+++ b/src/ext/DirectX/wixlib/DirectXExtension_Platform.wxi
@@ -11,13 +11,13 @@
 
     <Fragment>
         <CustomAction Id="$(var.Prefix)QueryDirectXCaps$(var.Suffix)" DllEntry="WixQueryDirectXCaps" Return="ignore" BinaryRef="$(var.Prefix)DXCA$(var.Suffix)" />
-        
+
         <InstallUISequence>
-            <Custom Action="$(var.Prefix)QueryDirectXCaps$(var.Suffix)" Before="LaunchConditions" Overridable="yes" />
+            <Custom Action="virtual $(var.Prefix)QueryDirectXCaps$(var.Suffix)" Before="LaunchConditions" />
         </InstallUISequence>
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)QueryDirectXCaps$(var.Suffix)" Before="LaunchConditions" Overridable="yes" />
+            <Custom Action="virtual $(var.Prefix)QueryDirectXCaps$(var.Suffix)" Before="LaunchConditions" />
         </InstallExecuteSequence>
     </Fragment>
 </Include>
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 @@
 
     <Fragment>
         <UIRef Id="WixFirewallErrors" />
+
         <UI>
             <ProgressText Action="$(var.Prefix5)SchedFirewallExceptionsInstall$(var.Suffix)" Message="!(loc.WixSchedFirewallExceptionsInstall)" />
             <ProgressText Action="$(var.Prefix5)SchedFirewallExceptionsUninstall$(var.Suffix)" Message="!(loc.WixSchedFirewallExceptionsUninstall)" />
@@ -22,11 +23,11 @@
         <CustomAction Id="$(var.Prefix5)ExecFirewallExceptionsUninstall$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix5)FWCA$(var.Suffix)" />
 
         <!--
-            We need the firewall on Windows Vista or later.
+        We need the firewall on Windows Vista or later.
         -->
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix5)SchedFirewallExceptionsUninstall$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="VersionNT &gt;= 600" />
-            <Custom Action="$(var.Prefix5)SchedFirewallExceptionsInstall$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT &gt;= 600" />
+            <Custom Action="virtual $(var.Prefix5)SchedFirewallExceptionsUninstall$(var.Suffix)" Before="RemoveFiles" Condition="VersionNT &gt;= 600" />
+            <Custom Action="virtual $(var.Prefix5)SchedFirewallExceptionsInstall$(var.Suffix)" After="InstallFiles" Condition="VersionNT &gt;= 600" />
         </InstallExecuteSequence>
     </Fragment>
 
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 @@
             We need the HTTP server on Windows XP SP2 or later.
         -->
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)SchedHttpUrlReservationsUninstall$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="VersionNT &gt;= 600 OR (VersionNT &gt;= 501 AND ((MsiNTProductType = 1 AND ServicePackLevel &gt;= 2) OR (MsiNTProductType &gt; 1)))" />
-            <Custom Action="$(var.Prefix)SchedHttpUrlReservationsInstall$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT &gt;= 600 OR (VersionNT &gt;= 501 AND ((MsiNTProductType = 1 AND ServicePackLevel &gt;= 2) OR (MsiNTProductType &gt; 1)))" />
+            <Custom Action="virtual $(var.Prefix)SchedHttpUrlReservationsUninstall$(var.Suffix)" Before="RemoveFiles" Condition="VersionNT &gt;= 600 OR (VersionNT &gt;= 501 AND ((MsiNTProductType = 1 AND ServicePackLevel &gt;= 2) OR (MsiNTProductType &gt; 1)))" />
+            <Custom Action="virtual $(var.Prefix)SchedHttpUrlReservationsInstall$(var.Suffix)" After="InstallFiles" Condition="VersionNT &gt;= 600 OR (VersionNT &gt;= 501 AND ((MsiNTProductType = 1 AND ServicePackLevel &gt;= 2) OR (MsiNTProductType &gt; 1)))" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -53,8 +53,8 @@
             We need HTTP.SYS on Windows 8 or later for SNI SSL support.
         -->
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)SchedHttpSniSslCertsUninstall$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="VersionNT >= 602" />
-            <Custom Action="$(var.Prefix)SchedHttpSniSslCertsInstall$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT >= 602" />
+            <Custom Action="virtual $(var.Prefix)SchedHttpSniSslCertsUninstall$(var.Suffix)" Before="RemoveFiles" Condition="VersionNT >= 602" />
+            <Custom Action="virtual $(var.Prefix)SchedHttpSniSslCertsInstall$(var.Suffix)" After="InstallFiles" Condition="VersionNT >= 602" />
         </InstallExecuteSequence>
     </Fragment>
 
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 @@
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <?include ..\..\caDecor.wxi ?>
-  
+
   <Fragment>
     <UIRef Id="WixIIsErrors" />
     <UI>
@@ -35,7 +35,7 @@
     <CustomAction Id="$(var.Prefix)WriteIIS7ConfigChanges$(var.Suffix)" DllEntry="WriteIIS7ConfigChanges" Impersonate="no" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" BinaryRef="IisCA$(var.Suffix)" />
 
     <InstallExecuteSequence>
-      <Custom Action="$(var.Prefix)ConfigureIIs$(var.Suffix)" Before="RegisterUser" Overridable="yes" Condition="NOT SKIPCONFIGUREIIS AND VersionNT &gt; 400" />
+      <Custom Action="virtual $(var.Prefix)ConfigureIIs$(var.Suffix)" Before="RegisterUser" Condition="NOT SKIPCONFIGUREIIS AND VersionNT &gt; 400" />
     </InstallExecuteSequence>
   </Fragment>
 
@@ -58,8 +58,8 @@
     <CustomAction Id="$(var.Prefix)RollbackDeleteMachineCertificate$(var.Suffix)" DllEntry="AddMachineCertificate" Impersonate="no" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" BinaryRef="IisCA$(var.Suffix)" />
 
     <InstallExecuteSequence>
-      <Custom Action="$(var.Prefix)UninstallCertificates$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="VersionNT &gt; 400" />
-      <Custom Action="$(var.Prefix)InstallCertificates$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT &gt; 400" />
+      <Custom Action="virtual $(var.Prefix)UninstallCertificates$(var.Suffix)" Before="RemoveFiles" Condition="VersionNT &gt; 400" />
+      <Custom Action="virtual $(var.Prefix)InstallCertificates$(var.Suffix)" After="InstallFiles" Condition="VersionNT &gt; 400" />
     </InstallExecuteSequence>
   </Fragment>
 
diff --git a/src/ext/Msmq/wixlib/MsmqExtension_Platform.wxi b/src/ext/Msmq/wixlib/MsmqExtension_Platform.wxi
index 278bb3a8..60eaaf78 100644
--- a/src/ext/Msmq/wixlib/MsmqExtension_Platform.wxi
+++ b/src/ext/Msmq/wixlib/MsmqExtension_Platform.wxi
@@ -15,8 +15,8 @@
     <CustomAction Id="$(var.Prefix)MessageQueuingRollbackUninstall$(var.Suffix)" DllEntry="MessageQueuingRollbackUninstall" Execute="rollback" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="$(var.Prefix)MsmqCA$(var.Suffix)" />
 
     <InstallExecuteSequence>
-      <Custom Action="$(var.Prefix)MessageQueuingUninstall$(var.Suffix)" After="DeleteServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
-      <Custom Action="$(var.Prefix)MessageQueuingInstall$(var.Suffix)" Before="InstallServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
+      <Custom Action="virtual $(var.Prefix)MessageQueuingUninstall$(var.Suffix)" After="DeleteServices" Condition="VersionNT &gt;= 500" />
+      <Custom Action="virtual $(var.Prefix)MessageQueuingInstall$(var.Suffix)" Before="InstallServices" Condition="VersionNT &gt;= 500" />
     </InstallExecuteSequence>
   </Fragment>
 
diff --git a/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi b/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi
index ddafe769..725b2700 100644
--- a/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi
+++ b/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi
@@ -12,11 +12,11 @@
     <CustomAction Id="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" DllEntry="ExecNetFx" Execute="commit" Impersonate="no" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" />
 
     <InstallExecuteSequence>
-      <Custom Action="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" Before="InstallFiles" Overridable="yes" />
-      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" After="MsiPublishAssemblies" Overridable="yes" Condition="RollbackDisabled &lt;&gt; 1" />
-      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled = 1" />
-      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled &lt;&gt; 1" />
-      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled = 1" />
+      <Custom Action="virtual $(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" Before="InstallFiles" />
+      <Custom Action="virtual $(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" After="MsiPublishAssemblies" Condition="RollbackDisabled &lt;&gt; 1" />
+      <Custom Action="virtual $(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" Condition="RollbackDisabled = 1" />
+      <Custom Action="virtual $(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" Condition="RollbackDisabled &lt;&gt; 1" />
+      <Custom Action="virtual $(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" Condition="RollbackDisabled = 1" />
     </InstallExecuteSequence>
   </Fragment>
 
@@ -28,11 +28,11 @@
     <CustomAction Id="$(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" DllEntry="DotNetCompatibilityCheck" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" />
 
     <InstallExecuteSequence>
-      <Custom Action="$(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" Before="LaunchConditions" Overridable="yes" />
+      <Custom Action="virtual $(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" Before="LaunchConditions" />
     </InstallExecuteSequence>
 
     <InstallUISequence>
-      <Custom Action="$(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" Before="LaunchConditions" Overridable="yes" />
+      <Custom Action="virtual $(var.Prefix)NetFxDotNetCompatibilityCheck$(var.Suffix)" Before="LaunchConditions" />
     </InstallUISequence>
 
     <Binary Id="$(var.Prefix)NetCheck_x86" SourceFile="!(bindpath.x86)NetCoreCheck.exe" />
diff --git a/src/ext/Sql/wixlib/SqlExtension.wxi b/src/ext/Sql/wixlib/SqlExtension.wxi
index 13cb6178..a90c11bb 100644
--- a/src/ext/Sql/wixlib/SqlExtension.wxi
+++ b/src/ext/Sql/wixlib/SqlExtension.wxi
@@ -23,8 +23,8 @@
         <CustomAction Id="$(var.Prefix)RollbackExecuteSqlStrings$(var.Suffix)" DllEntry="ExecuteSqlStrings" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" BinaryRef="SqlCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)UninstallSqlData$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="NOT SKIPUNINSTALLSQLDATA AND VersionNT &gt; 400" />
-            <Custom Action="$(var.Prefix)InstallSqlData$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="NOT SKIPINSTALLSQLDATA AND VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)UninstallSqlData$(var.Suffix)" Before="RemoveFiles" Condition="NOT SKIPUNINSTALLSQLDATA AND VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)InstallSqlData$(var.Suffix)" After="InstallFiles" Condition="NOT SKIPINSTALLSQLDATA AND VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
diff --git a/src/ext/Util/wixlib/UtilExtension_Platform.wxi b/src/ext/Util/wixlib/UtilExtension_Platform.wxi
index 06f500f3..690c76c5 100644
--- a/src/ext/Util/wixlib/UtilExtension_Platform.wxi
+++ b/src/ext/Util/wixlib/UtilExtension_Platform.wxi
@@ -8,7 +8,7 @@
         <CustomAction Id="$(var.Prefix)FailWhenDeferred$(var.Suffix)" DllEntry="WixFailWhenDeferred" Execute="deferred" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)FailWhenDeferred$(var.Suffix)" Before="InstallFinalize" Overridable="yes" Condition="WIXFAILWHENDEFERRED=1 AND VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)FailWhenDeferred$(var.Suffix)" Before="InstallFinalize" Condition="WIXFAILWHENDEFERRED=1 AND VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -16,7 +16,7 @@
         <CustomAction Id="$(var.Prefix)WaitForEvent$(var.Suffix)" DllEntry="WixWaitForEvent" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)WaitForEvent$(var.Suffix)" Before="InstallFinalize" Overridable="yes" />
+            <Custom Action="virtual $(var.Prefix)WaitForEvent$(var.Suffix)" Before="InstallFinalize" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -24,7 +24,7 @@
         <CustomAction Id="$(var.Prefix)WaitForEventDeferred$(var.Suffix)" DllEntry="WixWaitForEvent" Execute="deferred" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)WaitForEventDeferred$(var.Suffix)" After="InstallInitialize" Overridable="yes" />
+            <Custom Action="virtual $(var.Prefix)WaitForEventDeferred$(var.Suffix)" After="InstallInitialize" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -32,7 +32,7 @@
         <CustomAction Id="$(var.Prefix)ExitEarlyWithSuccess$(var.Suffix)" DllEntry="WixExitEarlyWithSuccess" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)ExitEarlyWithSuccess$(var.Suffix)" After="FindRelatedProducts" Overridable="yes" Condition="NEWERVERSIONDETECTED AND VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)ExitEarlyWithSuccess$(var.Suffix)" After="FindRelatedProducts" Condition="NEWERVERSIONDETECTED AND VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -56,7 +56,7 @@
         <CustomAction Id="$(var.Prefix)BroadcastSettingChange$(var.Suffix)" DllEntry="WixBroadcastSettingChange" Execute="immediate" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)BroadcastSettingChange$(var.Suffix)" After="InstallFinalize" Overridable="yes" />
+            <Custom Action="virtual $(var.Prefix)BroadcastSettingChange$(var.Suffix)" After="InstallFinalize" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -64,7 +64,7 @@
         <CustomAction Id="$(var.Prefix)BroadcastEnvironmentChange$(var.Suffix)" DllEntry="WixBroadcastEnvironmentChange" Execute="immediate" Return="ignore" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)BroadcastEnvironmentChange$(var.Suffix)" After="InstallFinalize" Overridable="yes" />
+            <Custom Action="virtual $(var.Prefix)BroadcastEnvironmentChange$(var.Suffix)" After="InstallFinalize" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -110,7 +110,7 @@
 
         <InstallExecuteSequence>
             <!-- Condition this so it runs on install and MMode, but not uninstall -->
-            <Custom Action="$(var.Prefix)CheckRebootRequired$(var.Suffix)" After="InstallFinalize" Overridable="yes" Condition="NOT REMOVE~=&quot;ALL&quot; AND VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)CheckRebootRequired$(var.Suffix)" After="InstallFinalize" Condition="NOT REMOVE~=&quot;ALL&quot; AND VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -120,7 +120,7 @@
         <CustomActionRef Id="$(var.Prefix)CheckRebootRequired$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)CloseApplications$(var.Suffix)" Before="InstallFiles" Overridable="yes" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)CloseApplications$(var.Suffix)" Before="InstallFiles" Condition="VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -128,7 +128,7 @@
         <CustomAction Id="$(var.Prefix)RegisterRestartResources$(var.Suffix)" DllEntry="WixRegisterRestartResources" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)RegisterRestartResources$(var.Suffix)" Before="InstallValidate" Overridable="yes" />
+            <Custom Action="virtual $(var.Prefix)RegisterRestartResources$(var.Suffix)" Before="InstallValidate" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -142,7 +142,7 @@
         <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)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)ConfigureUsers$(var.Suffix)" Before="InstallFiles" Overridable="yes" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)ConfigureUsers$(var.Suffix)" Before="InstallFiles" Condition="VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -157,8 +157,8 @@
         <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)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)ConfigureSmbInstall$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT &gt; 400" />
-            <Custom Action="$(var.Prefix)ConfigureSmbUninstall$(var.Suffix)" After="RemoveFiles" Overridable="yes" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)ConfigureSmbInstall$(var.Suffix)" After="InstallFiles" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)ConfigureSmbUninstall$(var.Suffix)" After="RemoveFiles" Condition="VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -173,8 +173,8 @@
         <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)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)InstallPerfCounterData$(var.Suffix)" After="WriteRegistryValues" Overridable="yes" Condition="VersionNT &gt; 400" />
-            <Custom Action="$(var.Prefix)UninstallPerfCounterData$(var.Suffix)" Before="RemoveRegistryValues" Overridable="yes" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)InstallPerfCounterData$(var.Suffix)" After="WriteRegistryValues" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)UninstallPerfCounterData$(var.Suffix)" Before="RemoveRegistryValues" Condition="VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -189,8 +189,8 @@
         <CustomAction Id="$(var.Prefix)RollbackUnregisterPerfmon$(var.Suffix)" DllEntry="RegisterPerfmon" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)ConfigurePerfmonInstall$(var.Suffix)" After="WriteRegistryValues" Overridable="yes" Condition="VersionNT &gt; 400" />
-            <Custom Action="$(var.Prefix)ConfigurePerfmonUninstall$(var.Suffix)" Before="RemoveRegistryValues" Overridable="yes" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)ConfigurePerfmonInstall$(var.Suffix)" After="WriteRegistryValues" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)ConfigurePerfmonUninstall$(var.Suffix)" Before="RemoveRegistryValues" Condition="VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -203,8 +203,8 @@
         <CustomAction Id="$(var.Prefix)RollbackUnregisterPerfmonManifest$(var.Suffix)" DllEntry="WixQuietExec" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)ConfigurePerfmonManifestRegister$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT &gt; 400" />
-            <Custom Action="$(var.Prefix)ConfigurePerfmonManifestUnregister$(var.Suffix)" After="RemoveRegistryValues" Overridable="yes" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)ConfigurePerfmonManifestRegister$(var.Suffix)" After="InstallFiles" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)ConfigurePerfmonManifestUnregister$(var.Suffix)" After="RemoveRegistryValues" Condition="VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -217,8 +217,8 @@
         <CustomAction Id="$(var.Prefix)RollbackUnregisterEventManifest$(var.Suffix)" DllEntry="WixQuietExec" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)ConfigureEventManifestRegister$(var.Suffix)" After="$(var.Prefix)SchedXmlFile$(var.Suffix)" Overridable="yes" Condition="VersionNT &gt; 400" />
-            <Custom Action="$(var.Prefix)ConfigureEventManifestUnregister$(var.Suffix)" After="RemoveRegistryValues" Overridable="yes" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)ConfigureEventManifestRegister$(var.Suffix)" After="$(var.Prefix)SchedXmlFile$(var.Suffix)" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)ConfigureEventManifestUnregister$(var.Suffix)" After="RemoveRegistryValues" Condition="VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -229,7 +229,7 @@
 
         <InstallExecuteSequence>
             <!-- Condition this so it runs on install and MMode, but not uninstall -->
-            <Custom Action="$(var.Prefix)SchedServiceConfig$(var.Suffix)" After="InstallServices" Overridable="yes" Condition="NOT REMOVE~=&quot;ALL&quot; AND VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)SchedServiceConfig$(var.Suffix)" After="InstallServices" Condition="NOT REMOVE~=&quot;ALL&quot; AND VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -240,8 +240,8 @@
         <CustomAction Id="$(var.Prefix)RollbackTouchFile$(var.Suffix)" DllEntry="WixExecuteTouchFile" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)TouchFileDuringUninstall$(var.Suffix)" Before="RemoveFiles" Overridable="yes" />
-            <Custom Action="$(var.Prefix)TouchFileDuringInstall$(var.Suffix)" After="InstallFiles" Overridable="yes" />
+            <Custom Action="virtual $(var.Prefix)TouchFileDuringUninstall$(var.Suffix)" Before="RemoveFiles" />
+            <Custom Action="virtual $(var.Prefix)TouchFileDuringInstall$(var.Suffix)" After="InstallFiles" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -253,7 +253,7 @@
         <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)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)SchedXmlFile$(var.Suffix)" After="DuplicateFiles" Overridable="yes" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)SchedXmlFile$(var.Suffix)" After="DuplicateFiles" Condition="VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -265,7 +265,7 @@
         <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)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)SchedXmlConfig$(var.Suffix)" After="DuplicateFiles" Overridable="yes" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)SchedXmlConfig$(var.Suffix)" After="DuplicateFiles" Condition="VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -275,9 +275,9 @@
         <CustomAction Id="$(var.Prefix)CreateInternetShortcuts$(var.Suffix)" DllEntry="WixCreateInternetShortcuts" Impersonate="no" Execute="deferred" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)SchedInternetShortcuts$(var.Suffix)" Before="RemoveFolders" Overridable="yes" Condition="VersionNT &gt; 400" />
-            <Custom Action="$(var.Prefix)RollbackInternetShortcuts$(var.Suffix)" Before="$(var.Prefix)CreateInternetShortcuts$(var.Suffix)" Overridable="yes" Condition="VersionNT &gt; 400" />
-            <Custom Action="$(var.Prefix)CreateInternetShortcuts$(var.Suffix)" After="CreateShortcuts" Overridable="yes" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)SchedInternetShortcuts$(var.Suffix)" Before="RemoveFolders" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)RollbackInternetShortcuts$(var.Suffix)" Before="$(var.Prefix)CreateInternetShortcuts$(var.Suffix)" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)CreateInternetShortcuts$(var.Suffix)" After="CreateShortcuts" Condition="VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -291,8 +291,8 @@
 
         <InstallExecuteSequence>
             <!-- Condition this so it runs on install and MMode, but not uninstall -->
-            <Custom Action="$(var.Prefix)SchedSecureObjects$(var.Suffix)" After="InstallServices" Overridable="yes" Condition="NOT REMOVE~=&quot;ALL&quot; AND VersionNT &gt; 400" />
-            <Custom Action="$(var.Prefix)SchedSecureObjectsRollback$(var.Suffix)" After="UnpublishFeatures" Overridable="yes" Condition="VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)SchedSecureObjects$(var.Suffix)" After="InstallServices" Condition="NOT REMOVE~=&quot;ALL&quot; AND VersionNT &gt; 400" />
+            <Custom Action="virtual $(var.Prefix)SchedSecureObjectsRollback$(var.Suffix)" After="UnpublishFeatures" Condition="VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -310,11 +310,11 @@
         <CustomAction Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" DllEntry="WixQueryOsInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+            <Custom Action="virtual $(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
         </InstallExecuteSequence>
 
         <InstallUISequence>
-            <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+            <Custom Action="virtual $(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
         </InstallUISequence>
     </Fragment>
 
@@ -322,11 +322,11 @@
         <CustomAction Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" DllEntry="WixQueryOsDirs" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+            <Custom Action="virtual $(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
         </InstallExecuteSequence>
 
         <InstallUISequence>
-            <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+            <Custom Action="virtual $(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
         </InstallUISequence>
     </Fragment>
 
@@ -334,11 +334,11 @@
         <CustomAction Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" DllEntry="WixQueryOsWellKnownSID" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+            <Custom Action="virtual $(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
         </InstallExecuteSequence>
 
         <InstallUISequence>
-            <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+            <Custom Action="virtual $(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
         </InstallUISequence>
     </Fragment>
 
@@ -346,11 +346,11 @@
         <CustomAction Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" DllEntry="WixQueryOsDriverInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+            <Custom Action="virtual $(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
         </InstallExecuteSequence>
 
         <InstallUISequence>
-            <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+            <Custom Action="virtual $(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
         </InstallUISequence>
     </Fragment>
 
@@ -358,11 +358,11 @@
         <CustomAction Id="$(var.Prefix)QueryNativeMachine$(var.Suffix)" DllEntry="WixQueryNativeMachine" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)QueryNativeMachine$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+            <Custom Action="virtual $(var.Prefix)QueryNativeMachine$(var.Suffix)" After="AppSearch" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
         </InstallExecuteSequence>
 
         <InstallUISequence>
-            <Custom Action="$(var.Prefix)QueryNativeMachine$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
+            <Custom Action="virtual $(var.Prefix)QueryNativeMachine$(var.Suffix)" After="AppSearch" Condition="VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)" />
         </InstallUISequence>
     </Fragment>
 
diff --git a/src/ext/VisualStudio/wixlib/VSExtension_Platform.wxi b/src/ext/VisualStudio/wixlib/VSExtension_Platform.wxi
index 32aedb65..71c3a6c5 100644
--- a/src/ext/VisualStudio/wixlib/VSExtension_Platform.wxi
+++ b/src/ext/VisualStudio/wixlib/VSExtension_Platform.wxi
@@ -6,10 +6,10 @@
     <Fragment>
         <CustomAction Id="$(var.Prefix)VSFindInstances$(var.Suffix)" DllEntry="FindInstances" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="VSCA$(var.Suffix)" />
         <InstallExecuteSequence>
-            <Custom Action="$(var.Prefix)VSFindInstances$(var.Suffix)" Before="AppSearch" Overridable="yes" />
+            <Custom Action="virtual $(var.Prefix)VSFindInstances$(var.Suffix)" Before="AppSearch" />
         </InstallExecuteSequence>
         <InstallUISequence>
-            <Custom Action="$(var.Prefix)VSFindInstances$(var.Suffix)" Before="AppSearch" Overridable="yes" />
+            <Custom Action="virtual $(var.Prefix)VSFindInstances$(var.Suffix)" Before="AppSearch" />
         </InstallUISequence>
     </Fragment>
 
-- 
cgit v1.2.3-55-g6feb