Allow customized AdditionalOptions for all HarvestX MSBuild ItemGroups
Nir Bar committed
Apr 20, 2023 at 08:44 UTC
2daf18981fb28a691df95e7b071a0a991bf515b3
1 file changed
+15
-5
src/tools/WixToolset.Heat/WixToolset.Heat.targets
+15
-5
@@ -236,7 +236,11 @@
236
237
%(HarvestProject.ProjectOutputGroups)
238
%(HeatProjects.ProjectOutputGroups)
239
- - The project output groups to harvest
239
+ - The project output groups to harvest
240
+
241
+ %(HarvestProject.AdditionalOptions)
242
+ %(HeatProjects.AdditionalOptions)
243
+ - Any additional harvesting command line options
244
245
[OUT]
246
%(HeatOutput)
@@ -248,11 +252,13 @@
252
<Transforms>$(HarvestProjectsTransforms)</Transforms>
253
<ProjectOutputGroups>$(HarvestProjectsProjectOutputGroups)</ProjectOutputGroups>
254
<DirectoryIds>$(HarvestProjectsDirectoryIds)</DirectoryIds>
255
+ <AdditionalOptions>$(HarvestProjectsAdditionalOptions)</AdditionalOptions>
256
</HeatProject>
257
<HarvestProject>
258
<Transforms>$(HarvestProjectsTransforms)</Transforms>
259
<ProjectOutputGroups>$(HarvestProjectsProjectOutputGroups)</ProjectOutputGroups>
260
<DirectoryIds>$(HarvestProjectsDirectoryIds)</DirectoryIds>
261
+ <AdditionalOptions>$(HarvestProjectsAdditionalOptions)</AdditionalOptions>
262
</HarvestProject>
263
</ItemDefinitionGroup>
264
@@ -288,7 +294,7 @@
294
Platform="%(_AllHeatProjects.Platform)"
295
GenerateWixVariables="$(HarvestProjectsGenerateWixVariables)"
296
UseToolsVersion="$(HarvestProjectsUseToolsVersion)"
291
- AdditionalOptions="$(HarvestProjectsAdditionalOptions)"
297
+ AdditionalOptions="%(_AllHeatProjects.AdditionalOptions)"
298
ToolPath="$(HeatToolDir)">
299
300
<Output TaskParameter="OutputFile" ItemName="Compile" />
@@ -313,7 +319,8 @@
319
%(HarvestDirectory.PreprocessorVariable) - Substitute SourceDir for another variable name (ex: var.Dir).
320
%(HarvestDirectory.SuppressCom) - Suppress COM elements.
321
%(HarvestDirectory.SuppressRootDirectory) - Suppress a Directory element for the root directory.
316
- $(HarvestDirectory.SuppressRegistry) - Suppress registry harvesting.
322
+ %(HarvestDirectory.SuppressRegistry) - Suppress registry harvesting.
323
+ %(HarvestDirectory.AdditionalOptions) - Any additional harvesting command line options.
324
325
[OUT]
326
$(IntermediateOutputPath)_%(HarvestDirectory.ComponentGroupName)_dir.wxs
@@ -331,6 +338,7 @@
338
<SuppressCom>$(HarvestDirectorySuppressCom)</SuppressCom>
339
<SuppressRootDirectory>$(HarvestDirectorySuppressRootDirectory)</SuppressRootDirectory>
340
<SuppressRegistry>$(HarvestDirectorySuppressRegistry)</SuppressRegistry>
341
+ <AdditionalOptions>$(HarvestDirectoryAdditionalOptions)</AdditionalOptions>
342
</HarvestDirectory>
343
</ItemDefinitionGroup>
344
@@ -374,7 +382,7 @@
382
SuppressCom="%(HarvestDirectory.SuppressCom)"
383
SuppressRootDirectory="%(HarvestDirectory.SuppressRootDirectory)"
384
SuppressRegistry="%(HarvestDirectory.SuppressRegistry)"
377
- AdditionalOptions="$(HarvestDirectoryAdditionalOptions)"
385
+ AdditionalOptions="%(HarvestDirectory.AdditionalOptions)"
386
ToolPath="$(HeatToolDir)">
387
388
<Output TaskParameter="OutputFile" ItemName="Compile" />
@@ -400,6 +408,7 @@
408
%(HarvestFile.SuppressCom) - Suppress COM elements.
409
%(HarvestFile.SuppressRootDirectory) - Suppress a Directory element for the root directory.
410
$(HarvestFile.SuppressRegistry) - Suppress registry harvesting.
411
+ %(HarvestFile.AdditionalOptions) - Any additional harvesting command line options.
412
413
[OUT]
414
$(IntermediateOutputPath)_%(HarvestFile.Filename)_file.wxs
@@ -416,6 +425,7 @@
425
<SuppressCom>$(HarvestFileSuppressCom)</SuppressCom>
426
<SuppressRegistry>$(HarvestFileSuppressRegistry)</SuppressRegistry>
427
<SuppressRootDirectory>$(HarvestFileSuppressRootDirectory)</SuppressRootDirectory>
428
+ <AdditionalOptions>$(HarvestFileAdditionalOptions)</AdditionalOptions>
429
</HarvestFile>
430
</ItemDefinitionGroup>
431
@@ -448,7 +458,7 @@
458
SuppressCom="%(HarvestFile.SuppressCom)"
459
SuppressRegistry="%(HarvestFile.SuppressRegistry)"
460
SuppressRootDirectory="%(HarvestFile.SuppressRootDirectory)"
451
- AdditionalOptions="$(HarvestFileAdditionalOptions)"
461
+ AdditionalOptions="%(HarvestFile.AdditionalOptions)"
462
ToolPath="$(HeatToolDir)">
463
464
<Output TaskParameter="OutputFile" ItemName="Compile" />