@joebigelow / wix / commits / 16ed14a9

Update project for Package/SummaryInformation change.

Bob Arnson committed Oct 27, 2020 at 17:41 UTC 16ed14a97c67b563feceff359efcb81c324cb953

24 files changed +197 -522

VisualStudio.wixext.sln

+2 -2

@@ -1,7 +1,7 @@

2 Microsoft Visual Studio Solution File, Format Version 12.00

3 -# Visual Studio 15

4 -VisualStudioVersion = 15.0.27130.2003

3 +# Visual Studio Version 16

4 +VisualStudioVersion = 16.0.30611.23

5 MinimumVisualStudioVersion = 15.0.26124.0

6 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsca", "src\ca\vsca.vcxproj", "{45308B85-0628-4978-8FC8-6AD9E1AD5949}"

7 EndProject

global.json

+1 -1

@@ -1,5 +1,5 @@

1 {

2 "msbuild-sdks": {

3 - "WixToolset.Sdk": "4.0.0-build-0143"

3 + "WixToolset.Sdk": "4.0.0-build-0162"

4 }

5 }

src/ca/vsca.vcxproj

+3 -14

@@ -1,10 +1,8 @@

1 <?xml version="1.0" encoding="utf-8"?>

3 -

3 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

4 <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />

5 <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" />

7 -

6 <ItemGroup Label="ProjectConfigurations">

7 <ProjectConfiguration Include="Debug|Win32">

8 <Configuration>Debug</Configuration>

@@ -15,49 +13,40 @@

13 <Platform>Win32</Platform>

14 </ProjectConfiguration>

15 </ItemGroup>

18 -

16 <PropertyGroup Label="Globals">

17 <ProjectGuid>{45308B85-0628-4978-8FC8-6AD9E1AD5949}</ProjectGuid>

18 <ConfigurationType>DynamicLibrary</ConfigurationType>

19 <TargetName>vsca</TargetName>

23 - <PlatformToolset>v141</PlatformToolset>

20 + <PlatformToolset>v142</PlatformToolset>

21 <CharacterSet>Unicode</CharacterSet>

22 <ProjectModuleDefinitionFile>vsca.def</ProjectModuleDefinitionFile>

23 <Description>WiX Toolset VS CustomAction</Description>

24 + <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

25 </PropertyGroup>

28 -

26 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

27 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

31 -

28 <ImportGroup Label="ExtensionSettings">

29 </ImportGroup>

34 -

30 <ImportGroup Label="Shared">

31 <Import Project="..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" />

32 </ImportGroup>

38 -

33 <PropertyGroup>

34 <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>

35 </PropertyGroup>

42 -

36 <ItemGroup>

37 <ClCompile Include="dllmain.cpp">

38 <PrecompiledHeader>Create</PrecompiledHeader>

39 </ClCompile>

40 <ClCompile Include="vsca.cpp" />

41 </ItemGroup>

49 -

42 <ItemGroup>

43 <ClInclude Include="precomp.h" />

44 </ItemGroup>

53 -

45 <ItemGroup>

46 <None Include="packages.config" />

47 <None Include="vsca.def" />

48 </ItemGroup>

58 -

49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

60 -

50 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

51 <PropertyGroup>

52 <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

@@ -66,4 +55,4 @@

55 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />

56 <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props'))" />

57 </Target>

69 -</Project>

58 +</Project>

\ No newline at end of file

src/test/WixToolsetTest.VisualStudio/TestData/UsingVsixPackage/Package.wxs

+3 -8

@@ -1,18 +1,13 @@

1 -<?xml version="1.0" encoding="utf-8"?>

2 -<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

3 - <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">

4 - <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />

5 -

1 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

2 + <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">

3 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />

7 - <MediaTemplate />

5 <PropertyRef Id="VS2017DEVENV" />

7 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">

8 <ComponentGroupRef Id="ProductComponents" />

9 </Feature>

14 -

15 - </Product>

10 + </Package>

12 <Fragment>

13 <Directory Id="TARGETDIR" Name="SourceDir">

src/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs

+6 -6

@@ -23,13 +23,13 @@ namespace WixToolsetTest.VisualStudio

23 "CustomAction:SetVS2012Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2012_VSIX_INSTALLER_PATH]\t",

24 "CustomAction:SetVS2013Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2013_VSIX_INSTALLER_PATH]\t",

25 "CustomAction:SetVS2015Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2015_VSIX_INSTALLER_PATH]\t",

26 - "CustomAction:vimyrEjb_CFhXi3TTLayKNM2w7rvr4\t3122\tVS_VSIX_INSTALLER_PATH\t/q \"[#filzi8nwT8Ta133xcfp7qSIdGdRiC0]\" /admin\t",

27 - "CustomAction:viuFqqe3R3R3Fh7P05ubFRhqQlCBdQ\t1074\tVS_VSIX_INSTALLER_PATH\t/q \"[#filzi8nwT8Ta133xcfp7qSIdGdRiC0]\"\t",

28 - "CustomAction:vrmyrEjb_CFhXi3TTLayKNM2w7rvr4\t3442\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\" /admin\t",

29 - "CustomAction:vruFqqe3R3R3Fh7P05ubFRhqQlCBdQ\t1394\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\"\t",

26 + "CustomAction:vimLa9TyFoAVwf8JmA0_ZJHA69J2fo\t3122\tVS_VSIX_INSTALLER_PATH\t/q \"[#filzi8nwT8Ta133xcfp7qSIdGdRiC0]\" /admin\t",

27 + "CustomAction:viuMpl8IvFSDAzTulrmpAzBwAmCRTQ\t1074\tVS_VSIX_INSTALLER_PATH\t/q \"[#filzi8nwT8Ta133xcfp7qSIdGdRiC0]\"\t",

28 + "CustomAction:vrmLa9TyFoAVwf8JmA0_ZJHA69J2fo\t3442\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\" /admin\t",

29 + "CustomAction:vruMpl8IvFSDAzTulrmpAzBwAmCRTQ\t1394\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\"\t",

30 "CustomAction:VSFindInstances\t257\tVSCA\tFindInstances\t",

31 - "CustomAction:vumyrEjb_CFhXi3TTLayKNM2w7rvr4\t3186\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\" /admin\t",

32 - "CustomAction:vuuFqqe3R3R3Fh7P05ubFRhqQlCBdQ\t1138\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\"\t",

31 + "CustomAction:vumLa9TyFoAVwf8JmA0_ZJHA69J2fo\t3186\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\" /admin\t",

32 + "CustomAction:vuuMpl8IvFSDAzTulrmpAzBwAmCRTQ\t1138\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\"\t",

33 "CustomAction:Vwd2012VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2012_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t",

34 "CustomAction:Vwd2013VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2013_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t",

35 "CustomAction:Vwd2015VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2015_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t",

src/wixext/VSCompiler.cs

+1 -1

@@ -60,7 +60,7 @@ namespace WixToolset.VisualStudio

60 break;

61 case "Fragment":

62 case "Module":

63 - case "Product":

63 + case "Package":

64 switch (element.Name.LocalName)

65 {

66 case "HelpCollectionRef":

src/wixext/WixToolset.VisualStudio.wixext.csproj

-1

@@ -13,7 +13,6 @@

14 <ItemGroup>

15 <Content Include="$(MSBuildThisFileName).targets" />

16 - <Content Include="vs.xsd" PackagePath="tools" />

16 <EmbeddedResource Include="$(OutputPath)..\vs.wixlib" />

17 </ItemGroup>

src/wixext/vs.xsd deleted

-292

@@ -1,292 +0,0 @@

1 -<?xml version="1.0" encoding="utf-8"?>

3 -

4 -

5 -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"

6 - xmlns:xse=" http://wixtoolset.org/schemas/XmlSchemaExtension"

7 - targetNamespace="http://wixtoolset.org/schemas/v4/wxs/vs"

8 - xmlns="http://wixtoolset.org/schemas/v4/wxs/vs">

9 - <xs:annotation>

10 - <xs:documentation>

11 - The source code schema for the WiX Toolset Visual Studio Extension.

12 - </xs:documentation>

13 - </xs:annotation>

14 -

15 - <xs:element name="HelpCollection">

16 - <xs:annotation>

17 - <xs:documentation>

18 - Help Namespace for a help collection. The parent file is the key for the HxC (Collection) file.

19 - </xs:documentation>

20 - <xs:appinfo>

21 - <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="File" />

22 - </xs:appinfo>

23 - </xs:annotation>

24 - <xs:complexType>

25 - <xs:choice minOccurs="0" maxOccurs="unbounded">

26 - <xs:element ref="HelpFileRef" />

27 - <xs:element ref="HelpFilterRef" />

28 - <xs:element ref="PlugCollectionInto" />

29 - </xs:choice>

30 - <xs:attribute name="Id" type="xs:string" use="required">

31 - <xs:annotation><xs:documentation>Primary Key for HelpNamespace.</xs:documentation></xs:annotation>

32 - </xs:attribute>

33 - <xs:attribute name="Description" type="xs:string">

34 - <xs:annotation><xs:documentation>Friendly name for Namespace.</xs:documentation></xs:annotation>

35 - </xs:attribute>

36 - <xs:attribute name="Name" use="required" type="xs:string">

37 - <xs:annotation><xs:documentation>Internal Microsoft Help ID for this Namespace.</xs:documentation></xs:annotation>

38 - </xs:attribute>

39 - <xs:attribute name="SuppressCustomActions" type="YesNoType">

40 - <xs:annotation><xs:documentation>Suppress linking Help registration custom actions. Help redistributable merge modules will be required. Use this when building a merge module.</xs:documentation></xs:annotation>

41 - </xs:attribute>

42 - </xs:complexType>

43 - </xs:element>

44 -

45 - <xs:element name="HelpFilter">

46 - <xs:annotation>

47 - <xs:documentation>

48 - Filter for Help Namespace.

49 - </xs:documentation>

50 - <xs:appinfo>

51 - <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />

52 - <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />

53 - <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />

54 - </xs:appinfo>

55 - </xs:annotation>

56 - <xs:complexType>

57 - <xs:attribute name="Id" use="required" type="xs:string">

58 - <xs:annotation><xs:documentation>Primary Key for HelpFilter.</xs:documentation></xs:annotation>

59 - </xs:attribute>

60 - <xs:attribute name="FilterDefinition" type="xs:string">

61 - <xs:annotation><xs:documentation>Query String for Help Filter.</xs:documentation></xs:annotation>

62 - </xs:attribute>

63 - <xs:attribute name="Name" use="required" type="xs:string">

64 - <xs:annotation><xs:documentation>Friendly name for Filter.</xs:documentation></xs:annotation>

65 - </xs:attribute>

66 - <xs:attribute name="SuppressCustomActions" type="YesNoType">

67 - <xs:annotation><xs:documentation>Suppress linking Help registration custom actions. Help redistributable merge modules will be required. Use this when building a merge module.</xs:documentation></xs:annotation>

68 - </xs:attribute>

69 - </xs:complexType>

70 - </xs:element>

71 -

72 - <xs:element name="HelpFile">

73 - <xs:annotation>

74 - <xs:documentation>

75 - File for Help Namespace. The parent file is the key for HxS (Title) file.

76 - </xs:documentation>

77 - <xs:appinfo>

78 - <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="File" />

79 - </xs:appinfo>

80 - </xs:annotation>

81 - <xs:complexType>

82 - <xs:attribute name="Id" use="required" type="xs:string">

83 - <xs:annotation><xs:documentation>Primary Key for HelpFile Table.</xs:documentation></xs:annotation>

84 - </xs:attribute>

85 - <xs:attribute name="AttributeIndex" type="xs:string">

86 - <xs:annotation><xs:documentation>Key for HxR (Attributes) file.</xs:documentation></xs:annotation>

87 - </xs:attribute>

88 - <xs:attribute name="Index" type="xs:string">

89 - <xs:annotation><xs:documentation>Key for HxI (Index) file.</xs:documentation></xs:annotation>

90 - </xs:attribute>

91 - <xs:attribute name="Language" use="required" type="xs:integer">

92 - <xs:annotation><xs:documentation>Language ID for content file.</xs:documentation></xs:annotation>

93 - </xs:attribute>

94 - <xs:attribute name="Name" use="required" type="xs:string">

95 - <xs:annotation><xs:documentation>Internal Microsoft Help ID for this HelpFile.</xs:documentation></xs:annotation>

96 - </xs:attribute>

97 - <xs:attribute name="SampleLocation" type="xs:string">

98 - <xs:annotation><xs:documentation>Key for a file that is in the "root" of the samples directory for this HelpFile.</xs:documentation></xs:annotation>

99 - </xs:attribute>

100 - <xs:attribute name="Search" type="xs:string">

101 - <xs:annotation><xs:documentation>Key for HxQ (Query) file.</xs:documentation></xs:annotation>

102 - </xs:attribute>

103 - <xs:attribute name="SuppressCustomActions" type="YesNoType">

104 - <xs:annotation><xs:documentation>Suppress linking Help registration custom actions. Help redistributable merge modules will be required. Use this when building a merge module.</xs:documentation></xs:annotation>

105 - </xs:attribute>

106 - </xs:complexType>

107 - </xs:element>

108 -

109 - <xs:element name="PlugCollectionInto">

110 - <xs:annotation><xs:documentation>Plugin for Help Namespace.</xs:documentation></xs:annotation>

111 - <xs:complexType>

112 - <xs:attribute name="Attributes" type="xs:string">

113 - <xs:annotation><xs:documentation>Key for HxA (Attributes) file of child namespace.</xs:documentation></xs:annotation>

114 - </xs:attribute>

115 - <xs:attribute name="TableOfContents" type="xs:string">

116 - <xs:annotation><xs:documentation>Key for HxT file of child namespace.</xs:documentation></xs:annotation>

117 - </xs:attribute>

118 - <xs:attribute name="TargetCollection" use="required" type="xs:string">

119 - <xs:annotation><xs:documentation>

120 - Foriegn Key into HelpNamespace table for the parent namespace into which the child will be inserted.

121 - The following special keys can be used to plug into external namespaces defined outside of the installer.

122 - MS_VSIPCC_v80 : Visual Studio 2005

123 - MS.VSIPCC.v90 : Visual Studio 2008

124 - </xs:documentation></xs:annotation>

125 - </xs:attribute>

126 - <xs:attribute name="TargetTableOfContents" type="xs:string">

127 - <xs:annotation><xs:documentation>Key for HxT file of parent namespace that now includes the new child namespace.</xs:documentation></xs:annotation>

128 - </xs:attribute>

129 - <xs:attribute name="TargetFeature" type="xs:string">

130 - <xs:annotation><xs:documentation>Key for the feature parent of this help collection. Required only when plugging into external namespaces.</xs:documentation></xs:annotation>

131 - </xs:attribute>

132 - <xs:attribute name="SuppressExternalNamespaces" type="YesNoType">

133 - <xs:annotation><xs:documentation>Suppress linking Visual Studio Help namespaces. Help redistributable merge modules will be required. Use this when building a merge module.</xs:documentation></xs:annotation>

134 - </xs:attribute>

135 - </xs:complexType>

136 - </xs:element>

137 -

138 - <xs:element name="HelpFileRef">

139 - <xs:annotation><xs:documentation>Create a reference to a HelpFile element in another Fragment.</xs:documentation></xs:annotation>

140 - <xs:complexType>

141 - <xs:attribute name="Id" use="required" type="xs:string">

142 - <xs:annotation><xs:documentation>Primary Key for HelpFile Table.</xs:documentation></xs:annotation>

143 - </xs:attribute>

144 - <xs:anyAttribute namespace="##other" processContents="lax">

145 - <xs:annotation><xs:documentation>

146 - Extensibility point in the WiX XML Schema. Schema extensions can register additional

147 - attributes at this point in the schema.

148 - </xs:documentation></xs:annotation>

149 - </xs:anyAttribute>

150 - </xs:complexType>

151 - </xs:element>

152 -

153 - <xs:element name="HelpFilterRef">

154 - <xs:annotation><xs:documentation>Create a reference to a HelpFile element in another Fragment.</xs:documentation></xs:annotation>

155 - <xs:complexType>

156 - <xs:attribute name="Id" use="required" type="xs:string">

157 - <xs:annotation><xs:documentation>Primary Key for HelpFilter.</xs:documentation></xs:annotation>

158 - </xs:attribute>

159 - <xs:anyAttribute namespace="##other" processContents="lax">

160 - <xs:annotation><xs:documentation>

161 - Extensibility point in the WiX XML Schema. Schema extensions can register additional

162 - attributes at this point in the schema.

163 - </xs:documentation></xs:annotation>

164 - </xs:anyAttribute>

165 - </xs:complexType>

166 - </xs:element>

167 -

168 - <xs:element name="HelpCollectionRef">

169 - <xs:annotation>

170 - <xs:documentation>Create a reference to a HelpCollection element in another Fragment.</xs:documentation>

171 - <xs:appinfo>

172 - <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />

173 - <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />

174 - <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />

175 - </xs:appinfo>

176 - </xs:annotation>

177 - <xs:complexType>

178 - <xs:choice minOccurs="0" maxOccurs="unbounded">

179 - <xs:element ref="HelpFileRef" />

180 - </xs:choice>

181 - <xs:attribute name="Id" use="required" type="xs:string">

182 - <xs:annotation><xs:documentation>Primary Key for HelpNamespace Table.</xs:documentation></xs:annotation>

183 - </xs:attribute>

184 - <xs:anyAttribute namespace="##other" processContents="lax">

185 - <xs:annotation><xs:documentation>

186 - Extensibility point in the WiX XML Schema. Schema extensions can register additional

187 - attributes at this point in the schema.

188 - </xs:documentation></xs:annotation>

189 - </xs:anyAttribute>

190 - </xs:complexType>

191 - </xs:element>

192 -

193 - <xs:element name="VsixPackage">

194 - <xs:annotation>

195 - <xs:documentation>

196 - This element provides the metdata required to install/uninstall a file as

197 - a VSIX Package. The VSIX package file will be installed as part of the MSI

198 - then passed to the VSIX installer to install the VSIX package. To avoid the

199 - duplication, simply use the MSI to install the VSIX package itself.

200 - </xs:documentation>

201 - <xs:appinfo>

202 - <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Component" />

203 - <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="File" />

204 - </xs:appinfo>

205 - </xs:annotation>

206 - <xs:complexType>

207 - <xs:attribute name="File" type="xs:string">

208 - <xs:annotation>

209 - <xs:documentation>

210 - Reference to file identifer. This attribute is required when the element is not a

211 - child of a File element and is invalid when the element is a child of the File element.

212 - </xs:documentation>

213 - </xs:annotation>

214 - </xs:attribute>

215 - <xs:attribute name="PackageId" type="xs:string" use="required">

216 - <xs:annotation>

217 - <xs:documentation>

218 - Identity of the VSIX package per its internal manifest. If this value is not correct

219 - the VSIX package will not correctly uninstall.

220 - </xs:documentation>

221 - </xs:annotation>

222 - </xs:attribute>

223 - <xs:attribute name="Permanent" type="YesNoType">

224 - <xs:annotation>

225 - <xs:documentation>

226 - Indicates whether the VSIX package is uninstalled when the parent Component is uninstalled.

227 - The default is 'no'.

228 - </xs:documentation>

229 - </xs:annotation>

230 - </xs:attribute>

231 - <xs:attribute name="Target" type="xs:string">

232 - <xs:annotation>

233 - <xs:documentation>

234 - Specifies the SKU of Visual Studio in which to register the extension. If no target

235 - is specified the extension is registered with all installed SKUs. If the Target

236 - attribute is specified the TargetVersion attribute must also be specified. The

237 - following is a list of known Visual Studio targets: integratedShell, professional,

238 - premium, ultimate, vbExpress, vcExpress, vcsExpress, vwdExpress

239 - </xs:documentation>

240 - </xs:annotation>

241 - </xs:attribute>

242 - <xs:attribute name="TargetVersion" type="VersionType">

243 - <xs:annotation>

244 - <xs:documentation>

245 - Specifies the version of Visual Studio in which to register the extension. This attribute

246 - is required if the Target attribute is specified.

247 - </xs:documentation>

248 - </xs:annotation>

249 - </xs:attribute>

250 - <xs:attribute name="Vital" type="YesNoType">

251 - <xs:annotation>

252 - <xs:documentation>

253 - Indicates whether failure to install the VSIX package causes the installation to rollback.

254 - The default is 'yes'.

255 - </xs:documentation>

256 - </xs:annotation>

257 - </xs:attribute>

258 - <xs:attribute name="VsixInstallerPathProperty" type="xs:string">

259 - <xs:annotation>

260 - <xs:documentation>

261 - Optional reference to a Property element that contains the path to the VsixInstaller.exe.

262 - By default, the latest VsixInstaller.exe on the machine will be used to install the VSIX

263 - package. It is highly recommended that this attribute is *not* used.

264 - </xs:documentation>

265 - </xs:annotation>

266 - </xs:attribute>

267 - <xs:anyAttribute namespace="##other" processContents="lax">

268 - <xs:annotation><xs:documentation>

269 - Extensibility point in the WiX XML Schema. Schema extensions can register additional

270 - attributes at this point in the schema.

271 - </xs:documentation></xs:annotation>

272 - </xs:anyAttribute>

273 - </xs:complexType>

274 - </xs:element>

275 -

276 - <xs:simpleType name="VersionType">

277 - <xs:annotation><xs:documentation>Values of this type will look like: "x.x.x.x" where x is an integer from 0 to 65534.</xs:documentation></xs:annotation>

278 - <xs:restriction base="xs:string">

279 - <xs:pattern value="(\d{1,5}\.){0,3}\d{1,5}"/>

280 - </xs:restriction>

281 - </xs:simpleType>

282 -

283 - <xs:simpleType name="YesNoType">

284 - <xs:annotation>

285 - <xs:documentation>Values of this type will either be "yes" or "no".</xs:documentation>

286 - </xs:annotation>

287 - <xs:restriction base='xs:NMTOKEN'>

288 - <xs:enumeration value="no"/>

289 - <xs:enumeration value="yes"/>

290 - </xs:restriction>

291 - </xs:simpleType>

292 -</xs:schema>

src/wixlib/HTML_Help_Registration__RTL_X86.wxs

+19 -20

@@ -1,5 +1,4 @@

1 -<?xml version="1.0" encoding="utf-8"?>

3 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

4 <Fragment>

@@ -18,23 +17,23 @@

17 <Binary Id="BIN_File_46001" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_46001.dll" />

18 <Binary Id="BIN_File_107602" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_107602.dll" />

19

21 - <CustomAction Id="CA_BeginHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="BeginTransaction" Execute="deferred" Impersonate="no" />

22 - <CustomAction Id="CA_RegisterPlugIn.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterPlugIn2" Execute="deferred" Impersonate="no" />

23 - <CustomAction Id="CA_CommitHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="CommitTransaction" Return="ignore" Execute="commit" Impersonate="no" />

24 - <CustomAction Id="CA_CommitHelpTransactionNoRB.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="CommitTransaction" Return="ignore" Execute="deferred" Impersonate="no" />

25 - <CustomAction Id="CA_ExportTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46002" DllEntry="ExportTempHxDs" />

26 - <CustomAction Id="CA_RegisterNamespace.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterNamespace2" Execute="deferred" Impersonate="no" />

27 - <CustomAction Id="CA_RollbackTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveTempHxDs" Execute="rollback" Impersonate="no" />

28 - <CustomAction Id="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46002" DllEntry="RegisterMicrosoftHelp" Return="ignore" />

29 - <CustomAction Id="CA_RegisterHelpFile.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterHelpFile" Execute="deferred" Impersonate="no" />

30 - <CustomAction Id="CA_RegisterFilter.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterFilter2" Execute="deferred" Impersonate="no" />

31 - <CustomAction Id="CA_RemoveNamespace.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveNamespace" Execute="deferred" Impersonate="no" />

32 - <CustomAction Id="CA_RemoveTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveTempHxDs" Return="ignore" />

20 + <CustomAction Id="CA_BeginHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="BeginTransaction" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />

21 + <CustomAction Id="CA_RegisterPlugIn.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterPlugIn2" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />

22 + <CustomAction Id="CA_CommitHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="CommitTransaction" Return="ignore" Execute="commit" Impersonate="no" BinaryRef="BIN_File_46001" />

23 + <CustomAction Id="CA_CommitHelpTransactionNoRB.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="CommitTransaction" Return="ignore" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />

24 + <CustomAction Id="CA_ExportTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="ExportTempHxDs" BinaryRef="BIN_File_46002" />

25 + <CustomAction Id="CA_RegisterNamespace.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterNamespace2" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />

26 + <CustomAction Id="CA_RollbackTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RemoveTempHxDs" Execute="rollback" Impersonate="no" BinaryRef="BIN_File_46001" />

27 + <CustomAction Id="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterMicrosoftHelp" Return="ignore" BinaryRef="BIN_File_46002" />

28 + <CustomAction Id="CA_RegisterHelpFile.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterHelpFile" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />

29 + <CustomAction Id="CA_RegisterFilter.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RegisterFilter2" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />

30 + <CustomAction Id="CA_RemoveNamespace.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RemoveNamespace" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />

31 + <CustomAction Id="CA_RemoveTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RemoveTempHxDs" Return="ignore" BinaryRef="BIN_File_46001" />

32

34 - <CustomAction Id="CA_DummyForHXDS_DLL.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_107602" DllEntry="Bogus" />

35 - <CustomAction Id="CA_RollbackHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RollbackTransaction" Execute="rollback" Impersonate="no" />

36 - <CustomAction Id="CA_RemoveHelpFile.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveHelpFile" Execute="deferred" Impersonate="no" />

37 - <CustomAction Id="CA_UnRegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46002" DllEntry="UnRegisterMicrosoftHelp" Return="ignore" />

33 + <CustomAction Id="CA_DummyForHXDS_DLL.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="Bogus" BinaryRef="BIN_File_107602" />

34 + <CustomAction Id="CA_RollbackHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RollbackTransaction" Execute="rollback" Impersonate="no" BinaryRef="BIN_File_46001" />

35 + <CustomAction Id="CA_RemoveHelpFile.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="RemoveHelpFile" Execute="deferred" Impersonate="no" BinaryRef="BIN_File_46001" />

36 + <CustomAction Id="CA_UnRegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" DllEntry="UnRegisterMicrosoftHelp" Return="ignore" BinaryRef="BIN_File_46002" />

38 <InstallExecuteSequence>

39 <Custom Action="CA_ExportTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" Before="ProcessComponents" />

@@ -45,8 +44,8 @@

45 <Custom Action="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" After="InstallFiles" />

48 - <Custom Action="CA_CommitHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" Before="InstallFinalize">( NOT RollbackDisabled )</Custom>

49 - <Custom Action="CA_CommitHelpTransactionNoRB.3643236F_FC70_11D3_A536_0090278A1BB8" Before="InstallFinalize">( RollbackDisabled )</Custom>

47 + <Custom Action="CA_CommitHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" Before="InstallFinalize" Condition="( NOT RollbackDisabled )" />

48 + <Custom Action="CA_CommitHelpTransactionNoRB.3643236F_FC70_11D3_A536_0090278A1BB8" Before="InstallFinalize" Condition="( RollbackDisabled )" />

49 <Custom Action="CA_RemoveTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" After="InstallFinalize" />

50 </InstallExecuteSequence>

src/wixlib/VS11.wxs

+7 -8

@@ -1,5 +1,4 @@

1 -<?xml version="1.0" encoding="UTF-8"?>

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

@@ -60,7 +59,7 @@

59 <PropertyRef Id="VS11DEVENV" />

61 <InstallExecuteSequence>

63 - <Custom Action="VS11Setup" Before="InstallFinalize" Overridable="yes">VS11DEVENV</Custom>

62 + <Custom Action="VS11Setup" Before="InstallFinalize" Overridable="yes" Condition="VS11DEVENV" />

63 </InstallExecuteSequence>

64 </Fragment>

@@ -69,7 +68,7 @@

68 <PropertyRef Id="VS11DEVENV" />

70 <InstallExecuteSequence>

72 - <Custom Action="VS11InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS11DEVENV</Custom>

71 + <Custom Action="VS11InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS11DEVENV" />

72 </InstallExecuteSequence>

73 </Fragment>

@@ -108,7 +107,7 @@

107 <CustomAction Id="VWD11Setup" Property="VWD11EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />

108 <PropertyRef Id="VWD11EXPRESS_IDE" />

109 <InstallExecuteSequence>

111 - <Custom Action="VWD11Setup" Before="InstallFinalize" Overridable="yes">VWD11EXPRESS_IDE</Custom>

110 + <Custom Action="VWD11Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD11EXPRESS_IDE" />

111 </InstallExecuteSequence>

112 </Fragment>

113

@@ -116,7 +115,7 @@

115 <CustomAction Id="VWD11InstallVSTemplates" Property="VWD11EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />

116 <PropertyRef Id="VWD11EXPRESS_IDE" />

117 <InstallExecuteSequence>

119 - <Custom Action="VWD11InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD11EXPRESS_IDE</Custom>

118 + <Custom Action="VWD11InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD11EXPRESS_IDE" />

119 </InstallExecuteSequence>

120 </Fragment>

121

@@ -192,7 +191,7 @@

191 <CustomAction Id="VS11WinExpressSetup" Property="VS11WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />

192 <PropertyRef Id="VS11WINEXPRESS_IDE" />

193 <InstallExecuteSequence>

195 - <Custom Action="VS11WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS11WINEXPRESS_IDE</Custom>

194 + <Custom Action="VS11WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS11WINEXPRESS_IDE" />

195 </InstallExecuteSequence>

196 </Fragment>

197

@@ -200,7 +199,7 @@

199 <CustomAction Id="VS11WinExpressInstallVSTemplates" Property="VS11WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />

200 <PropertyRef Id="VS11WINEXPRESS_IDE" />

201 <InstallExecuteSequence>

203 - <Custom Action="VS11WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS11WINEXPRESS_IDE</Custom>

202 + <Custom Action="VS11WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS11WINEXPRESS_IDE" />

203 </InstallExecuteSequence>

204 </Fragment>

205 </Wix>

src/wixlib/VS14.wxs

+7 -8

@@ -1,5 +1,4 @@

1 -<?xml version="1.0" encoding="UTF-8"?>

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

@@ -60,7 +59,7 @@

59 <PropertyRef Id="VS14DEVENV" />

61 <InstallExecuteSequence>

63 - <Custom Action="VS14Setup" Before="InstallFinalize" Overridable="yes">VS14DEVENV</Custom>

62 + <Custom Action="VS14Setup" Before="InstallFinalize" Overridable="yes" Condition="VS14DEVENV" />

63 </InstallExecuteSequence>

64 </Fragment>

@@ -69,7 +68,7 @@

68 <PropertyRef Id="VS14DEVENV" />

70 <InstallExecuteSequence>

72 - <Custom Action="VS14InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS14DEVENV</Custom>

71 + <Custom Action="VS14InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS14DEVENV" />

72 </InstallExecuteSequence>

73 </Fragment>

@@ -106,7 +105,7 @@

105 <CustomAction Id="VWD14Setup" Property="VWD14EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />

106 <PropertyRef Id="VWD14EXPRESS_IDE" />

107 <InstallExecuteSequence>

109 - <Custom Action="VWD14Setup" Before="InstallFinalize" Overridable="yes">VWD14EXPRESS_IDE</Custom>

108 + <Custom Action="VWD14Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD14EXPRESS_IDE" />

109 </InstallExecuteSequence>

110 </Fragment>

111

@@ -114,7 +113,7 @@

113 <CustomAction Id="VWD14InstallVSTemplates" Property="VWD14EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />

114 <PropertyRef Id="VWD14EXPRESS_IDE" />

115 <InstallExecuteSequence>

117 - <Custom Action="VWD14InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD14EXPRESS_IDE</Custom>

116 + <Custom Action="VWD14InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD14EXPRESS_IDE" />

117 </InstallExecuteSequence>

118 </Fragment>

119

@@ -173,7 +172,7 @@

172 <CustomAction Id="VS14WinExpressSetup" Property="VS14WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />

173 <PropertyRef Id="VS14WINEXPRESS_IDE" />

174 <InstallExecuteSequence>

176 - <Custom Action="VS14WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS14WINEXPRESS_IDE</Custom>

175 + <Custom Action="VS14WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS14WINEXPRESS_IDE" />

176 </InstallExecuteSequence>

177 </Fragment>

178

@@ -181,7 +180,7 @@

180 <CustomAction Id="VS14WinExpressInstallVSTemplates" Property="VS14WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />

181 <PropertyRef Id="VS14WINEXPRESS_IDE" />

182 <InstallExecuteSequence>

184 - <Custom Action="VS14WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS14WINEXPRESS_IDE</Custom>

183 + <Custom Action="VS14WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS14WINEXPRESS_IDE" />

184 </InstallExecuteSequence>

185 </Fragment>

186 </Wix>

src/wixlib/VS2003.wxs

+2 -3

@@ -1,5 +1,4 @@

1 -<?xml version="1.0" encoding="UTF-8"?>

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

@@ -15,7 +14,7 @@

14 <PropertyRef Id="VS2003DEVENV" />

16 <InstallExecuteSequence>

18 - <Custom Action="VS2003Setup" Before="InstallFinalize" Overridable="yes">VS2003DEVENV</Custom>

17 + <Custom Action="VS2003Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2003DEVENV" />

18 </InstallExecuteSequence>

19 </Fragment>

src/wixlib/VS2005.wxs

+19 -20

@@ -1,5 +1,4 @@

1 -<?xml version="1.0" encoding="UTF-8"?>

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

@@ -47,7 +46,7 @@

46 <PropertyRef Id="VS2005DEVENV" />

48 <InstallExecuteSequence>

50 - <Custom Action="VS2005Setup" Before="InstallFinalize" Overridable="yes">VS2005DEVENV</Custom>

49 + <Custom Action="VS2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2005DEVENV" />

50 </InstallExecuteSequence>

51 </Fragment>

@@ -56,7 +55,7 @@

55 <PropertyRef Id="VS2005DEVENV" />

57 <InstallExecuteSequence>

59 - <Custom Action="VS2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2005DEVENV</Custom>

58 + <Custom Action="VS2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2005DEVENV" />

59 </InstallExecuteSequence>

60 </Fragment>

@@ -72,8 +71,8 @@

71

72 <Fragment>

73 <Property Id="VCSHARP2005EXPRESS_IDE" Secure="yes">

75 - <ComponentSearch Id="SearchForVcsExpressIde2005Component" Guid="E8A67F23-21D0-4E7B-BBD3-54E2D505BED8" Type="file" >

76 - <FileSearch Id="VcsExpressIde2005" Name="vcsexpress.exe"/>

74 + <ComponentSearch Id="SearchForVcsExpressIde2005Component" Guid="E8A67F23-21D0-4E7B-BBD3-54E2D505BED8" Type="file">

75 + <FileSearch Id="VcsExpressIde2005" Name="vcsexpress.exe" />

76 </ComponentSearch>

77 </Property>

78 </Fragment>

@@ -84,7 +83,7 @@

83 <PropertyRef Id="VCSHARP2005EXPRESS_IDE" />

85 <InstallExecuteSequence>

87 - <Custom Action="VCSHARP2005Setup" Before="InstallFinalize" Overridable="yes">VCSHARP2005EXPRESS_IDE</Custom>

86 + <Custom Action="VCSHARP2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP2005EXPRESS_IDE" />

87 </InstallExecuteSequence>

88 </Fragment>

@@ -94,7 +93,7 @@

93 <PropertyRef Id="VCSHARP2005EXPRESS_IDE" />

95 <InstallExecuteSequence>

97 - <Custom Action="VCSHARP2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VCSHARP2005EXPRESS_IDE</Custom>

96 + <Custom Action="VCSHARP2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP2005EXPRESS_IDE" />

97 </InstallExecuteSequence>

98 </Fragment>

@@ -114,7 +113,7 @@

113 <Fragment>

114 <Property Id="VB2005EXPRESS_IDE" Secure="yes">

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" />

117 </ComponentSearch>

118 </Property>

119 </Fragment>

@@ -125,7 +124,7 @@

124 <PropertyRef Id="VB2005EXPRESS_IDE" />

125

126 <InstallExecuteSequence>

128 - <Custom Action="VB2005Setup" Before="InstallFinalize" Overridable="yes">VB2005EXPRESS_IDE</Custom>

127 + <Custom Action="VB2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VB2005EXPRESS_IDE" />

128 </InstallExecuteSequence>

129 </Fragment>

130

@@ -135,7 +134,7 @@

134 <PropertyRef Id="VB2005EXPRESS_IDE" />

135

136 <InstallExecuteSequence>

138 - <Custom Action="VB2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VB2005EXPRESS_IDE</Custom>

137 + <Custom Action="VB2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VB2005EXPRESS_IDE" />

138 </InstallExecuteSequence>

139 </Fragment>

140

@@ -155,7 +154,7 @@

154 <Fragment>

155 <Property Id="VWD2005EXPRESS_IDE" Secure="yes">

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" />

158 </ComponentSearch>

159 </Property>

160 </Fragment>

@@ -166,7 +165,7 @@

165 <PropertyRef Id="VWD2005EXPRESS_IDE" />

166

167 <InstallExecuteSequence>

169 - <Custom Action="VWD2005Setup" Before="InstallFinalize" Overridable="yes">VWD2005EXPRESS_IDE</Custom>

168 + <Custom Action="VWD2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2005EXPRESS_IDE" />

169 </InstallExecuteSequence>

170 </Fragment>

171

@@ -176,7 +175,7 @@

175 <PropertyRef Id="VWD2005EXPRESS_IDE" />

176

177 <InstallExecuteSequence>

179 - <Custom Action="VWD2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2005EXPRESS_IDE</Custom>

178 + <Custom Action="VWD2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2005EXPRESS_IDE" />

179 </InstallExecuteSequence>

180 </Fragment>

181

@@ -196,7 +195,7 @@

195 <Fragment>

196 <Property Id="VC2005EXPRESS_IDE" Secure="yes">

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" />

199 </ComponentSearch>

200 </Property>

201 </Fragment>

@@ -207,7 +206,7 @@

206 <PropertyRef Id="VC2005EXPRESS_IDE" />

207

208 <InstallExecuteSequence>

210 - <Custom Action="VC2005Setup" Before="InstallFinalize" Overridable="yes">VC2005EXPRESS_IDE</Custom>

209 + <Custom Action="VC2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VC2005EXPRESS_IDE" />

210 </InstallExecuteSequence>

211 </Fragment>

212

@@ -217,7 +216,7 @@

216 <PropertyRef Id="VC2005EXPRESS_IDE" />

217

218 <InstallExecuteSequence>

220 - <Custom Action="VC2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VC2005EXPRESS_IDE</Custom>

219 + <Custom Action="VC2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VC2005EXPRESS_IDE" />

220 </InstallExecuteSequence>

221 </Fragment>

222

@@ -237,7 +236,7 @@

236 <Fragment>

237 <Property Id="VJSHARP2005EXPRESS_IDE" Secure="yes">

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" />

240 </ComponentSearch>

241 </Property>

242 </Fragment>

@@ -248,7 +247,7 @@

247 <PropertyRef Id="VJSHARP2005EXPRESS_IDE" />

248

249 <InstallExecuteSequence>

251 - <Custom Action="VJSHARP2005Setup" Before="InstallFinalize" Overridable="yes">VJSHARP2005EXPRESS_IDE</Custom>

250 + <Custom Action="VJSHARP2005Setup" Before="InstallFinalize" Overridable="yes" Condition="VJSHARP2005EXPRESS_IDE" />

251 </InstallExecuteSequence>

252 </Fragment>

253

@@ -258,7 +257,7 @@

257 <PropertyRef Id="VJSHARP2005EXPRESS_IDE" />

258

259 <InstallExecuteSequence>

261 - <Custom Action="VJSHARP2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VJSHARP2005EXPRESS_IDE</Custom>

260 + <Custom Action="VJSHARP2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VJSHARP2005EXPRESS_IDE" />

261 </InstallExecuteSequence>

262 </Fragment>

263

src/wixlib/VS2008.wxs

+22 -23

@@ -1,5 +1,4 @@

1 -<?xml version="1.0" encoding="UTF-8"?>

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

@@ -41,7 +40,7 @@

40 <PropertyRef Id="VS90DEVENV" />

42 <InstallExecuteSequence>

44 - <Custom Action="VS90Setup" Before="InstallFinalize" Overridable="yes">VS90DEVENV</Custom>

43 + <Custom Action="VS90Setup" Before="InstallFinalize" Overridable="yes" Condition="VS90DEVENV" />

44 </InstallExecuteSequence>

45 </Fragment>

@@ -50,7 +49,7 @@

49 <PropertyRef Id="VS90DEVENV" />

51 <InstallExecuteSequence>

53 - <Custom Action="VS90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS90DEVENV</Custom>

52 + <Custom Action="VS90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS90DEVENV" />

53 </InstallExecuteSequence>

54 </Fragment>

@@ -66,8 +65,8 @@

65

66 <Fragment>

67 <Property Id="VCSHARP90EXPRESS_IDE" Secure="yes">

69 - <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file" >

70 - <FileSearch Id="VcsExpressIde90" Name="vcsexpress.exe"/>

68 + <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file">

69 + <FileSearch Id="VcsExpressIde90" Name="vcsexpress.exe" />

70 </ComponentSearch>

71 </Property>

72 </Fragment>

@@ -78,7 +77,7 @@

77 <PropertyRef Id="VCSHARP90EXPRESS_IDE" />

79 <InstallExecuteSequence>

81 - <Custom Action="VCSHARP90Setup" Before="InstallFinalize" Overridable="yes">VCSHARP90EXPRESS_IDE</Custom>

80 + <Custom Action="VCSHARP90Setup" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP90EXPRESS_IDE" />

81 </InstallExecuteSequence>

82 </Fragment>

@@ -88,7 +87,7 @@

87 <PropertyRef Id="VCSHARP90EXPRESS_IDE" />

89 <InstallExecuteSequence>

91 - <Custom Action="VCSHARP90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VCSHARP90EXPRESS_IDE</Custom>

90 + <Custom Action="VCSHARP90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP90EXPRESS_IDE" />

91 </InstallExecuteSequence>

92 </Fragment>

@@ -108,7 +107,7 @@

107 <Fragment>

108 <Property Id="VB90EXPRESS_IDE" Secure="yes">

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" />

111 </ComponentSearch>

112 </Property>

113 </Fragment>

@@ -119,7 +118,7 @@

118 <PropertyRef Id="VB90EXPRESS_IDE" />

119

120 <InstallExecuteSequence>

122 - <Custom Action="VB90Setup" Before="InstallFinalize" Overridable="yes">VB90EXPRESS_IDE</Custom>

121 + <Custom Action="VB90Setup" Before="InstallFinalize" Overridable="yes" Condition="VB90EXPRESS_IDE" />

122 </InstallExecuteSequence>

123 </Fragment>

124

@@ -129,7 +128,7 @@

128 <PropertyRef Id="VB90EXPRESS_IDE" />

129

130 <InstallExecuteSequence>

132 - <Custom Action="VB90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VB90EXPRESS_IDE</Custom>

131 + <Custom Action="VB90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VB90EXPRESS_IDE" />

132 </InstallExecuteSequence>

133 </Fragment>

134

@@ -149,7 +148,7 @@

148 <Fragment>

149 <Property Id="VWD90EXPRESS_IDE" Secure="yes">

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" />

152 </ComponentSearch>

153 </Property>

154 </Fragment>

@@ -160,7 +159,7 @@

159 <PropertyRef Id="VWD90EXPRESS_IDE" />

160

161 <InstallExecuteSequence>

163 - <Custom Action="VWD90Setup" Before="InstallFinalize" Overridable="yes">VWD90EXPRESS_IDE</Custom>

162 + <Custom Action="VWD90Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD90EXPRESS_IDE" />

163 </InstallExecuteSequence>

164 </Fragment>

165

@@ -170,7 +169,7 @@

169 <PropertyRef Id="VWD90EXPRESS_IDE" />

170

171 <InstallExecuteSequence>

173 - <Custom Action="VWD90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD90EXPRESS_IDE</Custom>

172 + <Custom Action="VWD90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD90EXPRESS_IDE" />

173 </InstallExecuteSequence>

174 </Fragment>

175

@@ -190,7 +189,7 @@

189 <Fragment>

190 <Property Id="VC90EXPRESS_IDE" Secure="yes">

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" />

193 </ComponentSearch>

194 </Property>

195 </Fragment>

@@ -201,7 +200,7 @@

200 <PropertyRef Id="VC90EXPRESS_IDE" />

201

202 <InstallExecuteSequence>

204 - <Custom Action="VC90Setup" Before="InstallFinalize" Overridable="yes">VC90EXPRESS_IDE</Custom>

203 + <Custom Action="VC90Setup" Before="InstallFinalize" Overridable="yes" Condition="VC90EXPRESS_IDE" />

204 </InstallExecuteSequence>

205 </Fragment>

206

@@ -211,7 +210,7 @@

210 <PropertyRef Id="VC90EXPRESS_IDE" />

211

212 <InstallExecuteSequence>

214 - <Custom Action="VC90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VC90EXPRESS_IDE</Custom>

213 + <Custom Action="VC90InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VC90EXPRESS_IDE" />

214 </InstallExecuteSequence>

215 </Fragment>

216

@@ -245,7 +244,7 @@

244 <Property Id="VS90_SP1" Secure="yes">

245 <RegistrySearch Id="VS90DevEnvDirectorySearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">

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" />

248 </DirectorySearch>

249 </RegistrySearch>

250 </Property>

@@ -256,7 +255,7 @@

255 <Fragment>

256 <Property Id="VB90EXPRESS_SP1" Secure="yes">

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" />

259 </ComponentSearch>

260 </Property>

261 </Fragment>

@@ -266,7 +265,7 @@

265 <Fragment>

266 <Property Id="VC90EXPRESS_SP1" Secure="yes">

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" />

269 </ComponentSearch>

270 </Property>

271 </Fragment>

@@ -275,8 +274,8 @@

274

275 <Fragment>

276 <Property Id="VCS90EXPRESS_SP1" Secure="yes">

278 - <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file" >

279 - <FileSearch Id="VCS90ExpressFileVersionSearch" Name="vcsexpress.exe" MinVersion="9.0.30729.0"/>

277 + <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file">

278 + <FileSearch Id="VCS90ExpressFileVersionSearch" Name="vcsexpress.exe" MinVersion="9.0.30729.0" />

279 </ComponentSearch>

280 </Property>

281 </Fragment>

@@ -286,7 +285,7 @@

285 <Fragment>

286 <Property Id="VWD90EXPRESS_SP1" Secure="yes">

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" />

289 </ComponentSearch>

290 </Property>

291 </Fragment>

src/wixlib/VS2010.wxs

+19 -20

@@ -1,5 +1,4 @@

1 -<?xml version="1.0" encoding="UTF-8"?>

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

@@ -60,7 +59,7 @@

59 <PropertyRef Id="VS2010DEVENV" />

61 <InstallExecuteSequence>

63 - <Custom Action="VS2010Setup" Before="InstallFinalize" Overridable="yes">VS2010DEVENV</Custom>

62 + <Custom Action="VS2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2010DEVENV" />

63 </InstallExecuteSequence>

64 </Fragment>

@@ -69,7 +68,7 @@

68 <PropertyRef Id="VS2010DEVENV" />

70 <InstallExecuteSequence>

72 - <Custom Action="VS2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2010DEVENV</Custom>

71 + <Custom Action="VS2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2010DEVENV" />

72 </InstallExecuteSequence>

73 </Fragment>

@@ -78,8 +77,8 @@

77

78 <Fragment>

79 <Property Id="VCSHARP2010EXPRESS_IDE" Secure="yes">

81 - <ComponentSearch Id="SearchForVcsExpressIde2010Component" Guid="A4945167-D8A4-4B10-9B78-99C2CDC243EC" Type="file" >

82 - <FileSearch Id="VcsExpressIde2010" Name="vcsexpress.exe"/>

80 + <ComponentSearch Id="SearchForVcsExpressIde2010Component" Guid="A4945167-D8A4-4B10-9B78-99C2CDC243EC" Type="file">

81 + <FileSearch Id="VcsExpressIde2010" Name="vcsexpress.exe" />

82 </ComponentSearch>

83 </Property>

84 </Fragment>

@@ -90,7 +89,7 @@

89 <PropertyRef Id="VCSHARP2010EXPRESS_IDE" />

91 <InstallExecuteSequence>

93 - <Custom Action="VCSHARP2010Setup" Before="InstallFinalize" Overridable="yes">VCSHARP2010EXPRESS_IDE</Custom>

92 + <Custom Action="VCSHARP2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP2010EXPRESS_IDE" />

93 </InstallExecuteSequence>

94 </Fragment>

@@ -100,7 +99,7 @@

99 <PropertyRef Id="VCSHARP2010EXPRESS_IDE" />

100

101 <InstallExecuteSequence>

103 - <Custom Action="VCSHARP2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VCSHARP2010EXPRESS_IDE</Custom>

102 + <Custom Action="VCSHARP2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VCSHARP2010EXPRESS_IDE" />

103 </InstallExecuteSequence>

104 </Fragment>

105

@@ -120,7 +119,7 @@

119 <Fragment>

120 <Property Id="VB2010EXPRESS_IDE" Secure="yes">

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" />

123 </ComponentSearch>

124 </Property>

125 </Fragment>

@@ -131,7 +130,7 @@

130 <PropertyRef Id="VB2010EXPRESS_IDE" />

131

132 <InstallExecuteSequence>

134 - <Custom Action="VB2010Setup" Before="InstallFinalize" Overridable="yes">VB2010EXPRESS_IDE</Custom>

133 + <Custom Action="VB2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VB2010EXPRESS_IDE" />

134 </InstallExecuteSequence>

135 </Fragment>

136

@@ -141,7 +140,7 @@

140 <PropertyRef Id="VB2010EXPRESS_IDE" />

141

142 <InstallExecuteSequence>

144 - <Custom Action="VB2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VB2010EXPRESS_IDE</Custom>

143 + <Custom Action="VB2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VB2010EXPRESS_IDE" />

144 </InstallExecuteSequence>

145 </Fragment>

146

@@ -161,7 +160,7 @@

160 <Fragment>

161 <Property Id="VWD2010EXPRESS_IDE" Secure="yes">

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" />

164 </ComponentSearch>

165 </Property>

166 </Fragment>

@@ -172,7 +171,7 @@

171 <PropertyRef Id="VWD2010EXPRESS_IDE" />

172

173 <InstallExecuteSequence>

175 - <Custom Action="VWD2010Setup" Before="InstallFinalize" Overridable="yes">VWD2010EXPRESS_IDE</Custom>

174 + <Custom Action="VWD2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2010EXPRESS_IDE" />

175 </InstallExecuteSequence>

176 </Fragment>

177

@@ -182,7 +181,7 @@

181 <PropertyRef Id="VWD2010EXPRESS_IDE" />

182

183 <InstallExecuteSequence>

185 - <Custom Action="VWD2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2010EXPRESS_IDE</Custom>

184 + <Custom Action="VWD2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2010EXPRESS_IDE" />

185 </InstallExecuteSequence>

186 </Fragment>

187

@@ -202,7 +201,7 @@

201 <Fragment>

202 <Property Id="VC2010EXPRESS_IDE" Secure="yes">

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" />

205 </ComponentSearch>

206 </Property>

207 </Fragment>

@@ -213,7 +212,7 @@

212 <PropertyRef Id="VC2010EXPRESS_IDE" />

213

214 <InstallExecuteSequence>

216 - <Custom Action="VC2010Setup" Before="InstallFinalize" Overridable="yes">VC2010EXPRESS_IDE</Custom>

215 + <Custom Action="VC2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VC2010EXPRESS_IDE" />

216 </InstallExecuteSequence>

217 </Fragment>

218

@@ -223,7 +222,7 @@

222 <PropertyRef Id="VC2010EXPRESS_IDE" />

223

224 <InstallExecuteSequence>

226 - <Custom Action="VC2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VC2010EXPRESS_IDE</Custom>

225 + <Custom Action="VC2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VC2010EXPRESS_IDE" />

226 </InstallExecuteSequence>

227 </Fragment>

228

@@ -243,7 +242,7 @@

242 <Fragment>

243 <Property Id="VPD2010EXPRESS_IDE" Secure="yes">

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" />

246 </ComponentSearch>

247 </Property>

248 </Fragment>

@@ -254,7 +253,7 @@

253 <PropertyRef Id="VPD2010EXPRESS_IDE" />

254

255 <InstallExecuteSequence>

257 - <Custom Action="VPD2010Setup" Before="InstallFinalize" Overridable="yes">VPD2010EXPRESS_IDE</Custom>

256 + <Custom Action="VPD2010Setup" Before="InstallFinalize" Overridable="yes" Condition="VPD2010EXPRESS_IDE" />

257 </InstallExecuteSequence>

258 </Fragment>

259

@@ -264,7 +263,7 @@

263 <PropertyRef Id="VPD2010EXPRESS_IDE" />

264

265 <InstallExecuteSequence>

267 - <Custom Action="VPD2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VPD2010EXPRESS_IDE</Custom>

266 + <Custom Action="VPD2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VPD2010EXPRESS_IDE" />

267 </InstallExecuteSequence>

268 </Fragment>

269

src/wixlib/VS2012.wxs

+11 -12

@@ -1,5 +1,4 @@

1 -<?xml version="1.0" encoding="UTF-8"?>

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

@@ -60,7 +59,7 @@

59 <PropertyRef Id="VS2012DEVENV" />

61 <InstallExecuteSequence>

63 - <Custom Action="VS2012Setup" Before="InstallFinalize" Overridable="yes">VS2012DEVENV</Custom>

62 + <Custom Action="VS2012Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2012DEVENV" />

63 </InstallExecuteSequence>

64 </Fragment>

@@ -69,7 +68,7 @@

68 <PropertyRef Id="VS2012DEVENV" />

70 <InstallExecuteSequence>

72 - <Custom Action="VS2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012DEVENV</Custom>

71 + <Custom Action="VS2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2012DEVENV" />

72 </InstallExecuteSequence>

73 </Fragment>

@@ -108,7 +107,7 @@

107 <CustomAction Id="VWD2012Setup" Property="VWD2012EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />

108 <PropertyRef Id="VWD2012EXPRESS_IDE" />

109 <InstallExecuteSequence>

111 - <Custom Action="VWD2012Setup" Before="InstallFinalize" Overridable="yes">VWD2012EXPRESS_IDE</Custom>

110 + <Custom Action="VWD2012Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2012EXPRESS_IDE" />

111 </InstallExecuteSequence>

112 </Fragment>

113

@@ -116,7 +115,7 @@

115 <CustomAction Id="VWD2012InstallVSTemplates" Property="VWD2012EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />

116 <PropertyRef Id="VWD2012EXPRESS_IDE" />

117 <InstallExecuteSequence>

119 - <Custom Action="VWD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2012EXPRESS_IDE</Custom>

118 + <Custom Action="VWD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2012EXPRESS_IDE" />

119 </InstallExecuteSequence>

120 </Fragment>

121

@@ -131,7 +130,7 @@

130 <CustomAction Id="VPD2012Setup" Property="VPD2012EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />

131 <PropertyRef Id="VPD2012EXPRESS_IDE" />

132 <InstallExecuteSequence>

134 - <Custom Action="VPD2012Setup" Before="InstallFinalize" Overridable="yes">VPD2012EXPRESS_IDE</Custom>

133 + <Custom Action="VPD2012Setup" Before="InstallFinalize" Overridable="yes" Condition="VPD2012EXPRESS_IDE" />

134 </InstallExecuteSequence>

135 </Fragment>

136

@@ -139,7 +138,7 @@

138 <CustomAction Id="VPD2012InstallVSTemplates" Property="VPD2012EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />

139 <PropertyRef Id="VPD2012EXPRESS_IDE" />

140 <InstallExecuteSequence>

142 - <Custom Action="VPD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VPD2012EXPRESS_IDE</Custom>

141 + <Custom Action="VPD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VPD2012EXPRESS_IDE" />

142 </InstallExecuteSequence>

143 </Fragment>

144

@@ -215,7 +214,7 @@

214 <CustomAction Id="VS2012WinExpressSetup" Property="VS2012WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />

215 <PropertyRef Id="VS2012WINEXPRESS_IDE" />

216 <InstallExecuteSequence>

218 - <Custom Action="VS2012WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS2012WINEXPRESS_IDE</Custom>

217 + <Custom Action="VS2012WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2012WINEXPRESS_IDE" />

218 </InstallExecuteSequence>

219 </Fragment>

220

@@ -223,7 +222,7 @@

222 <CustomAction Id="VS2012WinExpressInstallVSTemplates" Property="VS2012WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />

223 <PropertyRef Id="VS2012WINEXPRESS_IDE" />

224 <InstallExecuteSequence>

226 - <Custom Action="VS2012WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012WINEXPRESS_IDE</Custom>

225 + <Custom Action="VS2012WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2012WINEXPRESS_IDE" />

226 </InstallExecuteSequence>

227 </Fragment>

228

@@ -242,7 +241,7 @@

241 <CustomAction Id="VS2012WDExpressSetup" Property="VS2012WDEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />

242 <PropertyRef Id="VS2012WDEXPRESS_IDE" />

243 <InstallExecuteSequence>

245 - <Custom Action="VS2012WDExpressSetup" Before="InstallFinalize" Overridable="yes">VS2012WDEXPRESS_IDE</Custom>

244 + <Custom Action="VS2012WDExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2012WDEXPRESS_IDE" />

245 </InstallExecuteSequence>

246 </Fragment>

247

@@ -250,7 +249,7 @@

249 <CustomAction Id="VS2012WDExpressInstallVSTemplates" Property="VS2012WDEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />

250 <PropertyRef Id="VS2012WDEXPRESS_IDE" />

251 <InstallExecuteSequence>

253 - <Custom Action="VS2012WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012WDEXPRESS_IDE</Custom>

252 + <Custom Action="VS2012WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2012WDEXPRESS_IDE" />

253 </InstallExecuteSequence>

254 </Fragment>

255 </Wix>

src/wixlib/VS2013.wxs

+11 -12

@@ -1,5 +1,4 @@

1 -<?xml version="1.0" encoding="UTF-8"?>

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

@@ -60,7 +59,7 @@

59 <PropertyRef Id="VS2013DEVENV" />

61 <InstallExecuteSequence>

63 - <Custom Action="VS2013Setup" Before="InstallFinalize" Overridable="yes">VS2013DEVENV</Custom>

62 + <Custom Action="VS2013Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2013DEVENV" />

63 </InstallExecuteSequence>

64 </Fragment>

@@ -69,7 +68,7 @@

68 <PropertyRef Id="VS2013DEVENV" />

70 <InstallExecuteSequence>

72 - <Custom Action="VS2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2013DEVENV</Custom>

71 + <Custom Action="VS2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2013DEVENV" />

72 </InstallExecuteSequence>

73 </Fragment>

@@ -108,7 +107,7 @@

107 <CustomAction Id="VWD2013Setup" Property="VWD2013EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />

108 <PropertyRef Id="VWD2013EXPRESS_IDE" />

109 <InstallExecuteSequence>

111 - <Custom Action="VWD2013Setup" Before="InstallFinalize" Overridable="yes">VWD2013EXPRESS_IDE</Custom>

110 + <Custom Action="VWD2013Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2013EXPRESS_IDE" />

111 </InstallExecuteSequence>

112 </Fragment>

113

@@ -116,7 +115,7 @@

115 <CustomAction Id="VWD2013InstallVSTemplates" Property="VWD2013EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />

116 <PropertyRef Id="VWD2013EXPRESS_IDE" />

117 <InstallExecuteSequence>

119 - <Custom Action="VWD2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2013EXPRESS_IDE</Custom>

118 + <Custom Action="VWD2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2013EXPRESS_IDE" />

119 </InstallExecuteSequence>

120 </Fragment>

121

@@ -131,7 +130,7 @@

130 <CustomAction Id="VPD2013Setup" Property="VPD2013EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />

131 <PropertyRef Id="VPD2013EXPRESS_IDE" />

132 <InstallExecuteSequence>

134 - <Custom Action="VPD2013Setup" Before="InstallFinalize" Overridable="yes">VPD2013EXPRESS_IDE</Custom>

133 + <Custom Action="VPD2013Setup" Before="InstallFinalize" Overridable="yes" Condition="VPD2013EXPRESS_IDE" />

134 </InstallExecuteSequence>

135 </Fragment>

136

@@ -139,7 +138,7 @@

138 <CustomAction Id="VPD2013InstallVSTemplates" Property="VPD2013EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />

139 <PropertyRef Id="VPD2013EXPRESS_IDE" />

140 <InstallExecuteSequence>

142 - <Custom Action="VPD2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VPD2013EXPRESS_IDE</Custom>

141 + <Custom Action="VPD2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VPD2013EXPRESS_IDE" />

142 </InstallExecuteSequence>

143 </Fragment>

144

@@ -209,7 +208,7 @@

208 <CustomAction Id="VS2013WinExpressSetup" Property="VS2013WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />

209 <PropertyRef Id="VS2013WINEXPRESS_IDE" />

210 <InstallExecuteSequence>

212 - <Custom Action="VS2013WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS2013WINEXPRESS_IDE</Custom>

211 + <Custom Action="VS2013WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2013WINEXPRESS_IDE" />

212 </InstallExecuteSequence>

213 </Fragment>

214

@@ -218,7 +217,7 @@

217 <CustomAction Id="VS2013WinExpressInstallVSTemplates" Property="VS2013WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />

218 <PropertyRef Id="VS2013WINEXPRESS_IDE" />

219 <InstallExecuteSequence>

221 - <Custom Action="VS2013WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2013WINEXPRESS_IDE</Custom>

220 + <Custom Action="VS2013WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2013WINEXPRESS_IDE" />

221 </InstallExecuteSequence>

222 </Fragment>

223

@@ -238,7 +237,7 @@

237 <CustomAction Id="VS2013WDExpressSetup" Property="VS2013WDEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />

238 <PropertyRef Id="VS2013WDEXPRESS_IDE" />

239 <InstallExecuteSequence>

241 - <Custom Action="VS2013WDExpressSetup" Before="InstallFinalize" Overridable="yes">VS2013WDEXPRESS_IDE</Custom>

240 + <Custom Action="VS2013WDExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2013WDEXPRESS_IDE" />

241 </InstallExecuteSequence>

242 </Fragment>

243

@@ -247,7 +246,7 @@

246 <CustomAction Id="VS2013WDExpressInstallVSTemplates" Property="VS2013WDEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />

247 <PropertyRef Id="VS2013WDEXPRESS_IDE" />

248 <InstallExecuteSequence>

250 - <Custom Action="VS2013WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2013WDEXPRESS_IDE</Custom>

249 + <Custom Action="VS2013WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2013WDEXPRESS_IDE" />

250 </InstallExecuteSequence>

251 </Fragment>

252 </Wix>

src/wixlib/VS2015.wxs

+7 -8

@@ -1,5 +1,4 @@

1 -<?xml version="1.0" encoding="UTF-8"?>

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

@@ -60,7 +59,7 @@

59 <PropertyRef Id="VS2015DEVENV" />

61 <InstallExecuteSequence>

63 - <Custom Action="VS2015Setup" Before="InstallFinalize" Overridable="yes">VS2015DEVENV</Custom>

62 + <Custom Action="VS2015Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2015DEVENV" />

63 </InstallExecuteSequence>

64 </Fragment>

@@ -69,7 +68,7 @@

68 <PropertyRef Id="VS2015DEVENV" />

70 <InstallExecuteSequence>

72 - <Custom Action="VS2015InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2015DEVENV</Custom>

71 + <Custom Action="VS2015InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2015DEVENV" />

72 </InstallExecuteSequence>

73 </Fragment>

@@ -106,7 +105,7 @@

105 <CustomAction Id="VWD2015Setup" Property="VWD2015EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />

106 <PropertyRef Id="VWD2015EXPRESS_IDE" />

107 <InstallExecuteSequence>

109 - <Custom Action="VWD2015Setup" Before="InstallFinalize" Overridable="yes">VWD2015EXPRESS_IDE</Custom>

108 + <Custom Action="VWD2015Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2015EXPRESS_IDE" />

109 </InstallExecuteSequence>

110 </Fragment>

111

@@ -114,7 +113,7 @@

113 <CustomAction Id="VWD2015InstallVSTemplates" Property="VWD2015EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />

114 <PropertyRef Id="VWD2015EXPRESS_IDE" />

115 <InstallExecuteSequence>

117 - <Custom Action="VWD2015InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2015EXPRESS_IDE</Custom>

116 + <Custom Action="VWD2015InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2015EXPRESS_IDE" />

117 </InstallExecuteSequence>

118 </Fragment>

119

@@ -173,7 +172,7 @@

172 <CustomAction Id="VS2015WinExpressSetup" Property="VS2015WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />

173 <PropertyRef Id="VS2015WINEXPRESS_IDE" />

174 <InstallExecuteSequence>

176 - <Custom Action="VS2015WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS2015WINEXPRESS_IDE</Custom>

175 + <Custom Action="VS2015WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2015WINEXPRESS_IDE" />

176 </InstallExecuteSequence>

177 </Fragment>

178

@@ -181,7 +180,7 @@

180 <CustomAction Id="VS2015WinExpressInstallVSTemplates" Property="VS2015WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />

181 <PropertyRef Id="VS2015WINEXPRESS_IDE" />

182 <InstallExecuteSequence>

184 - <Custom Action="VS2015WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2015WINEXPRESS_IDE</Custom>

183 + <Custom Action="VS2015WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2015WINEXPRESS_IDE" />

184 </InstallExecuteSequence>

185 </Fragment>

186 </Wix>

src/wixlib/VS2017.wxs

+3 -4

@@ -1,5 +1,4 @@

1 -<?xml version="1.0" encoding="UTF-8"?>

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

@@ -74,7 +73,7 @@

73 <PropertyRef Id="VS2017DEVENV" />

75 <InstallExecuteSequence>

77 - <Custom Action="VS2017Setup" Before="InstallFinalize" Overridable="yes">VS2017DEVENV</Custom>

76 + <Custom Action="VS2017Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2017DEVENV" />

77 </InstallExecuteSequence>

78 </Fragment>

@@ -83,7 +82,7 @@

82 <PropertyRef Id="VS2017DEVENV" />

84 <InstallExecuteSequence>

86 - <Custom Action="VS2017InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2017DEVENV</Custom>

85 + <Custom Action="VS2017InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2017DEVENV" />

86 </InstallExecuteSequence>

87 </Fragment>

src/wixlib/VS2019.wxs

+3 -4

@@ -1,5 +1,4 @@

1 -<?xml version="1.0" encoding="UTF-8"?>

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

@@ -74,7 +73,7 @@

73 <PropertyRef Id="VS2019DEVENV" />

75 <InstallExecuteSequence>

77 - <Custom Action="VS2019Setup" Before="InstallFinalize" Overridable="yes">VS2019DEVENV</Custom>

76 + <Custom Action="VS2019Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2019DEVENV" />

77 </InstallExecuteSequence>

78 </Fragment>

@@ -83,7 +82,7 @@

82 <PropertyRef Id="VS2019DEVENV" />

84 <InstallExecuteSequence>

86 - <Custom Action="VS2019InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2019DEVENV</Custom>

85 + <Custom Action="VS2019InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2019DEVENV" />

86 </InstallExecuteSequence>

87 </Fragment>

src/wixlib/VSExtension_Platform.wxi

+2 -3

@@ -1,10 +1,9 @@

1 -<?xml version="1.0" encoding="UTF-8"?>

3 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">

4 <?include caSuffix.wxi ?>

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)" />

7 <InstallExecuteSequence>

8 <Custom Action="VSFindInstances$(var.Suffix)" Before="AppSearch" Overridable="yes" />

9 </InstallExecuteSequence>

src/wixlib/VsixPackage.wxs

+8 -9

@@ -1,5 +1,4 @@

1 -<?xml version="1.0" encoding="UTF-8"?>

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

@@ -47,15 +46,15 @@

46 </Property>

48

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>

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>

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" />

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" />

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>

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>

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" />

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" />

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>

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>

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" />

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" />

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" />

59 </Fragment>

60 </Wix>

src/wixlib/vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs

+17 -18

@@ -1,5 +1,4 @@

1 -<?xml version="1.0" encoding="utf-8"?>

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

@@ -24,41 +23,41 @@

23 </Component>

24 </Directory>

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" />

28 - <CustomAction Id="CA_HxMerge_VSIPCC_VSExpCC" Return="ignore" Execute="commit" Impersonate="no" BinaryKey="BIN_File_60377" ExeCommand="ms-help://MS.VSExpressCC.v80" />

26 + <CustomAction Id="CA_HxMerge_VSIPCC_VSCC" Return="ignore" Execute="commit" Impersonate="no" ExeCommand="ms-help://MS.VSCC.v80" BinaryRef="BIN_File_60377" />

27 + <CustomAction Id="CA_HxMerge_VSIPCC_VSExpCC" Return="ignore" Execute="commit" Impersonate="no" ExeCommand="ms-help://MS.VSExpressCC.v80" BinaryRef="BIN_File_60377" />

28 <InstallExecuteSequence>

30 - <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"/>

29 + <Custom Action="CA_HxMerge_VSIPCC_VSCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" />

30 + <Custom Action="CA_HxMerge_VSIPCC_VSExpCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" />

31 </InstallExecuteSequence>

32 <Binary Id="BIN_File_60377" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_60377.dll" />

33 <CustomTable Id="HelpPlugin">

34 <Row>

36 - <Data Column="HelpNamespace_">MS_VSIPCC_v80</Data>

37 - <Data Column="HelpNamespace_Parent">MS_VSCC_v80</Data>

38 - <Data Column="File_HxT">FL_vsipcc_hxt_86880________</Data>

35 + <Data Column="HelpNamespace_" Value="MS_VSIPCC_v80" />

36 + <Data Column="HelpNamespace_Parent" Value="MS_VSCC_v80" />

37 + <Data Column="File_HxT" Value="FL_vsipcc_hxt_86880________" />

38 <Data Column="File_HxA" />

39 <Data Column="File_ParentHxT" />

40 </Row>

41 <Row>

43 - <Data Column="HelpNamespace_">MS_VSIPCC_v80</Data>

44 - <Data Column="HelpNamespace_Parent">MS_VSExpressCC_v80</Data>

45 - <Data Column="File_HxT">FL_vsipcc_hxt_86880________</Data>

42 + <Data Column="HelpNamespace_" Value="MS_VSIPCC_v80" />

43 + <Data Column="HelpNamespace_Parent" Value="MS_VSExpressCC_v80" />

44 + <Data Column="File_HxT" Value="FL_vsipcc_hxt_86880________" />

45 <Data Column="File_HxA" />

46 <Data Column="File_ParentHxT" />

47 </Row>

48 </CustomTable>

49 <CustomTable Id="HelpNamespace">

50 <Row>

52 - <Data Column="NamespaceKey">MS_VSIPCC_v80</Data>

53 - <Data Column="NamespaceName">MS.VSIPCC.v80</Data>

54 - <Data Column="File_Collection">FL_vsipcc_hxc_86879________</Data>

55 - <Data Column="Description">VSIP Documentation</Data>

51 + <Data Column="NamespaceKey" Value="MS_VSIPCC_v80" />

52 + <Data Column="NamespaceName" Value="MS.VSIPCC.v80" />

53 + <Data Column="File_Collection" Value="FL_vsipcc_hxc_86879________" />

54 + <Data Column="Description" Value="VSIP Documentation" />

55 </Row>

56 </CustomTable>

58 <ComponentGroup Id="Help2_VS2005_Namespace_Components">

60 - <ComponentRef Id="VSIPCC_Reg"/>

61 - <ComponentRef Id="vsipcc_collection________"/>

59 + <ComponentRef Id="VSIPCC_Reg" />

60 + <ComponentRef Id="vsipcc_collection________" />

61 </ComponentGroup>

62 </Fragment>

63 </Wix>

src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs

+24 -25

@@ -1,12 +1,11 @@

1 -<?xml version="1.0" encoding="utf-8"?>

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

5 <Fragment Id="VS2008_Namespace">

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" />

9 - <CustomAction Id="CA_ExtHelpPlugin" BinaryKey="BIN_435439_x86_enu" DllEntry="ExtHelpPluginAction" Execute="deferred" Impersonate="no" />

7 + <CustomAction Id="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" DllEntry="ScheduleExtHelpPlugin" Return="ignore" BinaryRef="BIN_435439_x86_enu" />

8 + <CustomAction Id="CA_ExtHelpPlugin" DllEntry="ExtHelpPluginAction" Execute="deferred" Impersonate="no" BinaryRef="BIN_435439_x86_enu" />

10 <DirectoryRef Id="VSIPCC">

11 <Component Id="VSIPCC_Reg_27501" Guid="{7C32E9FB-9C4D-416B-8ACC-9D487ED0ADBD}" KeyPath="yes">

@@ -15,33 +14,33 @@

14 </Component>

15 <Directory Id="vsipcc_v9.0" Name="v9.0" FileSource="$(sys.SOURCEFILEDIR)\Redist">

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"/>

19 - <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"/>

21 - <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"/>

23 - <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"/>

25 - <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"/>

27 - <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"/>

17 + <File Id="FL_vsipcc_reg_hxs_86878_86878_cn_ln" Name="vsipcc_reg.hxs" KeyPath="yes" Vital="no" />

18 + <File Id="FL_vsipcc_hxc_86879_86879_cn_ln" Name="_vsipcc90.hxc" Vital="no" />

19 + <File Id="FL_vsipcc_hxt_86880_86880_cn_ln" Name="_vsipcc90.hxt" Vital="no" />

20 + <File Id="FL_vsipccALinks_hxk_86881_86881_cn_ln" Name="_ALinks.hxk" Vital="no" />

21 + <File Id="FL_vsipccBLinks_hxk_86882_86882_cn_ln" Name="_BLinks.hxk" Vital="no" />

22 + <File Id="FL_vsipccCLinks_hxk_cn_ln" Name="_CLinks.hxk" Vital="no" />

23 + <File Id="FL_vsipccFLinks_hxk_86885_86885_cn_ln" Name="_FLinks.hxk" Vital="no" />

24 + <File Id="FL_vsipccKLinks_hxk_86886_86886_cn_ln" Name="_KLinks.hxk" Vital="no" />

25 + <File Id="FL_vsipccNamedURLs_hxk_86888_86888_cn_ln" Name="_vsipcc_namedUrls.hxk" Vital="no" />

26 + <File Id="FL_vsipccSlinks_hxk_93825_93825_cn_ln" Name="_SLinks.hxk" Vital="no" />

27 + <File Id="FL_VsipCCSamples_HxK_103959_103959_cn_ln" Name="_vsipcc_samples.HxK" Vital="no" />

28 </Component>

29 </Directory>

30 </DirectoryRef>

31 <CustomTable Id="HelpNamespace">

32 <Row>

34 - <Data Column="NamespaceKey">MS.VSIPCC.v90</Data>

35 - <Data Column="NamespaceName">MS.VSIPCC.v90</Data>

36 - <Data Column="File_Collection">FL_vsipcc_hxc_86879_86879_cn_ln</Data>

37 - <Data Column="Description">VSIP Documentation</Data>

33 + <Data Column="NamespaceKey" Value="MS.VSIPCC.v90" />

34 + <Data Column="NamespaceName" Value="MS.VSIPCC.v90" />

35 + <Data Column="File_Collection" Value="FL_vsipcc_hxc_86879_86879_cn_ln" />

36 + <Data Column="Description" Value="VSIP Documentation" />

37 </Row>

38 </CustomTable>

39 <CustomTable Id="HelpPlugin">

40 <Row>

42 - <Data Column="HelpNamespace_">MS.VSIPCC.v90</Data>

43 - <Data Column="HelpNamespace_Parent">MS.VSCC.v90</Data>

44 - <Data Column="File_HxT">FL_vsipcc_hxt_86880_86880_cn_ln</Data>

41 + <Data Column="HelpNamespace_" Value="MS.VSIPCC.v90" />

42 + <Data Column="HelpNamespace_Parent" Value="MS.VSCC.v90" />

43 + <Data Column="File_HxT" Value="FL_vsipcc_hxt_86880_86880_cn_ln" />

44 <Data Column="File_HxA" />

45 <Data Column="File_ParentHxT" />

46 </Row>

@@ -50,12 +49,12 @@

49 <Property Id="DirectoryTable_x86" Value="DirectoryTable" />

50 <Property Id="HHFilterTable" Value="HHFilterTable" />

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" />

53 </InstallExecuteSequence>

55 <ComponentGroup Id="Help2_VS2008_Namespace_Components">

57 - <ComponentRef Id="VSIPCC_Reg_27501"/>

58 - <ComponentRef Id="vsipcc_collection_25097"/>

56 + <ComponentRef Id="VSIPCC_Reg_27501" />

57 + <ComponentRef Id="vsipcc_collection_25097" />

58 </ComponentGroup>

59 </Fragment>

60 </Wix>