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/TestBA/TestBA.csproj                           |  2 +-
 src/test/burn/TestBA/TestBA_x64.csproj                       |  2 +-
 src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj |  2 +-
 src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs     |  8 ++++----
 src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs        | 12 ++++++------
 .../burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj   |  2 +-
 .../burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs     | 12 ++++++------
 src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs | 12 ++++++------
 .../TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj         |  2 +-
 src/test/burn/WixToolset.WixBA/Model.cs                      |  2 ++
 src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj       |  2 +-
 src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj   |  2 +-
 12 files changed, 31 insertions(+), 29 deletions(-)

(limited to 'src/test')

diff --git a/src/test/burn/TestBA/TestBA.csproj b/src/test/burn/TestBA/TestBA.csproj
index 7d51f4aa..ab3c21cb 100644
--- a/src/test/burn/TestBA/TestBA.csproj
+++ b/src/test/burn/TestBA/TestBA.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net35;net6.0-windows</TargetFrameworks>
     <AssemblyName>TestBA</AssemblyName>
     <RootNamespace>WixToolset.Test.BA</RootNamespace>
     <DebugType>embedded</DebugType>
diff --git a/src/test/burn/TestBA/TestBA_x64.csproj b/src/test/burn/TestBA/TestBA_x64.csproj
index cb9db1c4..748d78ab 100644
--- a/src/test/burn/TestBA/TestBA_x64.csproj
+++ b/src/test/burn/TestBA/TestBA_x64.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net35;net6.0-windows</TargetFrameworks>
     <AssemblyName>TestBA</AssemblyName>
     <RootNamespace>WixToolset.Test.BA</RootNamespace>
     <DebugType>embedded</DebugType>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj
index e09a6aa4..0199f91f 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj
@@ -9,7 +9,7 @@
     <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <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="..\PackageA\PackageA.wixproj" />
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
index 455ea1e1..682f0bd7 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
@@ -4,11 +4,11 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
   <Fragment>
     <BootstrapperApplication Id="BrokenDnc">
-      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" />
-      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" />
+      <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
       <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />
-      <Payload SourceFile="!(bindpath.dnc5x86)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
       <bal:WixDotNetCoreBootstrapperApplicationHost />
     </BootstrapperApplication>
   </Fragment>
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" />
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
index 078f4f01..df058958 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.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.dnc5x64)\TestBA.deps.json" />
-      <Payload SourceFile="!(bindpath.dnc5x64)\TestBA.dll" bal:BAFactoryAssembly="yes" />
-      <Payload SourceFile="!(bindpath.dnc5x64)\TestBA.runtimeconfig.json" />
-      <Payload SourceFile="!(bindpath.dnc5x64)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.dncx64)\TestBA.deps.json" />
+      <Payload SourceFile="!(bindpath.dncx64)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dncx64)\TestBA.runtimeconfig.json" />
+      <Payload SourceFile="!(bindpath.dncx64)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.Mba.Core.dll" />
       <bal:WixDotNetCoreBootstrapperApplicationHost />
     </BootstrapperApplication>
 
     <PackageGroup Id="TestBAdnc_x64">
-      <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_x64/WixBA_x64.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
index f28b6b70..bc5d4080 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
@@ -2,17 +2,17 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
   <Fragment>
     <BootstrapperApplication>
-      <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.WixBA.deps.json" />
-      <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.WixBA.dll" bal:BAFactoryAssembly="yes" />
-      <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.WixBA.runtimeconfig.json" />
-      <Payload SourceFile="!(bindpath.dnc5x64)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.deps.json" />
+      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.runtimeconfig.json" />
+      <Payload SourceFile="!(bindpath.dncx64)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.Mba.Core.dll" />
       <Payload SourceFile='..\..\..\..\..\..\License.txt' />
       <bal:WixDotNetCoreBootstrapperApplicationHost />
     </BootstrapperApplication>
 
     <PackageGroup Id="WixBAdnc_x64">
-      <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>
 </Wix>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
index e63eb74c..3d714c4e 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x64" BindName="net2x64" />
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x64" BindName="net4x64" />
-    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x64" BindName="dnc5x64" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x64" BindName="dncx64" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj" />
diff --git a/src/test/burn/WixToolset.WixBA/Model.cs b/src/test/burn/WixToolset.WixBA/Model.cs
index a557fa4e..5eaad8f3 100644
--- a/src/test/burn/WixToolset.WixBA/Model.cs
+++ b/src/test/burn/WixToolset.WixBA/Model.cs
@@ -113,7 +113,9 @@ namespace WixToolset.WixBA
         /// <returns>Correctly configured HTTP web request.</returns>
         public HttpWebRequest CreateWebRequest(string uri)
         {
+#pragma warning disable SYSLIB0014 // Type or member is obsolete
             HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri);
+#pragma warning restore SYSLIB0014 // Type or member is obsolete
             request.UserAgent = String.Concat("WixInstall", this.Version.ToString());
 
             return request;
diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
index b872457c..9ee714b6 100644
--- a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
+++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
@@ -2,7 +2,7 @@
 <!-- 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="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <AssemblyName>WixToolset.WixBA</AssemblyName>
     <RootNamespace>WixToolset.WixBA</RootNamespace>
     <DebugType>embedded</DebugType>
diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
index 672f7a62..9307c6c9 100644
--- a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
+++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
@@ -2,7 +2,7 @@
 <!-- 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="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <AssemblyName>WixToolset.WixBA</AssemblyName>
     <RootNamespace>WixToolset.WixBA</RootNamespace>
     <DebugType>embedded</DebugType>
-- 
cgit v1.2.3-55-g6feb