From 73dc2706d9f151554356aaf3e69bfad5b46a21e9 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 1 Jan 2021 19:11:00 -0600
Subject: Add tests for wrong managed BA configuration.

Test out the .NET Core test BA as well.
---
 src/TestData/TestBA/TestBAWixlib/TestBA.wxs        | 22 ++++++++++++++++++----
 .../TestBA/TestBAWixlib/testbawixlib.wixproj       |  3 ++-
 2 files changed, 20 insertions(+), 5 deletions(-)

(limited to 'src/TestData/TestBA')

diff --git a/src/TestData/TestBA/TestBAWixlib/TestBA.wxs b/src/TestData/TestBA/TestBAWixlib/TestBA.wxs
index 56ddd1aa..348a0cbb 100644
--- a/src/TestData/TestBA/TestBAWixlib/TestBA.wxs
+++ b/src/TestData/TestBA/TestBAWixlib/TestBA.wxs
@@ -2,10 +2,24 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
   <Fragment>
     <BootstrapperApplication>
-      <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.x86)\TestBA.BootstrapperCore.config" />
-      <Payload SourceFile="!(bindpath.x86)\TestBA.dll" />
-      <Payload SourceFile="!(bindpath.x86)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.x86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.runtimeconfig.json" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" />
+      <bal:WixDotNetCoreBootstrapperApplicationHost />
+    </BootstrapperApplication>
+
+    <PackageGroup Id="TestBAdnc">
+      <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 5 packages yet -->
+    </PackageGroup>
+  </Fragment>
+  <Fragment>
+    <BootstrapperApplication>
+      <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.net2x86)\TestBA.BootstrapperCore.config" />
+      <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" />
+      <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
       <bal:WixManagedBootstrapperApplicationHost />
     </BootstrapperApplication>
 
diff --git a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
index ee63707e..7dd1798c 100644
--- a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+++ b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
@@ -6,7 +6,8 @@
     <Cultures>en-us</Cultures>
   </PropertyGroup>
   <ItemGroup>
-    <BindInputPaths Include="$(OutputPath)..\net35\win-x86" BindName="x86" />
+    <BindInputPaths Include="$(OutputPath)..\net35\win-x86" BindName="net2x86" />
+    <BindInputPaths Include="$(OutputPath)..\net5.0-windows\win-x86" BindName="dnc5x86" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" />
-- 
cgit v1.2.3-55-g6feb