From 56105916271ff9a7c0bfa237b45b9b3fab9c570b Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Wed, 9 Jun 2021 11:30:46 -0500
Subject: Fix building and perf for bundles with 1000s of package and BA
 payloads

Fixes other half of #5300
---
 src/test/burn/TestData/Manual/BundleB/Bundle.wxs   | 56 ++++++++++++++++++++++
 .../burn/TestData/Manual/BundleB/BundleB.wixproj   | 32 +++++++++++++
 src/test/burn/TestData/Manual/BundleB/BundleB.wxs  | 15 ++++++
 src/test/burn/TestData/Manual/BundleB/ba.xslt      | 21 ++++++++
 src/test/burn/TestData/Manual/BundleB/package.xslt | 21 ++++++++
 src/test/burn/TestExe/Task.cs                      | 22 +++++++++
 6 files changed, 167 insertions(+)
 create mode 100644 src/test/burn/TestData/Manual/BundleB/Bundle.wxs
 create mode 100644 src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
 create mode 100644 src/test/burn/TestData/Manual/BundleB/BundleB.wxs
 create mode 100644 src/test/burn/TestData/Manual/BundleB/ba.xslt
 create mode 100644 src/test/burn/TestData/Manual/BundleB/package.xslt

(limited to 'src/test')

diff --git a/src/test/burn/TestData/Manual/BundleB/Bundle.wxs b/src/test/burn/TestData/Manual/BundleB/Bundle.wxs
new file mode 100644
index 00000000..615d4b1d
--- /dev/null
+++ b/src/test/burn/TestData/Manual/BundleB/Bundle.wxs
@@ -0,0 +1,56 @@
+<!-- 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">
+  <!-- The only difference from the template should be the SplashScreen -->
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" SplashScreenSourceFile="..\BafThmutilTesting\theme\star_transparent.bmp">
+    <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) = "TestBA_x64"?>
+      <!-- pulled in through the PackageGroupRef below -->
+    <?elseif $(var.BA) = "TestBAdnc_x64"?>
+      <!-- pulled in through the PackageGroupRef below -->
+    <?elseif $(var.BA) = "WixBA"?>
+      <!-- pulled in through the PackageGroupRef below -->
+    <?elseif $(var.BA) = "WixBAdnc_x64"?>
+      <!-- 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" />
+      <?elseif $(var.BA) = "TestBA_x64"?>
+        <PackageGroupRef Id="TestBA_x64" />
+      <?elseif $(var.BA) = "TestBAdnc_x64"?>
+        <PackageGroupRef Id="TestBAdnc_x64" />
+      <?elseif $(var.BA) = "WixBA"?>
+        <PackageGroupRef Id="WixBA" />
+      <?elseif $(var.BA) = "WixBAdnc_x64"?>
+        <PackageGroupRef Id="WixBAdnc_x64" />
+      <?endif?>
+
+      <PackageGroupRef Id="BundlePackages" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
new file mode 100644
index 00000000..35c92246
--- /dev/null
+++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
@@ -0,0 +1,32 @@
+<!-- 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>
+    <BA>hyperlinkLicense</BA>
+    <UpgradeCode>{5DE2F206-3C37-4265-81F7-095284E16B08}</UpgradeCode>
+    <HarvestDirectoryAdditionalOptions>-generate payloadgroup</HarvestDirectoryAdditionalOptions>
+  </PropertyGroup>
+  <ItemGroup>
+    <HarvestDirectory Include="BAPayloads">
+      <ComponentGroupName>BAPayloads</ComponentGroupName>
+      <DirectoryRefId>BAPayloads</DirectoryRefId>
+      <Transforms>ba.xslt</Transforms>
+    </HarvestDirectory>
+    <HarvestDirectory Include="PackagePayloads">
+      <ComponentGroupName>PackagePayloads</ComponentGroupName>
+      <DirectoryRefId>PackagePayloads</DirectoryRefId>
+      <Transforms>package.xslt</Transforms>
+    </HarvestDirectory>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" />
+  </ItemGroup>
+  <!-- We do this dynamically to avoid committing so many files to source control. -->
+  <Target Name="CreateThousandsOfFiles" AfterTargets="BeforeBuild">
+    <Exec Command='"$(BaseOutputPath)$(Configuration)\netcoreapp3.1\win-x86\testexe.exe" /gf "BAPayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
+    <Exec Command='"$(BaseOutputPath)$(Configuration)\netcoreapp3.1\win-x86\testexe.exe" /gf "PackagePayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wxs b/src/test/burn/TestData/Manual/BundleB/BundleB.wxs
new file mode 100644
index 00000000..3b189b15
--- /dev/null
+++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wxs
@@ -0,0 +1,15 @@
+<!-- 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" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Fragment>
+    <BootstrapperApplication>
+      <PayloadGroupRef Id="BAPayloads" />
+    </BootstrapperApplication>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)">
+        <PayloadGroupRef Id="PackagePayloads" />
+      </MsiPackage>
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/Manual/BundleB/ba.xslt b/src/test/burn/TestData/Manual/BundleB/ba.xslt
new file mode 100644
index 00000000..54bc7fe6
--- /dev/null
+++ b/src/test/burn/TestData/Manual/BundleB/ba.xslt
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl"
+    xmlns:wix="http://wixtoolset.org/schemas/v4/wxs"
+>
+    <xsl:output method="xml" indent="yes"/>
+
+    <xsl:template match="@* | node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="wix:Payload" >
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()"/>
+            <xsl:attribute name="Id">ba_<xsl:value-of select="substring(@SourceFile, 11)" /></xsl:attribute>
+            <xsl:attribute name="SourceFile">BAPayloads<xsl:value-of select="substring(@SourceFile, 10)" /></xsl:attribute>
+        </xsl:copy>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/src/test/burn/TestData/Manual/BundleB/package.xslt b/src/test/burn/TestData/Manual/BundleB/package.xslt
new file mode 100644
index 00000000..304ff78b
--- /dev/null
+++ b/src/test/burn/TestData/Manual/BundleB/package.xslt
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl"
+    xmlns:wix="http://wixtoolset.org/schemas/v4/wxs"
+>
+    <xsl:output method="xml" indent="yes"/>
+
+    <xsl:template match="@* | node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="wix:Payload" >
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()"/>
+            <xsl:attribute name="Id">package_<xsl:value-of select="substring(@SourceFile, 11)" /></xsl:attribute>
+            <xsl:attribute name="SourceFile">PackagePayloads<xsl:value-of select="substring(@SourceFile, 10)" /></xsl:attribute>
+        </xsl:copy>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/src/test/burn/TestExe/Task.cs b/src/test/burn/TestExe/Task.cs
index 7d39bfd9..59f774fb 100644
--- a/src/test/burn/TestExe/Task.cs
+++ b/src/test/burn/TestExe/Task.cs
@@ -59,6 +59,24 @@ namespace TestExe
         }
     }
 
+    public class GenerateFilesTask : Task
+    {
+        public GenerateFilesTask(string Data) : base(Data) { }
+
+        public override void RunTask()
+        {
+            string[] tokens = this.data.Split(new char[] { '|' }, 2);
+            string folderPath = System.Environment.ExpandEnvironmentVariables(tokens[0]);
+            long size = long.Parse(tokens[1]);
+            Directory.CreateDirectory(folderPath);
+            var bytes = new byte[0];
+            for (long i = 1; i <= size; i++)
+            {
+                File.WriteAllBytes(Path.Combine(folderPath, $"{i}.txt"), bytes);
+            }
+        }
+    }
+
     public class LargeFileTask : Task
     {
         public LargeFileTask(string Data) : base(Data) { }
@@ -163,6 +181,10 @@ namespace TestExe
                                 t = new SleepRandomTask(args[i + 1]);
                                 tasks.Add(t);
                                 break;
+                            case "/gf":
+                                t = new GenerateFilesTask(args[i + 1]);
+                                tasks.Add(t);
+                                break;
                             case "/lf":
                                 t = new LargeFileTask(args[i + 1]);
                                 tasks.Add(t);
-- 
cgit v1.2.3-55-g6feb