From 96ce05107d0e01014a3264e91ecb5731a9f28cc5 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 19 Apr 2022 16:08:21 -0500
Subject: Upgrade test BAs to net6.0 and use x64 bundles for ManagedHost tests.

Fixes 6651
---
 src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs        | 12 ++++++------
 .../burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/test/burn/TestData/TestBA/TestBAWixlib')

diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
index 348a0cbb..ae162050 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
@@ -2,16 +2,16 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
   <Fragment>
     <BootstrapperApplication>
-      <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" />
+      <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" />
+      <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
+      <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.dncx86)\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 -->
+      <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 6 packages yet -->
     </PackageGroup>
   </Fragment>
   <Fragment>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
index fdce5ecd..1dbc4f63 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x86" BindName="net4x86" />
-    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x86" BindName="dnc5x86" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\TestBA\TestBA.csproj" />
-- 
cgit v1.2.3-55-g6feb