aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-10-27 17:41:10 -0400
committerBob Arnson <bob@firegiant.com>2020-10-27 17:43:35 -0400
commit16ed14a97c67b563feceff359efcb81c324cb953 (patch)
tree6e4f90d3aec644d7190d6db9b3828e531b369c7f /src/wixlib
parent2df95e5979b318537adee1dfd9260a3c73dce824 (diff)
downloadwix-16ed14a97c67b563feceff359efcb81c324cb953.tar.gz
wix-16ed14a97c67b563feceff359efcb81c324cb953.tar.bz2
wix-16ed14a97c67b563feceff359efcb81c324cb953.zip
Update project for Package/SummaryInformation change.
Diffstat (limited to 'src/wixlib')
-rw-r--r--src/wixlib/HTML_Help_Registration__RTL_X86.wxs39
-rw-r--r--src/wixlib/VS11.wxs15
-rw-r--r--src/wixlib/VS14.wxs15
-rw-r--r--src/wixlib/VS2003.wxs5
-rw-r--r--src/wixlib/VS2005.wxs39
-rw-r--r--src/wixlib/VS2008.wxs45
-rw-r--r--src/wixlib/VS2010.wxs39
-rw-r--r--src/wixlib/VS2012.wxs23
-rw-r--r--src/wixlib/VS2013.wxs23
-rw-r--r--src/wixlib/VS2015.wxs15
-rw-r--r--src/wixlib/VS2017.wxs7
-rw-r--r--src/wixlib/VS2019.wxs7
-rw-r--r--src/wixlib/VSExtension_Platform.wxi5
-rw-r--r--src/wixlib/VsixPackage.wxs17
-rw-r--r--src/wixlib/vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs35
-rw-r--r--src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs49
16 files changed, 181 insertions, 197 deletions
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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <Fragment> 4 <Fragment>
@@ -18,23 +17,23 @@
18 <Binary Id="BIN_File_46001" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_46001.dll" /> 17 <Binary Id="BIN_File_46001" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_46001.dll" />
19 <Binary Id="BIN_File_107602" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_107602.dll" /> 18 <Binary Id="BIN_File_107602" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_107602.dll" />
20 <!-- We are stuck using GUID'ed ids here because they were hardcoded in the Help2 dlls--> 19 <!-- We are stuck using GUID'ed ids here because they were hardcoded in the Help2 dlls-->
21 <CustomAction Id="CA_BeginHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="BeginTransaction" Execute="deferred" Impersonate="no" /> 20 <CustomAction Id="CA_BeginHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="BeginTransaction" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
22 <CustomAction Id="CA_RegisterPlugIn.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterPlugIn2" Execute="deferred" Impersonate="no" /> 21 <CustomAction Id="CA_RegisterPlugIn.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterPlugIn2" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
23 <CustomAction Id="CA_CommitHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="CommitTransaction" Return="ignore" Execute="commit" Impersonate="no" /> 22 <CustomAction Id="CA_CommitHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="CommitTransaction" Return="ignore" Execute="commit" Impersonate="no" BinaryRef="BIN_File_46001" />
24 <CustomAction Id="CA_CommitHelpTransactionNoRB.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="CommitTransaction" Return="ignore" Execute="deferred" Impersonate="no" /> 23 <CustomAction Id="CA_CommitHelpTransactionNoRB.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="CommitTransaction" Return="ignore" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
25 <CustomAction Id="CA_ExportTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46002" DllEntry="ExportTempHxDs" /> 24 <CustomAction Id="CA_ExportTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="ExportTempHxDs" BinaryRef="BIN_File_46002" />
26 <CustomAction Id="CA_RegisterNamespace.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterNamespace2" Execute="deferred" Impersonate="no" /> 25 <CustomAction Id="CA_RegisterNamespace.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterNamespace2" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
27 <CustomAction Id="CA_RollbackTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveTempHxDs" Execute="rollback" Impersonate="no" /> 26 <CustomAction Id="CA_RollbackTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RemoveTempHxDs" Execute="rollback" Impersonate="no" BinaryRef="BIN_File_46001" />
28 <CustomAction Id="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46002" DllEntry="RegisterMicrosoftHelp" Return="ignore" /> 27 <CustomAction Id="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterMicrosoftHelp" Return="ignore" BinaryRef="BIN_File_46002" />
29 <CustomAction Id="CA_RegisterHelpFile.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterHelpFile" Execute="deferred" Impersonate="no" /> 28 <CustomAction Id="CA_RegisterHelpFile.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterHelpFile" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
30 <CustomAction Id="CA_RegisterFilter.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterFilter2" Execute="deferred" Impersonate="no" /> 29 <CustomAction Id="CA_RegisterFilter.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterFilter2" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
31 <CustomAction Id="CA_RemoveNamespace.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveNamespace" Execute="deferred" Impersonate="no" /> 30 <CustomAction Id="CA_RemoveNamespace.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RemoveNamespace" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
32 <CustomAction Id="CA_RemoveTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveTempHxDs" Return="ignore" /> 31 <CustomAction Id="CA_RemoveTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RemoveTempHxDs" Return="ignore" BinaryRef="BIN_File_46001" />
33 <!-- This isn't actually executed, but the Help2 dlls use it to find the key for the binary file--> 32 <!-- This isn't actually executed, but the Help2 dlls use it to find the key for the binary file-->
34 <CustomAction Id="CA_DummyForHXDS_DLL.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_107602" DllEntry="Bogus" /> 33 <CustomAction Id="CA_DummyForHXDS_DLL.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="Bogus" BinaryRef="BIN_File_107602" />
35 <CustomAction Id="CA_RollbackHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RollbackTransaction" Execute="rollback" Impersonate="no" /> 34 <CustomAction Id="CA_RollbackHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RollbackTransaction" Execute="rollback" Impersonate="no" BinaryRef="BIN_File_46001" />
36 <CustomAction Id="CA_RemoveHelpFile.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveHelpFile" Execute="deferred" Impersonate="no" /> 35 <CustomAction Id="CA_RemoveHelpFile.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RemoveHelpFile" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />
37 <CustomAction Id="CA_UnRegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46002" DllEntry="UnRegisterMicrosoftHelp" Return="ignore" /> 36 <CustomAction Id="CA_UnRegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="UnRegisterMicrosoftHelp" Return="ignore" BinaryRef="BIN_File_46002" />
38 37
39 <InstallExecuteSequence> 38 <InstallExecuteSequence>
40 <Custom Action="CA_ExportTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" Before="ProcessComponents" /> 39 <Custom Action="CA_ExportTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" Before="ProcessComponents" />
@@ -45,8 +44,8 @@
45 44
46 <Custom Action="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" After="InstallFiles" /> 45 <Custom Action="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" After="InstallFiles" />
47 46
48 <Custom Action="CA_CommitHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" Before="InstallFinalize">( NOT RollbackDisabled )</Custom> 47 <Custom Action="CA_CommitHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" Before="InstallFinalize" Condition="( NOT RollbackDisabled )" />
49 <Custom Action="CA_CommitHelpTransactionNoRB.3643236F_FC70_11D3_A536_0090278A1BB8" Before="InstallFinalize">( RollbackDisabled )</Custom> 48 <Custom Action="CA_CommitHelpTransactionNoRB.3643236F_FC70_11D3_A536_0090278A1BB8" Before="InstallFinalize" Condition="( RollbackDisabled )" />
50 <Custom Action="CA_RemoveTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" After="InstallFinalize" /> 49 <Custom Action="CA_RemoveTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" After="InstallFinalize" />
51 </InstallExecuteSequence> 50 </InstallExecuteSequence>
52 51
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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -60,7 +59,7 @@
60 <PropertyRef Id="VS11DEVENV" /> 59 <PropertyRef Id="VS11DEVENV" />
61 60
62 <InstallExecuteSequence> 61 <InstallExecuteSequence>
63 <Custom Action="VS11Setup" Before="InstallFinalize" Overridable="yes">VS11DEVENV</Custom> 62 <Custom Action="VS11Setup" Before="InstallFinalize" Overridable="yes" Condition="VS11DEVENV" />
64 </InstallExecuteSequence> 63 </InstallExecuteSequence>
65 </Fragment> 64 </Fragment>
66 65
@@ -69,7 +68,7 @@
69 <PropertyRef Id="VS11DEVENV" /> 68 <PropertyRef Id="VS11DEVENV" />
70 69
71 <InstallExecuteSequence> 70 <InstallExecuteSequence>
72 <Custom Action="VS11InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS11DEVENV</Custom> 71 <Custom Action="VS11InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS11DEVENV" />
73 </InstallExecuteSequence> 72 </InstallExecuteSequence>
74 </Fragment> 73 </Fragment>
75 74
@@ -108,7 +107,7 @@
108 <CustomAction Id="VWD11Setup" Property="VWD11EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> 107 <CustomAction Id="VWD11Setup" Property="VWD11EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
109 <PropertyRef Id="VWD11EXPRESS_IDE" /> 108 <PropertyRef Id="VWD11EXPRESS_IDE" />
110 <InstallExecuteSequence> 109 <InstallExecuteSequence>
111 <Custom Action="VWD11Setup" Before="InstallFinalize" Overridable="yes">VWD11EXPRESS_IDE</Custom> 110 <Custom Action="VWD11Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD11EXPRESS_IDE" />
112 </InstallExecuteSequence> 111 </InstallExecuteSequence>
113 </Fragment> 112 </Fragment>
114 <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates --> 113 <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates -->
@@ -116,7 +115,7 @@
116 <CustomAction Id="VWD11InstallVSTemplates" Property="VWD11EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> 115 <CustomAction Id="VWD11InstallVSTemplates" Property="VWD11EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
117 <PropertyRef Id="VWD11EXPRESS_IDE" /> 116 <PropertyRef Id="VWD11EXPRESS_IDE" />
118 <InstallExecuteSequence> 117 <InstallExecuteSequence>
119 <Custom Action="VWD11InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD11EXPRESS_IDE</Custom> 118 <Custom Action="VWD11InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD11EXPRESS_IDE" />
120 </InstallExecuteSequence> 119 </InstallExecuteSequence>
121 </Fragment> 120 </Fragment>
122 121
@@ -192,7 +191,7 @@
192 <CustomAction Id="VS11WinExpressSetup" Property="VS11WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> 191 <CustomAction Id="VS11WinExpressSetup" Property="VS11WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
193 <PropertyRef Id="VS11WINEXPRESS_IDE" /> 192 <PropertyRef Id="VS11WINEXPRESS_IDE" />
194 <InstallExecuteSequence> 193 <InstallExecuteSequence>
195 <Custom Action="VS11WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS11WINEXPRESS_IDE</Custom> 194 <Custom Action="VS11WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS11WINEXPRESS_IDE" />
196 </InstallExecuteSequence> 195 </InstallExecuteSequence>
197 </Fragment> 196 </Fragment>
198 <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates --> 197 <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates -->
@@ -200,7 +199,7 @@
200 <CustomAction Id="VS11WinExpressInstallVSTemplates" Property="VS11WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> 199 <CustomAction Id="VS11WinExpressInstallVSTemplates" Property="VS11WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
201 <PropertyRef Id="VS11WINEXPRESS_IDE" /> 200 <PropertyRef Id="VS11WINEXPRESS_IDE" />
202 <InstallExecuteSequence> 201 <InstallExecuteSequence>
203 <Custom Action="VS11WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS11WINEXPRESS_IDE</Custom> 202 <Custom Action="VS11WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS11WINEXPRESS_IDE" />
204 </InstallExecuteSequence> 203 </InstallExecuteSequence>
205 </Fragment> 204 </Fragment>
206</Wix> 205</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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -60,7 +59,7 @@
60 <PropertyRef Id="VS14DEVENV" /> 59 <PropertyRef Id="VS14DEVENV" />
61 60
62 <InstallExecuteSequence> 61 <InstallExecuteSequence>
63 <Custom Action="VS14Setup" Before="InstallFinalize" Overridable="yes">VS14DEVENV</Custom> 62 <Custom Action="VS14Setup" Before="InstallFinalize" Overridable="yes" Condition="VS14DEVENV" />
64 </InstallExecuteSequence> 63 </InstallExecuteSequence>
65 </Fragment> 64 </Fragment>
66 65
@@ -69,7 +68,7 @@
69 <PropertyRef Id="VS14DEVENV" /> 68 <PropertyRef Id="VS14DEVENV" />
70 69
71 <InstallExecuteSequence> 70 <InstallExecuteSequence>
72 <Custom Action="VS14InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS14DEVENV</Custom> 71 <Custom Action="VS14InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS14DEVENV" />
73 </InstallExecuteSequence> 72 </InstallExecuteSequence>
74 </Fragment> 73 </Fragment>
75 74
@@ -106,7 +105,7 @@
106 <CustomAction Id="VWD14Setup" Property="VWD14EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> 105 <CustomAction Id="VWD14Setup" Property="VWD14EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
107 <PropertyRef Id="VWD14EXPRESS_IDE" /> 106 <PropertyRef Id="VWD14EXPRESS_IDE" />
108 <InstallExecuteSequence> 107 <InstallExecuteSequence>
109 <Custom Action="VWD14Setup" Before="InstallFinalize" Overridable="yes">VWD14EXPRESS_IDE</Custom> 108 <Custom Action="VWD14Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD14EXPRESS_IDE" />
110 </InstallExecuteSequence> 109 </InstallExecuteSequence>
111 </Fragment> 110 </Fragment>
112 <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates --> 111 <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates -->
@@ -114,7 +113,7 @@
114 <CustomAction Id="VWD14InstallVSTemplates" Property="VWD14EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> 113 <CustomAction Id="VWD14InstallVSTemplates" Property="VWD14EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
115 <PropertyRef Id="VWD14EXPRESS_IDE" /> 114 <PropertyRef Id="VWD14EXPRESS_IDE" />
116 <InstallExecuteSequence> 115 <InstallExecuteSequence>
117 <Custom Action="VWD14InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD14EXPRESS_IDE</Custom> 116 <Custom Action="VWD14InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD14EXPRESS_IDE" />
118 </InstallExecuteSequence> 117 </InstallExecuteSequence>
119 </Fragment> 118 </Fragment>
120 119
@@ -173,7 +172,7 @@
173 <CustomAction Id="VS14WinExpressSetup" Property="VS14WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> 172 <CustomAction Id="VS14WinExpressSetup" Property="VS14WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
174 <PropertyRef Id="VS14WINEXPRESS_IDE" /> 173 <PropertyRef Id="VS14WINEXPRESS_IDE" />
175 <InstallExecuteSequence> 174 <InstallExecuteSequence>
176 <Custom Action="VS14WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS14WINEXPRESS_IDE</Custom> 175 <Custom Action="VS14WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS14WINEXPRESS_IDE" />
177 </InstallExecuteSequence> 176 </InstallExecuteSequence>
178 </Fragment> 177 </Fragment>
179 <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates --> 178 <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates -->
@@ -181,7 +180,7 @@
181 <CustomAction Id="VS14WinExpressInstallVSTemplates" Property="VS14WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> 180 <CustomAction Id="VS14WinExpressInstallVSTemplates" Property="VS14WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
182 <PropertyRef Id="VS14WINEXPRESS_IDE" /> 181 <PropertyRef Id="VS14WINEXPRESS_IDE" />
183 <InstallExecuteSequence> 182 <InstallExecuteSequence>
184 <Custom Action="VS14WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS14WINEXPRESS_IDE</Custom> 183 <Custom Action="VS14WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS14WINEXPRESS_IDE" />
185 </InstallExecuteSequence> 184 </InstallExecuteSequence>
186 </Fragment> 185 </Fragment>
187</Wix> 186</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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -15,7 +14,7 @@
15 <PropertyRef Id="VS2003DEVENV" /> 14 <PropertyRef Id="VS2003DEVENV" />
16 15
17 <InstallExecuteSequence> 16 <InstallExecuteSequence>
18 <Custom Action="VS2003Setup" Before="InstallFinalize" Overridable="yes">VS2003DEVENV</Custom> 17 <Custom Action="VS2003Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2003DEVENV" />
19 </InstallExecuteSequence> 18 </InstallExecuteSequence>
20 </Fragment> 19 </Fragment>
21 20
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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -47,7 +46,7 @@
47 <PropertyRef Id="VS2005DEVENV" /> 46 <PropertyRef Id="VS2005DEVENV" />
48 47
49 <InstallExecuteSequence> 48 <InstallExecuteSequence>
50 <Custom Action="VS2005Setup" Before="InstallFinalize" Overridable="yes">VS2005DEVENV</Custom> 49 <Custom Action="VS2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2005DEVENV" />
51 </InstallExecuteSequence> 50 </InstallExecuteSequence>
52 </Fragment> 51 </Fragment>
53 52
@@ -56,7 +55,7 @@
56 <PropertyRef Id="VS2005DEVENV" /> 55 <PropertyRef Id="VS2005DEVENV" />
57 56
58 <InstallExecuteSequence> 57 <InstallExecuteSequence>
59 <Custom Action="VS2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2005DEVENV</Custom> 58 <Custom Action="VS2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2005DEVENV" />
60 </InstallExecuteSequence> 59 </InstallExecuteSequence>
61 </Fragment> 60 </Fragment>
62 61
@@ -72,8 +71,8 @@
72 <!-- installed on the system. --> 71 <!-- installed on the system. -->
73 <Fragment> 72 <Fragment>
74 <Property Id="VCSHARP2005EXPRESS_IDE" Secure="yes"> 73 <Property Id="VCSHARP2005EXPRESS_IDE" Secure="yes">
75 <ComponentSearch Id="SearchForVcsExpressIde2005Component" Guid="E8A67F23-21D0-4E7B-BBD3-54E2D505BED8" Type="file" > 74 <ComponentSearch Id="SearchForVcsExpressIde2005Component" Guid="E8A67F23-21D0-4E7B-BBD3-54E2D505BED8" Type="file">
76 <FileSearch Id="VcsExpressIde2005" Name="vcsexpress.exe"/> 75 <FileSearch Id="VcsExpressIde2005" Name="vcsexpress.exe" />
77 </ComponentSearch> 76 </ComponentSearch>
78 </Property> 77 </Property>
79 </Fragment> 78 </Fragment>
@@ -84,7 +83,7 @@
84 <PropertyRef Id="VCSHARP2005EXPRESS_IDE" /> 83 <PropertyRef Id="VCSHARP2005EXPRESS_IDE" />
85 84
86 <InstallExecuteSequence> 85 <InstallExecuteSequence>
87 <Custom Action="VCSHARP2005Setup" Before="InstallFinalize" Overridable="yes">VCSHARP2005EXPRESS_IDE</Custom> 86 <Custom Action="VCSHARP2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP2005EXPRESS_IDE" />
88 </InstallExecuteSequence> 87 </InstallExecuteSequence>
89 </Fragment> 88 </Fragment>
90 89
@@ -94,7 +93,7 @@
94 <PropertyRef Id="VCSHARP2005EXPRESS_IDE" /> 93 <PropertyRef Id="VCSHARP2005EXPRESS_IDE" />
95 94
96 <InstallExecuteSequence> 95 <InstallExecuteSequence>
97 <Custom Action="VCSHARP2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VCSHARP2005EXPRESS_IDE</Custom> 96 <Custom Action="VCSHARP2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP2005EXPRESS_IDE" />
98 </InstallExecuteSequence> 97 </InstallExecuteSequence>
99 </Fragment> 98 </Fragment>
100 99
@@ -114,7 +113,7 @@
114 <Fragment> 113 <Fragment>
115 <Property Id="VB2005EXPRESS_IDE" Secure="yes"> 114 <Property Id="VB2005EXPRESS_IDE" Secure="yes">
116 <ComponentSearch Id="SearchForVbExpressIde2005Component" Guid="FCDD3EF0-FFF4-4391-9467-AA48ADC7028F" Type="file"> 115 <ComponentSearch Id="SearchForVbExpressIde2005Component" Guid="FCDD3EF0-FFF4-4391-9467-AA48ADC7028F" Type="file">
117 <FileSearch Id="VbExpressIde2005" Name="vbexpress.exe"/> 116 <FileSearch Id="VbExpressIde2005" Name="vbexpress.exe" />
118 </ComponentSearch> 117 </ComponentSearch>
119 </Property> 118 </Property>
120 </Fragment> 119 </Fragment>
@@ -125,7 +124,7 @@
125 <PropertyRef Id="VB2005EXPRESS_IDE" /> 124 <PropertyRef Id="VB2005EXPRESS_IDE" />
126 125
127 <InstallExecuteSequence> 126 <InstallExecuteSequence>
128 <Custom Action="VB2005Setup" Before="InstallFinalize" Overridable="yes">VB2005EXPRESS_IDE</Custom> 127 <Custom Action="VB2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VB2005EXPRESS_IDE" />
129 </InstallExecuteSequence> 128 </InstallExecuteSequence>
130 </Fragment> 129 </Fragment>
131 130
@@ -135,7 +134,7 @@
135 <PropertyRef Id="VB2005EXPRESS_IDE" /> 134 <PropertyRef Id="VB2005EXPRESS_IDE" />
136 135
137 <InstallExecuteSequence> 136 <InstallExecuteSequence>
138 <Custom Action="VB2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VB2005EXPRESS_IDE</Custom> 137 <Custom Action="VB2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VB2005EXPRESS_IDE" />
139 </InstallExecuteSequence> 138 </InstallExecuteSequence>
140 </Fragment> 139 </Fragment>
141 140
@@ -155,7 +154,7 @@
155 <Fragment> 154 <Fragment>
156 <Property Id="VWD2005EXPRESS_IDE" Secure="yes"> 155 <Property Id="VWD2005EXPRESS_IDE" Secure="yes">
157 <ComponentSearch Id="SearchForVwdExpressIde2005Component" Guid="56B053EA-AEFA-490A-A537-5EA145574862" Type="file"> 156 <ComponentSearch Id="SearchForVwdExpressIde2005Component" Guid="56B053EA-AEFA-490A-A537-5EA145574862" Type="file">
158 <FileSearch Id="VwdExpressIde2005" Name="vwdexpress.exe"/> 157 <FileSearch Id="VwdExpressIde2005" Name="vwdexpress.exe" />
159 </ComponentSearch> 158 </ComponentSearch>
160 </Property> 159 </Property>
161 </Fragment> 160 </Fragment>
@@ -166,7 +165,7 @@
166 <PropertyRef Id="VWD2005EXPRESS_IDE" /> 165 <PropertyRef Id="VWD2005EXPRESS_IDE" />
167 166
168 <InstallExecuteSequence> 167 <InstallExecuteSequence>
169 <Custom Action="VWD2005Setup" Before="InstallFinalize" Overridable="yes">VWD2005EXPRESS_IDE</Custom> 168 <Custom Action="VWD2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2005EXPRESS_IDE" />
170 </InstallExecuteSequence> 169 </InstallExecuteSequence>
171 </Fragment> 170 </Fragment>
172 171
@@ -176,7 +175,7 @@
176 <PropertyRef Id="VWD2005EXPRESS_IDE" /> 175 <PropertyRef Id="VWD2005EXPRESS_IDE" />
177 176
178 <InstallExecuteSequence> 177 <InstallExecuteSequence>
179 <Custom Action="VWD2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2005EXPRESS_IDE</Custom> 178 <Custom Action="VWD2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2005EXPRESS_IDE" />
180 </InstallExecuteSequence> 179 </InstallExecuteSequence>
181 </Fragment> 180 </Fragment>
182 181
@@ -196,7 +195,7 @@
196 <Fragment> 195 <Fragment>
197 <Property Id="VC2005EXPRESS_IDE" Secure="yes"> 196 <Property Id="VC2005EXPRESS_IDE" Secure="yes">
198 <ComponentSearch Id="SearchForVcExpressIde2005Component" Guid="83D8DFB7-73ED-4C83-9606-805F4CD7E1EE" Type="file"> 197 <ComponentSearch Id="SearchForVcExpressIde2005Component" Guid="83D8DFB7-73ED-4C83-9606-805F4CD7E1EE" Type="file">
199 <FileSearch Id="VcExpressIde2005" Name="vcexpress.exe"/> 198 <FileSearch Id="VcExpressIde2005" Name="vcexpress.exe" />
200 </ComponentSearch> 199 </ComponentSearch>
201 </Property> 200 </Property>
202 </Fragment> 201 </Fragment>
@@ -207,7 +206,7 @@
207 <PropertyRef Id="VC2005EXPRESS_IDE" /> 206 <PropertyRef Id="VC2005EXPRESS_IDE" />
208 207
209 <InstallExecuteSequence> 208 <InstallExecuteSequence>
210 <Custom Action="VC2005Setup" Before="InstallFinalize" Overridable="yes">VC2005EXPRESS_IDE</Custom> 209 <Custom Action="VC2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VC2005EXPRESS_IDE" />
211 </InstallExecuteSequence> 210 </InstallExecuteSequence>
212 </Fragment> 211 </Fragment>
213 212
@@ -217,7 +216,7 @@
217 <PropertyRef Id="VC2005EXPRESS_IDE" /> 216 <PropertyRef Id="VC2005EXPRESS_IDE" />
218 217
219 <InstallExecuteSequence> 218 <InstallExecuteSequence>
220 <Custom Action="VC2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VC2005EXPRESS_IDE</Custom> 219 <Custom Action="VC2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VC2005EXPRESS_IDE" />
221 </InstallExecuteSequence> 220 </InstallExecuteSequence>
222 </Fragment> 221 </Fragment>
223 222
@@ -237,7 +236,7 @@
237 <Fragment> 236 <Fragment>
238 <Property Id="VJSHARP2005EXPRESS_IDE" Secure="yes"> 237 <Property Id="VJSHARP2005EXPRESS_IDE" Secure="yes">
239 <ComponentSearch Id="SearchForVjsExpressIde2005Component" Guid="7077FCC9-C3E4-437E-83ED-D5D7D8D9BB6C" Type="file"> 238 <ComponentSearch Id="SearchForVjsExpressIde2005Component" Guid="7077FCC9-C3E4-437E-83ED-D5D7D8D9BB6C" Type="file">
240 <FileSearch Id="VjsExpressIde2005" Name="vjsexpress.exe"/> 239 <FileSearch Id="VjsExpressIde2005" Name="vjsexpress.exe" />
241 </ComponentSearch> 240 </ComponentSearch>
242 </Property> 241 </Property>
243 </Fragment> 242 </Fragment>
@@ -248,7 +247,7 @@
248 <PropertyRef Id="VJSHARP2005EXPRESS_IDE" /> 247 <PropertyRef Id="VJSHARP2005EXPRESS_IDE" />
249 248
250 <InstallExecuteSequence> 249 <InstallExecuteSequence>
251 <Custom Action="VJSHARP2005Setup" Before="InstallFinalize" Overridable="yes">VJSHARP2005EXPRESS_IDE</Custom> 250 <Custom Action="VJSHARP2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VJSHARP2005EXPRESS_IDE" />
252 </InstallExecuteSequence> 251 </InstallExecuteSequence>
253 </Fragment> 252 </Fragment>
254 253
@@ -258,7 +257,7 @@
258 <PropertyRef Id="VJSHARP2005EXPRESS_IDE" /> 257 <PropertyRef Id="VJSHARP2005EXPRESS_IDE" />
259 258
260 <InstallExecuteSequence> 259 <InstallExecuteSequence>
261 <Custom Action="VJSHARP2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VJSHARP2005EXPRESS_IDE</Custom> 260 <Custom Action="VJSHARP2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VJSHARP2005EXPRESS_IDE" />
262 </InstallExecuteSequence> 261 </InstallExecuteSequence>
263 </Fragment> 262 </Fragment>
264 263
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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -41,7 +40,7 @@
41 <PropertyRef Id="VS90DEVENV" /> 40 <PropertyRef Id="VS90DEVENV" />
42 41
43 <InstallExecuteSequence> 42 <InstallExecuteSequence>
44 <Custom Action="VS90Setup" Before="InstallFinalize" Overridable="yes">VS90DEVENV</Custom> 43 <Custom Action="VS90Setup" Before="InstallFinalize" Overridable="yes" Condition="VS90DEVENV" />
45 </InstallExecuteSequence> 44 </InstallExecuteSequence>
46 </Fragment> 45 </Fragment>
47 46
@@ -50,7 +49,7 @@
50 <PropertyRef Id="VS90DEVENV" /> 49 <PropertyRef Id="VS90DEVENV" />
51 50
52 <InstallExecuteSequence> 51 <InstallExecuteSequence>
53 <Custom Action="VS90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS90DEVENV</Custom> 52 <Custom Action="VS90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS90DEVENV" />
54 </InstallExecuteSequence> 53 </InstallExecuteSequence>
55 </Fragment> 54 </Fragment>
56 55
@@ -66,8 +65,8 @@
66 <!-- installed on the system. --> 65 <!-- installed on the system. -->
67 <Fragment> 66 <Fragment>
68 <Property Id="VCSHARP90EXPRESS_IDE" Secure="yes"> 67 <Property Id="VCSHARP90EXPRESS_IDE" Secure="yes">
69 <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file" > 68 <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file">
70 <FileSearch Id="VcsExpressIde90" Name="vcsexpress.exe"/> 69 <FileSearch Id="VcsExpressIde90" Name="vcsexpress.exe" />
71 </ComponentSearch> 70 </ComponentSearch>
72 </Property> 71 </Property>
73 </Fragment> 72 </Fragment>
@@ -78,7 +77,7 @@
78 <PropertyRef Id="VCSHARP90EXPRESS_IDE" /> 77 <PropertyRef Id="VCSHARP90EXPRESS_IDE" />
79 78
80 <InstallExecuteSequence> 79 <InstallExecuteSequence>
81 <Custom Action="VCSHARP90Setup" Before="InstallFinalize" Overridable="yes">VCSHARP90EXPRESS_IDE</Custom> 80 <Custom Action="VCSHARP90Setup" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP90EXPRESS_IDE" />
82 </InstallExecuteSequence> 81 </InstallExecuteSequence>
83 </Fragment> 82 </Fragment>
84 83
@@ -88,7 +87,7 @@
88 <PropertyRef Id="VCSHARP90EXPRESS_IDE" /> 87 <PropertyRef Id="VCSHARP90EXPRESS_IDE" />
89 88
90 <InstallExecuteSequence> 89 <InstallExecuteSequence>
91 <Custom Action="VCSHARP90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VCSHARP90EXPRESS_IDE</Custom> 90 <Custom Action="VCSHARP90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP90EXPRESS_IDE" />
92 </InstallExecuteSequence> 91 </InstallExecuteSequence>
93 </Fragment> 92 </Fragment>
94 93
@@ -108,7 +107,7 @@
108 <Fragment> 107 <Fragment>
109 <Property Id="VB90EXPRESS_IDE" Secure="yes"> 108 <Property Id="VB90EXPRESS_IDE" Secure="yes">
110 <ComponentSearch Id="SearchForVbExpressIde90Component" Guid="010A50C6-8604-4BA2-8CA1-4EC3A5B861B2" Type="file"> 109 <ComponentSearch Id="SearchForVbExpressIde90Component" Guid="010A50C6-8604-4BA2-8CA1-4EC3A5B861B2" Type="file">
111 <FileSearch Id="VbExpressIde90" Name="vbexpress.exe"/> 110 <FileSearch Id="VbExpressIde90" Name="vbexpress.exe" />
112 </ComponentSearch> 111 </ComponentSearch>
113 </Property> 112 </Property>
114 </Fragment> 113 </Fragment>
@@ -119,7 +118,7 @@
119 <PropertyRef Id="VB90EXPRESS_IDE" /> 118 <PropertyRef Id="VB90EXPRESS_IDE" />
120 119
121 <InstallExecuteSequence> 120 <InstallExecuteSequence>
122 <Custom Action="VB90Setup" Before="InstallFinalize" Overridable="yes">VB90EXPRESS_IDE</Custom> 121 <Custom Action="VB90Setup" Before="InstallFinalize" Overridable="yes" Condition="VB90EXPRESS_IDE" />
123 </InstallExecuteSequence> 122 </InstallExecuteSequence>
124 </Fragment> 123 </Fragment>
125 124
@@ -129,7 +128,7 @@
129 <PropertyRef Id="VB90EXPRESS_IDE" /> 128 <PropertyRef Id="VB90EXPRESS_IDE" />
130 129
131 <InstallExecuteSequence> 130 <InstallExecuteSequence>
132 <Custom Action="VB90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VB90EXPRESS_IDE</Custom> 131 <Custom Action="VB90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VB90EXPRESS_IDE" />
133 </InstallExecuteSequence> 132 </InstallExecuteSequence>
134 </Fragment> 133 </Fragment>
135 134
@@ -149,7 +148,7 @@
149 <Fragment> 148 <Fragment>
150 <Property Id="VWD90EXPRESS_IDE" Secure="yes"> 149 <Property Id="VWD90EXPRESS_IDE" Secure="yes">
151 <ComponentSearch Id="SearchForVwdExpressIde90Component" Guid="C7F516CB-CB5C-41B7-9CB4-33927C4DD206" Type="file"> 150 <ComponentSearch Id="SearchForVwdExpressIde90Component" Guid="C7F516CB-CB5C-41B7-9CB4-33927C4DD206" Type="file">
152 <FileSearch Id="VwdExpressIde90" Name="vwdexpress.exe"/> 151 <FileSearch Id="VwdExpressIde90" Name="vwdexpress.exe" />
153 </ComponentSearch> 152 </ComponentSearch>
154 </Property> 153 </Property>
155 </Fragment> 154 </Fragment>
@@ -160,7 +159,7 @@
160 <PropertyRef Id="VWD90EXPRESS_IDE" /> 159 <PropertyRef Id="VWD90EXPRESS_IDE" />
161 160
162 <InstallExecuteSequence> 161 <InstallExecuteSequence>
163 <Custom Action="VWD90Setup" Before="InstallFinalize" Overridable="yes">VWD90EXPRESS_IDE</Custom> 162 <Custom Action="VWD90Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD90EXPRESS_IDE" />
164 </InstallExecuteSequence> 163 </InstallExecuteSequence>
165 </Fragment> 164 </Fragment>
166 165
@@ -170,7 +169,7 @@
170 <PropertyRef Id="VWD90EXPRESS_IDE" /> 169 <PropertyRef Id="VWD90EXPRESS_IDE" />
171 170
172 <InstallExecuteSequence> 171 <InstallExecuteSequence>
173 <Custom Action="VWD90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD90EXPRESS_IDE</Custom> 172 <Custom Action="VWD90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD90EXPRESS_IDE" />
174 </InstallExecuteSequence> 173 </InstallExecuteSequence>
175 </Fragment> 174 </Fragment>
176 175
@@ -190,7 +189,7 @@
190 <Fragment> 189 <Fragment>
191 <Property Id="VC90EXPRESS_IDE" Secure="yes"> 190 <Property Id="VC90EXPRESS_IDE" Secure="yes">
192 <ComponentSearch Id="SearchForVcExpressIde90Component" Guid="147EB31D-8042-4E8F-A3EC-D32C04ED652A" Type="file"> 191 <ComponentSearch Id="SearchForVcExpressIde90Component" Guid="147EB31D-8042-4E8F-A3EC-D32C04ED652A" Type="file">
193 <FileSearch Id="VcExpressIde90" Name="vcexpress.exe"/> 192 <FileSearch Id="VcExpressIde90" Name="vcexpress.exe" />
194 </ComponentSearch> 193 </ComponentSearch>
195 </Property> 194 </Property>
196 </Fragment> 195 </Fragment>
@@ -201,7 +200,7 @@
201 <PropertyRef Id="VC90EXPRESS_IDE" /> 200 <PropertyRef Id="VC90EXPRESS_IDE" />
202 201
203 <InstallExecuteSequence> 202 <InstallExecuteSequence>
204 <Custom Action="VC90Setup" Before="InstallFinalize" Overridable="yes">VC90EXPRESS_IDE</Custom> 203 <Custom Action="VC90Setup" Before="InstallFinalize" Overridable="yes" Condition="VC90EXPRESS_IDE" />
205 </InstallExecuteSequence> 204 </InstallExecuteSequence>
206 </Fragment> 205 </Fragment>
207 206
@@ -211,7 +210,7 @@
211 <PropertyRef Id="VC90EXPRESS_IDE" /> 210 <PropertyRef Id="VC90EXPRESS_IDE" />
212 211
213 <InstallExecuteSequence> 212 <InstallExecuteSequence>
214 <Custom Action="VC90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VC90EXPRESS_IDE</Custom> 213 <Custom Action="VC90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VC90EXPRESS_IDE" />
215 </InstallExecuteSequence> 214 </InstallExecuteSequence>
216 </Fragment> 215 </Fragment>
217 216
@@ -245,7 +244,7 @@
245 <Property Id="VS90_SP1" Secure="yes"> 244 <Property Id="VS90_SP1" Secure="yes">
246 <RegistrySearch Id="VS90DevEnvDirectorySearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VS" Name="EnvironmentDirectory" Type="raw"> 245 <RegistrySearch Id="VS90DevEnvDirectorySearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
247 <DirectorySearch Id="VS90DevEnvFilePathSearch"> 246 <DirectorySearch Id="VS90DevEnvFilePathSearch">
248 <FileSearch Id="VS90DevEnvFileVersionSearch" Name="devenv.exe" MinVersion="9.0.30729.0"/> 247 <FileSearch Id="VS90DevEnvFileVersionSearch" Name="devenv.exe" MinVersion="9.0.30729.0" />
249 </DirectorySearch> 248 </DirectorySearch>
250 </RegistrySearch> 249 </RegistrySearch>
251 </Property> 250 </Property>
@@ -256,7 +255,7 @@
256 <Fragment> 255 <Fragment>
257 <Property Id="VB90EXPRESS_SP1" Secure="yes"> 256 <Property Id="VB90EXPRESS_SP1" Secure="yes">
258 <ComponentSearch Id="SearchForVbExpressIde90Component" Guid="010A50C6-8604-4BA2-8CA1-4EC3A5B861B2" Type="file"> 257 <ComponentSearch Id="SearchForVbExpressIde90Component" Guid="010A50C6-8604-4BA2-8CA1-4EC3A5B861B2" Type="file">
259 <FileSearch Id="VB90ExpressFileVersionSearch" Name="vbexpress.exe" MinVersion="9.0.30729.0"/> 258 <FileSearch Id="VB90ExpressFileVersionSearch" Name="vbexpress.exe" MinVersion="9.0.30729.0" />
260 </ComponentSearch> 259 </ComponentSearch>
261 </Property> 260 </Property>
262 </Fragment> 261 </Fragment>
@@ -266,7 +265,7 @@
266 <Fragment> 265 <Fragment>
267 <Property Id="VC90EXPRESS_SP1" Secure="yes"> 266 <Property Id="VC90EXPRESS_SP1" Secure="yes">
268 <ComponentSearch Id="SearchForVcExpressIde90Component" Guid="147EB31D-8042-4E8F-A3EC-D32C04ED652A" Type="file"> 267 <ComponentSearch Id="SearchForVcExpressIde90Component" Guid="147EB31D-8042-4E8F-A3EC-D32C04ED652A" Type="file">
269 <FileSearch Id="VC90ExpressFileVersionSearch" Name="vcexpress.exe" MinVersion="9.0.30729.0"/> 268 <FileSearch Id="VC90ExpressFileVersionSearch" Name="vcexpress.exe" MinVersion="9.0.30729.0" />
270 </ComponentSearch> 269 </ComponentSearch>
271 </Property> 270 </Property>
272 </Fragment> 271 </Fragment>
@@ -275,8 +274,8 @@
275 <!-- installed on the system. --> 274 <!-- installed on the system. -->
276 <Fragment> 275 <Fragment>
277 <Property Id="VCS90EXPRESS_SP1" Secure="yes"> 276 <Property Id="VCS90EXPRESS_SP1" Secure="yes">
278 <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file" > 277 <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file">
279 <FileSearch Id="VCS90ExpressFileVersionSearch" Name="vcsexpress.exe" MinVersion="9.0.30729.0"/> 278 <FileSearch Id="VCS90ExpressFileVersionSearch" Name="vcsexpress.exe" MinVersion="9.0.30729.0" />
280 </ComponentSearch> 279 </ComponentSearch>
281 </Property> 280 </Property>
282 </Fragment> 281 </Fragment>
@@ -286,7 +285,7 @@
286 <Fragment> 285 <Fragment>
287 <Property Id="VWD90EXPRESS_SP1" Secure="yes"> 286 <Property Id="VWD90EXPRESS_SP1" Secure="yes">
288 <ComponentSearch Id="SearchForVwdExpressIde90Component" Guid="C7F516CB-CB5C-41B7-9CB4-33927C4DD206" Type="file"> 287 <ComponentSearch Id="SearchForVwdExpressIde90Component" Guid="C7F516CB-CB5C-41B7-9CB4-33927C4DD206" Type="file">
289 <FileSearch Id="VWD90ExpressFileVersionSearch" Name="vwdexpress.exe" MinVersion="9.0.30729.0"/> 288 <FileSearch Id="VWD90ExpressFileVersionSearch" Name="vwdexpress.exe" MinVersion="9.0.30729.0" />
290 </ComponentSearch> 289 </ComponentSearch>
291 </Property> 290 </Property>
292 </Fragment> 291 </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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -60,7 +59,7 @@
60 <PropertyRef Id="VS2010DEVENV" /> 59 <PropertyRef Id="VS2010DEVENV" />
61 60
62 <InstallExecuteSequence> 61 <InstallExecuteSequence>
63 <Custom Action="VS2010Setup" Before="InstallFinalize" Overridable="yes">VS2010DEVENV</Custom> 62 <Custom Action="VS2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2010DEVENV" />
64 </InstallExecuteSequence> 63 </InstallExecuteSequence>
65 </Fragment> 64 </Fragment>
66 65
@@ -69,7 +68,7 @@
69 <PropertyRef Id="VS2010DEVENV" /> 68 <PropertyRef Id="VS2010DEVENV" />
70 69
71 <InstallExecuteSequence> 70 <InstallExecuteSequence>
72 <Custom Action="VS2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2010DEVENV</Custom> 71 <Custom Action="VS2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2010DEVENV" />
73 </InstallExecuteSequence> 72 </InstallExecuteSequence>
74 </Fragment> 73 </Fragment>
75 74
@@ -78,8 +77,8 @@
78 <!-- installed on the system. --> 77 <!-- installed on the system. -->
79 <Fragment> 78 <Fragment>
80 <Property Id="VCSHARP2010EXPRESS_IDE" Secure="yes"> 79 <Property Id="VCSHARP2010EXPRESS_IDE" Secure="yes">
81 <ComponentSearch Id="SearchForVcsExpressIde2010Component" Guid="A4945167-D8A4-4B10-9B78-99C2CDC243EC" Type="file" > 80 <ComponentSearch Id="SearchForVcsExpressIde2010Component" Guid="A4945167-D8A4-4B10-9B78-99C2CDC243EC" Type="file">
82 <FileSearch Id="VcsExpressIde2010" Name="vcsexpress.exe"/> 81 <FileSearch Id="VcsExpressIde2010" Name="vcsexpress.exe" />
83 </ComponentSearch> 82 </ComponentSearch>
84 </Property> 83 </Property>
85 </Fragment> 84 </Fragment>
@@ -90,7 +89,7 @@
90 <PropertyRef Id="VCSHARP2010EXPRESS_IDE" /> 89 <PropertyRef Id="VCSHARP2010EXPRESS_IDE" />
91 90
92 <InstallExecuteSequence> 91 <InstallExecuteSequence>
93 <Custom Action="VCSHARP2010Setup" Before="InstallFinalize" Overridable="yes">VCSHARP2010EXPRESS_IDE</Custom> 92 <Custom Action="VCSHARP2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP2010EXPRESS_IDE" />
94 </InstallExecuteSequence> 93 </InstallExecuteSequence>
95 </Fragment> 94 </Fragment>
96 95
@@ -100,7 +99,7 @@
100 <PropertyRef Id="VCSHARP2010EXPRESS_IDE" /> 99 <PropertyRef Id="VCSHARP2010EXPRESS_IDE" />
101 100
102 <InstallExecuteSequence> 101 <InstallExecuteSequence>
103 <Custom Action="VCSHARP2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VCSHARP2010EXPRESS_IDE</Custom> 102 <Custom Action="VCSHARP2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP2010EXPRESS_IDE" />
104 </InstallExecuteSequence> 103 </InstallExecuteSequence>
105 </Fragment> 104 </Fragment>
106 105
@@ -120,7 +119,7 @@
120 <Fragment> 119 <Fragment>
121 <Property Id="VB2010EXPRESS_IDE" Secure="yes"> 120 <Property Id="VB2010EXPRESS_IDE" Secure="yes">
122 <ComponentSearch Id="SearchForVbExpressIde2010Component" Guid="3EDEF607-9E3A-4A64-BFE1-104979CF2899" Type="file"> 121 <ComponentSearch Id="SearchForVbExpressIde2010Component" Guid="3EDEF607-9E3A-4A64-BFE1-104979CF2899" Type="file">
123 <FileSearch Id="VbExpressIde2010" Name="vbexpress.exe"/> 122 <FileSearch Id="VbExpressIde2010" Name="vbexpress.exe" />
124 </ComponentSearch> 123 </ComponentSearch>
125 </Property> 124 </Property>
126 </Fragment> 125 </Fragment>
@@ -131,7 +130,7 @@
131 <PropertyRef Id="VB2010EXPRESS_IDE" /> 130 <PropertyRef Id="VB2010EXPRESS_IDE" />
132 131
133 <InstallExecuteSequence> 132 <InstallExecuteSequence>
134 <Custom Action="VB2010Setup" Before="InstallFinalize" Overridable="yes">VB2010EXPRESS_IDE</Custom> 133 <Custom Action="VB2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VB2010EXPRESS_IDE" />
135 </InstallExecuteSequence> 134 </InstallExecuteSequence>
136 </Fragment> 135 </Fragment>
137 136
@@ -141,7 +140,7 @@
141 <PropertyRef Id="VB2010EXPRESS_IDE" /> 140 <PropertyRef Id="VB2010EXPRESS_IDE" />
142 141
143 <InstallExecuteSequence> 142 <InstallExecuteSequence>
144 <Custom Action="VB2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VB2010EXPRESS_IDE</Custom> 143 <Custom Action="VB2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VB2010EXPRESS_IDE" />
145 </InstallExecuteSequence> 144 </InstallExecuteSequence>
146 </Fragment> 145 </Fragment>
147 146
@@ -161,7 +160,7 @@
161 <Fragment> 160 <Fragment>
162 <Property Id="VWD2010EXPRESS_IDE" Secure="yes"> 161 <Property Id="VWD2010EXPRESS_IDE" Secure="yes">
163 <ComponentSearch Id="SearchForVwdExpressIde2010Component" Guid="771B6CF7-C8D2-4D85-BACD-ED01600256DC" Type="file"> 162 <ComponentSearch Id="SearchForVwdExpressIde2010Component" Guid="771B6CF7-C8D2-4D85-BACD-ED01600256DC" Type="file">
164 <FileSearch Id="VwdExpressIde2010" Name="vwdexpress.exe"/> 163 <FileSearch Id="VwdExpressIde2010" Name="vwdexpress.exe" />
165 </ComponentSearch> 164 </ComponentSearch>
166 </Property> 165 </Property>
167 </Fragment> 166 </Fragment>
@@ -172,7 +171,7 @@
172 <PropertyRef Id="VWD2010EXPRESS_IDE" /> 171 <PropertyRef Id="VWD2010EXPRESS_IDE" />
173 172
174 <InstallExecuteSequence> 173 <InstallExecuteSequence>
175 <Custom Action="VWD2010Setup" Before="InstallFinalize" Overridable="yes">VWD2010EXPRESS_IDE</Custom> 174 <Custom Action="VWD2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2010EXPRESS_IDE" />
176 </InstallExecuteSequence> 175 </InstallExecuteSequence>
177 </Fragment> 176 </Fragment>
178 177
@@ -182,7 +181,7 @@
182 <PropertyRef Id="VWD2010EXPRESS_IDE" /> 181 <PropertyRef Id="VWD2010EXPRESS_IDE" />
183 182
184 <InstallExecuteSequence> 183 <InstallExecuteSequence>
185 <Custom Action="VWD2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2010EXPRESS_IDE</Custom> 184 <Custom Action="VWD2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2010EXPRESS_IDE" />
186 </InstallExecuteSequence> 185 </InstallExecuteSequence>
187 </Fragment> 186 </Fragment>
188 187
@@ -202,7 +201,7 @@
202 <Fragment> 201 <Fragment>
203 <Property Id="VC2010EXPRESS_IDE" Secure="yes"> 202 <Property Id="VC2010EXPRESS_IDE" Secure="yes">
204 <ComponentSearch Id="SearchForVcExpressIde2010Component" Guid="B455E8D3-90CB-47F6-AB7B-9B31E5DE6266" Type="file"> 203 <ComponentSearch Id="SearchForVcExpressIde2010Component" Guid="B455E8D3-90CB-47F6-AB7B-9B31E5DE6266" Type="file">
205 <FileSearch Id="VcExpressIde2010" Name="vcexpress.exe"/> 204 <FileSearch Id="VcExpressIde2010" Name="vcexpress.exe" />
206 </ComponentSearch> 205 </ComponentSearch>
207 </Property> 206 </Property>
208 </Fragment> 207 </Fragment>
@@ -213,7 +212,7 @@
213 <PropertyRef Id="VC2010EXPRESS_IDE" /> 212 <PropertyRef Id="VC2010EXPRESS_IDE" />
214 213
215 <InstallExecuteSequence> 214 <InstallExecuteSequence>
216 <Custom Action="VC2010Setup" Before="InstallFinalize" Overridable="yes">VC2010EXPRESS_IDE</Custom> 215 <Custom Action="VC2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VC2010EXPRESS_IDE" />
217 </InstallExecuteSequence> 216 </InstallExecuteSequence>
218 </Fragment> 217 </Fragment>
219 218
@@ -223,7 +222,7 @@
223 <PropertyRef Id="VC2010EXPRESS_IDE" /> 222 <PropertyRef Id="VC2010EXPRESS_IDE" />
224 223
225 <InstallExecuteSequence> 224 <InstallExecuteSequence>
226 <Custom Action="VC2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VC2010EXPRESS_IDE</Custom> 225 <Custom Action="VC2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VC2010EXPRESS_IDE" />
227 </InstallExecuteSequence> 226 </InstallExecuteSequence>
228 </Fragment> 227 </Fragment>
229 228
@@ -243,7 +242,7 @@
243 <Fragment> 242 <Fragment>
244 <Property Id="VPD2010EXPRESS_IDE" Secure="yes"> 243 <Property Id="VPD2010EXPRESS_IDE" Secure="yes">
245 <ComponentSearch Id="SearchForVpdExpressIde2010Component" Guid="80C81DB2-E95B-4C03-A559-C664E8411DDF" Type="file"> 244 <ComponentSearch Id="SearchForVpdExpressIde2010Component" Guid="80C81DB2-E95B-4C03-A559-C664E8411DDF" Type="file">
246 <FileSearch Id="VpdExpressIde2010" Name="vpdexpress.exe"/> 245 <FileSearch Id="VpdExpressIde2010" Name="vpdexpress.exe" />
247 </ComponentSearch> 246 </ComponentSearch>
248 </Property> 247 </Property>
249 </Fragment> 248 </Fragment>
@@ -254,7 +253,7 @@
254 <PropertyRef Id="VPD2010EXPRESS_IDE" /> 253 <PropertyRef Id="VPD2010EXPRESS_IDE" />
255 254
256 <InstallExecuteSequence> 255 <InstallExecuteSequence>
257 <Custom Action="VPD2010Setup" Before="InstallFinalize" Overridable="yes">VPD2010EXPRESS_IDE</Custom> 256 <Custom Action="VPD2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VPD2010EXPRESS_IDE" />
258 </InstallExecuteSequence> 257 </InstallExecuteSequence>
259 </Fragment> 258 </Fragment>
260 259
@@ -264,7 +263,7 @@
264 <PropertyRef Id="VPD2010EXPRESS_IDE" /> 263 <PropertyRef Id="VPD2010EXPRESS_IDE" />
265 264
266 <InstallExecuteSequence> 265 <InstallExecuteSequence>
267 <Custom Action="VPD2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VPD2010EXPRESS_IDE</Custom> 266 <Custom Action="VPD2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VPD2010EXPRESS_IDE" />
268 </InstallExecuteSequence> 267 </InstallExecuteSequence>
269 </Fragment> 268 </Fragment>
270 269
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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -60,7 +59,7 @@
60 <PropertyRef Id="VS2012DEVENV" /> 59 <PropertyRef Id="VS2012DEVENV" />
61 60
62 <InstallExecuteSequence> 61 <InstallExecuteSequence>
63 <Custom Action="VS2012Setup" Before="InstallFinalize" Overridable="yes">VS2012DEVENV</Custom> 62 <Custom Action="VS2012Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2012DEVENV" />
64 </InstallExecuteSequence> 63 </InstallExecuteSequence>
65 </Fragment> 64 </Fragment>
66 65
@@ -69,7 +68,7 @@
69 <PropertyRef Id="VS2012DEVENV" /> 68 <PropertyRef Id="VS2012DEVENV" />
70 69
71 <InstallExecuteSequence> 70 <InstallExecuteSequence>
72 <Custom Action="VS2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012DEVENV</Custom> 71 <Custom Action="VS2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2012DEVENV" />
73 </InstallExecuteSequence> 72 </InstallExecuteSequence>
74 </Fragment> 73 </Fragment>
75 74
@@ -108,7 +107,7 @@
108 <CustomAction Id="VWD2012Setup" Property="VWD2012EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> 107 <CustomAction Id="VWD2012Setup" Property="VWD2012EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
109 <PropertyRef Id="VWD2012EXPRESS_IDE" /> 108 <PropertyRef Id="VWD2012EXPRESS_IDE" />
110 <InstallExecuteSequence> 109 <InstallExecuteSequence>
111 <Custom Action="VWD2012Setup" Before="InstallFinalize" Overridable="yes">VWD2012EXPRESS_IDE</Custom> 110 <Custom Action="VWD2012Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2012EXPRESS_IDE" />
112 </InstallExecuteSequence> 111 </InstallExecuteSequence>
113 </Fragment> 112 </Fragment>
114 <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates --> 113 <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates -->
@@ -116,7 +115,7 @@
116 <CustomAction Id="VWD2012InstallVSTemplates" Property="VWD2012EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> 115 <CustomAction Id="VWD2012InstallVSTemplates" Property="VWD2012EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
117 <PropertyRef Id="VWD2012EXPRESS_IDE" /> 116 <PropertyRef Id="VWD2012EXPRESS_IDE" />
118 <InstallExecuteSequence> 117 <InstallExecuteSequence>
119 <Custom Action="VWD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2012EXPRESS_IDE</Custom> 118 <Custom Action="VWD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2012EXPRESS_IDE" />
120 </InstallExecuteSequence> 119 </InstallExecuteSequence>
121 </Fragment> 120 </Fragment>
122 121
@@ -131,7 +130,7 @@
131 <CustomAction Id="VPD2012Setup" Property="VPD2012EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> 130 <CustomAction Id="VPD2012Setup" Property="VPD2012EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
132 <PropertyRef Id="VPD2012EXPRESS_IDE" /> 131 <PropertyRef Id="VPD2012EXPRESS_IDE" />
133 <InstallExecuteSequence> 132 <InstallExecuteSequence>
134 <Custom Action="VPD2012Setup" Before="InstallFinalize" Overridable="yes">VPD2012EXPRESS_IDE</Custom> 133 <Custom Action="VPD2012Setup" Before="InstallFinalize" Overridable="yes" Condition="VPD2012EXPRESS_IDE" />
135 </InstallExecuteSequence> 134 </InstallExecuteSequence>
136 </Fragment> 135 </Fragment>
137 <!-- Custom action definition to run VPDexpress.exe /InstallVSTemplates --> 136 <!-- Custom action definition to run VPDexpress.exe /InstallVSTemplates -->
@@ -139,7 +138,7 @@
139 <CustomAction Id="VPD2012InstallVSTemplates" Property="VPD2012EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> 138 <CustomAction Id="VPD2012InstallVSTemplates" Property="VPD2012EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
140 <PropertyRef Id="VPD2012EXPRESS_IDE" /> 139 <PropertyRef Id="VPD2012EXPRESS_IDE" />
141 <InstallExecuteSequence> 140 <InstallExecuteSequence>
142 <Custom Action="VPD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VPD2012EXPRESS_IDE</Custom> 141 <Custom Action="VPD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VPD2012EXPRESS_IDE" />
143 </InstallExecuteSequence> 142 </InstallExecuteSequence>
144 </Fragment> 143 </Fragment>
145 144
@@ -215,7 +214,7 @@
215 <CustomAction Id="VS2012WinExpressSetup" Property="VS2012WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> 214 <CustomAction Id="VS2012WinExpressSetup" Property="VS2012WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
216 <PropertyRef Id="VS2012WINEXPRESS_IDE" /> 215 <PropertyRef Id="VS2012WINEXPRESS_IDE" />
217 <InstallExecuteSequence> 216 <InstallExecuteSequence>
218 <Custom Action="VS2012WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS2012WINEXPRESS_IDE</Custom> 217 <Custom Action="VS2012WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2012WINEXPRESS_IDE" />
219 </InstallExecuteSequence> 218 </InstallExecuteSequence>
220 </Fragment> 219 </Fragment>
221 <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates --> 220 <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates -->
@@ -223,7 +222,7 @@
223 <CustomAction Id="VS2012WinExpressInstallVSTemplates" Property="VS2012WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> 222 <CustomAction Id="VS2012WinExpressInstallVSTemplates" Property="VS2012WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
224 <PropertyRef Id="VS2012WINEXPRESS_IDE" /> 223 <PropertyRef Id="VS2012WINEXPRESS_IDE" />
225 <InstallExecuteSequence> 224 <InstallExecuteSequence>
226 <Custom Action="VS2012WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012WINEXPRESS_IDE</Custom> 225 <Custom Action="VS2012WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2012WINEXPRESS_IDE" />
227 </InstallExecuteSequence> 226 </InstallExecuteSequence>
228 </Fragment> 227 </Fragment>
229 228
@@ -242,7 +241,7 @@
242 <CustomAction Id="VS2012WDExpressSetup" Property="VS2012WDEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> 241 <CustomAction Id="VS2012WDExpressSetup" Property="VS2012WDEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
243 <PropertyRef Id="VS2012WDEXPRESS_IDE" /> 242 <PropertyRef Id="VS2012WDEXPRESS_IDE" />
244 <InstallExecuteSequence> 243 <InstallExecuteSequence>
245 <Custom Action="VS2012WDExpressSetup" Before="InstallFinalize" Overridable="yes">VS2012WDEXPRESS_IDE</Custom> 244 <Custom Action="VS2012WDExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2012WDEXPRESS_IDE" />
246 </InstallExecuteSequence> 245 </InstallExecuteSequence>
247 </Fragment> 246 </Fragment>
248 <!-- Custom action definition to run WDExpress.exe /InstallVSTemplates --> 247 <!-- Custom action definition to run WDExpress.exe /InstallVSTemplates -->
@@ -250,7 +249,7 @@
250 <CustomAction Id="VS2012WDExpressInstallVSTemplates" Property="VS2012WDEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> 249 <CustomAction Id="VS2012WDExpressInstallVSTemplates" Property="VS2012WDEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
251 <PropertyRef Id="VS2012WDEXPRESS_IDE" /> 250 <PropertyRef Id="VS2012WDEXPRESS_IDE" />
252 <InstallExecuteSequence> 251 <InstallExecuteSequence>
253 <Custom Action="VS2012WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012WDEXPRESS_IDE</Custom> 252 <Custom Action="VS2012WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2012WDEXPRESS_IDE" />
254 </InstallExecuteSequence> 253 </InstallExecuteSequence>
255 </Fragment> 254 </Fragment>
256</Wix> 255</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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -60,7 +59,7 @@
60 <PropertyRef Id="VS2013DEVENV" /> 59 <PropertyRef Id="VS2013DEVENV" />
61 60
62 <InstallExecuteSequence> 61 <InstallExecuteSequence>
63 <Custom Action="VS2013Setup" Before="InstallFinalize" Overridable="yes">VS2013DEVENV</Custom> 62 <Custom Action="VS2013Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2013DEVENV" />
64 </InstallExecuteSequence> 63 </InstallExecuteSequence>
65 </Fragment> 64 </Fragment>
66 65
@@ -69,7 +68,7 @@
69 <PropertyRef Id="VS2013DEVENV" /> 68 <PropertyRef Id="VS2013DEVENV" />
70 69
71 <InstallExecuteSequence> 70 <InstallExecuteSequence>
72 <Custom Action="VS2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2013DEVENV</Custom> 71 <Custom Action="VS2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2013DEVENV" />
73 </InstallExecuteSequence> 72 </InstallExecuteSequence>
74 </Fragment> 73 </Fragment>
75 74
@@ -108,7 +107,7 @@
108 <CustomAction Id="VWD2013Setup" Property="VWD2013EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> 107 <CustomAction Id="VWD2013Setup" Property="VWD2013EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
109 <PropertyRef Id="VWD2013EXPRESS_IDE" /> 108 <PropertyRef Id="VWD2013EXPRESS_IDE" />
110 <InstallExecuteSequence> 109 <InstallExecuteSequence>
111 <Custom Action="VWD2013Setup" Before="InstallFinalize" Overridable="yes">VWD2013EXPRESS_IDE</Custom> 110 <Custom Action="VWD2013Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2013EXPRESS_IDE" />
112 </InstallExecuteSequence> 111 </InstallExecuteSequence>
113 </Fragment> 112 </Fragment>
114 <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates --> 113 <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates -->
@@ -116,7 +115,7 @@
116 <CustomAction Id="VWD2013InstallVSTemplates" Property="VWD2013EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> 115 <CustomAction Id="VWD2013InstallVSTemplates" Property="VWD2013EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
117 <PropertyRef Id="VWD2013EXPRESS_IDE" /> 116 <PropertyRef Id="VWD2013EXPRESS_IDE" />
118 <InstallExecuteSequence> 117 <InstallExecuteSequence>
119 <Custom Action="VWD2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2013EXPRESS_IDE</Custom> 118 <Custom Action="VWD2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2013EXPRESS_IDE" />
120 </InstallExecuteSequence> 119 </InstallExecuteSequence>
121 </Fragment> 120 </Fragment>
122 121
@@ -131,7 +130,7 @@
131 <CustomAction Id="VPD2013Setup" Property="VPD2013EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> 130 <CustomAction Id="VPD2013Setup" Property="VPD2013EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
132 <PropertyRef Id="VPD2013EXPRESS_IDE" /> 131 <PropertyRef Id="VPD2013EXPRESS_IDE" />
133 <InstallExecuteSequence> 132 <InstallExecuteSequence>
134 <Custom Action="VPD2013Setup" Before="InstallFinalize" Overridable="yes">VPD2013EXPRESS_IDE</Custom> 133 <Custom Action="VPD2013Setup" Before="InstallFinalize" Overridable="yes" Condition="VPD2013EXPRESS_IDE" />
135 </InstallExecuteSequence> 134 </InstallExecuteSequence>
136 </Fragment> 135 </Fragment>
137 <!-- Custom action definition to run VPDexpress.exe /InstallVSTemplates --> 136 <!-- Custom action definition to run VPDexpress.exe /InstallVSTemplates -->
@@ -139,7 +138,7 @@
139 <CustomAction Id="VPD2013InstallVSTemplates" Property="VPD2013EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> 138 <CustomAction Id="VPD2013InstallVSTemplates" Property="VPD2013EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
140 <PropertyRef Id="VPD2013EXPRESS_IDE" /> 139 <PropertyRef Id="VPD2013EXPRESS_IDE" />
141 <InstallExecuteSequence> 140 <InstallExecuteSequence>
142 <Custom Action="VPD2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VPD2013EXPRESS_IDE</Custom> 141 <Custom Action="VPD2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VPD2013EXPRESS_IDE" />
143 </InstallExecuteSequence> 142 </InstallExecuteSequence>
144 </Fragment> 143 </Fragment>
145 144
@@ -209,7 +208,7 @@
209 <CustomAction Id="VS2013WinExpressSetup" Property="VS2013WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> 208 <CustomAction Id="VS2013WinExpressSetup" Property="VS2013WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
210 <PropertyRef Id="VS2013WINEXPRESS_IDE" /> 209 <PropertyRef Id="VS2013WINEXPRESS_IDE" />
211 <InstallExecuteSequence> 210 <InstallExecuteSequence>
212 <Custom Action="VS2013WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS2013WINEXPRESS_IDE</Custom> 211 <Custom Action="VS2013WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2013WINEXPRESS_IDE" />
213 </InstallExecuteSequence> 212 </InstallExecuteSequence>
214 </Fragment> 213 </Fragment>
215 214
@@ -218,7 +217,7 @@
218 <CustomAction Id="VS2013WinExpressInstallVSTemplates" Property="VS2013WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> 217 <CustomAction Id="VS2013WinExpressInstallVSTemplates" Property="VS2013WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
219 <PropertyRef Id="VS2013WINEXPRESS_IDE" /> 218 <PropertyRef Id="VS2013WINEXPRESS_IDE" />
220 <InstallExecuteSequence> 219 <InstallExecuteSequence>
221 <Custom Action="VS2013WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2013WINEXPRESS_IDE</Custom> 220 <Custom Action="VS2013WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2013WINEXPRESS_IDE" />
222 </InstallExecuteSequence> 221 </InstallExecuteSequence>
223 </Fragment> 222 </Fragment>
224 223
@@ -238,7 +237,7 @@
238 <CustomAction Id="VS2013WDExpressSetup" Property="VS2013WDEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> 237 <CustomAction Id="VS2013WDExpressSetup" Property="VS2013WDEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
239 <PropertyRef Id="VS2013WDEXPRESS_IDE" /> 238 <PropertyRef Id="VS2013WDEXPRESS_IDE" />
240 <InstallExecuteSequence> 239 <InstallExecuteSequence>
241 <Custom Action="VS2013WDExpressSetup" Before="InstallFinalize" Overridable="yes">VS2013WDEXPRESS_IDE</Custom> 240 <Custom Action="VS2013WDExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2013WDEXPRESS_IDE" />
242 </InstallExecuteSequence> 241 </InstallExecuteSequence>
243 </Fragment> 242 </Fragment>
244 243
@@ -247,7 +246,7 @@
247 <CustomAction Id="VS2013WDExpressInstallVSTemplates" Property="VS2013WDEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> 246 <CustomAction Id="VS2013WDExpressInstallVSTemplates" Property="VS2013WDEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
248 <PropertyRef Id="VS2013WDEXPRESS_IDE" /> 247 <PropertyRef Id="VS2013WDEXPRESS_IDE" />
249 <InstallExecuteSequence> 248 <InstallExecuteSequence>
250 <Custom Action="VS2013WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2013WDEXPRESS_IDE</Custom> 249 <Custom Action="VS2013WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2013WDEXPRESS_IDE" />
251 </InstallExecuteSequence> 250 </InstallExecuteSequence>
252 </Fragment> 251 </Fragment>
253</Wix> 252</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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -60,7 +59,7 @@
60 <PropertyRef Id="VS2015DEVENV" /> 59 <PropertyRef Id="VS2015DEVENV" />
61 60
62 <InstallExecuteSequence> 61 <InstallExecuteSequence>
63 <Custom Action="VS2015Setup" Before="InstallFinalize" Overridable="yes">VS2015DEVENV</Custom> 62 <Custom Action="VS2015Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2015DEVENV" />
64 </InstallExecuteSequence> 63 </InstallExecuteSequence>
65 </Fragment> 64 </Fragment>
66 65
@@ -69,7 +68,7 @@
69 <PropertyRef Id="VS2015DEVENV" /> 68 <PropertyRef Id="VS2015DEVENV" />
70 69
71 <InstallExecuteSequence> 70 <InstallExecuteSequence>
72 <Custom Action="VS2015InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2015DEVENV</Custom> 71 <Custom Action="VS2015InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2015DEVENV" />
73 </InstallExecuteSequence> 72 </InstallExecuteSequence>
74 </Fragment> 73 </Fragment>
75 74
@@ -106,7 +105,7 @@
106 <CustomAction Id="VWD2015Setup" Property="VWD2015EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> 105 <CustomAction Id="VWD2015Setup" Property="VWD2015EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
107 <PropertyRef Id="VWD2015EXPRESS_IDE" /> 106 <PropertyRef Id="VWD2015EXPRESS_IDE" />
108 <InstallExecuteSequence> 107 <InstallExecuteSequence>
109 <Custom Action="VWD2015Setup" Before="InstallFinalize" Overridable="yes">VWD2015EXPRESS_IDE</Custom> 108 <Custom Action="VWD2015Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2015EXPRESS_IDE" />
110 </InstallExecuteSequence> 109 </InstallExecuteSequence>
111 </Fragment> 110 </Fragment>
112 <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates --> 111 <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates -->
@@ -114,7 +113,7 @@
114 <CustomAction Id="VWD2015InstallVSTemplates" Property="VWD2015EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> 113 <CustomAction Id="VWD2015InstallVSTemplates" Property="VWD2015EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
115 <PropertyRef Id="VWD2015EXPRESS_IDE" /> 114 <PropertyRef Id="VWD2015EXPRESS_IDE" />
116 <InstallExecuteSequence> 115 <InstallExecuteSequence>
117 <Custom Action="VWD2015InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2015EXPRESS_IDE</Custom> 116 <Custom Action="VWD2015InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2015EXPRESS_IDE" />
118 </InstallExecuteSequence> 117 </InstallExecuteSequence>
119 </Fragment> 118 </Fragment>
120 119
@@ -173,7 +172,7 @@
173 <CustomAction Id="VS2015WinExpressSetup" Property="VS2015WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> 172 <CustomAction Id="VS2015WinExpressSetup" Property="VS2015WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
174 <PropertyRef Id="VS2015WINEXPRESS_IDE" /> 173 <PropertyRef Id="VS2015WINEXPRESS_IDE" />
175 <InstallExecuteSequence> 174 <InstallExecuteSequence>
176 <Custom Action="VS2015WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS2015WINEXPRESS_IDE</Custom> 175 <Custom Action="VS2015WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2015WINEXPRESS_IDE" />
177 </InstallExecuteSequence> 176 </InstallExecuteSequence>
178 </Fragment> 177 </Fragment>
179 <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates --> 178 <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates -->
@@ -181,7 +180,7 @@
181 <CustomAction Id="VS2015WinExpressInstallVSTemplates" Property="VS2015WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> 180 <CustomAction Id="VS2015WinExpressInstallVSTemplates" Property="VS2015WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
182 <PropertyRef Id="VS2015WINEXPRESS_IDE" /> 181 <PropertyRef Id="VS2015WINEXPRESS_IDE" />
183 <InstallExecuteSequence> 182 <InstallExecuteSequence>
184 <Custom Action="VS2015WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2015WINEXPRESS_IDE</Custom> 183 <Custom Action="VS2015WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2015WINEXPRESS_IDE" />
185 </InstallExecuteSequence> 184 </InstallExecuteSequence>
186 </Fragment> 185 </Fragment>
187</Wix> 186</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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -74,7 +73,7 @@
74 <PropertyRef Id="VS2017DEVENV" /> 73 <PropertyRef Id="VS2017DEVENV" />
75 74
76 <InstallExecuteSequence> 75 <InstallExecuteSequence>
77 <Custom Action="VS2017Setup" Before="InstallFinalize" Overridable="yes">VS2017DEVENV</Custom> 76 <Custom Action="VS2017Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2017DEVENV" />
78 </InstallExecuteSequence> 77 </InstallExecuteSequence>
79 </Fragment> 78 </Fragment>
80 79
@@ -83,7 +82,7 @@
83 <PropertyRef Id="VS2017DEVENV" /> 82 <PropertyRef Id="VS2017DEVENV" />
84 83
85 <InstallExecuteSequence> 84 <InstallExecuteSequence>
86 <Custom Action="VS2017InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2017DEVENV</Custom> 85 <Custom Action="VS2017InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2017DEVENV" />
87 </InstallExecuteSequence> 86 </InstallExecuteSequence>
88 </Fragment> 87 </Fragment>
89 88
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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -74,7 +73,7 @@
74 <PropertyRef Id="VS2019DEVENV" /> 73 <PropertyRef Id="VS2019DEVENV" />
75 74
76 <InstallExecuteSequence> 75 <InstallExecuteSequence>
77 <Custom Action="VS2019Setup" Before="InstallFinalize" Overridable="yes">VS2019DEVENV</Custom> 76 <Custom Action="VS2019Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2019DEVENV" />
78 </InstallExecuteSequence> 77 </InstallExecuteSequence>
79 </Fragment> 78 </Fragment>
80 79
@@ -83,7 +82,7 @@
83 <PropertyRef Id="VS2019DEVENV" /> 82 <PropertyRef Id="VS2019DEVENV" />
84 83
85 <InstallExecuteSequence> 84 <InstallExecuteSequence>
86 <Custom Action="VS2019InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2019DEVENV</Custom> 85 <Custom Action="VS2019InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2019DEVENV" />
87 </InstallExecuteSequence> 86 </InstallExecuteSequence>
88 </Fragment> 87 </Fragment>
89 88
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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> 3<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include caSuffix.wxi ?> 4 <?include caSuffix.wxi ?>
6 <Fragment> 5 <Fragment>
7 <CustomAction Id="VSFindInstances$(var.Suffix)" BinaryKey="VSCA$(var.Suffix)" DllEntry="FindInstances" Execute="firstSequence" Return="check" SuppressModularization="yes" /> 6 <CustomAction Id="VSFindInstances$(var.Suffix)" DllEntry="FindInstances" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="VSCA$(var.Suffix)" />
8 <InstallExecuteSequence> 7 <InstallExecuteSequence>
9 <Custom Action="VSFindInstances$(var.Suffix)" Before="AppSearch" Overridable="yes" /> 8 <Custom Action="VSFindInstances$(var.Suffix)" Before="AppSearch" Overridable="yes" />
10 </InstallExecuteSequence> 9 </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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -47,15 +46,15 @@
47 </Property> 46 </Property>
48 47
49 <!-- Use the latest VS- or VWD-installed VSIXInstaller.exe. --> 48 <!-- Use the latest VS- or VWD-installed VSIXInstaller.exe. -->
50 <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> 49 <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" />
51 <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> 50 <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" />
52 51
53 <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> 52 <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" />
54 <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> 53 <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" />
55 54
56 <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> 55 <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" />
57 <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> 56 <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" />
58 57
59 <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> 58 <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" />
60 </Fragment> 59 </Fragment>
61</Wix> 60</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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -24,41 +23,41 @@
24 </Component> 23 </Component>
25 </Directory> 24 </Directory>
26 </DirectoryRef> 25 </DirectoryRef>
27 <CustomAction Id="CA_HxMerge_VSIPCC_VSCC" Return="ignore" Execute="commit" Impersonate="no" BinaryKey="BIN_File_60377" ExeCommand="ms-help://MS.VSCC.v80" /> 26 <CustomAction Id="CA_HxMerge_VSIPCC_VSCC" Return="ignore" Execute="commit" Impersonate="no" ExeCommand="ms-help://MS.VSCC.v80" BinaryRef="BIN_File_60377" />
28 <CustomAction Id="CA_HxMerge_VSIPCC_VSExpCC" Return="ignore" Execute="commit" Impersonate="no" BinaryKey="BIN_File_60377" ExeCommand="ms-help://MS.VSExpressCC.v80" /> 27 <CustomAction Id="CA_HxMerge_VSIPCC_VSExpCC" Return="ignore" Execute="commit" Impersonate="no" ExeCommand="ms-help://MS.VSExpressCC.v80" BinaryRef="BIN_File_60377" />
29 <InstallExecuteSequence> 28 <InstallExecuteSequence>
30 <Custom Action="CA_HxMerge_VSIPCC_VSCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8"/> 29 <Custom Action="CA_HxMerge_VSIPCC_VSCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" />
31 <Custom Action="CA_HxMerge_VSIPCC_VSExpCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8"/> 30 <Custom Action="CA_HxMerge_VSIPCC_VSExpCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" />
32 </InstallExecuteSequence> 31 </InstallExecuteSequence>
33 <Binary Id="BIN_File_60377" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_60377.dll" /> 32 <Binary Id="BIN_File_60377" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_60377.dll" />
34 <CustomTable Id="HelpPlugin"> 33 <CustomTable Id="HelpPlugin">
35 <Row> 34 <Row>
36 <Data Column="HelpNamespace_">MS_VSIPCC_v80</Data> 35 <Data Column="HelpNamespace_" Value="MS_VSIPCC_v80" />
37 <Data Column="HelpNamespace_Parent">MS_VSCC_v80</Data> 36 <Data Column="HelpNamespace_Parent" Value="MS_VSCC_v80" />
38 <Data Column="File_HxT">FL_vsipcc_hxt_86880________</Data> 37 <Data Column="File_HxT" Value="FL_vsipcc_hxt_86880________" />
39 <Data Column="File_HxA" /> 38 <Data Column="File_HxA" />
40 <Data Column="File_ParentHxT" /> 39 <Data Column="File_ParentHxT" />
41 </Row> 40 </Row>
42 <Row> 41 <Row>
43 <Data Column="HelpNamespace_">MS_VSIPCC_v80</Data> 42 <Data Column="HelpNamespace_" Value="MS_VSIPCC_v80" />
44 <Data Column="HelpNamespace_Parent">MS_VSExpressCC_v80</Data> 43 <Data Column="HelpNamespace_Parent" Value="MS_VSExpressCC_v80" />
45 <Data Column="File_HxT">FL_vsipcc_hxt_86880________</Data> 44 <Data Column="File_HxT" Value="FL_vsipcc_hxt_86880________" />
46 <Data Column="File_HxA" /> 45 <Data Column="File_HxA" />
47 <Data Column="File_ParentHxT" /> 46 <Data Column="File_ParentHxT" />
48 </Row> 47 </Row>
49 </CustomTable> 48 </CustomTable>
50 <CustomTable Id="HelpNamespace"> 49 <CustomTable Id="HelpNamespace">
51 <Row> 50 <Row>
52 <Data Column="NamespaceKey">MS_VSIPCC_v80</Data> 51 <Data Column="NamespaceKey" Value="MS_VSIPCC_v80" />
53 <Data Column="NamespaceName">MS.VSIPCC.v80</Data> 52 <Data Column="NamespaceName" Value="MS.VSIPCC.v80" />
54 <Data Column="File_Collection">FL_vsipcc_hxc_86879________</Data> 53 <Data Column="File_Collection" Value="FL_vsipcc_hxc_86879________" />
55 <Data Column="Description">VSIP Documentation</Data> 54 <Data Column="Description" Value="VSIP Documentation" />
56 </Row> 55 </Row>
57 </CustomTable> 56 </CustomTable>
58 57
59 <ComponentGroup Id="Help2_VS2005_Namespace_Components"> 58 <ComponentGroup Id="Help2_VS2005_Namespace_Components">
60 <ComponentRef Id="VSIPCC_Reg"/> 59 <ComponentRef Id="VSIPCC_Reg" />
61 <ComponentRef Id="vsipcc_collection________"/> 60 <ComponentRef Id="vsipcc_collection________" />
62 </ComponentGroup> 61 </ComponentGroup>
63 </Fragment> 62 </Fragment>
64</Wix> 63</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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<!-- 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. -->
2<!-- 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. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <Fragment Id="VS2008_Namespace"> 5 <Fragment Id="VS2008_Namespace">
7 <Binary Id="BIN_435439_x86_enu" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_435439_x86_enu.dll" /> 6 <Binary Id="BIN_435439_x86_enu" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_435439_x86_enu.dll" />
8 <CustomAction Id="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" BinaryKey="BIN_435439_x86_enu" DllEntry="ScheduleExtHelpPlugin" Return="ignore" /> 7 <CustomAction Id="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" DllEntry="ScheduleExtHelpPlugin" Return="ignore" BinaryRef="BIN_435439_x86_enu" />
9 <CustomAction Id="CA_ExtHelpPlugin" BinaryKey="BIN_435439_x86_enu" DllEntry="ExtHelpPluginAction" Execute="deferred" Impersonate="no" /> 8 <CustomAction Id="CA_ExtHelpPlugin" DllEntry="ExtHelpPluginAction" Execute="deferred" Impersonate="no" BinaryRef="BIN_435439_x86_enu" />
10 9
11 <DirectoryRef Id="VSIPCC"> 10 <DirectoryRef Id="VSIPCC">
12 <Component Id="VSIPCC_Reg_27501" Guid="{7C32E9FB-9C4D-416B-8ACC-9D487ED0ADBD}" KeyPath="yes"> 11 <Component Id="VSIPCC_Reg_27501" Guid="{7C32E9FB-9C4D-416B-8ACC-9D487ED0ADBD}" KeyPath="yes">
@@ -15,33 +14,33 @@
15 </Component> 14 </Component>
16 <Directory Id="vsipcc_v9.0" Name="v9.0" FileSource="$(sys.SOURCEFILEDIR)\Redist"> 15 <Directory Id="vsipcc_v9.0" Name="v9.0" FileSource="$(sys.SOURCEFILEDIR)\Redist">
17 <Component Id="vsipcc_collection_25097" Guid="{D419D13C-D6D8-4E2A-A3EF-B26398D36524}"> 16 <Component Id="vsipcc_collection_25097" Guid="{D419D13C-D6D8-4E2A-A3EF-B26398D36524}">
18 <File Id="FL_vsipcc_reg_hxs_86878_86878_cn_ln" Name="vsipcc_reg.hxs" KeyPath="yes" Vital="no"/> 17 <File Id="FL_vsipcc_reg_hxs_86878_86878_cn_ln" Name="vsipcc_reg.hxs" KeyPath="yes" Vital="no" />
19 <File Id="FL_vsipcc_hxc_86879_86879_cn_ln" Name="_vsipcc90.hxc" Vital="no"/> 18 <File Id="FL_vsipcc_hxc_86879_86879_cn_ln" Name="_vsipcc90.hxc" Vital="no" />
20 <File Id="FL_vsipcc_hxt_86880_86880_cn_ln" Name="_vsipcc90.hxt" Vital="no"/> 19 <File Id="FL_vsipcc_hxt_86880_86880_cn_ln" Name="_vsipcc90.hxt" Vital="no" />
21 <File Id="FL_vsipccALinks_hxk_86881_86881_cn_ln" Name="_ALinks.hxk" Vital="no"/> 20 <File Id="FL_vsipccALinks_hxk_86881_86881_cn_ln" Name="_ALinks.hxk" Vital="no" />
22 <File Id="FL_vsipccBLinks_hxk_86882_86882_cn_ln" Name="_BLinks.hxk" Vital="no"/> 21 <File Id="FL_vsipccBLinks_hxk_86882_86882_cn_ln" Name="_BLinks.hxk" Vital="no" />
23 <File Id="FL_vsipccCLinks_hxk_cn_ln" Name="_CLinks.hxk" Vital="no"/> 22 <File Id="FL_vsipccCLinks_hxk_cn_ln" Name="_CLinks.hxk" Vital="no" />
24 <File Id="FL_vsipccFLinks_hxk_86885_86885_cn_ln" Name="_FLinks.hxk" Vital="no"/> 23 <File Id="FL_vsipccFLinks_hxk_86885_86885_cn_ln" Name="_FLinks.hxk" Vital="no" />
25 <File Id="FL_vsipccKLinks_hxk_86886_86886_cn_ln" Name="_KLinks.hxk" Vital="no"/> 24 <File Id="FL_vsipccKLinks_hxk_86886_86886_cn_ln" Name="_KLinks.hxk" Vital="no" />
26 <File Id="FL_vsipccNamedURLs_hxk_86888_86888_cn_ln" Name="_vsipcc_namedUrls.hxk" Vital="no"/> 25 <File Id="FL_vsipccNamedURLs_hxk_86888_86888_cn_ln" Name="_vsipcc_namedUrls.hxk" Vital="no" />
27 <File Id="FL_vsipccSlinks_hxk_93825_93825_cn_ln" Name="_SLinks.hxk" Vital="no"/> 26 <File Id="FL_vsipccSlinks_hxk_93825_93825_cn_ln" Name="_SLinks.hxk" Vital="no" />
28 <File Id="FL_VsipCCSamples_HxK_103959_103959_cn_ln" Name="_vsipcc_samples.HxK" Vital="no"/> 27 <File Id="FL_VsipCCSamples_HxK_103959_103959_cn_ln" Name="_vsipcc_samples.HxK" Vital="no" />
29 </Component> 28 </Component>
30 </Directory> 29 </Directory>
31 </DirectoryRef> 30 </DirectoryRef>
32 <CustomTable Id="HelpNamespace"> 31 <CustomTable Id="HelpNamespace">
33 <Row> 32 <Row>
34 <Data Column="NamespaceKey">MS.VSIPCC.v90</Data> 33 <Data Column="NamespaceKey" Value="MS.VSIPCC.v90" />
35 <Data Column="NamespaceName">MS.VSIPCC.v90</Data> 34 <Data Column="NamespaceName" Value="MS.VSIPCC.v90" />
36 <Data Column="File_Collection">FL_vsipcc_hxc_86879_86879_cn_ln</Data> 35 <Data Column="File_Collection" Value="FL_vsipcc_hxc_86879_86879_cn_ln" />
37 <Data Column="Description">VSIP Documentation</Data> 36 <Data Column="Description" Value="VSIP Documentation" />
38 </Row> 37 </Row>
39 </CustomTable> 38 </CustomTable>
40 <CustomTable Id="HelpPlugin"> 39 <CustomTable Id="HelpPlugin">
41 <Row> 40 <Row>
42 <Data Column="HelpNamespace_">MS.VSIPCC.v90</Data> 41 <Data Column="HelpNamespace_" Value="MS.VSIPCC.v90" />
43 <Data Column="HelpNamespace_Parent">MS.VSCC.v90</Data> 42 <Data Column="HelpNamespace_Parent" Value="MS.VSCC.v90" />
44 <Data Column="File_HxT">FL_vsipcc_hxt_86880_86880_cn_ln</Data> 43 <Data Column="File_HxT" Value="FL_vsipcc_hxt_86880_86880_cn_ln" />
45 <Data Column="File_HxA" /> 44 <Data Column="File_HxA" />
46 <Data Column="File_ParentHxT" /> 45 <Data Column="File_ParentHxT" />
47 </Row> 46 </Row>
@@ -50,12 +49,12 @@
50 <Property Id="DirectoryTable_x86" Value="DirectoryTable" /> 49 <Property Id="DirectoryTable_x86" Value="DirectoryTable" />
51 <Property Id="HHFilterTable" Value="HHFilterTable" /> 50 <Property Id="HHFilterTable" Value="HHFilterTable" />
52 <InstallExecuteSequence> 51 <InstallExecuteSequence>
53 <Custom Action="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8">Not Installed</Custom> 52 <Custom Action="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" Condition="Not Installed" />
54 </InstallExecuteSequence> 53 </InstallExecuteSequence>
55 54
56 <ComponentGroup Id="Help2_VS2008_Namespace_Components"> 55 <ComponentGroup Id="Help2_VS2008_Namespace_Components">
57 <ComponentRef Id="VSIPCC_Reg_27501"/> 56 <ComponentRef Id="VSIPCC_Reg_27501" />
58 <ComponentRef Id="vsipcc_collection_25097"/> 57 <ComponentRef Id="vsipcc_collection_25097" />
59 </ComponentGroup> 58 </ComponentGroup>
60 </Fragment> 59 </Fragment>
61</Wix> 60</Wix>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-01 08:31:51 +0000