From 16ed14a97c67b563feceff359efcb81c324cb953 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Tue, 27 Oct 2020 17:41:10 -0400
Subject: Update project for Package/SummaryInformation change.

---
 src/wixlib/HTML_Help_Registration__RTL_X86.wxs     | 39 +++++++++--------
 src/wixlib/VS11.wxs                                | 15 ++++---
 src/wixlib/VS14.wxs                                | 15 ++++---
 src/wixlib/VS2003.wxs                              |  5 +--
 src/wixlib/VS2005.wxs                              | 39 +++++++++--------
 src/wixlib/VS2008.wxs                              | 45 ++++++++++----------
 src/wixlib/VS2010.wxs                              | 39 +++++++++--------
 src/wixlib/VS2012.wxs                              | 23 +++++-----
 src/wixlib/VS2013.wxs                              | 23 +++++-----
 src/wixlib/VS2015.wxs                              | 15 ++++---
 src/wixlib/VS2017.wxs                              |  7 ++--
 src/wixlib/VS2019.wxs                              |  7 ++--
 src/wixlib/VSExtension_Platform.wxi                |  5 +--
 src/wixlib/VsixPackage.wxs                         | 17 ++++----
 .../vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs  | 35 ++++++++--------
 .../vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs  | 49 +++++++++++-----------
 16 files changed, 181 insertions(+), 197 deletions(-)

(limited to 'src/wixlib')

diff --git a/src/wixlib/HTML_Help_Registration__RTL_X86.wxs b/src/wixlib/HTML_Help_Registration__RTL_X86.wxs
index fcb99f0f..2bdb810a 100644
--- a/src/wixlib/HTML_Help_Registration__RTL_X86.wxs
+++ b/src/wixlib/HTML_Help_Registration__RTL_X86.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
@@ -18,23 +17,23 @@
     <Binary Id="BIN_File_46001" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_46001.dll" />
     <Binary Id="BIN_File_107602" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_107602.dll" />
     <!-- We are stuck using GUID'ed ids here because they were hardcoded in the Help2 dlls-->
-    <CustomAction Id="CA_BeginHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="BeginTransaction" Execute="deferred" Impersonate="no" />
-    <CustomAction Id="CA_RegisterPlugIn.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterPlugIn2" Execute="deferred" Impersonate="no" />
-    <CustomAction Id="CA_CommitHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="CommitTransaction" Return="ignore" Execute="commit" Impersonate="no" />
-    <CustomAction Id="CA_CommitHelpTransactionNoRB.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="CommitTransaction" Return="ignore" Execute="deferred" Impersonate="no" />
-    <CustomAction Id="CA_ExportTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46002" DllEntry="ExportTempHxDs" />
-    <CustomAction Id="CA_RegisterNamespace.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterNamespace2" Execute="deferred" Impersonate="no" />
-    <CustomAction Id="CA_RollbackTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveTempHxDs" Execute="rollback" Impersonate="no" />
-    <CustomAction Id="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46002" DllEntry="RegisterMicrosoftHelp" Return="ignore" />
-    <CustomAction Id="CA_RegisterHelpFile.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterHelpFile" Execute="deferred" Impersonate="no" />
-    <CustomAction Id="CA_RegisterFilter.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterFilter2" Execute="deferred" Impersonate="no" />
-    <CustomAction Id="CA_RemoveNamespace.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveNamespace" Execute="deferred" Impersonate="no" />
-    <CustomAction Id="CA_RemoveTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveTempHxDs" Return="ignore" />
+    <CustomAction Id="CA_BeginHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="BeginTransaction" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
+    <CustomAction Id="CA_RegisterPlugIn.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterPlugIn2" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
+    <CustomAction Id="CA_CommitHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="CommitTransaction" Return="ignore" Execute="commit" Impersonate="no" BinaryRef="BIN_File_46001" />
+    <CustomAction Id="CA_CommitHelpTransactionNoRB.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="CommitTransaction" Return="ignore" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
+    <CustomAction Id="CA_ExportTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="ExportTempHxDs" BinaryRef="BIN_File_46002" />
+    <CustomAction Id="CA_RegisterNamespace.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterNamespace2" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
+    <CustomAction Id="CA_RollbackTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RemoveTempHxDs" Execute="rollback" Impersonate="no" BinaryRef="BIN_File_46001" />
+    <CustomAction Id="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterMicrosoftHelp" Return="ignore" BinaryRef="BIN_File_46002" />
+    <CustomAction Id="CA_RegisterHelpFile.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterHelpFile" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
+    <CustomAction Id="CA_RegisterFilter.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterFilter2" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
+    <CustomAction Id="CA_RemoveNamespace.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RemoveNamespace" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
+    <CustomAction Id="CA_RemoveTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RemoveTempHxDs" Return="ignore" BinaryRef="BIN_File_46001" />
     <!-- This isn't actually executed, but the Help2 dlls use it to find the key for the binary file-->
-    <CustomAction Id="CA_DummyForHXDS_DLL.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_107602" DllEntry="Bogus" />
-    <CustomAction Id="CA_RollbackHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RollbackTransaction" Execute="rollback" Impersonate="no" />
-    <CustomAction Id="CA_RemoveHelpFile.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveHelpFile" Execute="deferred" Impersonate="no" />
-    <CustomAction Id="CA_UnRegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46002" DllEntry="UnRegisterMicrosoftHelp" Return="ignore" />
+    <CustomAction Id="CA_DummyForHXDS_DLL.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="Bogus" BinaryRef="BIN_File_107602" />
+    <CustomAction Id="CA_RollbackHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RollbackTransaction" Execute="rollback" Impersonate="no" BinaryRef="BIN_File_46001" />
+    <CustomAction Id="CA_RemoveHelpFile.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RemoveHelpFile" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
+    <CustomAction Id="CA_UnRegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="UnRegisterMicrosoftHelp" Return="ignore" BinaryRef="BIN_File_46002" />
 
     <InstallExecuteSequence>
       <Custom Action="CA_ExportTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" Before="ProcessComponents" />
@@ -45,8 +44,8 @@
 
       <Custom Action="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" After="InstallFiles" />
 
-      <Custom Action="CA_CommitHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" Before="InstallFinalize">( NOT RollbackDisabled )</Custom>
-      <Custom Action="CA_CommitHelpTransactionNoRB.3643236F_FC70_11D3_A536_0090278A1BB8" Before="InstallFinalize">( RollbackDisabled )</Custom>
+      <Custom Action="CA_CommitHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" Before="InstallFinalize" Condition="( NOT RollbackDisabled )" />
+      <Custom Action="CA_CommitHelpTransactionNoRB.3643236F_FC70_11D3_A536_0090278A1BB8" Before="InstallFinalize" Condition="( RollbackDisabled )" />
       <Custom Action="CA_RemoveTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" After="InstallFinalize" />
     </InstallExecuteSequence>
 
diff --git a/src/wixlib/VS11.wxs b/src/wixlib/VS11.wxs
index dd52e80a..d3f31843 100644
--- a/src/wixlib/VS11.wxs
+++ b/src/wixlib/VS11.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -60,7 +59,7 @@
         <PropertyRef Id="VS11DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS11Setup" Before="InstallFinalize" Overridable="yes">VS11DEVENV</Custom>
+            <Custom Action="VS11Setup" Before="InstallFinalize" Overridable="yes" Condition="VS11DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -69,7 +68,7 @@
         <PropertyRef Id="VS11DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS11InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS11DEVENV</Custom>
+            <Custom Action="VS11InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS11DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -108,7 +107,7 @@
         <CustomAction Id="VWD11Setup" Property="VWD11EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VWD11EXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VWD11Setup" Before="InstallFinalize" Overridable="yes">VWD11EXPRESS_IDE</Custom>
+            <Custom Action="VWD11Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD11EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
     <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates                  -->
@@ -116,7 +115,7 @@
         <CustomAction Id="VWD11InstallVSTemplates" Property="VWD11EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VWD11EXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VWD11InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD11EXPRESS_IDE</Custom>
+            <Custom Action="VWD11InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD11EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -192,7 +191,7 @@
         <CustomAction Id="VS11WinExpressSetup" Property="VS11WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VS11WINEXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VS11WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS11WINEXPRESS_IDE</Custom>
+            <Custom Action="VS11WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS11WINEXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
     <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates                -->
@@ -200,7 +199,7 @@
         <CustomAction Id="VS11WinExpressInstallVSTemplates" Property="VS11WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VS11WINEXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VS11WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS11WINEXPRESS_IDE</Custom>
+            <Custom Action="VS11WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS11WINEXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 </Wix>
diff --git a/src/wixlib/VS14.wxs b/src/wixlib/VS14.wxs
index 52db1562..83449802 100644
--- a/src/wixlib/VS14.wxs
+++ b/src/wixlib/VS14.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -60,7 +59,7 @@
         <PropertyRef Id="VS14DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS14Setup" Before="InstallFinalize" Overridable="yes">VS14DEVENV</Custom>
+            <Custom Action="VS14Setup" Before="InstallFinalize" Overridable="yes" Condition="VS14DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -69,7 +68,7 @@
         <PropertyRef Id="VS14DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS14InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS14DEVENV</Custom>
+            <Custom Action="VS14InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS14DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -106,7 +105,7 @@
         <CustomAction Id="VWD14Setup" Property="VWD14EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VWD14EXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VWD14Setup" Before="InstallFinalize" Overridable="yes">VWD14EXPRESS_IDE</Custom>
+            <Custom Action="VWD14Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD14EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
     <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates                  -->
@@ -114,7 +113,7 @@
         <CustomAction Id="VWD14InstallVSTemplates" Property="VWD14EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VWD14EXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VWD14InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD14EXPRESS_IDE</Custom>
+            <Custom Action="VWD14InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD14EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -173,7 +172,7 @@
         <CustomAction Id="VS14WinExpressSetup" Property="VS14WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VS14WINEXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VS14WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS14WINEXPRESS_IDE</Custom>
+            <Custom Action="VS14WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS14WINEXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
     <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates                -->
@@ -181,7 +180,7 @@
         <CustomAction Id="VS14WinExpressInstallVSTemplates" Property="VS14WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VS14WINEXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VS14WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS14WINEXPRESS_IDE</Custom>
+            <Custom Action="VS14WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS14WINEXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 </Wix>
diff --git a/src/wixlib/VS2003.wxs b/src/wixlib/VS2003.wxs
index 10515b52..1e5d36d9 100644
--- a/src/wixlib/VS2003.wxs
+++ b/src/wixlib/VS2003.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -15,7 +14,7 @@
         <PropertyRef Id="VS2003DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2003Setup" Before="InstallFinalize" Overridable="yes">VS2003DEVENV</Custom>
+            <Custom Action="VS2003Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2003DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
diff --git a/src/wixlib/VS2005.wxs b/src/wixlib/VS2005.wxs
index 3aadf08c..ef538099 100644
--- a/src/wixlib/VS2005.wxs
+++ b/src/wixlib/VS2005.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -47,7 +46,7 @@
         <PropertyRef Id="VS2005DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2005Setup" Before="InstallFinalize" Overridable="yes">VS2005DEVENV</Custom>
+            <Custom Action="VS2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2005DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -56,7 +55,7 @@
         <PropertyRef Id="VS2005DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2005DEVENV</Custom>
+            <Custom Action="VS2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2005DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -72,8 +71,8 @@
     <!-- installed on the system.                                                  -->
     <Fragment>
         <Property Id="VCSHARP2005EXPRESS_IDE" Secure="yes">
-            <ComponentSearch Id="SearchForVcsExpressIde2005Component" Guid="E8A67F23-21D0-4E7B-BBD3-54E2D505BED8" Type="file" >
-                <FileSearch Id="VcsExpressIde2005" Name="vcsexpress.exe"/>
+            <ComponentSearch Id="SearchForVcsExpressIde2005Component" Guid="E8A67F23-21D0-4E7B-BBD3-54E2D505BED8" Type="file">
+                <FileSearch Id="VcsExpressIde2005" Name="vcsexpress.exe" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -84,7 +83,7 @@
         <PropertyRef Id="VCSHARP2005EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VCSHARP2005Setup" Before="InstallFinalize" Overridable="yes">VCSHARP2005EXPRESS_IDE</Custom>
+            <Custom Action="VCSHARP2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP2005EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -94,7 +93,7 @@
         <PropertyRef Id="VCSHARP2005EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VCSHARP2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VCSHARP2005EXPRESS_IDE</Custom>
+            <Custom Action="VCSHARP2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP2005EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
   
@@ -114,7 +113,7 @@
     <Fragment>
         <Property Id="VB2005EXPRESS_IDE" Secure="yes">
             <ComponentSearch Id="SearchForVbExpressIde2005Component" Guid="FCDD3EF0-FFF4-4391-9467-AA48ADC7028F" Type="file">
-                <FileSearch Id="VbExpressIde2005" Name="vbexpress.exe"/>
+                <FileSearch Id="VbExpressIde2005" Name="vbexpress.exe" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -125,7 +124,7 @@
         <PropertyRef Id="VB2005EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VB2005Setup" Before="InstallFinalize" Overridable="yes">VB2005EXPRESS_IDE</Custom>
+            <Custom Action="VB2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VB2005EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -135,7 +134,7 @@
         <PropertyRef Id="VB2005EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VB2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VB2005EXPRESS_IDE</Custom>
+            <Custom Action="VB2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VB2005EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -155,7 +154,7 @@
     <Fragment>
         <Property Id="VWD2005EXPRESS_IDE" Secure="yes">
             <ComponentSearch Id="SearchForVwdExpressIde2005Component" Guid="56B053EA-AEFA-490A-A537-5EA145574862" Type="file">
-                <FileSearch Id="VwdExpressIde2005" Name="vwdexpress.exe"/>
+                <FileSearch Id="VwdExpressIde2005" Name="vwdexpress.exe" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -166,7 +165,7 @@
         <PropertyRef Id="VWD2005EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VWD2005Setup" Before="InstallFinalize" Overridable="yes">VWD2005EXPRESS_IDE</Custom>
+            <Custom Action="VWD2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2005EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -176,7 +175,7 @@
         <PropertyRef Id="VWD2005EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VWD2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2005EXPRESS_IDE</Custom>
+            <Custom Action="VWD2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2005EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -196,7 +195,7 @@
     <Fragment>
         <Property Id="VC2005EXPRESS_IDE" Secure="yes">
             <ComponentSearch Id="SearchForVcExpressIde2005Component" Guid="83D8DFB7-73ED-4C83-9606-805F4CD7E1EE" Type="file">
-                <FileSearch Id="VcExpressIde2005" Name="vcexpress.exe"/>
+                <FileSearch Id="VcExpressIde2005" Name="vcexpress.exe" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -207,7 +206,7 @@
         <PropertyRef Id="VC2005EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VC2005Setup" Before="InstallFinalize" Overridable="yes">VC2005EXPRESS_IDE</Custom>
+            <Custom Action="VC2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VC2005EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -217,7 +216,7 @@
         <PropertyRef Id="VC2005EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VC2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VC2005EXPRESS_IDE</Custom>
+            <Custom Action="VC2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VC2005EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -237,7 +236,7 @@
     <Fragment>
         <Property Id="VJSHARP2005EXPRESS_IDE" Secure="yes">
             <ComponentSearch Id="SearchForVjsExpressIde2005Component" Guid="7077FCC9-C3E4-437E-83ED-D5D7D8D9BB6C" Type="file">
-                <FileSearch Id="VjsExpressIde2005" Name="vjsexpress.exe"/>
+                <FileSearch Id="VjsExpressIde2005" Name="vjsexpress.exe" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -248,7 +247,7 @@
         <PropertyRef Id="VJSHARP2005EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VJSHARP2005Setup" Before="InstallFinalize" Overridable="yes">VJSHARP2005EXPRESS_IDE</Custom>
+            <Custom Action="VJSHARP2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VJSHARP2005EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -258,7 +257,7 @@
         <PropertyRef Id="VJSHARP2005EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VJSHARP2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VJSHARP2005EXPRESS_IDE</Custom>
+            <Custom Action="VJSHARP2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VJSHARP2005EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
diff --git a/src/wixlib/VS2008.wxs b/src/wixlib/VS2008.wxs
index 096221c2..43bf1d1e 100644
--- a/src/wixlib/VS2008.wxs
+++ b/src/wixlib/VS2008.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -41,7 +40,7 @@
         <PropertyRef Id="VS90DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS90Setup" Before="InstallFinalize" Overridable="yes">VS90DEVENV</Custom>
+            <Custom Action="VS90Setup" Before="InstallFinalize" Overridable="yes" Condition="VS90DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -50,7 +49,7 @@
         <PropertyRef Id="VS90DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS90DEVENV</Custom>
+            <Custom Action="VS90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS90DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -66,8 +65,8 @@
     <!-- installed on the system.                                                  -->
     <Fragment>
         <Property Id="VCSHARP90EXPRESS_IDE" Secure="yes">
-            <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file" >
-                <FileSearch Id="VcsExpressIde90" Name="vcsexpress.exe"/>
+            <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file">
+                <FileSearch Id="VcsExpressIde90" Name="vcsexpress.exe" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -78,7 +77,7 @@
         <PropertyRef Id="VCSHARP90EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VCSHARP90Setup" Before="InstallFinalize" Overridable="yes">VCSHARP90EXPRESS_IDE</Custom>
+            <Custom Action="VCSHARP90Setup" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP90EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
   
@@ -88,7 +87,7 @@
         <PropertyRef Id="VCSHARP90EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VCSHARP90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VCSHARP90EXPRESS_IDE</Custom>
+            <Custom Action="VCSHARP90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP90EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -108,7 +107,7 @@
     <Fragment>
         <Property Id="VB90EXPRESS_IDE" Secure="yes">
             <ComponentSearch Id="SearchForVbExpressIde90Component" Guid="010A50C6-8604-4BA2-8CA1-4EC3A5B861B2" Type="file">
-                <FileSearch Id="VbExpressIde90" Name="vbexpress.exe"/>
+                <FileSearch Id="VbExpressIde90" Name="vbexpress.exe" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -119,7 +118,7 @@
         <PropertyRef Id="VB90EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VB90Setup" Before="InstallFinalize" Overridable="yes">VB90EXPRESS_IDE</Custom>
+            <Custom Action="VB90Setup" Before="InstallFinalize" Overridable="yes" Condition="VB90EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -129,7 +128,7 @@
         <PropertyRef Id="VB90EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VB90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VB90EXPRESS_IDE</Custom>
+            <Custom Action="VB90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VB90EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -149,7 +148,7 @@
     <Fragment>
         <Property Id="VWD90EXPRESS_IDE" Secure="yes">
             <ComponentSearch Id="SearchForVwdExpressIde90Component" Guid="C7F516CB-CB5C-41B7-9CB4-33927C4DD206" Type="file">
-                <FileSearch Id="VwdExpressIde90" Name="vwdexpress.exe"/>
+                <FileSearch Id="VwdExpressIde90" Name="vwdexpress.exe" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -160,7 +159,7 @@
         <PropertyRef Id="VWD90EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VWD90Setup" Before="InstallFinalize" Overridable="yes">VWD90EXPRESS_IDE</Custom>
+            <Custom Action="VWD90Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD90EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -170,7 +169,7 @@
         <PropertyRef Id="VWD90EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VWD90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD90EXPRESS_IDE</Custom>
+            <Custom Action="VWD90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD90EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -190,7 +189,7 @@
     <Fragment>
         <Property Id="VC90EXPRESS_IDE" Secure="yes">
             <ComponentSearch Id="SearchForVcExpressIde90Component" Guid="147EB31D-8042-4E8F-A3EC-D32C04ED652A" Type="file">
-                <FileSearch Id="VcExpressIde90" Name="vcexpress.exe"/>
+                <FileSearch Id="VcExpressIde90" Name="vcexpress.exe" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -201,7 +200,7 @@
         <PropertyRef Id="VC90EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VC90Setup" Before="InstallFinalize" Overridable="yes">VC90EXPRESS_IDE</Custom>
+            <Custom Action="VC90Setup" Before="InstallFinalize" Overridable="yes" Condition="VC90EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -211,7 +210,7 @@
         <PropertyRef Id="VC90EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VC90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VC90EXPRESS_IDE</Custom>
+            <Custom Action="VC90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VC90EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -245,7 +244,7 @@
         <Property Id="VS90_SP1" Secure="yes">
             <RegistrySearch Id="VS90DevEnvDirectorySearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
                 <DirectorySearch Id="VS90DevEnvFilePathSearch">
-                    <FileSearch Id="VS90DevEnvFileVersionSearch" Name="devenv.exe" MinVersion="9.0.30729.0"/>
+                    <FileSearch Id="VS90DevEnvFileVersionSearch" Name="devenv.exe" MinVersion="9.0.30729.0" />
                 </DirectorySearch>      
             </RegistrySearch>      
         </Property>
@@ -256,7 +255,7 @@
     <Fragment>
         <Property Id="VB90EXPRESS_SP1" Secure="yes">
             <ComponentSearch Id="SearchForVbExpressIde90Component" Guid="010A50C6-8604-4BA2-8CA1-4EC3A5B861B2" Type="file">
-                <FileSearch Id="VB90ExpressFileVersionSearch" Name="vbexpress.exe" MinVersion="9.0.30729.0"/>
+                <FileSearch Id="VB90ExpressFileVersionSearch" Name="vbexpress.exe" MinVersion="9.0.30729.0" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -266,7 +265,7 @@
     <Fragment>
         <Property Id="VC90EXPRESS_SP1" Secure="yes">
             <ComponentSearch Id="SearchForVcExpressIde90Component" Guid="147EB31D-8042-4E8F-A3EC-D32C04ED652A" Type="file">
-                <FileSearch Id="VC90ExpressFileVersionSearch" Name="vcexpress.exe" MinVersion="9.0.30729.0"/>
+                <FileSearch Id="VC90ExpressFileVersionSearch" Name="vcexpress.exe" MinVersion="9.0.30729.0" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -275,8 +274,8 @@
     <!-- installed on the system.                                                  -->
     <Fragment>
         <Property Id="VCS90EXPRESS_SP1" Secure="yes">
-            <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file" >
-                <FileSearch Id="VCS90ExpressFileVersionSearch" Name="vcsexpress.exe" MinVersion="9.0.30729.0"/>
+            <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file">
+                <FileSearch Id="VCS90ExpressFileVersionSearch" Name="vcsexpress.exe" MinVersion="9.0.30729.0" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -286,7 +285,7 @@
     <Fragment>
         <Property Id="VWD90EXPRESS_SP1" Secure="yes">
             <ComponentSearch Id="SearchForVwdExpressIde90Component" Guid="C7F516CB-CB5C-41B7-9CB4-33927C4DD206" Type="file">
-                <FileSearch Id="VWD90ExpressFileVersionSearch" Name="vwdexpress.exe" MinVersion="9.0.30729.0"/>
+                <FileSearch Id="VWD90ExpressFileVersionSearch" Name="vwdexpress.exe" MinVersion="9.0.30729.0" />
             </ComponentSearch>
         </Property>
     </Fragment>
diff --git a/src/wixlib/VS2010.wxs b/src/wixlib/VS2010.wxs
index d0d899cc..6c940b86 100644
--- a/src/wixlib/VS2010.wxs
+++ b/src/wixlib/VS2010.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -60,7 +59,7 @@
         <PropertyRef Id="VS2010DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2010Setup" Before="InstallFinalize" Overridable="yes">VS2010DEVENV</Custom>
+            <Custom Action="VS2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2010DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -69,7 +68,7 @@
         <PropertyRef Id="VS2010DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2010DEVENV</Custom>
+            <Custom Action="VS2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2010DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -78,8 +77,8 @@
     <!-- installed on the system.                                                  -->
     <Fragment>
         <Property Id="VCSHARP2010EXPRESS_IDE" Secure="yes">
-            <ComponentSearch Id="SearchForVcsExpressIde2010Component" Guid="A4945167-D8A4-4B10-9B78-99C2CDC243EC" Type="file" >
-                <FileSearch Id="VcsExpressIde2010" Name="vcsexpress.exe"/>
+            <ComponentSearch Id="SearchForVcsExpressIde2010Component" Guid="A4945167-D8A4-4B10-9B78-99C2CDC243EC" Type="file">
+                <FileSearch Id="VcsExpressIde2010" Name="vcsexpress.exe" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -90,7 +89,7 @@
         <PropertyRef Id="VCSHARP2010EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VCSHARP2010Setup" Before="InstallFinalize" Overridable="yes">VCSHARP2010EXPRESS_IDE</Custom>
+            <Custom Action="VCSHARP2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP2010EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -100,7 +99,7 @@
         <PropertyRef Id="VCSHARP2010EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VCSHARP2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VCSHARP2010EXPRESS_IDE</Custom>
+            <Custom Action="VCSHARP2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP2010EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -120,7 +119,7 @@
     <Fragment>
         <Property Id="VB2010EXPRESS_IDE" Secure="yes">
             <ComponentSearch Id="SearchForVbExpressIde2010Component" Guid="3EDEF607-9E3A-4A64-BFE1-104979CF2899" Type="file">
-                <FileSearch Id="VbExpressIde2010" Name="vbexpress.exe"/>
+                <FileSearch Id="VbExpressIde2010" Name="vbexpress.exe" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -131,7 +130,7 @@
         <PropertyRef Id="VB2010EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VB2010Setup" Before="InstallFinalize" Overridable="yes">VB2010EXPRESS_IDE</Custom>
+            <Custom Action="VB2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VB2010EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -141,7 +140,7 @@
         <PropertyRef Id="VB2010EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VB2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VB2010EXPRESS_IDE</Custom>
+            <Custom Action="VB2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VB2010EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -161,7 +160,7 @@
     <Fragment>
         <Property Id="VWD2010EXPRESS_IDE" Secure="yes">
             <ComponentSearch Id="SearchForVwdExpressIde2010Component" Guid="771B6CF7-C8D2-4D85-BACD-ED01600256DC" Type="file">
-                <FileSearch Id="VwdExpressIde2010" Name="vwdexpress.exe"/>
+                <FileSearch Id="VwdExpressIde2010" Name="vwdexpress.exe" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -172,7 +171,7 @@
         <PropertyRef Id="VWD2010EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VWD2010Setup" Before="InstallFinalize" Overridable="yes">VWD2010EXPRESS_IDE</Custom>
+            <Custom Action="VWD2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2010EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -182,7 +181,7 @@
         <PropertyRef Id="VWD2010EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VWD2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2010EXPRESS_IDE</Custom>
+            <Custom Action="VWD2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2010EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -202,7 +201,7 @@
     <Fragment>
         <Property Id="VC2010EXPRESS_IDE" Secure="yes">
             <ComponentSearch Id="SearchForVcExpressIde2010Component" Guid="B455E8D3-90CB-47F6-AB7B-9B31E5DE6266" Type="file">
-                <FileSearch Id="VcExpressIde2010" Name="vcexpress.exe"/>
+                <FileSearch Id="VcExpressIde2010" Name="vcexpress.exe" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -213,7 +212,7 @@
         <PropertyRef Id="VC2010EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VC2010Setup" Before="InstallFinalize" Overridable="yes">VC2010EXPRESS_IDE</Custom>
+            <Custom Action="VC2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VC2010EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -223,7 +222,7 @@
         <PropertyRef Id="VC2010EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VC2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VC2010EXPRESS_IDE</Custom>
+            <Custom Action="VC2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VC2010EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -243,7 +242,7 @@
     <Fragment>
         <Property Id="VPD2010EXPRESS_IDE" Secure="yes">
             <ComponentSearch Id="SearchForVpdExpressIde2010Component" Guid="80C81DB2-E95B-4C03-A559-C664E8411DDF" Type="file">
-                <FileSearch Id="VpdExpressIde2010" Name="vpdexpress.exe"/>
+                <FileSearch Id="VpdExpressIde2010" Name="vpdexpress.exe" />
             </ComponentSearch>
         </Property>
     </Fragment>
@@ -254,7 +253,7 @@
         <PropertyRef Id="VPD2010EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VPD2010Setup" Before="InstallFinalize" Overridable="yes">VPD2010EXPRESS_IDE</Custom>
+            <Custom Action="VPD2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VPD2010EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -264,7 +263,7 @@
         <PropertyRef Id="VPD2010EXPRESS_IDE" />
 
         <InstallExecuteSequence>
-            <Custom Action="VPD2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VPD2010EXPRESS_IDE</Custom>
+            <Custom Action="VPD2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VPD2010EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
diff --git a/src/wixlib/VS2012.wxs b/src/wixlib/VS2012.wxs
index c4baa2c9..513d8684 100644
--- a/src/wixlib/VS2012.wxs
+++ b/src/wixlib/VS2012.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -60,7 +59,7 @@
         <PropertyRef Id="VS2012DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2012Setup" Before="InstallFinalize" Overridable="yes">VS2012DEVENV</Custom>
+            <Custom Action="VS2012Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2012DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -69,7 +68,7 @@
         <PropertyRef Id="VS2012DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012DEVENV</Custom>
+            <Custom Action="VS2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2012DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -108,7 +107,7 @@
         <CustomAction Id="VWD2012Setup" Property="VWD2012EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VWD2012EXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VWD2012Setup" Before="InstallFinalize" Overridable="yes">VWD2012EXPRESS_IDE</Custom>
+            <Custom Action="VWD2012Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2012EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
     <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates                  -->
@@ -116,7 +115,7 @@
         <CustomAction Id="VWD2012InstallVSTemplates" Property="VWD2012EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VWD2012EXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VWD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2012EXPRESS_IDE</Custom>
+            <Custom Action="VWD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2012EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -131,7 +130,7 @@
         <CustomAction Id="VPD2012Setup" Property="VPD2012EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VPD2012EXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VPD2012Setup" Before="InstallFinalize" Overridable="yes">VPD2012EXPRESS_IDE</Custom>
+            <Custom Action="VPD2012Setup" Before="InstallFinalize" Overridable="yes" Condition="VPD2012EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
     <!-- Custom action definition to run VPDexpress.exe /InstallVSTemplates                  -->
@@ -139,7 +138,7 @@
         <CustomAction Id="VPD2012InstallVSTemplates" Property="VPD2012EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VPD2012EXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VPD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VPD2012EXPRESS_IDE</Custom>
+            <Custom Action="VPD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VPD2012EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -215,7 +214,7 @@
         <CustomAction Id="VS2012WinExpressSetup" Property="VS2012WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VS2012WINEXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VS2012WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS2012WINEXPRESS_IDE</Custom>
+            <Custom Action="VS2012WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2012WINEXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
     <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates                -->
@@ -223,7 +222,7 @@
         <CustomAction Id="VS2012WinExpressInstallVSTemplates" Property="VS2012WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VS2012WINEXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VS2012WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012WINEXPRESS_IDE</Custom>
+            <Custom Action="VS2012WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2012WINEXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
     
@@ -242,7 +241,7 @@
         <CustomAction Id="VS2012WDExpressSetup" Property="VS2012WDEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VS2012WDEXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VS2012WDExpressSetup" Before="InstallFinalize" Overridable="yes">VS2012WDEXPRESS_IDE</Custom>
+            <Custom Action="VS2012WDExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2012WDEXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
     <!-- Custom action definition to run WDExpress.exe /InstallVSTemplates -->
@@ -250,7 +249,7 @@
         <CustomAction Id="VS2012WDExpressInstallVSTemplates" Property="VS2012WDEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VS2012WDEXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VS2012WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012WDEXPRESS_IDE</Custom>
+            <Custom Action="VS2012WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2012WDEXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 </Wix>
diff --git a/src/wixlib/VS2013.wxs b/src/wixlib/VS2013.wxs
index fa774ff0..6681b43f 100644
--- a/src/wixlib/VS2013.wxs
+++ b/src/wixlib/VS2013.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -60,7 +59,7 @@
         <PropertyRef Id="VS2013DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2013Setup" Before="InstallFinalize" Overridable="yes">VS2013DEVENV</Custom>
+            <Custom Action="VS2013Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2013DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -69,7 +68,7 @@
         <PropertyRef Id="VS2013DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2013DEVENV</Custom>
+            <Custom Action="VS2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2013DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -108,7 +107,7 @@
         <CustomAction Id="VWD2013Setup" Property="VWD2013EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VWD2013EXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VWD2013Setup" Before="InstallFinalize" Overridable="yes">VWD2013EXPRESS_IDE</Custom>
+            <Custom Action="VWD2013Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2013EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
     <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates                  -->
@@ -116,7 +115,7 @@
         <CustomAction Id="VWD2013InstallVSTemplates" Property="VWD2013EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VWD2013EXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VWD2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2013EXPRESS_IDE</Custom>
+            <Custom Action="VWD2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2013EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -131,7 +130,7 @@
         <CustomAction Id="VPD2013Setup" Property="VPD2013EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VPD2013EXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VPD2013Setup" Before="InstallFinalize" Overridable="yes">VPD2013EXPRESS_IDE</Custom>
+            <Custom Action="VPD2013Setup" Before="InstallFinalize" Overridable="yes" Condition="VPD2013EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
     <!-- Custom action definition to run VPDexpress.exe /InstallVSTemplates                  -->
@@ -139,7 +138,7 @@
         <CustomAction Id="VPD2013InstallVSTemplates" Property="VPD2013EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VPD2013EXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VPD2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VPD2013EXPRESS_IDE</Custom>
+            <Custom Action="VPD2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VPD2013EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -209,7 +208,7 @@
         <CustomAction Id="VS2013WinExpressSetup" Property="VS2013WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VS2013WINEXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VS2013WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS2013WINEXPRESS_IDE</Custom>
+            <Custom Action="VS2013WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2013WINEXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
     
@@ -218,7 +217,7 @@
         <CustomAction Id="VS2013WinExpressInstallVSTemplates" Property="VS2013WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VS2013WINEXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VS2013WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2013WINEXPRESS_IDE</Custom>
+            <Custom Action="VS2013WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2013WINEXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -238,7 +237,7 @@
         <CustomAction Id="VS2013WDExpressSetup" Property="VS2013WDEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VS2013WDEXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VS2013WDExpressSetup" Before="InstallFinalize" Overridable="yes">VS2013WDEXPRESS_IDE</Custom>
+            <Custom Action="VS2013WDExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2013WDEXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -247,7 +246,7 @@
         <CustomAction Id="VS2013WDExpressInstallVSTemplates" Property="VS2013WDEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VS2013WDEXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VS2013WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2013WDEXPRESS_IDE</Custom>
+            <Custom Action="VS2013WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2013WDEXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 </Wix>
diff --git a/src/wixlib/VS2015.wxs b/src/wixlib/VS2015.wxs
index b7fb7b4d..f14802e2 100644
--- a/src/wixlib/VS2015.wxs
+++ b/src/wixlib/VS2015.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -60,7 +59,7 @@
         <PropertyRef Id="VS2015DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2015Setup" Before="InstallFinalize" Overridable="yes">VS2015DEVENV</Custom>
+            <Custom Action="VS2015Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2015DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -69,7 +68,7 @@
         <PropertyRef Id="VS2015DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2015InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2015DEVENV</Custom>
+            <Custom Action="VS2015InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2015DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -106,7 +105,7 @@
         <CustomAction Id="VWD2015Setup" Property="VWD2015EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VWD2015EXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VWD2015Setup" Before="InstallFinalize" Overridable="yes">VWD2015EXPRESS_IDE</Custom>
+            <Custom Action="VWD2015Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2015EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
     <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates                  -->
@@ -114,7 +113,7 @@
         <CustomAction Id="VWD2015InstallVSTemplates" Property="VWD2015EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VWD2015EXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VWD2015InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2015EXPRESS_IDE</Custom>
+            <Custom Action="VWD2015InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2015EXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -173,7 +172,7 @@
         <CustomAction Id="VS2015WinExpressSetup" Property="VS2015WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VS2015WINEXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VS2015WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS2015WINEXPRESS_IDE</Custom>
+            <Custom Action="VS2015WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2015WINEXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
     <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates                -->
@@ -181,7 +180,7 @@
         <CustomAction Id="VS2015WinExpressInstallVSTemplates" Property="VS2015WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
         <PropertyRef Id="VS2015WINEXPRESS_IDE" />
         <InstallExecuteSequence>
-            <Custom Action="VS2015WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2015WINEXPRESS_IDE</Custom>
+            <Custom Action="VS2015WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2015WINEXPRESS_IDE" />
         </InstallExecuteSequence>
     </Fragment>
 </Wix>
diff --git a/src/wixlib/VS2017.wxs b/src/wixlib/VS2017.wxs
index acc96d67..5524361d 100644
--- a/src/wixlib/VS2017.wxs
+++ b/src/wixlib/VS2017.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -74,7 +73,7 @@
         <PropertyRef Id="VS2017DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2017Setup" Before="InstallFinalize" Overridable="yes">VS2017DEVENV</Custom>
+            <Custom Action="VS2017Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2017DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -83,7 +82,7 @@
         <PropertyRef Id="VS2017DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2017InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2017DEVENV</Custom>
+            <Custom Action="VS2017InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2017DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
diff --git a/src/wixlib/VS2019.wxs b/src/wixlib/VS2019.wxs
index 57ae6168..0be63dec 100644
--- a/src/wixlib/VS2019.wxs
+++ b/src/wixlib/VS2019.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -74,7 +73,7 @@
         <PropertyRef Id="VS2019DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2019Setup" Before="InstallFinalize" Overridable="yes">VS2019DEVENV</Custom>
+            <Custom Action="VS2019Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2019DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
@@ -83,7 +82,7 @@
         <PropertyRef Id="VS2019DEVENV" />
 
         <InstallExecuteSequence>
-            <Custom Action="VS2019InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2019DEVENV</Custom>
+            <Custom Action="VS2019InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2019DEVENV" />
         </InstallExecuteSequence>
     </Fragment>
 
diff --git a/src/wixlib/VSExtension_Platform.wxi b/src/wixlib/VSExtension_Platform.wxi
index 30d107ef..f9cd96f4 100644
--- a/src/wixlib/VSExtension_Platform.wxi
+++ b/src/wixlib/VSExtension_Platform.wxi
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?include caSuffix.wxi ?>
     <Fragment>
-        <CustomAction Id="VSFindInstances$(var.Suffix)" BinaryKey="VSCA$(var.Suffix)" DllEntry="FindInstances" Execute="firstSequence" Return="check" SuppressModularization="yes" />
+        <CustomAction Id="VSFindInstances$(var.Suffix)" DllEntry="FindInstances" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="VSCA$(var.Suffix)" />
         <InstallExecuteSequence>
             <Custom Action="VSFindInstances$(var.Suffix)" Before="AppSearch" Overridable="yes" />
         </InstallExecuteSequence>
diff --git a/src/wixlib/VsixPackage.wxs b/src/wixlib/VsixPackage.wxs
index 8149c55b..5937177b 100644
--- a/src/wixlib/VsixPackage.wxs
+++ b/src/wixlib/VsixPackage.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -47,15 +46,15 @@
         </Property>
 
         <!-- Use the latest VS- or VWD-installed VSIXInstaller.exe. -->
-        <SetProperty Action="SetVS2015Vsix" Id="VS_VSIX_INSTALLER_PATH" Value="[VS2015_VSIX_INSTALLER_PATH]" Sequence="both" After="AppSearch">NOT VS_VSIX_INSTALLER_PATH AND VS2015_VSIX_INSTALLER_PATH</SetProperty>
-        <SetProperty Action="Vwd2015VsixWhenVSAbsent" Id="VS_VSIX_INSTALLER_PATH" Value="[VWD2015_VSIX_INSTALL_ROOT]\Common7\IDE\VSIXInstaller.exe" Sequence="both" After="SetVS2015Vsix">NOT VS_VSIX_INSTALLER_PATH AND VWD2015_VSIX_INSTALL_ROOT</SetProperty>
+        <SetProperty Action="SetVS2015Vsix" Id="VS_VSIX_INSTALLER_PATH" Value="[VS2015_VSIX_INSTALLER_PATH]" Sequence="both" After="AppSearch" Condition="NOT VS_VSIX_INSTALLER_PATH AND VS2015_VSIX_INSTALLER_PATH" />
+        <SetProperty Action="Vwd2015VsixWhenVSAbsent" Id="VS_VSIX_INSTALLER_PATH" Value="[VWD2015_VSIX_INSTALL_ROOT]\Common7\IDE\VSIXInstaller.exe" Sequence="both" After="SetVS2015Vsix" Condition="NOT VS_VSIX_INSTALLER_PATH AND VWD2015_VSIX_INSTALL_ROOT" />
 
-        <SetProperty Action="SetVS2013Vsix" Id="VS_VSIX_INSTALLER_PATH" Value="[VS2013_VSIX_INSTALLER_PATH]" Sequence="both" After="Vwd2015VsixWhenVSAbsent">NOT VS_VSIX_INSTALLER_PATH AND VS2013_VSIX_INSTALLER_PATH</SetProperty>
-        <SetProperty Action="Vwd2013VsixWhenVSAbsent" Id="VS_VSIX_INSTALLER_PATH" Value="[VWD2013_VSIX_INSTALL_ROOT]\Common7\IDE\VSIXInstaller.exe" Sequence="both" After="SetVS2013Vsix">NOT VS_VSIX_INSTALLER_PATH AND VWD2013_VSIX_INSTALL_ROOT</SetProperty>
+        <SetProperty Action="SetVS2013Vsix" Id="VS_VSIX_INSTALLER_PATH" Value="[VS2013_VSIX_INSTALLER_PATH]" Sequence="both" After="Vwd2015VsixWhenVSAbsent" Condition="NOT VS_VSIX_INSTALLER_PATH AND VS2013_VSIX_INSTALLER_PATH" />
+        <SetProperty Action="Vwd2013VsixWhenVSAbsent" Id="VS_VSIX_INSTALLER_PATH" Value="[VWD2013_VSIX_INSTALL_ROOT]\Common7\IDE\VSIXInstaller.exe" Sequence="both" After="SetVS2013Vsix" Condition="NOT VS_VSIX_INSTALLER_PATH AND VWD2013_VSIX_INSTALL_ROOT" />
 
-        <SetProperty Action="SetVS2012Vsix" Id="VS_VSIX_INSTALLER_PATH" Value="[VS2012_VSIX_INSTALLER_PATH]" Sequence="both" After="Vwd2013VsixWhenVSAbsent">NOT VS_VSIX_INSTALLER_PATH AND VS2012_VSIX_INSTALLER_PATH</SetProperty>
-        <SetProperty Action="Vwd2012VsixWhenVSAbsent" Id="VS_VSIX_INSTALLER_PATH" Value="[VWD2012_VSIX_INSTALL_ROOT]\Common7\IDE\VSIXInstaller.exe" Sequence="both" After="SetVS2012Vsix">NOT VS_VSIX_INSTALLER_PATH AND VWD2012_VSIX_INSTALL_ROOT</SetProperty>
+        <SetProperty Action="SetVS2012Vsix" Id="VS_VSIX_INSTALLER_PATH" Value="[VS2012_VSIX_INSTALLER_PATH]" Sequence="both" After="Vwd2013VsixWhenVSAbsent" Condition="NOT VS_VSIX_INSTALLER_PATH AND VS2012_VSIX_INSTALLER_PATH" />
+        <SetProperty Action="Vwd2012VsixWhenVSAbsent" Id="VS_VSIX_INSTALLER_PATH" Value="[VWD2012_VSIX_INSTALL_ROOT]\Common7\IDE\VSIXInstaller.exe" Sequence="both" After="SetVS2012Vsix" Condition="NOT VS_VSIX_INSTALLER_PATH AND VWD2012_VSIX_INSTALL_ROOT" />
 
-        <SetProperty Action="SetVS2010Vsix" Id="VS_VSIX_INSTALLER_PATH" Value="[VS2010_VSIX_INSTALLER_PATH]" Sequence="both" After="Vwd2012VsixWhenVSAbsent">NOT VS_VSIX_INSTALLER_PATH AND VS2010_VSIX_INSTALLER_PATH</SetProperty>
+        <SetProperty Action="SetVS2010Vsix" Id="VS_VSIX_INSTALLER_PATH" Value="[VS2010_VSIX_INSTALLER_PATH]" Sequence="both" After="Vwd2012VsixWhenVSAbsent" Condition="NOT VS_VSIX_INSTALLER_PATH AND VS2010_VSIX_INSTALLER_PATH" />
     </Fragment>
 </Wix>
diff --git a/src/wixlib/vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs b/src/wixlib/vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs
index bb0dfd62..66757349 100644
--- a/src/wixlib/vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs
+++ b/src/wixlib/vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -24,41 +23,41 @@
         </Component>
       </Directory>
     </DirectoryRef>
-    <CustomAction Id="CA_HxMerge_VSIPCC_VSCC" Return="ignore" Execute="commit" Impersonate="no" BinaryKey="BIN_File_60377" ExeCommand="ms-help://MS.VSCC.v80" />
-    <CustomAction Id="CA_HxMerge_VSIPCC_VSExpCC" Return="ignore" Execute="commit" Impersonate="no" BinaryKey="BIN_File_60377" ExeCommand="ms-help://MS.VSExpressCC.v80" />
+    <CustomAction Id="CA_HxMerge_VSIPCC_VSCC" Return="ignore" Execute="commit" Impersonate="no" ExeCommand="ms-help://MS.VSCC.v80" BinaryRef="BIN_File_60377" />
+    <CustomAction Id="CA_HxMerge_VSIPCC_VSExpCC" Return="ignore" Execute="commit" Impersonate="no" ExeCommand="ms-help://MS.VSExpressCC.v80" BinaryRef="BIN_File_60377" />
     <InstallExecuteSequence>
-      <Custom Action="CA_HxMerge_VSIPCC_VSCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8"/>
-      <Custom Action="CA_HxMerge_VSIPCC_VSExpCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8"/>
+      <Custom Action="CA_HxMerge_VSIPCC_VSCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" />
+      <Custom Action="CA_HxMerge_VSIPCC_VSExpCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" />
     </InstallExecuteSequence>
     <Binary Id="BIN_File_60377" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_60377.dll" />
     <CustomTable Id="HelpPlugin">
       <Row>
-        <Data Column="HelpNamespace_">MS_VSIPCC_v80</Data>
-        <Data Column="HelpNamespace_Parent">MS_VSCC_v80</Data>
-        <Data Column="File_HxT">FL_vsipcc_hxt_86880________</Data>
+        <Data Column="HelpNamespace_" Value="MS_VSIPCC_v80" />
+        <Data Column="HelpNamespace_Parent" Value="MS_VSCC_v80" />
+        <Data Column="File_HxT" Value="FL_vsipcc_hxt_86880________" />
         <Data Column="File_HxA" />
         <Data Column="File_ParentHxT" />
       </Row>
       <Row>
-        <Data Column="HelpNamespace_">MS_VSIPCC_v80</Data>
-        <Data Column="HelpNamespace_Parent">MS_VSExpressCC_v80</Data>
-        <Data Column="File_HxT">FL_vsipcc_hxt_86880________</Data>
+        <Data Column="HelpNamespace_" Value="MS_VSIPCC_v80" />
+        <Data Column="HelpNamespace_Parent" Value="MS_VSExpressCC_v80" />
+        <Data Column="File_HxT" Value="FL_vsipcc_hxt_86880________" />
         <Data Column="File_HxA" />
         <Data Column="File_ParentHxT" />
       </Row>
     </CustomTable>
     <CustomTable Id="HelpNamespace">
       <Row>
-        <Data Column="NamespaceKey">MS_VSIPCC_v80</Data>
-        <Data Column="NamespaceName">MS.VSIPCC.v80</Data>
-        <Data Column="File_Collection">FL_vsipcc_hxc_86879________</Data>
-        <Data Column="Description">VSIP Documentation</Data>
+        <Data Column="NamespaceKey" Value="MS_VSIPCC_v80" />
+        <Data Column="NamespaceName" Value="MS.VSIPCC.v80" />
+        <Data Column="File_Collection" Value="FL_vsipcc_hxc_86879________" />
+        <Data Column="Description" Value="VSIP Documentation" />
       </Row>
     </CustomTable>
 
     <ComponentGroup Id="Help2_VS2005_Namespace_Components">
-      <ComponentRef Id="VSIPCC_Reg"/>
-      <ComponentRef Id="vsipcc_collection________"/>
+      <ComponentRef Id="VSIPCC_Reg" />
+      <ComponentRef Id="vsipcc_collection________" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs b/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs
index bfeef18f..9fb1a0e5 100644
--- a/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs
+++ b/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment Id="VS2008_Namespace">
     <Binary Id="BIN_435439_x86_enu" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_435439_x86_enu.dll" />
-    <CustomAction Id="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" BinaryKey="BIN_435439_x86_enu" DllEntry="ScheduleExtHelpPlugin" Return="ignore" />
-    <CustomAction Id="CA_ExtHelpPlugin" BinaryKey="BIN_435439_x86_enu" DllEntry="ExtHelpPluginAction" Execute="deferred" Impersonate="no" />
+    <CustomAction Id="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" DllEntry="ScheduleExtHelpPlugin" Return="ignore" BinaryRef="BIN_435439_x86_enu" />
+    <CustomAction Id="CA_ExtHelpPlugin" DllEntry="ExtHelpPluginAction" Execute="deferred" Impersonate="no" BinaryRef="BIN_435439_x86_enu" />
     
     <DirectoryRef Id="VSIPCC">
       <Component Id="VSIPCC_Reg_27501" Guid="{7C32E9FB-9C4D-416B-8ACC-9D487ED0ADBD}" KeyPath="yes">
@@ -15,33 +14,33 @@
       </Component>
       <Directory Id="vsipcc_v9.0" Name="v9.0" FileSource="$(sys.SOURCEFILEDIR)\Redist">
         <Component Id="vsipcc_collection_25097" Guid="{D419D13C-D6D8-4E2A-A3EF-B26398D36524}">
-          <File Id="FL_vsipcc_reg_hxs_86878_86878_cn_ln" Name="vsipcc_reg.hxs" KeyPath="yes" Vital="no"/>
-          <File Id="FL_vsipcc_hxc_86879_86879_cn_ln" Name="_vsipcc90.hxc" Vital="no"/>
-          <File Id="FL_vsipcc_hxt_86880_86880_cn_ln" Name="_vsipcc90.hxt" Vital="no"/>
-          <File Id="FL_vsipccALinks_hxk_86881_86881_cn_ln" Name="_ALinks.hxk" Vital="no"/>
-          <File Id="FL_vsipccBLinks_hxk_86882_86882_cn_ln" Name="_BLinks.hxk" Vital="no"/>
-          <File Id="FL_vsipccCLinks_hxk_cn_ln" Name="_CLinks.hxk" Vital="no"/>
-          <File Id="FL_vsipccFLinks_hxk_86885_86885_cn_ln" Name="_FLinks.hxk" Vital="no"/>
-          <File Id="FL_vsipccKLinks_hxk_86886_86886_cn_ln" Name="_KLinks.hxk" Vital="no"/>
-          <File Id="FL_vsipccNamedURLs_hxk_86888_86888_cn_ln" Name="_vsipcc_namedUrls.hxk" Vital="no"/>
-          <File Id="FL_vsipccSlinks_hxk_93825_93825_cn_ln" Name="_SLinks.hxk" Vital="no"/>
-          <File Id="FL_VsipCCSamples_HxK_103959_103959_cn_ln" Name="_vsipcc_samples.HxK" Vital="no"/>
+          <File Id="FL_vsipcc_reg_hxs_86878_86878_cn_ln" Name="vsipcc_reg.hxs" KeyPath="yes" Vital="no" />
+          <File Id="FL_vsipcc_hxc_86879_86879_cn_ln" Name="_vsipcc90.hxc" Vital="no" />
+          <File Id="FL_vsipcc_hxt_86880_86880_cn_ln" Name="_vsipcc90.hxt" Vital="no" />
+          <File Id="FL_vsipccALinks_hxk_86881_86881_cn_ln" Name="_ALinks.hxk" Vital="no" />
+          <File Id="FL_vsipccBLinks_hxk_86882_86882_cn_ln" Name="_BLinks.hxk" Vital="no" />
+          <File Id="FL_vsipccCLinks_hxk_cn_ln" Name="_CLinks.hxk" Vital="no" />
+          <File Id="FL_vsipccFLinks_hxk_86885_86885_cn_ln" Name="_FLinks.hxk" Vital="no" />
+          <File Id="FL_vsipccKLinks_hxk_86886_86886_cn_ln" Name="_KLinks.hxk" Vital="no" />
+          <File Id="FL_vsipccNamedURLs_hxk_86888_86888_cn_ln" Name="_vsipcc_namedUrls.hxk" Vital="no" />
+          <File Id="FL_vsipccSlinks_hxk_93825_93825_cn_ln" Name="_SLinks.hxk" Vital="no" />
+          <File Id="FL_VsipCCSamples_HxK_103959_103959_cn_ln" Name="_vsipcc_samples.HxK" Vital="no" />
         </Component>
       </Directory>
     </DirectoryRef>
     <CustomTable Id="HelpNamespace">
       <Row>
-        <Data Column="NamespaceKey">MS.VSIPCC.v90</Data>
-        <Data Column="NamespaceName">MS.VSIPCC.v90</Data>
-        <Data Column="File_Collection">FL_vsipcc_hxc_86879_86879_cn_ln</Data>
-        <Data Column="Description">VSIP Documentation</Data>
+        <Data Column="NamespaceKey" Value="MS.VSIPCC.v90" />
+        <Data Column="NamespaceName" Value="MS.VSIPCC.v90" />
+        <Data Column="File_Collection" Value="FL_vsipcc_hxc_86879_86879_cn_ln" />
+        <Data Column="Description" Value="VSIP Documentation" />
       </Row>
     </CustomTable>
     <CustomTable Id="HelpPlugin">
       <Row>
-        <Data Column="HelpNamespace_">MS.VSIPCC.v90</Data>
-        <Data Column="HelpNamespace_Parent">MS.VSCC.v90</Data>
-        <Data Column="File_HxT">FL_vsipcc_hxt_86880_86880_cn_ln</Data>
+        <Data Column="HelpNamespace_" Value="MS.VSIPCC.v90" />
+        <Data Column="HelpNamespace_Parent" Value="MS.VSCC.v90" />
+        <Data Column="File_HxT" Value="FL_vsipcc_hxt_86880_86880_cn_ln" />
         <Data Column="File_HxA" />
         <Data Column="File_ParentHxT" />
       </Row>
@@ -50,12 +49,12 @@
     <Property Id="DirectoryTable_x86" Value="DirectoryTable" />
     <Property Id="HHFilterTable" Value="HHFilterTable" />
     <InstallExecuteSequence>
-      <Custom Action="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8">Not Installed</Custom>
+      <Custom Action="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" Condition="Not Installed" />
     </InstallExecuteSequence>
 
     <ComponentGroup Id="Help2_VS2008_Namespace_Components">
-      <ComponentRef Id="VSIPCC_Reg_27501"/>
-      <ComponentRef Id="vsipcc_collection_25097"/>
+      <ComponentRef Id="VSIPCC_Reg_27501" />
+      <ComponentRef Id="vsipcc_collection_25097" />
     </ComponentGroup>
   </Fragment>
 </Wix>
-- 
cgit v1.2.3-55-g6feb