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

Resolves 9196

4 files changed, 6 insertions, 0 deletions

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" />