Upgrade dnchost's nethost dependency to .NET 6.0.4.

11 files changed, 108 insertions, 11 deletions

diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd
index 8864bbb6..7a005cfe 100644
--- a/src/ext/Bal/bal.cmd
+++ b/src/ext/Bal/bal.cmd
@@ -22,6 +22,10 @@ msbuild -p:Configuration=%_C%;Platform=x86 mbahost\mbahost.vcxproj || exit /b
 msbuild -p:Configuration=%_C%;Platform=x64 mbahost\mbahost.vcxproj || exit /b
 msbuild -p:Configuration=%_C%;Platform=ARM64 mbahost\mbahost.vcxproj || exit /b
 
+msbuild -p:Configuration=%_C%;Platform=x86 test\examples\TestEngine\Example.TestEngine.vcxproj || exit /b
+msbuild -p:Configuration=%_C%;Platform=x64 test\examples\TestEngine\Example.TestEngine.vcxproj || exit /b
+msbuild -p:Configuration=%_C%;Platform=ARM64 test\examples\TestEngine\Example.TestEngine.vcxproj || exit /b
+
 msbuild -p:Configuration=%_C% || exit /b
 
 dotnet test test\WixToolsetTest.Dnc.HostGenerator -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Dnc.HostGenerator.trx" || exit /b
diff --git a/src/ext/Bal/dnchost/dnchost.vcxproj b/src/ext/Bal/dnchost/dnchost.vcxproj
index 1fd2ebed..ca0c09d6 100644
--- a/src/ext/Bal/dnchost/dnchost.vcxproj
+++ b/src/ext/Bal/dnchost/dnchost.vcxproj
@@ -49,7 +49,7 @@
   <PropertyGroup>
     <NetHostPlatform>$(Platform)</NetHostPlatform>
     <NetHostPlatform Condition=" '$(NetHostPlatform)'=='Win32' ">x86</NetHostPlatform>
-    <NetHostPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.5.0.0\runtimes\win-$(NetHostPlatform)\native\</NetHostPath>
+    <NetHostPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.6.0.4\runtimes\win-$(NetHostPlatform)\native\</NetHostPath>
     <ProjectAdditionalIncludeDirectories>$(BaseOutputPath)obj;$(NetHostPath)</ProjectAdditionalIncludeDirectories>
     <ProjectAdditionalLinkLibraries>shlwapi.lib;$(NetHostPath)libnethost.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
diff --git a/src/ext/Bal/dnchost/packages.config b/src/ext/Bal/dnchost/packages.config
index 78fa970f..1c7505e7 100644
--- a/src/ext/Bal/dnchost/packages.config
+++ b/src/ext/Bal/dnchost/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
-  <package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
-  <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
+  <package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
+  <package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
+  <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
index 14b80fe8..25856f4d 100644
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
+++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
@@ -2,6 +2,7 @@
 
 namespace WixToolsetTest.ManagedHost
 {
+    using System;
     using WixBuildTools.TestSupport;
     using Xunit;
 
@@ -29,6 +30,29 @@ namespace WixToolsetTest.ManagedHost
             }
         }
 
+        [Fact(Skip = "Requires .NET Core 3.1 x86 runtime which might be missing")]
+        public void CanLoadFDDx86EarliestCoreMBA()
+        {
+            // https://github.com/microsoft/vstest/issues/3586
+            Environment.SetEnvironmentVariable("DOTNET_ROOT", null);
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleFDDx86.exe");
+                var testEngine = new TestEngine();
+
+                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder, x86: true);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading .NET Core FDD bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "EarliestCoreBA",
+                    "Shutdown,ReloadBootstrapper,0",
+                }, result.Output.ToArray());
+            }
+        }
+
         [Fact]
         public void CanLoadSCDEarliestCoreMBA()
         {
@@ -116,6 +140,29 @@ namespace WixToolsetTest.ManagedHost
         }
 
         [Fact]
+        public void CanLoadFDDx86LatestCoreMBA()
+        {
+            // https://github.com/microsoft/vstest/issues/3586
+            Environment.SetEnvironmentVariable("DOTNET_ROOT", null);
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleFDDx86.exe");
+                var testEngine = new TestEngine();
+
+                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder, x86: true);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading .NET Core FDD bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "LatestCoreBA",
+                    "Shutdown,ReloadBootstrapper,0",
+                }, result.Output.ToArray());
+            }
+        }
+
+        [Fact]
         public void CanReloadFDDLatestCoreMBA()
         {
             using (var fs = new DisposableFileSystem())
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs
index 4df52e87..0ca2b40f 100644
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs
+++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs
@@ -12,18 +12,19 @@ namespace WixToolsetTest.ManagedHost
     public class TestEngine
     {
         private static readonly string TestEngineFile = TestData.Get(@"..\x64\examples\Example.TestEngine\Example.TestEngine.exe");
+        private static readonly string TestEngineFileX86 = TestData.Get(@"..\x86\examples\Example.TestEngine\Example.TestEngine.exe");
 
-        public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath)
+        public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath, bool x86 = false)
         {
-            return this.RunTestEngine("reload", bundleFilePath, tempFolderPath);
+            return this.RunTestEngine("reload", bundleFilePath, tempFolderPath, x86);
         }
 
-        public TestEngineResult RunShutdownEngine(string bundleFilePath, string tempFolderPath)
+        public TestEngineResult RunShutdownEngine(string bundleFilePath, string tempFolderPath, bool x86 = false)
         {
-            return this.RunTestEngine("shutdown", bundleFilePath, tempFolderPath);
+            return this.RunTestEngine("shutdown", bundleFilePath, tempFolderPath, x86);
         }
 
-        private TestEngineResult RunTestEngine(string engineMode, string bundleFilePath, string tempFolderPath)
+        private TestEngineResult RunTestEngine(string engineMode, string bundleFilePath, string tempFolderPath, bool x86 = false)
         {
             var baFolderPath = Path.Combine(tempFolderPath, "ba");
             var extractFolderPath = Path.Combine(tempFolderPath, "extract");
@@ -35,7 +36,7 @@ namespace WixToolsetTest.ManagedHost
                 '"' + bundleFilePath + '"',
                 '"' + extractResult.GetBAFilePath(baFolderPath) + '"',
             };
-            return RunProcessCaptureOutput(TestEngineFile, args);
+            return RunProcessCaptureOutput(x86 ? TestEngineFileX86 : TestEngineFile, args);
         }
 
         private static TestEngineResult RunProcessCaptureOutput(string executablePath, string[] arguments = null, string workingFolder = null)
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
index 16dbec94..a55beac7 100644
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
+++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 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">
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/EarliestCoreBundleFDDx86.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/EarliestCoreBundleFDDx86.wixproj
new file mode 100644
index 00000000..470ee042
--- /dev/null
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/EarliestCoreBundleFDDx86.wixproj
@@ -0,0 +1,6 @@
+<!-- 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>
+    <InstallerPlatform>x86</InstallerPlatform>
+  </PropertyGroup>
+</Project>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs
new file mode 100644
index 00000000..3672fc1d
--- /dev/null
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs
@@ -0,0 +1,15 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+    <Bundle Name="FDDx86EarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="{3D4A29A0-8AAE-4831-A9CF-E34AC298097D}">
+        <BootstrapperApplication>
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.deps.json" Name="Example.EarliestCoreMBA.deps.json" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\mbanative.dll" Name="mbanative.dll" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
+            <bal:WixDotNetCoreBootstrapperApplicationHost />
+        </BootstrapperApplication>
+        <Chain>
+            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe"  bal:PrereqPackage="yes" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs
new file mode 100644
index 00000000..15dd290a
--- /dev/null
+++ b/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs
@@ -0,0 +1,15 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+    <Bundle Name="FDDx86LatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="{E547C546-5E0E-4BF9-A675-BBEF4C77FF0D}">
+        <BootstrapperApplication>
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.deps.json" Name="Example.LatestCoreMBA.deps.json" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\mbanative.dll" Name="mbanative.dll" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
+            <bal:WixDotNetCoreBootstrapperApplicationHost />
+        </BootstrapperApplication>
+        <Chain>
+            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/LatestCoreBundleFDDx86.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/LatestCoreBundleFDDx86.wixproj
new file mode 100644
index 00000000..470ee042
--- /dev/null
+++ b/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/LatestCoreBundleFDDx86.wixproj
@@ -0,0 +1,6 @@
+<!-- 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>
+    <InstallerPlatform>x86</InstallerPlatform>
+  </PropertyGroup>
+</Project>
diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj
index 20d4ecd5..82a5e3c1 100644
--- a/src/ext/Bal/test/examples/examples.proj
+++ b/src/ext/Bal/test/examples/examples.proj
@@ -25,6 +25,7 @@
     </CoreMBAProject>
     <CoreMBAProject Include="$(WPFCoreMBAProjectPath)">
       <PublishPath>$(MBAPublishPath)Example.WPFCoreMBA</PublishPath>
+      <SkipFDDx86>true</SkipFDDx86>
       <SkipSCD>true</SkipSCD>
     </CoreMBAProject>
     
@@ -35,6 +36,8 @@
   </ItemGroup>
 
   <Target Name="PublishCoreExamples">
+    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd-x86" -r win-x86 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
+          Condition="'%(CoreMBAProject.SkipFDDx86)'==''" />
     <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x64 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
           Condition="'%(CoreMBAProject.SkipFDD)'==''" />
     <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\scd" -r win-x64 -c $(Configuration) --self-contained true "%(CoreMBAProject.Identity)"'