diff options
Diffstat (limited to 'src/wixlib/VS2012.wxs')
-rw-r--r-- | src/wixlib/VS2012.wxs | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/wixlib/VS2012.wxs b/src/wixlib/VS2012.wxs index c4baa2c9..513d8684 100644 --- a/src/wixlib/VS2012.wxs +++ b/src/wixlib/VS2012.wxs | |||
@@ -1,5 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
3 | 2 | ||
4 | 3 | ||
5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
@@ -60,7 +59,7 @@ | |||
60 | <PropertyRef Id="VS2012DEVENV" /> | 59 | <PropertyRef Id="VS2012DEVENV" /> |
61 | 60 | ||
62 | <InstallExecuteSequence> | 61 | <InstallExecuteSequence> |
63 | <Custom Action="VS2012Setup" Before="InstallFinalize" Overridable="yes">VS2012DEVENV</Custom> | 62 | <Custom Action="VS2012Setup" Before="InstallFinalize" Overridable="yes" Condition="VS2012DEVENV" /> |
64 | </InstallExecuteSequence> | 63 | </InstallExecuteSequence> |
65 | </Fragment> | 64 | </Fragment> |
66 | 65 | ||
@@ -69,7 +68,7 @@ | |||
69 | <PropertyRef Id="VS2012DEVENV" /> | 68 | <PropertyRef Id="VS2012DEVENV" /> |
70 | 69 | ||
71 | <InstallExecuteSequence> | 70 | <InstallExecuteSequence> |
72 | <Custom Action="VS2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012DEVENV</Custom> | 71 | <Custom Action="VS2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2012DEVENV" /> |
73 | </InstallExecuteSequence> | 72 | </InstallExecuteSequence> |
74 | </Fragment> | 73 | </Fragment> |
75 | 74 | ||
@@ -108,7 +107,7 @@ | |||
108 | <CustomAction Id="VWD2012Setup" Property="VWD2012EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> | 107 | <CustomAction Id="VWD2012Setup" Property="VWD2012EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> |
109 | <PropertyRef Id="VWD2012EXPRESS_IDE" /> | 108 | <PropertyRef Id="VWD2012EXPRESS_IDE" /> |
110 | <InstallExecuteSequence> | 109 | <InstallExecuteSequence> |
111 | <Custom Action="VWD2012Setup" Before="InstallFinalize" Overridable="yes">VWD2012EXPRESS_IDE</Custom> | 110 | <Custom Action="VWD2012Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD2012EXPRESS_IDE" /> |
112 | </InstallExecuteSequence> | 111 | </InstallExecuteSequence> |
113 | </Fragment> | 112 | </Fragment> |
114 | <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates --> | 113 | <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates --> |
@@ -116,7 +115,7 @@ | |||
116 | <CustomAction Id="VWD2012InstallVSTemplates" Property="VWD2012EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> | 115 | <CustomAction Id="VWD2012InstallVSTemplates" Property="VWD2012EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> |
117 | <PropertyRef Id="VWD2012EXPRESS_IDE" /> | 116 | <PropertyRef Id="VWD2012EXPRESS_IDE" /> |
118 | <InstallExecuteSequence> | 117 | <InstallExecuteSequence> |
119 | <Custom Action="VWD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2012EXPRESS_IDE</Custom> | 118 | <Custom Action="VWD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD2012EXPRESS_IDE" /> |
120 | </InstallExecuteSequence> | 119 | </InstallExecuteSequence> |
121 | </Fragment> | 120 | </Fragment> |
122 | 121 | ||
@@ -131,7 +130,7 @@ | |||
131 | <CustomAction Id="VPD2012Setup" Property="VPD2012EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> | 130 | <CustomAction Id="VPD2012Setup" Property="VPD2012EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> |
132 | <PropertyRef Id="VPD2012EXPRESS_IDE" /> | 131 | <PropertyRef Id="VPD2012EXPRESS_IDE" /> |
133 | <InstallExecuteSequence> | 132 | <InstallExecuteSequence> |
134 | <Custom Action="VPD2012Setup" Before="InstallFinalize" Overridable="yes">VPD2012EXPRESS_IDE</Custom> | 133 | <Custom Action="VPD2012Setup" Before="InstallFinalize" Overridable="yes" Condition="VPD2012EXPRESS_IDE" /> |
135 | </InstallExecuteSequence> | 134 | </InstallExecuteSequence> |
136 | </Fragment> | 135 | </Fragment> |
137 | <!-- Custom action definition to run VPDexpress.exe /InstallVSTemplates --> | 136 | <!-- Custom action definition to run VPDexpress.exe /InstallVSTemplates --> |
@@ -139,7 +138,7 @@ | |||
139 | <CustomAction Id="VPD2012InstallVSTemplates" Property="VPD2012EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> | 138 | <CustomAction Id="VPD2012InstallVSTemplates" Property="VPD2012EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> |
140 | <PropertyRef Id="VPD2012EXPRESS_IDE" /> | 139 | <PropertyRef Id="VPD2012EXPRESS_IDE" /> |
141 | <InstallExecuteSequence> | 140 | <InstallExecuteSequence> |
142 | <Custom Action="VPD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VPD2012EXPRESS_IDE</Custom> | 141 | <Custom Action="VPD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VPD2012EXPRESS_IDE" /> |
143 | </InstallExecuteSequence> | 142 | </InstallExecuteSequence> |
144 | </Fragment> | 143 | </Fragment> |
145 | 144 | ||
@@ -215,7 +214,7 @@ | |||
215 | <CustomAction Id="VS2012WinExpressSetup" Property="VS2012WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> | 214 | <CustomAction Id="VS2012WinExpressSetup" Property="VS2012WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> |
216 | <PropertyRef Id="VS2012WINEXPRESS_IDE" /> | 215 | <PropertyRef Id="VS2012WINEXPRESS_IDE" /> |
217 | <InstallExecuteSequence> | 216 | <InstallExecuteSequence> |
218 | <Custom Action="VS2012WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS2012WINEXPRESS_IDE</Custom> | 217 | <Custom Action="VS2012WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2012WINEXPRESS_IDE" /> |
219 | </InstallExecuteSequence> | 218 | </InstallExecuteSequence> |
220 | </Fragment> | 219 | </Fragment> |
221 | <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates --> | 220 | <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates --> |
@@ -223,7 +222,7 @@ | |||
223 | <CustomAction Id="VS2012WinExpressInstallVSTemplates" Property="VS2012WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> | 222 | <CustomAction Id="VS2012WinExpressInstallVSTemplates" Property="VS2012WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> |
224 | <PropertyRef Id="VS2012WINEXPRESS_IDE" /> | 223 | <PropertyRef Id="VS2012WINEXPRESS_IDE" /> |
225 | <InstallExecuteSequence> | 224 | <InstallExecuteSequence> |
226 | <Custom Action="VS2012WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012WINEXPRESS_IDE</Custom> | 225 | <Custom Action="VS2012WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2012WINEXPRESS_IDE" /> |
227 | </InstallExecuteSequence> | 226 | </InstallExecuteSequence> |
228 | </Fragment> | 227 | </Fragment> |
229 | 228 | ||
@@ -242,7 +241,7 @@ | |||
242 | <CustomAction Id="VS2012WDExpressSetup" Property="VS2012WDEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> | 241 | <CustomAction Id="VS2012WDExpressSetup" Property="VS2012WDEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> |
243 | <PropertyRef Id="VS2012WDEXPRESS_IDE" /> | 242 | <PropertyRef Id="VS2012WDEXPRESS_IDE" /> |
244 | <InstallExecuteSequence> | 243 | <InstallExecuteSequence> |
245 | <Custom Action="VS2012WDExpressSetup" Before="InstallFinalize" Overridable="yes">VS2012WDEXPRESS_IDE</Custom> | 244 | <Custom Action="VS2012WDExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS2012WDEXPRESS_IDE" /> |
246 | </InstallExecuteSequence> | 245 | </InstallExecuteSequence> |
247 | </Fragment> | 246 | </Fragment> |
248 | <!-- Custom action definition to run WDExpress.exe /InstallVSTemplates --> | 247 | <!-- Custom action definition to run WDExpress.exe /InstallVSTemplates --> |
@@ -250,7 +249,7 @@ | |||
250 | <CustomAction Id="VS2012WDExpressInstallVSTemplates" Property="VS2012WDEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> | 249 | <CustomAction Id="VS2012WDExpressInstallVSTemplates" Property="VS2012WDEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> |
251 | <PropertyRef Id="VS2012WDEXPRESS_IDE" /> | 250 | <PropertyRef Id="VS2012WDEXPRESS_IDE" /> |
252 | <InstallExecuteSequence> | 251 | <InstallExecuteSequence> |
253 | <Custom Action="VS2012WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012WDEXPRESS_IDE</Custom> | 252 | <Custom Action="VS2012WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS2012WDEXPRESS_IDE" /> |
254 | </InstallExecuteSequence> | 253 | </InstallExecuteSequence> |
255 | </Fragment> | 254 | </Fragment> |
256 | </Wix> | 255 | </Wix> |