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

Resolves 9196

3 files changed, 8 insertions, 1 deletions

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);
         }