diff options
Diffstat (limited to 'src/WixToolset.MSBuild/tools/wix.targets')
| -rw-r--r-- | src/WixToolset.MSBuild/tools/wix.targets | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/WixToolset.MSBuild/tools/wix.targets b/src/WixToolset.MSBuild/tools/wix.targets index 62414017..6914d03e 100644 --- a/src/WixToolset.MSBuild/tools/wix.targets +++ b/src/WixToolset.MSBuild/tools/wix.targets | |||
| @@ -249,11 +249,6 @@ | |||
| 249 | 249 | ||
| 250 | <Error | 250 | <Error |
| 251 | Code="WIX102" | 251 | Code="WIX102" |
| 252 | Condition=" '$(MSBuildToolsVersion)' == '' OR '$(MSBuildToolsVersion)' < '4.0' " | ||
| 253 | Text="MSBuild v$(MSBuildToolsVersion) is not supported by the project "$(MSBuildProjectFile)". You must use MSBuild v4.0 or later." /> | ||
| 254 | |||
| 255 | <Error | ||
| 256 | Code="WIX103" | ||
| 257 | Condition=" '$(WixPdbType)' != 'none' and '$(WixPdbType)' != 'full' " | 252 | Condition=" '$(WixPdbType)' != 'none' and '$(WixPdbType)' != 'full' " |
| 258 | Text="The WixPdbType property '$(WixPdbType)' is not valid in project "$(MSBuildProjectFile)". Supported values are: 'full', 'none'" /> | 253 | Text="The WixPdbType property '$(WixPdbType)' is not valid in project "$(MSBuildProjectFile)". Supported values are: 'full', 'none'" /> |
| 259 | 254 | ||
| @@ -695,7 +690,11 @@ | |||
| 695 | 690 | ||
| 696 | SuppressValidation="$(SuppressValidation)" | 691 | SuppressValidation="$(SuppressValidation)" |
| 697 | SuppressIces="$(SuppressIces)" | 692 | SuppressIces="$(SuppressIces)" |
| 698 | AdditionalCub="$(AdditionalCub)" /> | 693 | AdditionalCub="$(AdditionalCub)" |
| 694 | |||
| 695 | RunAsSeparateProcess="$(RunWixToolsOutOfProc)" | ||
| 696 | ToolExe="$(WixToolExe)" | ||
| 697 | ToolPath="$(WixToolDir)" /> | ||
| 699 | 698 | ||
| 700 | <!-- | 699 | <!-- |
| 701 | SuppressAllWarnings="$(CompilerSuppressAllWarnings);$(LinkerSuppressAllWarnings)" | 700 | SuppressAllWarnings="$(CompilerSuppressAllWarnings);$(LinkerSuppressAllWarnings)" |