diff options
Diffstat (limited to 'src/wixlib/VS14.wxs')
-rw-r--r-- | src/wixlib/VS14.wxs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/wixlib/VS14.wxs b/src/wixlib/VS14.wxs index 52db1562..83449802 100644 --- a/src/wixlib/VS14.wxs +++ b/src/wixlib/VS14.wxs | |||
@@ -1,5 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
3 | 2 | ||
4 | 3 | ||
5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
@@ -60,7 +59,7 @@ | |||
60 | <PropertyRef Id="VS14DEVENV" /> | 59 | <PropertyRef Id="VS14DEVENV" /> |
61 | 60 | ||
62 | <InstallExecuteSequence> | 61 | <InstallExecuteSequence> |
63 | <Custom Action="VS14Setup" Before="InstallFinalize" Overridable="yes">VS14DEVENV</Custom> | 62 | <Custom Action="VS14Setup" Before="InstallFinalize" Overridable="yes" Condition="VS14DEVENV" /> |
64 | </InstallExecuteSequence> | 63 | </InstallExecuteSequence> |
65 | </Fragment> | 64 | </Fragment> |
66 | 65 | ||
@@ -69,7 +68,7 @@ | |||
69 | <PropertyRef Id="VS14DEVENV" /> | 68 | <PropertyRef Id="VS14DEVENV" /> |
70 | 69 | ||
71 | <InstallExecuteSequence> | 70 | <InstallExecuteSequence> |
72 | <Custom Action="VS14InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS14DEVENV</Custom> | 71 | <Custom Action="VS14InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS14DEVENV" /> |
73 | </InstallExecuteSequence> | 72 | </InstallExecuteSequence> |
74 | </Fragment> | 73 | </Fragment> |
75 | 74 | ||
@@ -106,7 +105,7 @@ | |||
106 | <CustomAction Id="VWD14Setup" Property="VWD14EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> | 105 | <CustomAction Id="VWD14Setup" Property="VWD14EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> |
107 | <PropertyRef Id="VWD14EXPRESS_IDE" /> | 106 | <PropertyRef Id="VWD14EXPRESS_IDE" /> |
108 | <InstallExecuteSequence> | 107 | <InstallExecuteSequence> |
109 | <Custom Action="VWD14Setup" Before="InstallFinalize" Overridable="yes">VWD14EXPRESS_IDE</Custom> | 108 | <Custom Action="VWD14Setup" Before="InstallFinalize" Overridable="yes" Condition="VWD14EXPRESS_IDE" /> |
110 | </InstallExecuteSequence> | 109 | </InstallExecuteSequence> |
111 | </Fragment> | 110 | </Fragment> |
112 | <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates --> | 111 | <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates --> |
@@ -114,7 +113,7 @@ | |||
114 | <CustomAction Id="VWD14InstallVSTemplates" Property="VWD14EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> | 113 | <CustomAction Id="VWD14InstallVSTemplates" Property="VWD14EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> |
115 | <PropertyRef Id="VWD14EXPRESS_IDE" /> | 114 | <PropertyRef Id="VWD14EXPRESS_IDE" /> |
116 | <InstallExecuteSequence> | 115 | <InstallExecuteSequence> |
117 | <Custom Action="VWD14InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD14EXPRESS_IDE</Custom> | 116 | <Custom Action="VWD14InstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VWD14EXPRESS_IDE" /> |
118 | </InstallExecuteSequence> | 117 | </InstallExecuteSequence> |
119 | </Fragment> | 118 | </Fragment> |
120 | 119 | ||
@@ -173,7 +172,7 @@ | |||
173 | <CustomAction Id="VS14WinExpressSetup" Property="VS14WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> | 172 | <CustomAction Id="VS14WinExpressSetup" Property="VS14WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" /> |
174 | <PropertyRef Id="VS14WINEXPRESS_IDE" /> | 173 | <PropertyRef Id="VS14WINEXPRESS_IDE" /> |
175 | <InstallExecuteSequence> | 174 | <InstallExecuteSequence> |
176 | <Custom Action="VS14WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS14WINEXPRESS_IDE</Custom> | 175 | <Custom Action="VS14WinExpressSetup" Before="InstallFinalize" Overridable="yes" Condition="VS14WINEXPRESS_IDE" /> |
177 | </InstallExecuteSequence> | 176 | </InstallExecuteSequence> |
178 | </Fragment> | 177 | </Fragment> |
179 | <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates --> | 178 | <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates --> |
@@ -181,7 +180,7 @@ | |||
181 | <CustomAction Id="VS14WinExpressInstallVSTemplates" Property="VS14WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> | 180 | <CustomAction Id="VS14WinExpressInstallVSTemplates" Property="VS14WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" /> |
182 | <PropertyRef Id="VS14WINEXPRESS_IDE" /> | 181 | <PropertyRef Id="VS14WINEXPRESS_IDE" /> |
183 | <InstallExecuteSequence> | 182 | <InstallExecuteSequence> |
184 | <Custom Action="VS14WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS14WINEXPRESS_IDE</Custom> | 183 | <Custom Action="VS14WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes" Condition="VS14WINEXPRESS_IDE" /> |
185 | </InstallExecuteSequence> | 184 | </InstallExecuteSequence> |
186 | </Fragment> | 185 | </Fragment> |
187 | </Wix> | 186 | </Wix> |