aboutsummaryrefslogtreecommitdiff
path: root/src/internal/WixInternal.TestSupport
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2026-01-19 17:02:30 -0800
committerRob Mensching <rob@firegiant.com>2026-01-21 12:47:56 -0800
commit6e5d4330049dce6a91327d2ad36790a1ea34db3f (patch)
treecf96c8c22cec7d42a25ebfcb6da14f7da627c142 /src/internal/WixInternal.TestSupport
parent50de1c4ee7a56e47a06c44769cea5aa2457a829b (diff)
downloadwix-6e5d4330049dce6a91327d2ad36790a1ea34db3f.tar.gz
wix-6e5d4330049dce6a91327d2ad36790a1ea34db3f.tar.bz2
wix-6e5d4330049dce6a91327d2ad36790a1ea34db3f.zip
Require "accept EULA"HEADmain
Resolves 9196
Diffstat (limited to 'src/internal/WixInternal.TestSupport')
-rw-r--r--src/internal/WixInternal.TestSupport/Builder.cs9
-rw-r--r--src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj1
2 files changed, 8 insertions, 2 deletions
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
56 56
57 var args = new List<string> 57 var args = new List<string>
58 { 58 {
59 "-acceptEula", "wix" + SomeVerInfo.Major,
59 "build", 60 "build",
60 "-o", outputPath, 61 "-o", outputPath,
61 "-intermediateFolder", intermediateFolder, 62 "-intermediateFolder", intermediateFolder,
@@ -89,6 +90,7 @@ namespace WixInternal.TestSupport
89 { 90 {
90 "msi", 91 "msi",
91 "validate", 92 "validate",
93 "-acceptEula", "wix" + SomeVerInfo.Major,
92 "-intermediateFolder", intermediateFolder, 94 "-intermediateFolder", intermediateFolder,
93 outputPath, 95 outputPath,
94 }; 96 };
@@ -120,6 +122,7 @@ namespace WixInternal.TestSupport
120 { 122 {
121 "build", 123 "build",
122 "-o", outputPath, 124 "-o", outputPath,
125 "-acceptEula", "wix" + SomeVerInfo.Major,
123 "-intermediateFolder", intermediateFolder, 126 "-intermediateFolder", intermediateFolder,
124 }; 127 };
125 128
@@ -149,8 +152,8 @@ namespace WixInternal.TestSupport
149 { 152 {
150 firstBuildArgs = new List<string> 153 firstBuildArgs = new List<string>
151 { 154 {
152 "msi", 155 "msi", "validate",
153 "validate", 156 "-acceptEula", "wix" + SomeVerInfo.Major,
154 "-intermediateFolder", intermediateFolder, 157 "-intermediateFolder", intermediateFolder,
155 outputPath, 158 outputPath,
156 }; 159 };
@@ -161,6 +164,7 @@ namespace WixInternal.TestSupport
161 // Decompile built output. 164 // Decompile built output.
162 var decompileArgs = new List<string> 165 var decompileArgs = new List<string>
163 { 166 {
167 "-acceptEula", "wix" + SomeVerInfo.Major,
164 "msi", "decompile", 168 "msi", "decompile",
165 outputPath, 169 outputPath,
166 "-intermediateFolder", decompileIntermediateFolder, 170 "-intermediateFolder", decompileIntermediateFolder,
@@ -181,6 +185,7 @@ namespace WixInternal.TestSupport
181 { 185 {
182 "build", 186 "build",
183 decompilePath, 187 decompilePath,
188 "-acceptEula", "wix" + SomeVerInfo.Major,
184 "-o", decompileBuildPath, 189 "-o", decompileBuildPath,
185 "-intermediateFolder", decompileIntermediateFolder 190 "-intermediateFolder", decompileIntermediateFolder
186 }; 191 };
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 @@
11 <CreateDocumentationFile>true</CreateDocumentationFile> 11 <CreateDocumentationFile>true</CreateDocumentationFile>
12 <NoWarn>$(NoWarn);CS1591</NoWarn> 12 <NoWarn>$(NoWarn);CS1591</NoWarn>
13 <SignOutput>false</SignOutput> 13 <SignOutput>false</SignOutput>
14 <IncludeSomeVerInfo>true</IncludeSomeVerInfo>
14 <IsWixTestSupportProject>true</IsWixTestSupportProject> 15 <IsWixTestSupportProject>true</IsWixTestSupportProject>
15 </PropertyGroup> 16 </PropertyGroup>
16 17