aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.BuildTasks/HeatProject.cs
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-11-07 11:30:25 -0600
committerSean Hall <r.sean.hall@gmail.com>2020-11-07 13:30:56 -0600
commitb0cb6432808a687bf18b19e0018bb4287093d02b (patch)
treeab87fd8d2707bcb5846755a34b9729ac3341cd13 /src/WixToolset.BuildTasks/HeatProject.cs
parent850bd580f898cf93d7b2d75b556324dd3d37f563 (diff)
downloadwix-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.BuildTasks/HeatProject.cs')
-rw-r--r--src/WixToolset.BuildTasks/HeatProject.cs9
1 files changed, 9 insertions, 0 deletions
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
39 set { this.generateType = value; } 39 set { this.generateType = value; }
40 } 40 }
41 41
42 public string MsbuildBinPath { get; set; }
43
42 public string Platform 44 public string Platform
43 { 45 {
44 get { return this.platform; } 46 get { return this.platform; }
@@ -77,6 +79,8 @@ namespace WixToolset.BuildTasks
77 } 79 }
78 } 80 }
79 81
82 public bool UseToolsVersion { get; set; }
83
80 protected override string OperationName 84 protected override string OperationName
81 { 85 {
82 get { return "project"; } 86 get { return "project"; }
@@ -90,11 +94,16 @@ namespace WixToolset.BuildTasks
90 commandLineBuilder.AppendSwitchIfNotNull("-configuration ", this.Configuration); 94 commandLineBuilder.AppendSwitchIfNotNull("-configuration ", this.Configuration);
91 commandLineBuilder.AppendSwitchIfNotNull("-directoryid ", this.DirectoryIds); 95 commandLineBuilder.AppendSwitchIfNotNull("-directoryid ", this.DirectoryIds);
92 commandLineBuilder.AppendSwitchIfNotNull("-generate ", this.GenerateType); 96 commandLineBuilder.AppendSwitchIfNotNull("-generate ", this.GenerateType);
97 commandLineBuilder.AppendSwitchIfNotNull("-msbuildbinpath ", this.MsbuildBinPath);
93 commandLineBuilder.AppendSwitchIfNotNull("-platform ", this.Platform); 98 commandLineBuilder.AppendSwitchIfNotNull("-platform ", this.Platform);
94 commandLineBuilder.AppendArrayIfNotNull("-pog ", this.ProjectOutputGroups); 99 commandLineBuilder.AppendArrayIfNotNull("-pog ", this.ProjectOutputGroups);
95 commandLineBuilder.AppendSwitchIfNotNull("-projectname ", this.ProjectName); 100 commandLineBuilder.AppendSwitchIfNotNull("-projectname ", this.ProjectName);
96 commandLineBuilder.AppendIfTrue("-wixvar", this.GenerateWixVariables); 101 commandLineBuilder.AppendIfTrue("-wixvar", this.GenerateWixVariables);
97 102
103#if !NETCOREAPP
104 commandLineBuilder.AppendIfTrue("-usetoolsversion", this.UseToolsVersion);
105#endif
106
98 base.BuildCommandLine(commandLineBuilder); 107 base.BuildCommandLine(commandLineBuilder);
99 } 108 }
100 } 109 }