From 72d694ee9cb6954953e55bf05b09c93ddebdc9d3 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 30 Mar 2021 15:50:32 -0500
Subject: Add layout tests.

---
 src/TestData/LayoutTests/BundleA/Bundle.wxs        | 42 ++++++++++++++++++++++
 src/TestData/LayoutTests/BundleA/BundleA.wixproj   | 23 ++++++++++++
 src/TestData/LayoutTests/BundleA/BundleA.wxs       | 26 ++++++++++++++
 src/TestData/LayoutTests/PackageA/PackageA.wixproj |  9 +++++
 4 files changed, 100 insertions(+)
 create mode 100644 src/TestData/LayoutTests/BundleA/Bundle.wxs
 create mode 100644 src/TestData/LayoutTests/BundleA/BundleA.wixproj
 create mode 100644 src/TestData/LayoutTests/BundleA/BundleA.wxs
 create mode 100644 src/TestData/LayoutTests/PackageA/PackageA.wixproj

(limited to 'src/TestData')

diff --git a/src/TestData/LayoutTests/BundleA/Bundle.wxs b/src/TestData/LayoutTests/BundleA/Bundle.wxs
new file mode 100644
index 00000000..e74b8394
--- /dev/null
+++ b/src/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/TestData/LayoutTests/BundleA/BundleA.wixproj b/src/TestData/LayoutTests/BundleA/BundleA.wixproj
new file mode 100644
index 00000000..fa7f227c
--- /dev/null
+++ b/src/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.90" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
+  </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/TestData/LayoutTests/BundleA/BundleA.wxs b/src/TestData/LayoutTests/BundleA/BundleA.wxs
new file mode 100644
index 00000000..ea46c5b2
--- /dev/null
+++ b/src/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/TestData/LayoutTests/PackageA/PackageA.wixproj b/src/TestData/LayoutTests/PackageA/PackageA.wixproj
new file mode 100644
index 00000000..be425985
--- /dev/null
+++ b/src/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
-- 
cgit v1.2.3-55-g6feb