From 6e5d4330049dce6a91327d2ad36790a1ea34db3f Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 19 Jan 2026 17:02:30 -0800 Subject: Require "accept EULA" Resolves 9196 --- src/internal/WixInternal.MSTestSupport/Builder.cs | 12 ++++++++---- .../WixInternal.MSTestSupport.csproj | 1 + src/internal/WixInternal.TestSupport/Builder.cs | 9 +++++++-- .../WixInternal.TestSupport/WixInternal.TestSupport.csproj | 1 + 4 files changed, 17 insertions(+), 6 deletions(-) (limited to 'src/internal') diff --git a/src/internal/WixInternal.MSTestSupport/Builder.cs b/src/internal/WixInternal.MSTestSupport/Builder.cs index 62f2891b..c671500e 100644 --- a/src/internal/WixInternal.MSTestSupport/Builder.cs +++ b/src/internal/WixInternal.MSTestSupport/Builder.cs @@ -56,6 +56,7 @@ namespace WixInternal.MSTestSupport var args = new List { + "-acceptEula", "wix" + SomeVerInfo.Major, "build", "-o", outputPath, "-intermediateFolder", intermediateFolder, @@ -87,8 +88,8 @@ namespace WixInternal.MSTestSupport { args = new List { - "msi", - "validate", + "msi", "validate", + "-acceptEula", "wix" + SomeVerInfo.Major, "-intermediateFolder", intermediateFolder, outputPath, }; @@ -120,6 +121,7 @@ namespace WixInternal.MSTestSupport { "build", "-o", outputPath, + "-acceptEula", "wix" + SomeVerInfo.Major, "-intermediateFolder", intermediateFolder, }; @@ -149,8 +151,8 @@ namespace WixInternal.MSTestSupport { firstBuildArgs = new List { - "msi", - "validate", + "msi", "validate", + "-acceptEula", "wix" + SomeVerInfo.Major, "-intermediateFolder", intermediateFolder, outputPath, }; @@ -163,6 +165,7 @@ namespace WixInternal.MSTestSupport { "msi", "decompile", outputPath, + "-acceptEula", "wix" + SomeVerInfo.Major, "-intermediateFolder", decompileIntermediateFolder, "-x", decompileExtractFolder, "-o", decompilePath @@ -182,6 +185,7 @@ namespace WixInternal.MSTestSupport "build", decompilePath, "-o", decompileBuildPath, + "-acceptEula", "wix" + SomeVerInfo.Major, "-intermediateFolder", decompileIntermediateFolder }; diff --git a/src/internal/WixInternal.MSTestSupport/WixInternal.MSTestSupport.csproj b/src/internal/WixInternal.MSTestSupport/WixInternal.MSTestSupport.csproj index 6edc92c3..799190d9 100644 --- a/src/internal/WixInternal.MSTestSupport/WixInternal.MSTestSupport.csproj +++ b/src/internal/WixInternal.MSTestSupport/WixInternal.MSTestSupport.csproj @@ -11,6 +11,7 @@ true $(NoWarn);CS1591 false + true true diff --git a/src/internal/WixInternal.TestSupport/Builder.cs b/src/internal/WixInternal.TestSupport/Builder.cs index aee5a8cf..c06aaf3b 100644 --- a/src/internal/WixInternal.TestSupport/Builder.cs +++ b/src/internal/WixInternal.TestSupport/Builder.cs @@ -56,6 +56,7 @@ namespace WixInternal.TestSupport var args = new List { + "-acceptEula", "wix" + SomeVerInfo.Major, "build", "-o", outputPath, "-intermediateFolder", intermediateFolder, @@ -89,6 +90,7 @@ namespace WixInternal.TestSupport { "msi", "validate", + "-acceptEula", "wix" + SomeVerInfo.Major, "-intermediateFolder", intermediateFolder, outputPath, }; @@ -120,6 +122,7 @@ namespace WixInternal.TestSupport { "build", "-o", outputPath, + "-acceptEula", "wix" + SomeVerInfo.Major, "-intermediateFolder", intermediateFolder, }; @@ -149,8 +152,8 @@ namespace WixInternal.TestSupport { firstBuildArgs = new List { - "msi", - "validate", + "msi", "validate", + "-acceptEula", "wix" + SomeVerInfo.Major, "-intermediateFolder", intermediateFolder, outputPath, }; @@ -161,6 +164,7 @@ namespace WixInternal.TestSupport // Decompile built output. var decompileArgs = new List { + "-acceptEula", "wix" + SomeVerInfo.Major, "msi", "decompile", outputPath, "-intermediateFolder", decompileIntermediateFolder, @@ -181,6 +185,7 @@ namespace WixInternal.TestSupport { "build", decompilePath, + "-acceptEula", "wix" + SomeVerInfo.Major, "-o", decompileBuildPath, "-intermediateFolder", decompileIntermediateFolder }; diff --git a/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj b/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj index 4e1c3c26..253202d4 100644 --- a/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj +++ b/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj @@ -11,6 +11,7 @@ true $(NoWarn);CS1591 false + true true -- cgit v1.2.3-55-g6feb