From afd296a66f97ef94f26a375c3a71ed79ef95127d Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 2 Oct 2017 00:02:23 -0700 Subject: Correctly pass -bindFiles switch if enabled --- src/WixToolset.BuildTasks/DoIt.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/WixToolset.BuildTasks/DoIt.cs b/src/WixToolset.BuildTasks/DoIt.cs index 97554bc6..d3bd7a80 100644 --- a/src/WixToolset.BuildTasks/DoIt.cs +++ b/src/WixToolset.BuildTasks/DoIt.cs @@ -88,9 +88,13 @@ namespace WixToolset.BuildTasks public ITaskItem[] BindInputPaths { get; set; } + public bool BindFiles { get; set; } + public ITaskItem BindContentsFile { get; set; } + public ITaskItem BindOutputsFile { get; set; } + public ITaskItem BindBuiltOutputsFile { get; set; } public string CabinetCachePath { get; set; } @@ -148,11 +152,12 @@ namespace WixToolset.BuildTasks commandLineBuilder.AppendSwitchIfNotNull("-outputsfile ", this.BindOutputsFile); commandLineBuilder.AppendSwitchIfNotNull("-builtoutputsfile ", this.BindBuiltOutputsFile); commandLineBuilder.AppendSwitchIfNotNull("-wixprojectfile ", this.WixProjectFile); - commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions); + commandLineBuilder.AppendIfTrue("-bindFiles", this.BindFiles); commandLineBuilder.AppendArrayIfNotNull("-bindPath ", this.CalculateBindPathStrings()); commandLineBuilder.AppendArrayIfNotNull("-loc ", this.LocalizationFiles); commandLineBuilder.AppendArrayIfNotNull("-lib ", this.LibraryFiles); + commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions); commandLineBuilder.AppendFileNamesIfNotNull(this.SourceFiles, " "); var commandLineString = commandLineBuilder.ToString(); -- cgit v1.2.3-55-g6feb