From b0cb6432808a687bf18b19e0018bb4287093d02b Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 7 Nov 2020 11:30:25 -0600 Subject: WIXFEAT:5490 - Send MSBuild bin path to heat project harvesting. --- src/WixToolset.BuildTasks/HeatProject.cs | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/WixToolset.BuildTasks/HeatProject.cs') diff --git a/src/WixToolset.BuildTasks/HeatProject.cs b/src/WixToolset.BuildTasks/HeatProject.cs index 71679dc4..3833a754 100644 --- a/src/WixToolset.BuildTasks/HeatProject.cs +++ b/src/WixToolset.BuildTasks/HeatProject.cs @@ -39,6 +39,8 @@ namespace WixToolset.BuildTasks set { this.generateType = value; } } + public string MsbuildBinPath { get; set; } + public string Platform { get { return this.platform; } @@ -77,6 +79,8 @@ namespace WixToolset.BuildTasks } } + public bool UseToolsVersion { get; set; } + protected override string OperationName { get { return "project"; } @@ -90,11 +94,16 @@ namespace WixToolset.BuildTasks commandLineBuilder.AppendSwitchIfNotNull("-configuration ", this.Configuration); commandLineBuilder.AppendSwitchIfNotNull("-directoryid ", this.DirectoryIds); commandLineBuilder.AppendSwitchIfNotNull("-generate ", this.GenerateType); + commandLineBuilder.AppendSwitchIfNotNull("-msbuildbinpath ", this.MsbuildBinPath); commandLineBuilder.AppendSwitchIfNotNull("-platform ", this.Platform); commandLineBuilder.AppendArrayIfNotNull("-pog ", this.ProjectOutputGroups); commandLineBuilder.AppendSwitchIfNotNull("-projectname ", this.ProjectName); commandLineBuilder.AppendIfTrue("-wixvar", this.GenerateWixVariables); +#if !NETCOREAPP + commandLineBuilder.AppendIfTrue("-usetoolsversion", this.UseToolsVersion); +#endif + base.BuildCommandLine(commandLineBuilder); } } -- cgit v1.2.3-55-g6feb