Upgrade dnchost's nethost dependency to .NET 6.0.4.

1 files changed, 47 insertions, 0 deletions

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())