diff options
| author | Rob Mensching <rob@firegiant.com> | 2017-10-02 00:02:23 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2017-10-02 00:02:23 -0700 |
| commit | afd296a66f97ef94f26a375c3a71ed79ef95127d (patch) | |
| tree | 86f061ecdfd3add91e699c90c9c3fc1478e7ba89 | |
| parent | c83d610e2008abfab622b8200313e4a8b2d56967 (diff) | |
| download | wix-afd296a66f97ef94f26a375c3a71ed79ef95127d.tar.gz wix-afd296a66f97ef94f26a375c3a71ed79ef95127d.tar.bz2 wix-afd296a66f97ef94f26a375c3a71ed79ef95127d.zip | |
Correctly pass -bindFiles switch if enabled
| -rw-r--r-- | src/WixToolset.BuildTasks/DoIt.cs | 7 |
1 files changed, 6 insertions, 1 deletions
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 | |||
| 88 | 88 | ||
| 89 | 89 | ||
| 90 | public ITaskItem[] BindInputPaths { get; set; } | 90 | public ITaskItem[] BindInputPaths { get; set; } |
| 91 | |||
| 91 | public bool BindFiles { get; set; } | 92 | public bool BindFiles { get; set; } |
| 93 | |||
| 92 | public ITaskItem BindContentsFile { get; set; } | 94 | public ITaskItem BindContentsFile { get; set; } |
| 95 | |||
| 93 | public ITaskItem BindOutputsFile { get; set; } | 96 | public ITaskItem BindOutputsFile { get; set; } |
| 97 | |||
| 94 | public ITaskItem BindBuiltOutputsFile { get; set; } | 98 | public ITaskItem BindBuiltOutputsFile { get; set; } |
| 95 | 99 | ||
| 96 | public string CabinetCachePath { get; set; } | 100 | public string CabinetCachePath { get; set; } |
| @@ -148,11 +152,12 @@ namespace WixToolset.BuildTasks | |||
| 148 | commandLineBuilder.AppendSwitchIfNotNull("-outputsfile ", this.BindOutputsFile); | 152 | commandLineBuilder.AppendSwitchIfNotNull("-outputsfile ", this.BindOutputsFile); |
| 149 | commandLineBuilder.AppendSwitchIfNotNull("-builtoutputsfile ", this.BindBuiltOutputsFile); | 153 | commandLineBuilder.AppendSwitchIfNotNull("-builtoutputsfile ", this.BindBuiltOutputsFile); |
| 150 | commandLineBuilder.AppendSwitchIfNotNull("-wixprojectfile ", this.WixProjectFile); | 154 | commandLineBuilder.AppendSwitchIfNotNull("-wixprojectfile ", this.WixProjectFile); |
| 151 | commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions); | ||
| 152 | 155 | ||
| 156 | commandLineBuilder.AppendIfTrue("-bindFiles", this.BindFiles); | ||
| 153 | commandLineBuilder.AppendArrayIfNotNull("-bindPath ", this.CalculateBindPathStrings()); | 157 | commandLineBuilder.AppendArrayIfNotNull("-bindPath ", this.CalculateBindPathStrings()); |
| 154 | commandLineBuilder.AppendArrayIfNotNull("-loc ", this.LocalizationFiles); | 158 | commandLineBuilder.AppendArrayIfNotNull("-loc ", this.LocalizationFiles); |
| 155 | commandLineBuilder.AppendArrayIfNotNull("-lib ", this.LibraryFiles); | 159 | commandLineBuilder.AppendArrayIfNotNull("-lib ", this.LibraryFiles); |
| 160 | commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions); | ||
| 156 | commandLineBuilder.AppendFileNamesIfNotNull(this.SourceFiles, " "); | 161 | commandLineBuilder.AppendFileNamesIfNotNull(this.SourceFiles, " "); |
| 157 | 162 | ||
| 158 | var commandLineString = commandLineBuilder.ToString(); | 163 | var commandLineString = commandLineBuilder.ToString(); |
