diff options
Diffstat (limited to 'src/WixToolset.BuildTasks/wix.harvest.targets')
| -rw-r--r-- | src/WixToolset.BuildTasks/wix.harvest.targets | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/WixToolset.BuildTasks/wix.harvest.targets b/src/WixToolset.BuildTasks/wix.harvest.targets index e94dfcea..a8be17df 100644 --- a/src/WixToolset.BuildTasks/wix.harvest.targets +++ b/src/WixToolset.BuildTasks/wix.harvest.targets | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | <!-- These properties can be overridden to support non-default installations. --> | 7 | <!-- These properties can be overridden to support non-default installations. --> |
| 8 | <PropertyGroup> | 8 | <PropertyGroup> |
| 9 | <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildThisFileFullPath)</WixTargetsPath> | 9 | <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildThisFileFullPath)</WixTargetsPath> |
| 10 | <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixTargetsPath)WixTasks.dll</WixTasksPath> | 10 | <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixTargetsPath)WixToolset.BuildTasks.dll</WixTasksPath> |
| 11 | </PropertyGroup> | 11 | </PropertyGroup> |
| 12 | 12 | ||
| 13 | <!-- These tasks are extensions for harvesting WiX source code from other sources. --> | 13 | <!-- These tasks are extensions for harvesting WiX source code from other sources. --> |
| @@ -260,10 +260,9 @@ | |||
| 260 | Condition=" $(EnableProjectHarvesting) and ('@(HeatProject)' != '' or '@(HarvestProject)' != '') "> | 260 | Condition=" $(EnableProjectHarvesting) and ('@(HeatProject)' != '' or '@(HarvestProject)' != '') "> |
| 261 | 261 | ||
| 262 | <HeatProject | 262 | <HeatProject |
| 263 | NoLogo="$(HarvestProjectsNoLogo)" | 263 | NoLogo="true" |
| 264 | SuppressAllWarnings="$(HarvestProjectsSuppressAllWarnings)" | 264 | SuppressAllWarnings="$(HarvestProjectsSuppressAllWarnings)" |
| 265 | SuppressSpecificWarnings="$(HarvestProjectsSuppressSpecificWarnings)" | 265 | SuppressSpecificWarnings="$(HarvestProjectsSuppressSpecificWarnings)" |
| 266 | ToolPath="$(WixToolPath)" | ||
| 267 | TreatWarningsAsErrors="$(HarvestProjectsTreatWarningsAsErrors)" | 266 | TreatWarningsAsErrors="$(HarvestProjectsTreatWarningsAsErrors)" |
| 268 | TreatSpecificWarningsAsErrors="$(HarvestProjectsTreatSpecificWarningsAsErrors)" | 267 | TreatSpecificWarningsAsErrors="$(HarvestProjectsTreatSpecificWarningsAsErrors)" |
| 269 | VerboseOutput="$(HarvestProjectsVerboseOutput)" | 268 | VerboseOutput="$(HarvestProjectsVerboseOutput)" |
| @@ -280,7 +279,6 @@ | |||
| 280 | ProjectName="%(_AllHeatProjects.ProjectName)" | 279 | ProjectName="%(_AllHeatProjects.ProjectName)" |
| 281 | Configuration="%(_AllHeatProjects.Configuration)" | 280 | Configuration="%(_AllHeatProjects.Configuration)" |
| 282 | Platform="%(_AllHeatProjects.Platform)" | 281 | Platform="%(_AllHeatProjects.Platform)" |
| 283 | RunAsSeparateProcess="$(RunWixToolsOutOfProc)" | ||
| 284 | GenerateWixVariables="$(HarvestProjectsGenerateWixVariables)" | 282 | GenerateWixVariables="$(HarvestProjectsGenerateWixVariables)" |
| 285 | AdditionalOptions="$(HarvestProjectsAdditionalOptions)"> | 283 | AdditionalOptions="$(HarvestProjectsAdditionalOptions)"> |
| 286 | 284 | ||
| @@ -347,10 +345,9 @@ | |||
| 347 | Condition=" '@(HarvestDirectory)' != '' "> | 345 | Condition=" '@(HarvestDirectory)' != '' "> |
| 348 | 346 | ||
| 349 | <HeatDirectory | 347 | <HeatDirectory |
| 350 | NoLogo="$(HarvestDirectoryNoLogo)" | 348 | NoLogo="true" |
| 351 | SuppressAllWarnings="$(HarvestDirectorySuppressAllWarnings)" | 349 | SuppressAllWarnings="$(HarvestDirectorySuppressAllWarnings)" |
| 352 | SuppressSpecificWarnings="$(HarvestDirectorySuppressSpecificWarnings)" | 350 | SuppressSpecificWarnings="$(HarvestDirectorySuppressSpecificWarnings)" |
| 353 | ToolPath="$(WixToolPath)" | ||
| 354 | TreatWarningsAsErrors="$(HarvestDirectoryTreatWarningsAsErrors)" | 351 | TreatWarningsAsErrors="$(HarvestDirectoryTreatWarningsAsErrors)" |
| 355 | TreatSpecificWarningsAsErrors="$(HarvestDirectoryTreatSpecificWarningsAsErrors)" | 352 | TreatSpecificWarningsAsErrors="$(HarvestDirectoryTreatSpecificWarningsAsErrors)" |
| 356 | VerboseOutput="$(HarvestDirectoryVerboseOutput)" | 353 | VerboseOutput="$(HarvestDirectoryVerboseOutput)" |
| @@ -365,7 +362,6 @@ | |||
| 365 | DirectoryRefId="%(HarvestDirectory.DirectoryRefId)" | 362 | DirectoryRefId="%(HarvestDirectory.DirectoryRefId)" |
| 366 | KeepEmptyDirectories="%(HarvestDirectory.KeepEmptyDirectories)" | 363 | KeepEmptyDirectories="%(HarvestDirectory.KeepEmptyDirectories)" |
| 367 | PreprocessorVariable="%(HarvestDirectory.PreprocessorVariable)" | 364 | PreprocessorVariable="%(HarvestDirectory.PreprocessorVariable)" |
| 368 | RunAsSeparateProcess="$(RunWixToolsOutOfProc)" | ||
| 369 | SuppressCom="%(HarvestDirectory.SuppressCom)" | 365 | SuppressCom="%(HarvestDirectory.SuppressCom)" |
| 370 | SuppressRootDirectory="%(HarvestDirectory.SuppressRootDirectory)" | 366 | SuppressRootDirectory="%(HarvestDirectory.SuppressRootDirectory)" |
| 371 | SuppressRegistry="%(HarvestDirectory.SuppressRegistry)" | 367 | SuppressRegistry="%(HarvestDirectory.SuppressRegistry)" |
| @@ -423,10 +419,9 @@ | |||
| 423 | Condition=" '@(HarvestFile)' != '' "> | 419 | Condition=" '@(HarvestFile)' != '' "> |
| 424 | 420 | ||
| 425 | <HeatFile | 421 | <HeatFile |
| 426 | NoLogo="$(HarvestFileNoLogo)" | 422 | NoLogo="true" |
| 427 | SuppressAllWarnings="$(HarvestFileSuppressAllWarnings)" | 423 | SuppressAllWarnings="$(HarvestFileSuppressAllWarnings)" |
| 428 | SuppressSpecificWarnings="$(HarvestFileSuppressSpecificWarnings)" | 424 | SuppressSpecificWarnings="$(HarvestFileSuppressSpecificWarnings)" |
| 429 | ToolPath="$(WixToolPath)" | ||
| 430 | TreatWarningsAsErrors="$(HarvestFileTreatWarningsAsErrors)" | 425 | TreatWarningsAsErrors="$(HarvestFileTreatWarningsAsErrors)" |
| 431 | TreatSpecificWarningsAsErrors="$(HarvestFileTreatSpecificWarningsAsErrors)" | 426 | TreatSpecificWarningsAsErrors="$(HarvestFileTreatSpecificWarningsAsErrors)" |
| 432 | VerboseOutput="$(HarvestFileVerboseOutput)" | 427 | VerboseOutput="$(HarvestFileVerboseOutput)" |
| @@ -440,7 +435,6 @@ | |||
| 440 | ComponentGroupName="%(HarvestFile.ComponentGroupName)" | 435 | ComponentGroupName="%(HarvestFile.ComponentGroupName)" |
| 441 | DirectoryRefId="%(HarvestFile.DirectoryRefId)" | 436 | DirectoryRefId="%(HarvestFile.DirectoryRefId)" |
| 442 | PreprocessorVariable="%(HarvestFile.PreprocessorVariable)" | 437 | PreprocessorVariable="%(HarvestFile.PreprocessorVariable)" |
| 443 | RunAsSeparateProcess="$(RunWixToolsOutOfProc)" | ||
| 444 | SuppressCom="%(HarvestFile.SuppressCom)" | 438 | SuppressCom="%(HarvestFile.SuppressCom)" |
| 445 | SuppressRegistry="%(HarvestFile.SuppressRegistry)" | 439 | SuppressRegistry="%(HarvestFile.SuppressRegistry)" |
| 446 | SuppressRootDirectory="%(HarvestFile.SuppressRootDirectory)" | 440 | SuppressRootDirectory="%(HarvestFile.SuppressRootDirectory)" |