From 323f62d3d0f4b73db5fde8977e2540194c6de006 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 2 Nov 2021 17:47:46 -0500
Subject: Follow up for multiple attached container support

* validate cContainers
* use previous embeddedid format and use intermediate folder when extracting attached containers
* remove special cases for 0 byte containers in BurnCommon classes and Insignia
* don't hardcode max containers
* reduce properties in BurnCommon
* add e2e test

#6144
---
 .../ContainerTests/BundleA/BundleA.wixproj         | 19 ++++++++++++++
 .../TestData/ContainerTests/BundleA/BundleA.wxs    | 17 +++++++++++++
 .../ContainerTests/PackageA/PackageA.wixproj       | 10 ++++++++
 .../ContainerTests/PackageB/PackageB.wixproj       | 10 ++++++++
 .../burn/WixToolsetTest.BurnE2E/ContainerTests.cs  | 29 ++++++++++++++++++++++
 5 files changed, 85 insertions(+)
 create mode 100644 src/test/burn/TestData/ContainerTests/BundleA/BundleA.wixproj
 create mode 100644 src/test/burn/TestData/ContainerTests/BundleA/BundleA.wxs
 create mode 100644 src/test/burn/TestData/ContainerTests/PackageA/PackageA.wixproj
 create mode 100644 src/test/burn/TestData/ContainerTests/PackageB/PackageB.wixproj
 create mode 100644 src/test/burn/WixToolsetTest.BurnE2E/ContainerTests.cs

(limited to 'src/test/burn')

diff --git a/src/test/burn/TestData/ContainerTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/ContainerTests/BundleA/BundleA.wixproj
new file mode 100644
index 00000000..1c2f1651
--- /dev/null
+++ b/src/test/burn/TestData/ContainerTests/BundleA/BundleA.wixproj
@@ -0,0 +1,19 @@
+<!-- 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>
+    <UpgradeCode>{16798DF3-C365-410D-B376-E63A961E4822}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+    <ProjectReference Include="..\PackageB\PackageB.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.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/ContainerTests/BundleA/BundleA.wxs b/src/test/burn/TestData/ContainerTests/BundleA/BundleA.wxs
new file mode 100644
index 00000000..7933eca5
--- /dev/null
+++ b/src/test/burn/TestData/ContainerTests/BundleA/BundleA.wxs
@@ -0,0 +1,17 @@
+<!-- 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">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
+      <PackageGroupRef Id="PackageB" />
+    </PackageGroup>
+    <PackageGroup Id="PackageB">
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
+    </PackageGroup>
+    <Container Id="CustomAttachedContainer" Name="CustomAttachedContainer" Type="attached">
+      <PackageGroupRef Id="PackageB" />
+    </Container>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/ContainerTests/PackageA/PackageA.wixproj b/src/test/burn/TestData/ContainerTests/PackageA/PackageA.wixproj
new file mode 100644
index 00000000..67dfd894
--- /dev/null
+++ b/src/test/burn/TestData/ContainerTests/PackageA/PackageA.wixproj
@@ -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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <CabPrefix>a</CabPrefix>
+    <UpgradeCode>{D452A40D-27B2-41A1-A103-4FD5744B548E}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/ContainerTests/PackageB/PackageB.wixproj b/src/test/burn/TestData/ContainerTests/PackageB/PackageB.wixproj
new file mode 100644
index 00000000..6ef92662
--- /dev/null
+++ b/src/test/burn/TestData/ContainerTests/PackageB/PackageB.wixproj
@@ -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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <CabPrefix>b</CabPrefix>
+    <UpgradeCode>{EB8E7A16-9855-4019-90D6-F5A242A75250}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/ContainerTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/ContainerTests.cs
new file mode 100644
index 00000000..cd6beaa9
--- /dev/null
+++ b/src/test/burn/WixToolsetTest.BurnE2E/ContainerTests.cs
@@ -0,0 +1,29 @@
+// 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.
+
+namespace WixToolsetTest.BurnE2E
+{
+    using Xunit;
+    using Xunit.Abstractions;
+
+    public class ContainerTests : BurnE2ETests
+    {
+        public ContainerTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
+
+        [Fact]
+        public void CanSupportMultipleAttachedContainers()
+        {
+            var packageA = this.CreatePackageInstaller("PackageA");
+            var packageB = this.CreatePackageInstaller("PackageB");
+            var bundleA = this.CreateBundleInstaller("BundleA");
+
+            packageA.VerifyInstalled(false);
+            packageB.VerifyInstalled(false);
+
+            bundleA.Install();
+            bundleA.VerifyRegisteredAndInPackageCache();
+
+            packageA.VerifyInstalled(true);
+            packageB.VerifyInstalled(true);
+        }
+    }
+}
-- 
cgit v1.2.3-55-g6feb