Add tests for #5253 and #5586.

author: Sean Hall <r.sean.hall@gmail.com> 2021-04-25 23:35:50 -0500
committer: Sean Hall <r.sean.hall@gmail.com> 2021-04-25 23:46:11 -0500
commit: 9eac17a8ab63f157253a74828b0fbd593f53d71a (patch)
tree: 349d9d7b7c0445dc9df4d9071fa2983781ddb41a /src/TestData
parent: d3aa9df30f8013b6ee60f0001a9473d4234b33ff (diff)
download: wix-9eac17a8ab63f157253a74828b0fbd593f53d71a.tar.gz
wix-9eac17a8ab63f157253a74828b0fbd593f53d71a.tar.bz2
wix-9eac17a8ab63f157253a74828b0fbd593f53d71a.zip
6 files changed, 78 insertions, 0 deletions
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
author	Sean Hall <r.sean.hall@gmail.com>	2021-04-25 23:35:50 -0500
committer	Sean Hall <r.sean.hall@gmail.com>	2021-04-25 23:46:11 -0500
commit	9eac17a8ab63f157253a74828b0fbd593f53d71a (patch)
tree	349d9d7b7c0445dc9df4d9071fa2983781ddb41a /src/TestData
parent	d3aa9df30f8013b6ee60f0001a9473d4234b33ff (diff)
download	wix-9eac17a8ab63f157253a74828b0fbd593f53d71a.tar.gz wix-9eac17a8ab63f157253a74828b0fbd593f53d71a.tar.bz2 wix-9eac17a8ab63f157253a74828b0fbd593f53d71a.zip

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 @@
	1	<!-- 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. -->
	2	<Project Sdk="WixToolset.Sdk">
	3	<PropertyGroup>
	4	<OutputType>Bundle</OutputType>
	5	<UpgradeCode>{C48D0F58-0F8F-461D-A60D-D83E5F35BA8E}</UpgradeCode>
	6	</PropertyGroup>
	7	<ItemGroup>
	8	<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
	9	</ItemGroup>
	10	<ItemGroup>
	11	<ProjectReference Include="..\PackageA\PackageA.wixproj" />
	12	<ProjectReference Include="..\PackageB\PackageB.wixproj" />
	13	<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
	14	</ItemGroup>
	15	<ItemGroup>
	16	<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.100" />
	17	<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.72" />
	18	</ItemGroup>
	19	</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 @@
	1	<!-- 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. -->
	2
	3
	4	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	5	<Fragment>
	6	<PackageGroup Id="BundlePackages">
	7	<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" DownloadUrl="$(var.WebServerBaseUrl)BundleA/{2}" />
	8	<MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" DownloadUrl="$(var.WebServerBaseUrl)BundleA/{2}" />
	9	</PackageGroup>
	10	</Fragment>
	11	</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 @@
	1	<!-- 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. -->
	2	<Project Sdk="WixToolset.Sdk">
	3	<PropertyGroup>
	4	<OutputType>Bundle</OutputType>
	5	<UpgradeCode>{3CC71AD2-39F3-4803-A24C-6E6A492B721C}</UpgradeCode>
	6	</PropertyGroup>
	7	<ItemGroup>
	8	<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
	9	</ItemGroup>
	10	<ItemGroup>
	11	<ProjectReference Include="..\PackageA\PackageA.wixproj" />
	12	<ProjectReference Include="..\PackageB\PackageB.wixproj" />
	13	<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
	14	</ItemGroup>
	15	<ItemGroup>
	16	<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.100" />
	17	<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.72" />
	18	</ItemGroup>
	19	</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 @@
	1	<!-- 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. -->
	2
	3
	4	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	5	<Fragment>
	6	<PackageGroup Id="BundlePackages">
	7	<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
	8	<MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
	9	</PackageGroup>
	10	</Fragment>
	11	</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 @@
	1	<!-- 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. -->
	2	<Project Sdk="WixToolset.Sdk">
	3	<PropertyGroup>
	4	<UpgradeCode>{5D0BD93A-D1D8-4F59-8417-1390B18A6611}</UpgradeCode>
	5	</PropertyGroup>
	6	<ItemGroup>
	7	<Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
	8	</ItemGroup>
	9	</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 @@
	1	<!-- 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. -->
	2	<Project Sdk="WixToolset.Sdk">
	3	<PropertyGroup>
	4	<UpgradeCode>{ADCE5902-224D-4C87-BA31-2D154B37EE22}</UpgradeCode>
	5	</PropertyGroup>
	6	<ItemGroup>
	7	<Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
	8	</ItemGroup>
	9	</Project> \ No newline at end of file