diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-11-07 11:30:25 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-11-07 13:30:56 -0600 |
| commit | b0cb6432808a687bf18b19e0018bb4287093d02b (patch) | |
| tree | ab87fd8d2707bcb5846755a34b9729ac3341cd13 /src/WixToolset.Sdk | |
| parent | 850bd580f898cf93d7b2d75b556324dd3d37f563 (diff) | |
| download | wix-b0cb6432808a687bf18b19e0018bb4287093d02b.tar.gz wix-b0cb6432808a687bf18b19e0018bb4287093d02b.tar.bz2 wix-b0cb6432808a687bf18b19e0018bb4287093d02b.zip | |
WIXFEAT:5490 - Send MSBuild bin path to heat project harvesting.
Diffstat (limited to 'src/WixToolset.Sdk')
| -rw-r--r-- | src/WixToolset.Sdk/tools/wix.harvest.targets | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/WixToolset.Sdk/tools/wix.harvest.targets b/src/WixToolset.Sdk/tools/wix.harvest.targets index dea44469..f3ec760b 100644 --- a/src/WixToolset.Sdk/tools/wix.harvest.targets +++ b/src/WixToolset.Sdk/tools/wix.harvest.targets | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | <HarvestProjectsTransforms Condition=" '$(HarvestProjectsTransforms)' == '' ">$(HarvestTransforms)</HarvestProjectsTransforms> | 48 | <HarvestProjectsTransforms Condition=" '$(HarvestProjectsTransforms)' == '' ">$(HarvestTransforms)</HarvestProjectsTransforms> |
| 49 | <HarvestProjectsGeneratedFile Condition=" '$(HarvestProjectsGeneratedFile)' == '' and '$(OutputType)' != 'Bundle' ">$(IntermediateOutputPath)Product.Generated.wxs</HarvestProjectsGeneratedFile> | 49 | <HarvestProjectsGeneratedFile Condition=" '$(HarvestProjectsGeneratedFile)' == '' and '$(OutputType)' != 'Bundle' ">$(IntermediateOutputPath)Product.Generated.wxs</HarvestProjectsGeneratedFile> |
| 50 | <HarvestProjectsGeneratedFile Condition=" '$(HarvestProjectsGeneratedFile)' == '' and '$(OutputType)' == 'Bundle' ">$(IntermediateOutputPath)Bundle.Generated.wxs</HarvestProjectsGeneratedFile> | 50 | <HarvestProjectsGeneratedFile Condition=" '$(HarvestProjectsGeneratedFile)' == '' and '$(OutputType)' == 'Bundle' ">$(IntermediateOutputPath)Bundle.Generated.wxs</HarvestProjectsGeneratedFile> |
| 51 | <HarvestProjectsMsbuildBinPath Condition=" '$(HarvestProjectsMsbuildBinPath)' == '' ">$(MSBuildBinPath)</HarvestProjectsMsbuildBinPath> | ||
| 51 | </PropertyGroup> | 52 | </PropertyGroup> |
| 52 | 53 | ||
| 53 | <!-- Default HarvestDirectory properties --> | 54 | <!-- Default HarvestDirectory properties --> |
| @@ -273,11 +274,13 @@ | |||
| 273 | Project="%(_AllHeatProjects.FullPath)" | 274 | Project="%(_AllHeatProjects.FullPath)" |
| 274 | ProjectOutputGroups="%(_AllHeatProjects.ProjectOutputGroups)" | 275 | ProjectOutputGroups="%(_AllHeatProjects.ProjectOutputGroups)" |
| 275 | GenerateType="%(_AllHeatProjects.GenerateType)" | 276 | GenerateType="%(_AllHeatProjects.GenerateType)" |
| 277 | MsbuildBinPath="$(HarvestProjectsMsbuildBinPath)" | ||
| 276 | DirectoryIds="%(_AllHeatProjects.DirectoryIds)" | 278 | DirectoryIds="%(_AllHeatProjects.DirectoryIds)" |
| 277 | ProjectName="%(_AllHeatProjects.ProjectName)" | 279 | ProjectName="%(_AllHeatProjects.ProjectName)" |
| 278 | Configuration="%(_AllHeatProjects.Configuration)" | 280 | Configuration="%(_AllHeatProjects.Configuration)" |
| 279 | Platform="%(_AllHeatProjects.Platform)" | 281 | Platform="%(_AllHeatProjects.Platform)" |
| 280 | GenerateWixVariables="$(HarvestProjectsGenerateWixVariables)" | 282 | GenerateWixVariables="$(HarvestProjectsGenerateWixVariables)" |
| 283 | UseToolsVersion="$(HarvestProjectsUseToolsVersion)" | ||
| 281 | AdditionalOptions="$(HarvestProjectsAdditionalOptions)" | 284 | AdditionalOptions="$(HarvestProjectsAdditionalOptions)" |
| 282 | RunAsSeparateProcess="$(RunWixToolsOutOfProc)" | 285 | RunAsSeparateProcess="$(RunWixToolsOutOfProc)" |
| 283 | ToolExe="$(HeatToolExe)" | 286 | ToolExe="$(HeatToolExe)" |