Fix duplication of AdditionalOptions being added to command-line
Fixes 7837
Rob Mensching committed
Nov 6, 2023 at 22:45 UTC
4b9bbae262d7a3c67e09c66d7b5c37c44df850c7
5 files changed
-9
src/wix/WixToolset.BuildTasks/DetachBundleEngineForSigning.cs
-2
@@ -42,8 +42,6 @@ namespace WixToolset.BuildTasks
42
commandLineBuilder.AppendSwitchIfNotNull("-intermediatefolder ", this.IntermediateDirectory);
43
44
base.BuildCommandLine(commandLineBuilder);
45
-
46
- commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions);
45
}
46
47
protected override int ExecuteTool(string pathToTool, string responseFileCommands, string commandLineCommands)
src/wix/WixToolset.BuildTasks/InscribeMsiWithCabinetSignatures.cs
-2
@@ -27,8 +27,6 @@ namespace WixToolset.BuildTasks
27
commandLineBuilder.AppendSwitchIfNotNull("-intermediatefolder ", this.IntermediateDirectory);
28
29
base.BuildCommandLine(commandLineBuilder);
30
-
31
- commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions);
30
}
31
}
32
}
src/wix/WixToolset.BuildTasks/ReattachSignedBundleEngine.cs
-2
@@ -49,8 +49,6 @@ namespace WixToolset.BuildTasks
49
commandLineBuilder.AppendSwitchIfNotNull("-intermediatefolder ", this.IntermediateDirectory);
50
51
base.BuildCommandLine(commandLineBuilder);
52
-
53
- commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions);
52
}
53
54
protected override int ExecuteTool(string pathToTool, string responseFileCommands, string commandLineCommands)
src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs
-2
@@ -53,8 +53,6 @@ namespace WixToolset.BuildTasks
53
commandLineBuilder.AppendArrayIfNotNull("-sice ", this.SuppressIces);
54
55
base.BuildCommandLine(commandLineBuilder);
56
-
57
- commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions);
56
}
57
}
58
}
src/wix/WixToolset.BuildTasks/WixBuild.cs
-1
@@ -82,7 +82,6 @@ namespace WixToolset.BuildTasks
82
commandLineBuilder.AppendArrayIfNotNull("-bindVariable ", this.CalculateBindVariableStrings());
83
commandLineBuilder.AppendArrayIfNotNull("-loc ", this.LocalizationFiles);
84
commandLineBuilder.AppendArrayIfNotNull("-lib ", this.LibraryFiles);
85
- commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions);
85
commandLineBuilder.AppendFileNamesIfNotNull(this.SourceFiles, " ");
86
}
87