Skip to content
/ wix Public

Commit 6e5d433

Browse files
robmenrobmen
committed
Require "accept EULA"
Resolves 9196
1 parent 50de1c4 commit 6e5d433

38 files changed

+579
-19677
lines changed

‎src/Directory.csproj.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<Project>
44
<PropertyGroup>
5+
<LangVersion Condition=" '$(TargetFrameworkVersion)'=='' ">14.0</LangVersion>
56
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
67
<SignAssembly>true</SignAssembly>
78
<AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>

‎src/Directory.wixproj.targets‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
33

44
<Project>
5+
<PropertyGroup>
6+
<AcceptEula>wix7</AcceptEula>
7+
</PropertyGroup>
8+
59
<Target Name="_SetWixVersion"
610
AfterTargets="_CreateProjectDefineConstants">
711
<PropertyGroup>

‎src/internal/WixInternal.MSTestSupport/Builder.cs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public string[] BuildAndQuery(Action<string[]> buildFunc, bool validate, params
5656

5757
var args = new List<string>
5858
{
59+
"-acceptEula", "wix" + SomeVerInfo.Major,
5960
"build",
6061
"-o", outputPath,
6162
"-intermediateFolder", intermediateFolder,
@@ -87,8 +88,8 @@ public string[] BuildAndQuery(Action<string[]> buildFunc, bool validate, params
8788
{
8889
args = new List<string>
8990
{
90-
"msi",
91-
"validate",
91+
"msi", "validate",
92+
"-acceptEula", "wix" + SomeVerInfo.Major,
9293
"-intermediateFolder", intermediateFolder,
9394
outputPath,
9495
};
@@ -120,6 +121,7 @@ public void BuildAndDecompileAndBuild(Action<string[]> buildFunc, Action<string[
120121
{
121122
"build",
122123
"-o", outputPath,
124+
"-acceptEula", "wix" + SomeVerInfo.Major,
123125
"-intermediateFolder", intermediateFolder,
124126
};
125127

@@ -149,8 +151,8 @@ public void BuildAndDecompileAndBuild(Action<string[]> buildFunc, Action<string[
149151
{
150152
firstBuildArgs = new List<string>
151153
{
152-
"msi",
153-
"validate",
154+
"msi", "validate",
155+
"-acceptEula", "wix" + SomeVerInfo.Major,
154156
"-intermediateFolder", intermediateFolder,
155157
outputPath,
156158
};
@@ -163,6 +165,7 @@ public void BuildAndDecompileAndBuild(Action<string[]> buildFunc, Action<string[
163165
{
164166
"msi", "decompile",
165167
outputPath,
168+
"-acceptEula", "wix" + SomeVerInfo.Major,
166169
"-intermediateFolder", decompileIntermediateFolder,
167170
"-x", decompileExtractFolder,
168171
"-o", decompilePath
@@ -182,6 +185,7 @@ public void BuildAndDecompileAndBuild(Action<string[]> buildFunc, Action<string[
182185
"build",
183186
decompilePath,
184187
"-o", decompileBuildPath,
188+
"-acceptEula", "wix" + SomeVerInfo.Major,
185189
"-intermediateFolder", decompileIntermediateFolder
186190
};
187191

‎src/internal/WixInternal.MSTestSupport/WixInternal.MSTestSupport.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<CreateDocumentationFile>true</CreateDocumentationFile>
1212
<NoWarn>$(NoWarn);CS1591</NoWarn>
1313
<SignOutput>false</SignOutput>
14+
<IncludeSomeVerInfo>true</IncludeSomeVerInfo>
1415
<IsWixTestSupportProject>true</IsWixTestSupportProject>
1516
</PropertyGroup>
1617

‎src/internal/WixInternal.TestSupport/Builder.cs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public string[] BuildAndQuery(Action<string[]> buildFunc, bool validate, params
5656

5757
var args = new List<string>
5858
{
59+
"-acceptEula", "wix" + SomeVerInfo.Major,
5960
"build",
6061
"-o", outputPath,
6162
"-intermediateFolder", intermediateFolder,
@@ -89,6 +90,7 @@ public string[] BuildAndQuery(Action<string[]> buildFunc, bool validate, params
8990
{
9091
"msi",
9192
"validate",
93+
"-acceptEula", "wix" + SomeVerInfo.Major,
9294
"-intermediateFolder", intermediateFolder,
9395
outputPath,
9496
};
@@ -120,6 +122,7 @@ public void BuildAndDecompileAndBuild(Action<string[]> buildFunc, Action<string[
120122
{
121123
"build",
122124
"-o", outputPath,
125+
"-acceptEula", "wix" + SomeVerInfo.Major,
123126
"-intermediateFolder", intermediateFolder,
124127
};
125128

@@ -149,8 +152,8 @@ public void BuildAndDecompileAndBuild(Action<string[]> buildFunc, Action<string[
149152
{
150153
firstBuildArgs = new List<string>
151154
{
152-
"msi",
153-
"validate",
155+
"msi", "validate",
156+
"-acceptEula", "wix" + SomeVerInfo.Major,
154157
"-intermediateFolder", intermediateFolder,
155158
outputPath,
156159
};
@@ -161,6 +164,7 @@ public void BuildAndDecompileAndBuild(Action<string[]> buildFunc, Action<string[
161164
// Decompile built output.
162165
var decompileArgs = new List<string>
163166
{
167+
"-acceptEula", "wix" + SomeVerInfo.Major,
164168
"msi", "decompile",
165169
outputPath,
166170
"-intermediateFolder", decompileIntermediateFolder,
@@ -181,6 +185,7 @@ public void BuildAndDecompileAndBuild(Action<string[]> buildFunc, Action<string[
181185
{
182186
"build",
183187
decompilePath,
188+
"-acceptEula", "wix" + SomeVerInfo.Major,
184189
"-o", decompileBuildPath,
185190
"-intermediateFolder", decompileIntermediateFolder
186191
};

‎src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<CreateDocumentationFile>true</CreateDocumentationFile>
1212
<NoWarn>$(NoWarn);CS1591</NoWarn>
1313
<SignOutput>false</SignOutput>
14+
<IncludeSomeVerInfo>true</IncludeSomeVerInfo>
1415
<IsWixTestSupportProject>true</IsWixTestSupportProject>
1516
</PropertyGroup>
1617

0 commit comments

Comments
 (0)