From 9eac17a8ab63f157253a74828b0fbd593f53d71a Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 25 Apr 2021 23:35:50 -0500
Subject: Add tests for #5253 and #5586.

---
 src/TestData/CacheTests/BundleA/BundleA.wixproj   | 19 +++++++++++++++++++
 src/TestData/CacheTests/BundleA/BundleA.wxs       | 11 +++++++++++
 src/TestData/CacheTests/BundleB/BundleB.wixproj   | 19 +++++++++++++++++++
 src/TestData/CacheTests/BundleB/BundleB.wxs       | 11 +++++++++++
 src/TestData/CacheTests/PackageA/PackageA.wixproj |  9 +++++++++
 src/TestData/CacheTests/PackageB/PackageB.wixproj |  9 +++++++++
 6 files changed, 78 insertions(+)
 create mode 100644 src/TestData/CacheTests/BundleA/BundleA.wixproj
 create mode 100644 src/TestData/CacheTests/BundleA/BundleA.wxs
 create mode 100644 src/TestData/CacheTests/BundleB/BundleB.wixproj
 create mode 100644 src/TestData/CacheTests/BundleB/BundleB.wxs
 create mode 100644 src/TestData/CacheTests/PackageA/PackageA.wixproj
 create mode 100644 src/TestData/CacheTests/PackageB/PackageB.wixproj

(limited to 'src/TestData')

diff --git a/src/TestData/CacheTests/BundleA/BundleA.wixproj b/src/TestData/CacheTests/BundleA/BundleA.wixproj
new file mode 100644
index 00000000..5071c1c7
--- /dev/null
+++ b/src/TestData/CacheTests/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>{C48D0F58-0F8F-461D-A60D-D83E5F35BA8E}</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" Version="4.0.100" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.72" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/CacheTests/BundleA/BundleA.wxs b/src/TestData/CacheTests/BundleA/BundleA.wxs
new file mode 100644
index 00000000..20262187
--- /dev/null
+++ b/src/TestData/CacheTests/BundleA/BundleA.wxs
@@ -0,0 +1,11 @@
+<!-- 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)" DownloadUrl="$(var.WebServerBaseUrl)BundleA/{2}" />
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" DownloadUrl="$(var.WebServerBaseUrl)BundleA/{2}" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/CacheTests/BundleB/BundleB.wixproj b/src/TestData/CacheTests/BundleB/BundleB.wixproj
new file mode 100644
index 00000000..ffc03f79
--- /dev/null
+++ b/src/TestData/CacheTests/BundleB/BundleB.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>{3CC71AD2-39F3-4803-A24C-6E6A492B721C}</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" Version="4.0.100" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.72" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/CacheTests/BundleB/BundleB.wxs b/src/TestData/CacheTests/BundleB/BundleB.wxs
new file mode 100644
index 00000000..95e714ec
--- /dev/null
+++ b/src/TestData/CacheTests/BundleB/BundleB.wxs
@@ -0,0 +1,11 @@
+<!-- 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)" />
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/CacheTests/PackageA/PackageA.wixproj b/src/TestData/CacheTests/PackageA/PackageA.wixproj
new file mode 100644
index 00000000..dd8176ed
--- /dev/null
+++ b/src/TestData/CacheTests/PackageA/PackageA.wixproj
@@ -0,0 +1,9 @@
+<!-- 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>
+    <UpgradeCode>{5D0BD93A-D1D8-4F59-8417-1390B18A6611}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/CacheTests/PackageB/PackageB.wixproj b/src/TestData/CacheTests/PackageB/PackageB.wixproj
new file mode 100644
index 00000000..efc57bb6
--- /dev/null
+++ b/src/TestData/CacheTests/PackageB/PackageB.wixproj
@@ -0,0 +1,9 @@
+<!-- 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>
+    <UpgradeCode>{ADCE5902-224D-4C87-BA31-2D154B37EE22}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb