diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-28 10:12:27 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 10:12:27 +1000 |
| commit | ca37ac8d6a7a3bab2d5b33216e793760e7455bb9 (patch) | |
| tree | 404f93e6308fb896f1d1cd06d9988c2e4f96acde /src/WixToolset.BuildTasks | |
| parent | 2480d0ad4bf4f0dd841697d6d607bb35a0fd8161 (diff) | |
| parent | 0b9fd5ae84460d943e685b9821473f356a66bd3b (diff) | |
| download | wix-ca37ac8d6a7a3bab2d5b33216e793760e7455bb9.tar.gz wix-ca37ac8d6a7a3bab2d5b33216e793760e7455bb9.tar.bz2 wix-ca37ac8d6a7a3bab2d5b33216e793760e7455bb9.zip | |
Merge pull request #30 from paulomorgado/patch-1
Allow more than one harvested file and files differing by extension
Diffstat (limited to 'src/WixToolset.BuildTasks')
| -rw-r--r-- | src/WixToolset.BuildTasks/wix.harvest.targets | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.BuildTasks/wix.harvest.targets b/src/WixToolset.BuildTasks/wix.harvest.targets index a8be17df..5dd2f729 100644 --- a/src/WixToolset.BuildTasks/wix.harvest.targets +++ b/src/WixToolset.BuildTasks/wix.harvest.targets | |||
| @@ -415,7 +415,7 @@ | |||
| 415 | <Target Name="HarvestFile" | 415 | <Target Name="HarvestFile" |
| 416 | DependsOnTargets="$(HarvestFileDependsOn)" | 416 | DependsOnTargets="$(HarvestFileDependsOn)" |
| 417 | Inputs="@(HarvestFile);%(HarvestFile.Transforms)" | 417 | Inputs="@(HarvestFile);%(HarvestFile.Transforms)" |
| 418 | Outputs="$(IntermediateOutputPath)_%(HarvestFile.Filename)_file.wxs" | 418 | Outputs="@(HarvestFile->'$(IntermediateOutputPath)_%(ComponentGroupName)_%(DirectoryRefId)_%(Filename)%(Extension)_file.wxs')" |
| 419 | Condition=" '@(HarvestFile)' != '' "> | 419 | Condition=" '@(HarvestFile)' != '' "> |
| 420 | 420 | ||
| 421 | <HeatFile | 421 | <HeatFile |
| @@ -427,7 +427,7 @@ | |||
| 427 | VerboseOutput="$(HarvestFileVerboseOutput)" | 427 | VerboseOutput="$(HarvestFileVerboseOutput)" |
| 428 | AutogenerateGuids="$(HarvestFileAutogenerateGuids)" | 428 | AutogenerateGuids="$(HarvestFileAutogenerateGuids)" |
| 429 | GenerateGuidsNow="$(HarvestFileGenerateGuidsNow)" | 429 | GenerateGuidsNow="$(HarvestFileGenerateGuidsNow)" |
| 430 | OutputFile="$(IntermediateOutputPath)_%(HarvestFile.Filename)_file.wxs" | 430 | OutputFile="$(IntermediateOutputPath)_%(HarvestFile.ComponentGroupName)_%(HarvestFile.DirectoryRefId)_%(HarvestFile.Filename)%(HarvestFile.Extension)_file.wxs" |
| 431 | SuppressFragments="$(HarvestFileSuppressFragments)" | 431 | SuppressFragments="$(HarvestFileSuppressFragments)" |
| 432 | SuppressUniqueIds="$(HarvestFileSuppressUniqueIds)" | 432 | SuppressUniqueIds="$(HarvestFileSuppressUniqueIds)" |
| 433 | Transforms="%(HarvestFile.Transforms)" | 433 | Transforms="%(HarvestFile.Transforms)" |