diff options
Diffstat (limited to 'src/wixlib/VS11.wxs')
-rw-r--r-- | src/wixlib/VS11.wxs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/wixlib/VS11.wxs b/src/wixlib/VS11.wxs index dd52e80a..d3f31843 100644 --- a/src/wixlib/VS11.wxs +++ b/src/wixlib/VS11.wxs | |||
@@ -1,5 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
3 | 2 | ||
4 | 3 | ||
5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
@@ -60,7 +59,7 @@ | |||
60 | <PropertyRef Id="VS11DEVENV" /> | 59 | <PropertyRef Id="VS11DEVENV" /> |
61 | 60 | ||
62 | <InstallExecuteSequence> | 61 | <InstallExecuteSequence> |
63 | <Custom Action="VS11Setup" Before="InstallFinalize" Overridable="yes">VS11DEVENV</Custom> | 62 | <Custom Action="VS11Setup" Before="InstallFinalize" Overridable="yes" Condition="VS11DEVENV" /> |
64 | </InstallExecuteSequence> | 63 | </InstallExecuteSequence> |
65 | </Fragment> | 64 | </Fragment> |
66 | 65 | ||
@@ -69,7 +68,7 @@ | |||
69 | <PropertyRef Id="VS11DEVENV" /> | 68 | <PropertyRef Id="VS11DEVENV" /> |
70 | 69 | ||
71 | <InstallExecuteSequence> | 70 | <InstallExecuteSequence> |
72 | <Custom Action="VS11InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS11DEVENV</Custom> | 71 | <Custom Action="VS11InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS11DEVENV" /> |
73 | </InstallExecuteSequence> | 72 | </InstallExecuteSequence> |
74 | </Fragment> | 73 | </Fragment> |
75 | 74 | ||
@@ -108,7 +107,7 @@ | |||
108 | <CustomAction Id="VWD11Setup" Property="VWD11EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> | 107 | <CustomAction Id="VWD11Setup" Property="VWD11EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> |
109 | <PropertyRef Id="VWD11EXPRESS_IDE" /> | 108 | <PropertyRef Id="VWD11EXPRESS_IDE" /> |
110 | <InstallExecuteSequence> | 109 | <InstallExecuteSequence> |
111 | <Custom Action="VWD11Setup" Before="InstallFinalize" Overridable="yes">VWD11EXPRESS_IDE</Custom> | 110 | <Custom Action="VWD11Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD11EXPRESS_IDE" /> |
112 | </InstallExecuteSequence> | 111 | </InstallExecuteSequence> |
113 | </Fragment> | 112 | </Fragment> |
114 | <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates --> | 113 | <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates --> |
@@ -116,7 +115,7 @@ | |||
116 | <CustomAction Id="VWD11InstallVSTemplates" Property="VWD11EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> | 115 | <CustomAction Id="VWD11InstallVSTemplates" Property="VWD11EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> |
117 | <PropertyRef Id="VWD11EXPRESS_IDE" /> | 116 | <PropertyRef Id="VWD11EXPRESS_IDE" /> |
118 | <InstallExecuteSequence> | 117 | <InstallExecuteSequence> |
119 | <Custom Action="VWD11InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD11EXPRESS_IDE</Custom> | 118 | <Custom Action="VWD11InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD11EXPRESS_IDE" /> |
120 | </InstallExecuteSequence> | 119 | </InstallExecuteSequence> |
121 | </Fragment> | 120 | </Fragment> |
122 | 121 | ||
@@ -192,7 +191,7 @@ | |||
192 | <CustomAction Id="VS11WinExpressSetup" Property="VS11WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> | 191 | <CustomAction Id="VS11WinExpressSetup" Property="VS11WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> |
193 | <PropertyRef Id="VS11WINEXPRESS_IDE" /> | 192 | <PropertyRef Id="VS11WINEXPRESS_IDE" /> |
194 | <InstallExecuteSequence> | 193 | <InstallExecuteSequence> |
195 | <Custom Action="VS11WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS11WINEXPRESS_IDE</Custom> | 194 | <Custom Action="VS11WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS11WINEXPRESS_IDE" /> |
196 | </InstallExecuteSequence> | 195 | </InstallExecuteSequence> |
197 | </Fragment> | 196 | </Fragment> |
198 | <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates --> | 197 | <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates --> |
@@ -200,7 +199,7 @@ | |||
200 | <CustomAction Id="VS11WinExpressInstallVSTemplates" Property="VS11WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> | 199 | <CustomAction Id="VS11WinExpressInstallVSTemplates" Property="VS11WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> |
201 | <PropertyRef Id="VS11WINEXPRESS_IDE" /> | 200 | <PropertyRef Id="VS11WINEXPRESS_IDE" /> |
202 | <InstallExecuteSequence> | 201 | <InstallExecuteSequence> |
203 | <Custom Action="VS11WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS11WINEXPRESS_IDE</Custom> | 202 | <Custom Action="VS11WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS11WINEXPRESS_IDE" /> |
204 | </InstallExecuteSequence> | 203 | </InstallExecuteSequence> |
205 | </Fragment> | 204 | </Fragment> |
206 | </Wix> | 205 | </Wix> |