4 files changed, 100 insertions, 0 deletions
diff --git a/src/test/burn/TestData/LayoutTests/BundleA/Bundle.wxs b/src/test/burn/TestData/LayoutTests/BundleA/Bundle.wxs
new file mode 100644
index 00000000..e74b8394
--- /dev/null
+++ b/src/test/burn/TestData/LayoutTests/BundleA/Bundle.wxs
@@ -0,0 +1,42 @@
+<!-- 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. -->
+<?ifndef Version?>
+<?define Version = 1.0.0.0?>
+<?endif?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
+    <!-- PayloadGroupRef should be the only thing different from the template -->
+    <PayloadGroupRef Id="LayoutOnlyPayloads" />
+    <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
+    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
+    <?ifdef SoftwareTag?>
+    <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]regid.1995-08.com.example" />
+    <?endif?>
+    <?ifndef BA?>
+      <!-- pulled in through the PackageGroupRef below -->
+    <?elseif $(var.BA) = "TestBAdnc"?>
+      <!-- pulled in through the PackageGroupRef below -->
+    <?elseif $(var.BA) = "hyperlinkLicense"?>
+      <BootstrapperApplication>
+        <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
+      </BootstrapperApplication>
+    <?else?>
+      <BootstrapperApplicationRef Id="$(var.BA)" />
+    <?endif?>
+    <Chain>
+      <?ifndef BA?>
+        <PackageGroupRef Id="TestBA" />
+      <?elseif $(var.BA) = "TestBAdnc"?>
+        <PackageGroupRef Id="TestBAdnc" />
+      <?endif?>
+      <PackageGroupRef Id="BundlePackages" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj
new file mode 100644
index 00000000..4cf9c875
--- /dev/null
+++ b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj
@@ -0,0 +1,23 @@
+<!-- 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>{D255FA2D-2B4A-4D78-AE90-C09FECD8491E}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
+  </ItemGroup>
+  <!-- Workaround wix.targets brokenness -->
+  <Target Name="CopyUncompressedFiles" AfterTargets="AfterBuild">
+    <ItemGroup>
+      <UncompressedFiles Include="$(IntermediateOutputPath)\BundleA.wxs" />
+      <UncompressedFiles Include="$(IntermediateOutputPath)\packages.cab" />
+    </ItemGroup>
+    <Copy SourceFiles="@(UncompressedFiles)" DestinationFolder="$(OutputPath)" />
+  </Target>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wxs b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wxs
new file mode 100644
index 00000000..ea46c5b2
--- /dev/null
+++ b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wxs
@@ -0,0 +1,26 @@
+<!-- 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)" />
+    </PackageGroup>
+    <!-- Reenable when fixed
+    <Container Id="PackagesContainer" Name="packages.cab" DownloadUrl="$(var.WebServerBaseUrl)BundleA/{2}">
+    -->
+    <Container Id="PackagesContainer" Name="packages.cab" DownloadUrl="$(var.WebServerBaseUrl)BundleA/packages.cab">
+      <PackageGroupRef Id="BundlePackages" />
+    </Container>
+  </Fragment>
+  <Fragment>
+    <PayloadGroup Id="LayoutOnlyPayloads">
+      <Payload Id="LayoutOnlyPayload" SourceFile="$(sys.SOURCEFILEPATH)" Compressed="no" DownloadUrl="$(var.WebServerBaseUrl)BundleA/LayoutOnlyPayload" />
+      <!-- Reenable when fixed
+      <Payload Id="LayoutOnlyPayload" SourceFile="$(sys.SOURCEFILEPATH)" Compressed="no" DownloadUrl="$(var.WebServerBaseUrl)BundleA/{1}" />
+      -->
+    </PayloadGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/LayoutTests/PackageA/PackageA.wixproj b/src/test/burn/TestData/LayoutTests/PackageA/PackageA.wixproj
new file mode 100644
index 00000000..be425985
--- /dev/null
+++ b/src/test/burn/TestData/LayoutTests/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>{CA12F025-6F6F-4E3C-A1D7-FE8CD45A77F5}</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/LayoutTests/BundleA/Bundle.wxs b/src/test/burn/TestData/LayoutTests/BundleA/Bundle.wxs new file mode 100644 index 00000000..e74b8394 --- /dev/null +++ b/src/test/burn/TestData/LayoutTests/BundleA/Bundle.wxs
@@ -0,0 +1,42 @@
	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	<?ifndef Version?>
	4	<?define Version = 1.0.0.0?>
	5	<?endif?>
	6
	7	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
	8	<Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
	9	<!-- PayloadGroupRef should be the only thing different from the template -->
	10	<PayloadGroupRef Id="LayoutOnlyPayloads" />
	11
	12	<Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
	13
	14	<Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
	15
	16	<?ifdef SoftwareTag?>
	17	<SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]regid.1995-08.com.example" />
	18	<?endif?>
	19
	20	<?ifndef BA?>
	21	<!-- pulled in through the PackageGroupRef below -->
	22	<?elseif $(var.BA) = "TestBAdnc"?>
	23	<!-- pulled in through the PackageGroupRef below -->
	24	<?elseif $(var.BA) = "hyperlinkLicense"?>
	25	<BootstrapperApplication>
	26	<bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
	27	</BootstrapperApplication>
	28	<?else?>
	29	<BootstrapperApplicationRef Id="$(var.BA)" />
	30	<?endif?>
	31
	32	<Chain>
	33	<?ifndef BA?>
	34	<PackageGroupRef Id="TestBA" />
	35	<?elseif $(var.BA) = "TestBAdnc"?>
	36	<PackageGroupRef Id="TestBAdnc" />
	37	<?endif?>
	38
	39	<PackageGroupRef Id="BundlePackages" />
	40	</Chain>
	41	</Bundle>
	42	</Wix>


diff --git a/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj new file mode 100644 index 00000000..4cf9c875 --- /dev/null +++ b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj
@@ -0,0 +1,23 @@
	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>{D255FA2D-2B4A-4D78-AE90-C09FECD8491E}</UpgradeCode>
	6	</PropertyGroup>
	7	<ItemGroup>
	8	<ProjectReference Include="..\PackageA\PackageA.wixproj" />
	9	<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
	10	</ItemGroup>
	11	<ItemGroup>
	12	<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
	13	<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
	14	</ItemGroup>
	15	<!-- Workaround wix.targets brokenness -->
	16	<Target Name="CopyUncompressedFiles" AfterTargets="AfterBuild">
	17	<ItemGroup>
	18	<UncompressedFiles Include="$(IntermediateOutputPath)\BundleA.wxs" />
	19	<UncompressedFiles Include="$(IntermediateOutputPath)\packages.cab" />
	20	</ItemGroup>
	21	<Copy SourceFiles="@(UncompressedFiles)" DestinationFolder="$(OutputPath)" />
	22	</Target>
	23	</Project> \ No newline at end of file


diff --git a/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wxs b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wxs new file mode 100644 index 00000000..ea46c5b2 --- /dev/null +++ b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wxs
@@ -0,0 +1,26 @@
	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	</PackageGroup>
	9
	10	<!-- Reenable when fixed
	11	<Container Id="PackagesContainer" Name="packages.cab" DownloadUrl="$(var.WebServerBaseUrl)BundleA/{2}">
	12	-->
	13	<Container Id="PackagesContainer" Name="packages.cab" DownloadUrl="$(var.WebServerBaseUrl)BundleA/packages.cab">
	14	<PackageGroupRef Id="BundlePackages" />
	15	</Container>
	16	</Fragment>
	17
	18	<Fragment>
	19	<PayloadGroup Id="LayoutOnlyPayloads">
	20	<Payload Id="LayoutOnlyPayload" SourceFile="$(sys.SOURCEFILEPATH)" Compressed="no" DownloadUrl="$(var.WebServerBaseUrl)BundleA/LayoutOnlyPayload" />
	21	<!-- Reenable when fixed
	22	<Payload Id="LayoutOnlyPayload" SourceFile="$(sys.SOURCEFILEPATH)" Compressed="no" DownloadUrl="$(var.WebServerBaseUrl)BundleA/{1}" />
	23	-->
	24	</PayloadGroup>
	25	</Fragment>
	26	</Wix>


diff --git a/src/test/burn/TestData/LayoutTests/PackageA/PackageA.wixproj b/src/test/burn/TestData/LayoutTests/PackageA/PackageA.wixproj new file mode 100644 index 00000000..be425985 --- /dev/null +++ b/src/test/burn/TestData/LayoutTests/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>{CA12F025-6F6F-4E3C-A1D7-FE8CD45A77F5}</UpgradeCode>
	5	</PropertyGroup>
	6	<ItemGroup>
	7	<Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
	8	</ItemGroup>
	9	</Project> \ No newline at end of file