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

Resolves 9196

39 files changed, 117 insertions, 12 deletions

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 110ccb28..35d10c30 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -41,6 +41,7 @@
 
     <PackageEulaSource>$(RootFolder)OSMFEULA.txt</PackageEulaSource>
     <PackageLicenseFile>OSMFEULA.txt</PackageLicenseFile>
+    <PackageLicenseAcceptanceTargets>$(MSBuildThisFileDirectory)internal\targets\CheckLicenseAcceptance.targets</PackageLicenseAcceptanceTargets>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 
     <Product Condition=" '$(WixOfficialBuild)'!='true' ">WiX Dev Build</Product>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 9cb7bbc2..45320d19 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -48,7 +48,7 @@
       <NuspecProperties>$(NuspecProperties);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);RepositoryType=$(RepositoryType);RepositoryCommit=$(RepositoryCommit);RepositoryUrl=$(RepositoryUrl)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);PackageTags=$(PackageTags)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory);RootFolder=$(RootFolder);EulaTxt=$(PackageEulaSource);IconPng=$(PackageIconSource)</NuspecProperties>
+      <NuspecProperties>$(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory);RootFolder=$(RootFolder);EulaTxt=$(PackageEulaSource);IconPng=$(PackageIconSource);LicenseAcceptanceTargets=$(PackageLicenseAcceptanceTargets)</NuspecProperties>
     </PropertyGroup>
   </Target>
 
diff --git a/src/Directory.csproj.props b/src/Directory.csproj.props
index 0663fb7f..42407929 100644
--- a/src/Directory.csproj.props
+++ b/src/Directory.csproj.props
@@ -11,8 +11,7 @@
     <DebugType Condition=" '$(DebugType)'=='' ">embedded</DebugType>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(IsWixTestProject)'!='true' ">
-    <Content Include="$(PackageEulaSource)" Pack="true" PackagePath="/" />
-    <Content Include="$(PackageIconSource)" Pack="true" PackagePath="/" />
-  </ItemGroup>
+  <PropertyGroup>
+    <AcceptEula>abc;wix7;xyz;123</AcceptEula>
+  </PropertyGroup>
 </Project>
diff --git a/src/Directory.csproj.targets b/src/Directory.csproj.targets
index dbf9d604..b49c8c04 100644
--- a/src/Directory.csproj.targets
+++ b/src/Directory.csproj.targets
@@ -13,13 +13,19 @@
     <SignOutput>false</SignOutput>
   </PropertyGroup>
 
-
   <PropertyGroup Condition=" '$(IsWixMSTestProject)' == 'true' ">
     <!-- Force a .NET v6-compatible package. -->
     <MicrosoftTestingExtensionsCodeCoverageVersion>17.11.5</MicrosoftTestingExtensionsCodeCoverageVersion>
     <TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
   </PropertyGroup>
 
+  <ItemGroup Condition=" '$(IsWixTestProject)'!='true' ">
+    <Content Include="$(PackageEulaSource)" Pack="true" PackagePath="/" />
+    <Content Include="$(PackageIconSource)" Pack="true" PackagePath="/" />
+    <Content Include="$(PackageLicenseAcceptanceTargets)" Pack="true" PackagePath="build/$(MSBuildProjectName).targets"
+             Condition=" '$(IsWixExtension)' != 'true' " />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(IsWixTestProject)'=='true' ">
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
index 73fef99b..398a16b7 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
@@ -29,6 +29,7 @@
     <file src="$projectFolder$\README.md" />
 
     <file src="$projectFolder$\build\WixToolset.BootstrapperApplicationApi.props" target="build\" />
+    <file src="$licenseAcceptanceTargets$" target="build\$id$.targets" />
 
     <file src="$projectFolder$\build\_._" target="lib\native" />
     <file src="net462\$id$.dll" target="lib\net462" />
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index 065b72a3..6efdf0fc 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -24,6 +24,7 @@
     <file src="$iconPng$" />
     <file src="$projectFolder$\README.md" />
     <file src="$projectFolder$\build\$id$.props" target="build\" />
+    <file src="$licenseAcceptanceTargets$" target="build\$id$.targets" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
     <file src="$projectFolder$\..\inc\BootstrapperExtensionTypes.h" target="build\native\include" />
     <file src="$projectFolder$\..\inc\BootstrapperExtensionEngineTypes.h" target="build\native\include" />
diff --git a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
index bac680dc..37cc3e86 100644
--- a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
+++ b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
@@ -24,6 +24,7 @@
     <file src="$iconPng$" />
     <file src="$projectFolder$\README.md" />
     <file src="$projectFolder$\$id$.targets" target="build" />
+    <file src="$licenseAcceptanceTargets$" target="build" />
     <file src="net472\WixToolset.Dtf.MakeSfxCA.exe" target="tools" />
     <file src="net472\WixToolset.Dtf.MakeSfxCA.exe.config" target="tools" />
     <file src="net472\WixToolset.Dtf.Compression.dll" target="tools" />
diff --git a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.targets b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.targets
index e83272a2..440a1298 100644
--- a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.targets
+++ b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.targets
@@ -5,6 +5,8 @@
 
   <Import Project="$(CustomBeforeWixCATargets)" Condition=" '$(CustomBeforeWixCATargets)' != '' and Exists('$(CustomBeforeWixCATargets)')" />
 
+  <Import Project="CheckLicenseAcceptance.targets" />
+
   <PropertyGroup>
     <WixCATargetsImported>true</WixCATargetsImported>
 
diff --git a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec
index 2af1e037..c7b4a6ea 100644
--- a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec
+++ b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec
@@ -21,6 +21,7 @@
     <file src="$iconPng$" />
     <file src="$projectFolder$\README.md" />
     <file src="$projectFolder$\WixToolset.Bal.wixext.targets"  target="build" />
+    <file src="$licenseAcceptanceTargets$" target="build" />
     <file src="WixToolset.BootstrapperApplications.wixext.dll" target="$wixExtensionPackageFolder$" />
   </files>
 </package>
diff --git a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.targets b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.targets
index 8203d95b..dd2960ab 100644
--- a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.targets
+++ b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="WixToolset.BootstrapperApplications.wixext"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\WixToolset.BootstrapperApplications.wixext.dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.targets b/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.targets
index bf6df083..b0a7c5b8 100644
--- a/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.targets
+++ b/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/Bal/wixstdfn/wixstdfn.nuspec b/src/ext/Bal/wixstdfn/wixstdfn.nuspec
index d4b6e104..b125ff7c 100644
--- a/src/ext/Bal/wixstdfn/wixstdfn.nuspec
+++ b/src/ext/Bal/wixstdfn/wixstdfn.nuspec
@@ -27,6 +27,7 @@
     <file src="$iconPng$" />
     <file src="$projectFolder$\README.md" />
     <file src="$projectFolder$\build\$id$.props" target="build\" />
+    <file src="$licenseAcceptanceTargets$" target="build\$id$.targets" />
     <file src="$projectFolder$\inc\*" target="lib\native\include" />
     <file src="..\..\v143\x86\wixstdfn.lib" target="lib\native\v14\x86" />
     <file src="..\..\v143\x64\wixstdfn.lib" target="lib\native\v14\x64" />
diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets
index bf6df083..b0a7c5b8 100644
--- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets
+++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.targets b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.targets
index bf6df083..b0a7c5b8 100644
--- a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.targets
+++ b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets
index bf6df083..b0a7c5b8 100644
--- a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets
+++ b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.targets b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.targets
index bf6df083..b0a7c5b8 100644
--- a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.targets
+++ b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/Http/wixext/WixToolset.Http.wixext.targets b/src/ext/Http/wixext/WixToolset.Http.wixext.targets
index bf6df083..b0a7c5b8 100644
--- a/src/ext/Http/wixext/WixToolset.Http.wixext.targets
+++ b/src/ext/Http/wixext/WixToolset.Http.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/Iis/wixext/WixToolset.Iis.wixext.targets b/src/ext/Iis/wixext/WixToolset.Iis.wixext.targets
index bf6df083..b0a7c5b8 100644
--- a/src/ext/Iis/wixext/WixToolset.Iis.wixext.targets
+++ b/src/ext/Iis/wixext/WixToolset.Iis.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.targets b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.targets
index bf6df083..b0a7c5b8 100644
--- a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.targets
+++ b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets
index bf6df083..b0a7c5b8 100644
--- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets
+++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.targets b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.targets
index bf6df083..b0a7c5b8 100644
--- a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.targets
+++ b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/Sql/wixext/WixToolset.Sql.wixext.targets b/src/ext/Sql/wixext/WixToolset.Sql.wixext.targets
index bf6df083..b0a7c5b8 100644
--- a/src/ext/Sql/wixext/WixToolset.Sql.wixext.targets
+++ b/src/ext/Sql/wixext/WixToolset.Sql.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.targets b/src/ext/UI/wixext/WixToolset.UI.wixext.targets
index bf6df083..b0a7c5b8 100644
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.targets
+++ b/src/ext/UI/wixext/WixToolset.UI.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.targets b/src/ext/Util/wixext/WixToolset.Util.wixext.targets
index bf6df083..b0a7c5b8 100644
--- a/src/ext/Util/wixext/WixToolset.Util.wixext.targets
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.targets b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.targets
index bf6df083..b0a7c5b8 100644
--- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.targets
+++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.targets
@@ -8,4 +8,6 @@
     <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
       Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
+
+  <Import Project="CheckLicenseAcceptance.targets" />
 </Project>
diff --git a/src/ext/WixExt.props b/src/ext/WixExt.props
index 538c6b97..56f40f50 100644
--- a/src/ext/WixExt.props
+++ b/src/ext/WixExt.props
@@ -8,10 +8,12 @@
     <NoWarn>NU5100</NoWarn>
     <WixExtensionPackageFolder>wixext6</WixExtensionPackageFolder>
     <PackageTags>$(PackageTags) wixext CustomActions</PackageTags>
+    <IsWixExtension>true</IsWixExtension>
   </PropertyGroup>
 
   <ItemGroup>
     <Content Include="$(MSBuildProjectName).targets" PackagePath="build" />
+    <Content Include="$(PackageLicenseAcceptanceTargets)" Pack="true" PackagePath="build/CheckLicenseAcceptance.targets" />
     <Content Include="$(TargetPath)" PackagePath="$(WixExtensionPackageFolder)" />
 
     <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
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>
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
index 534ccd69..eb3833a5 100644
--- a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
@@ -21,6 +21,7 @@
     <file src="$iconPng$" />
     <file src="$projectFolder$\..\README.md" />
     <file src="$projectFolder$\build\$id$.props" target="build\" />
+    <file src="$licenseAcceptanceTargets$" target="build\$id$.targets" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
     <file src="..\..\v143\x64\dutil.lib" target="build\native\v14\x64" />
     <file src="..\..\v143\x86\dutil.lib" target="build\native\v14\x86" />
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
index 915e00d9..78ac10a4 100644
--- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
+++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
@@ -24,6 +24,7 @@
     <file src="$iconPng$" />
     <file src="$projectFolder$\..\README.md" />
     <file src="$projectFolder$\build\$id$.props" target="build\" />
+    <file src="$licenseAcceptanceTargets$" target="build\$id$.targets" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
     <file src="..\..\v143\x64\wcautil.lib" target="build\native\v14\x64" />
     <file src="..\..\v143\x86\wcautil.lib" target="build\native\v14\x86" />
diff --git a/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj b/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj
index 80602295..00fb5a41 100644
--- a/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj
+++ b/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj
@@ -3,6 +3,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+
+    <!-- Add some random EULA Ids for testing purposes. -->
+    <AcceptEula>foo;wix7;bar</AcceptEula>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj
index 27affb11..1e137761 100644
--- a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj
+++ b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj
@@ -4,6 +4,9 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <SignOutput>true</SignOutput>
+
+    <!-- Add some random EULA Ids for testing purposes. -->
+    <AcceptEula>abc;xyz;123;wix7</AcceptEula>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,6 +15,7 @@
     <ProjectReference Include="..\WixprojModuleCsprojWinFormsNetFx\WixprojModuleCsprojWinFormsNetFx.wixproj" />
 
     <PackageReference Include="Wixtoolset.UI.wixext" />
+    <PackageReference Include="Wixtoolset.Util.wixext" />
   </ItemGroup>
 
   <Target Name="SignMsi">
diff --git a/src/test/wix/WixE2E/WixE2EFixture.cs b/src/test/wix/WixE2E/WixE2EFixture.cs
index f15571e4..512e80f5 100644
--- a/src/test/wix/WixE2E/WixE2EFixture.cs
+++ b/src/test/wix/WixE2E/WixE2EFixture.cs
@@ -71,7 +71,7 @@ namespace WixE2E
                                                 .ToArray();
             WixAssert.CompareLineByLine(new[]
             {
-                @"<projectFolder>\WixprojPackageVcxprojWindowsApp.wixproj(18,5): warning : SignMsi = obj\<configuration>\en-US\WixprojPackageVcxprojWindowsApp.msi;obj\<configuration>\ja-JP\WixprojPackageVcxprojWindowsApp.msi"
+                @"<projectFolder>\WixprojPackageVcxprojWindowsApp.wixproj(22,5): warning : SignMsi = obj\<configuration>\en-US\WixprojPackageVcxprojWindowsApp.msi;obj\<configuration>\ja-JP\WixprojPackageVcxprojWindowsApp.msi"
             }, signingStatement);
         }
 
diff --git a/src/wix/WixToolset.BuildTasks/DetachBundleEngineForSigning.cs b/src/wix/WixToolset.BuildTasks/DetachBundleEngineForSigning.cs
index c438d417..3a4ee36d 100644
--- a/src/wix/WixToolset.BuildTasks/DetachBundleEngineForSigning.cs
+++ b/src/wix/WixToolset.BuildTasks/DetachBundleEngineForSigning.cs
@@ -45,7 +45,7 @@ namespace WixToolset.BuildTasks
             commandLineBuilder.AppendFileNameIfNotNull(this.BundleFile);
             commandLineBuilder.AppendSwitchIfNotNull("-engine ", this.OutputFile);
             commandLineBuilder.AppendSwitchIfNotNull("-intermediatefolder ", this.IntermediateDirectory);
-            commandLineBuilder.AppendSwitchIfNotNull("-acceptEula ", this.AcceptEula);
+            commandLineBuilder.AppendTextAsArray("-acceptEula ", this.AcceptEula);
 
             base.BuildCommandLine(commandLineBuilder);
         }
diff --git a/src/wix/WixToolset.BuildTasks/InscribeMsiWithCabinetSignatures.cs b/src/wix/WixToolset.BuildTasks/InscribeMsiWithCabinetSignatures.cs
index dacae1a8..c88c14e7 100644
--- a/src/wix/WixToolset.BuildTasks/InscribeMsiWithCabinetSignatures.cs
+++ b/src/wix/WixToolset.BuildTasks/InscribeMsiWithCabinetSignatures.cs
@@ -30,7 +30,7 @@ namespace WixToolset.BuildTasks
             commandLineBuilder.AppendFileNameIfNotNull(this.DatabaseFile);
             commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
             commandLineBuilder.AppendSwitchIfNotNull("-intermediatefolder ", this.IntermediateDirectory);
-            commandLineBuilder.AppendSwitchIfNotNull("-acceptEula ", this.AcceptEula);
+            commandLineBuilder.AppendTextAsArray("-acceptEula ", this.AcceptEula);
 
             base.BuildCommandLine(commandLineBuilder);
         }
diff --git a/src/wix/WixToolset.BuildTasks/ReattachSignedBundleEngine.cs b/src/wix/WixToolset.BuildTasks/ReattachSignedBundleEngine.cs
index 433328bf..424263a5 100644
--- a/src/wix/WixToolset.BuildTasks/ReattachSignedBundleEngine.cs
+++ b/src/wix/WixToolset.BuildTasks/ReattachSignedBundleEngine.cs
@@ -52,7 +52,7 @@ namespace WixToolset.BuildTasks
             commandLineBuilder.AppendSwitchIfNotNull("-engine ", this.BundleEngineFile);
             commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
             commandLineBuilder.AppendSwitchIfNotNull("-intermediatefolder ", this.IntermediateDirectory);
-            commandLineBuilder.AppendSwitchIfNotNull("-acceptEula ", this.AcceptEula);
+            commandLineBuilder.AppendTextAsArray("-acceptEula ", this.AcceptEula);
 
             base.BuildCommandLine(commandLineBuilder);
         }
diff --git a/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs b/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs
index 75b99951..1a7ffa2c 100644
--- a/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs
+++ b/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs
@@ -56,7 +56,7 @@ namespace WixToolset.BuildTasks
             commandLineBuilder.AppendArrayIfNotNull("-cub ", this.CubeFiles);
             commandLineBuilder.AppendArrayIfNotNull("-ice ", this.Ices);
             commandLineBuilder.AppendArrayIfNotNull("-sice ", this.SuppressIces);
-            commandLineBuilder.AppendSwitchIfNotNull("-acceptEula ", this.AcceptEula);
+            commandLineBuilder.AppendTextAsArray("-acceptEula ", this.AcceptEula);
 
             base.BuildCommandLine(commandLineBuilder);
         }
diff --git a/src/wix/WixToolset.BuildTasks/WixBuild.cs b/src/wix/WixToolset.BuildTasks/WixBuild.cs
index 73da56d3..e3353b7f 100644
--- a/src/wix/WixToolset.BuildTasks/WixBuild.cs
+++ b/src/wix/WixToolset.BuildTasks/WixBuild.cs
@@ -79,7 +79,7 @@ namespace WixToolset.BuildTasks
             commandLineBuilder.AppendSwitchIfNotNull("-intermediatefolder ", this.IntermediateDirectory);
             commandLineBuilder.AppendSwitchIfNotNull("-trackingfile ", this.BindTrackingFile);
             commandLineBuilder.AppendSwitchIfNotNull("-defaultcompressionlevel ", this.DefaultCompressionLevel);
-            commandLineBuilder.AppendSwitchIfNotNull("-acceptEula ", this.AcceptEula);
+            commandLineBuilder.AppendTextAsArray("-acceptEula ", this.AcceptEula);
 
             base.BuildCommandLine(commandLineBuilder);
 
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitProperties/PackageUsingExplicitProperties.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitProperties/PackageUsingExplicitProperties.wixproj
index d93d9e3e..84d0db4d 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitProperties/PackageUsingExplicitProperties.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitProperties/PackageUsingExplicitProperties.wixproj
@@ -3,6 +3,7 @@
   <Import Project="$(WixMSBuildProps)" />
 
   <PropertyGroup>
+    <!-- Add some random EULA Ids for testing purposes. -->
     <AcceptEula>foo;wix7;bar</AcceptEula>
   </PropertyGroup>