Fix ManagedHost tests by using Heat to harvest the BA payloads.

Also, build all example bundles in the new examples.proj instead of the tests to speed up the solution build.

3 files changed, 43 insertions, 0 deletions

diff --git a/src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj b/src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj
new file mode 100644
index 00000000..30a860ab
--- /dev/null
+++ b/src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj
@@ -0,0 +1,10 @@
+<!-- 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">
+    <ItemGroup>
+        <BindInputPaths Include="$(OutputPath)publish\Example.LatestCoreMBA\scd" />
+        <HarvestDirectory Include="$(OutputPath)publish\Example.LatestCoreMBA\scd">
+            <DirectoryRefId>publish.Example.LatestCoreMBA.scd</DirectoryRefId>
+            <Transforms>ba.xslt</Transforms>
+        </HarvestDirectory>
+    </ItemGroup>
+</Project>
diff --git a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
new file mode 100644
index 00000000..4b0fe38a
--- /dev/null
+++ b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+    <Bundle Name="SCDLatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
+        <BootstrapperApplicationRef Id="DotNetCoreBootstrapperApplicationHost">
+            <bal:WixDotNetCoreBootstrapperApplication SelfContainedDeployment="yes" />
+            <PayloadGroupRef Id="publish.Example.LatestCoreMBA.scd" />
+        </BootstrapperApplicationRef>
+        <Chain>
+            <ExePackage SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/test/examples/LatestCoreBundleSCD/ba.xslt b/src/test/examples/LatestCoreBundleSCD/ba.xslt
new file mode 100644
index 00000000..acc7474c
--- /dev/null
+++ b/src/test/examples/LatestCoreBundleSCD/ba.xslt
@@ -0,0 +1,20 @@
+<?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[@SourceFile='SourceDir\Example.LatestCoreMBA.dll']" >
+        <xsl:copy>
+            <xsl:attribute name="BAFactoryAssembly" namespace="http://wixtoolset.org/schemas/v4/wxs/bal">yes</xsl:attribute>
+            <xsl:apply-templates select="@* | node()"/>
+        </xsl:copy>
+    </xsl:template>
+</xsl:stylesheet>