From 8faa28db427119b3541733290d87783dd699d425 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 1 Apr 2022 19:28:51 -0500
Subject: Support v3 bundles in BundlePackage and "burn extract" command.

---
 .../V3BundlePackageBundle.wixproj                  | 22 ++++++++++++++++++++++
 .../V3BundlePackageBundle.wxs                      | 10 ++++++++++
 .../WixToolsetTest.BurnE2E/BundlePackageTests.cs   | 12 ++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 src/test/burn/TestData/BundlePackageTests/V3BundlePackageBundle/V3BundlePackageBundle.wixproj
 create mode 100644 src/test/burn/TestData/BundlePackageTests/V3BundlePackageBundle/V3BundlePackageBundle.wxs

(limited to 'src/test')

diff --git a/src/test/burn/TestData/BundlePackageTests/V3BundlePackageBundle/V3BundlePackageBundle.wixproj b/src/test/burn/TestData/BundlePackageTests/V3BundlePackageBundle/V3BundlePackageBundle.wixproj
new file mode 100644
index 00000000..d57ac072
--- /dev/null
+++ b/src/test/burn/TestData/BundlePackageTests/V3BundlePackageBundle/V3BundlePackageBundle.wixproj
@@ -0,0 +1,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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <BA>TestBA_x64</BA>
+    <UpgradeCode>{B6CAE45D-A7E5-4302-9FCF-4D05632F9FD7}</UpgradeCode>
+    <InstallerPlatform>x64</InstallerPlatform>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BindInputPaths Include="..\..\..\..\..\wix\test\WixToolsetTest.CoreIntegration\TestData\.Data" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/BundlePackageTests/V3BundlePackageBundle/V3BundlePackageBundle.wxs b/src/test/burn/TestData/BundlePackageTests/V3BundlePackageBundle/V3BundlePackageBundle.wxs
new file mode 100644
index 00000000..131a1b4d
--- /dev/null
+++ b/src/test/burn/TestData/BundlePackageTests/V3BundlePackageBundle/V3BundlePackageBundle.wxs
@@ -0,0 +1,10 @@
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <BundlePackage SourceFile="v3bundle.exe" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
index 1e6cda9c..4686875a 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
@@ -3,6 +3,7 @@
 namespace WixToolsetTest.BurnE2E
 {
     using System.IO;
+    using WixTestTools;
     using Xunit;
     using Xunit.Abstractions;
 
@@ -63,6 +64,17 @@ namespace WixToolsetTest.BurnE2E
             bundleAv1.VerifyUnregisteredAndRemovedFromPackageCache();
         }
 
+        [Fact]
+        public void CanInstallV3BundlePackage()
+        {
+            var v3BundlePackageBundle = this.CreateBundleInstaller("V3BundlePackageBundle");
+
+            var logPath = v3BundlePackageBundle.Install();
+            v3BundlePackageBundle.VerifyRegisteredAndInPackageCache();
+
+            Assert.True(LogVerifier.MessageInLogFile(logPath, "Applied execute package: v3bundle.exe, result: 0x0, restart: None"));
+        }
+
         [Fact]
         public void CanSkipObsoleteBundlePackage()
         {
-- 
cgit v1.2.3-55-g6feb