1 files changed, 7 insertions, 8 deletions

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>