diff options
Diffstat (limited to 'src/wixlib/VS2013.wxs')
-rw-r--r-- | src/wixlib/VS2013.wxs | 23 |
1 files changed, 11 insertions, 12 deletions
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> |