Require "accept EULA" in .nupkgs plus some "accept EULA" bug fixes

Resolves 9196

2 files changed, 50 insertions, 0 deletions

diff --git a/src/internal/WixInternal.BaseBuildTasks.Sources/WixCommandLineBuilder.cs b/src/internal/WixInternal.BaseBuildTasks.Sources/WixCommandLineBuilder.cs
index d950bca9..61d7095d 100644
--- a/src/internal/WixInternal.BaseBuildTasks.Sources/WixCommandLineBuilder.cs
+++ b/src/internal/WixInternal.BaseBuildTasks.Sources/WixCommandLineBuilder.cs
@@ -76,6 +76,26 @@ namespace WixToolset.BaseBuildTasks
         }
 
         /// <summary>
+        /// Append a switch to the command-line for each value in a split text.
+        /// </summary>
+        /// <param name="switchName">Switch to append.</param>
+        /// <param name="values">Text to split and append.</param>
+        /// <param name="split">Character to use to split the string</param>
+        public void AppendTextAsArray(string switchName, string values, char splitter = ';')
+        {
+            if (!String.IsNullOrEmpty(values))
+            {
+                foreach (string value in values.Split([ splitter ], StringSplitOptions.RemoveEmptyEntries))
+                {
+                    if (!String.IsNullOrWhiteSpace(value))
+                    {
+                        this.AppendSwitchIfNotNull(switchName, value.Trim());
+                    }
+                }
+            }
+        }
+
+        /// <summary>
         /// Append arbitrary text to the command-line if specified.
         /// </summary>
         /// <param name="textToAppend">Text to append.</param>
diff --git a/src/internal/targets/CheckLicenseAcceptance.targets b/src/internal/targets/CheckLicenseAcceptance.targets
new file mode 100644
index 00000000..61155827
--- /dev/null
+++ b/src/internal/targets/CheckLicenseAcceptance.targets
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project>
+
+  <Target
+    Name="CheckWix7LicenseAcceptance"
+    BeforeTargets="CoreCompile">
+
+    <ItemGroup>
+      <_AcceptEula Include="$(AcceptEula)" />
+    </ItemGroup>
+
+    <PropertyGroup>
+      <_Wix7EulaFile>$(USERPROFILE)\.wix\wix7-osmf-eula.txt</_Wix7EulaFile>
+    </PropertyGroup>
+
+    <FindInList List="@(_AcceptEula)" ItemSpecToFind="wix7">
+      <Output TaskParameter="ItemFound" ItemName="_Wix7LicenseAccepted" />
+    </FindInList>
+
+    <Error
+      Text="You must accept the Open Source Maintenance Fee (OSMF) EULA to use WiX Toolset v7. For instructions, see https://wixtoolset.org/osmf/"
+      Code="WIX7015"
+      File="$(MSBuildProjectFile)"
+      HelpLink="https://wixtoolset.org/osmf"
+      Condition=" '@(_Wix7LicenseAccepted)' == '' and !Exists('$(_Wix7EulaFile)')" />
+  </Target>
+
+</Project>