From 4b9bbae262d7a3c67e09c66d7b5c37c44df850c7 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 6 Nov 2023 22:45:46 -0800 Subject: Fix duplication of AdditionalOptions being added to command-line Fixes 7837 --- src/wix/WixToolset.BuildTasks/DetachBundleEngineForSigning.cs | 2 -- src/wix/WixToolset.BuildTasks/InscribeMsiWithCabinetSignatures.cs | 2 -- src/wix/WixToolset.BuildTasks/ReattachSignedBundleEngine.cs | 2 -- src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs | 2 -- src/wix/WixToolset.BuildTasks/WixBuild.cs | 1 - 5 files changed, 9 deletions(-) diff --git a/src/wix/WixToolset.BuildTasks/DetachBundleEngineForSigning.cs b/src/wix/WixToolset.BuildTasks/DetachBundleEngineForSigning.cs index 27d4436b..506f6d56 100644 --- a/src/wix/WixToolset.BuildTasks/DetachBundleEngineForSigning.cs +++ b/src/wix/WixToolset.BuildTasks/DetachBundleEngineForSigning.cs @@ -42,8 +42,6 @@ namespace WixToolset.BuildTasks commandLineBuilder.AppendSwitchIfNotNull("-intermediatefolder ", this.IntermediateDirectory); base.BuildCommandLine(commandLineBuilder); - - commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions); } protected override int ExecuteTool(string pathToTool, string responseFileCommands, string commandLineCommands) diff --git a/src/wix/WixToolset.BuildTasks/InscribeMsiWithCabinetSignatures.cs b/src/wix/WixToolset.BuildTasks/InscribeMsiWithCabinetSignatures.cs index 72d9e872..4be47532 100644 --- a/src/wix/WixToolset.BuildTasks/InscribeMsiWithCabinetSignatures.cs +++ b/src/wix/WixToolset.BuildTasks/InscribeMsiWithCabinetSignatures.cs @@ -27,8 +27,6 @@ namespace WixToolset.BuildTasks commandLineBuilder.AppendSwitchIfNotNull("-intermediatefolder ", this.IntermediateDirectory); base.BuildCommandLine(commandLineBuilder); - - commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions); } } } diff --git a/src/wix/WixToolset.BuildTasks/ReattachSignedBundleEngine.cs b/src/wix/WixToolset.BuildTasks/ReattachSignedBundleEngine.cs index d131402d..0dbcc46d 100644 --- a/src/wix/WixToolset.BuildTasks/ReattachSignedBundleEngine.cs +++ b/src/wix/WixToolset.BuildTasks/ReattachSignedBundleEngine.cs @@ -49,8 +49,6 @@ namespace WixToolset.BuildTasks commandLineBuilder.AppendSwitchIfNotNull("-intermediatefolder ", this.IntermediateDirectory); base.BuildCommandLine(commandLineBuilder); - - commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions); } protected override int ExecuteTool(string pathToTool, string responseFileCommands, string commandLineCommands) diff --git a/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs b/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs index 24e50444..e0077ffa 100644 --- a/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs +++ b/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs @@ -53,8 +53,6 @@ namespace WixToolset.BuildTasks commandLineBuilder.AppendArrayIfNotNull("-sice ", this.SuppressIces); base.BuildCommandLine(commandLineBuilder); - - commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions); } } } diff --git a/src/wix/WixToolset.BuildTasks/WixBuild.cs b/src/wix/WixToolset.BuildTasks/WixBuild.cs index 4cadd7e0..0d455c46 100644 --- a/src/wix/WixToolset.BuildTasks/WixBuild.cs +++ b/src/wix/WixToolset.BuildTasks/WixBuild.cs @@ -82,7 +82,6 @@ namespace WixToolset.BuildTasks commandLineBuilder.AppendArrayIfNotNull("-bindVariable ", this.CalculateBindVariableStrings()); commandLineBuilder.AppendArrayIfNotNull("-loc ", this.LocalizationFiles); commandLineBuilder.AppendArrayIfNotNull("-lib ", this.LibraryFiles); - commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions); commandLineBuilder.AppendFileNamesIfNotNull(this.SourceFiles, " "); } -- cgit v1.2.3-55-g6feb