Replace Dnc.Host with Dnc.HostGenerator to support linker trimming.

16 files changed, 320 insertions, 138 deletions

diff --git a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/CSharpSourceGeneratorVerifier.cs b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/CSharpSourceGeneratorVerifier.cs
new file mode 100644
index 00000000..27729ac8
--- /dev/null
+++ b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/CSharpSourceGeneratorVerifier.cs
@@ -0,0 +1,45 @@
+// 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.
+
+namespace WixToolsetTest.Dnc.HostGenerator
+{
+    using System;
+    using System.Collections.Immutable;
+    using Microsoft.CodeAnalysis;
+    using Microsoft.CodeAnalysis.CSharp;
+    using Microsoft.CodeAnalysis.CSharp.Testing;
+    using Microsoft.CodeAnalysis.Testing.Verifiers;
+
+    public static class CSharpSourceGeneratorVerifier<TSourceGenerator>
+        where TSourceGenerator : ISourceGenerator, new()
+    {
+        public class Test : CSharpSourceGeneratorTest<TSourceGenerator, XUnitVerifier>
+        {
+            public Test()
+            {
+            }
+
+            protected override CompilationOptions CreateCompilationOptions()
+            {
+                var compilationOptions = base.CreateCompilationOptions();
+                return compilationOptions.WithSpecificDiagnosticOptions(
+                     compilationOptions.SpecificDiagnosticOptions.SetItems(GetNullableWarningsFromCompiler()));
+            }
+
+            public LanguageVersion LanguageVersion { get; set; } = LanguageVersion.Default;
+
+            private static ImmutableDictionary<string, ReportDiagnostic> GetNullableWarningsFromCompiler()
+            {
+                string[] args = { "/warnaserror:nullable" };
+                var commandLineArguments = CSharpCommandLineParser.Default.Parse(args, baseDirectory: Environment.CurrentDirectory, sdkDirectory: Environment.CurrentDirectory);
+                var nullableWarnings = commandLineArguments.CompilationOptions.SpecificDiagnosticOptions;
+
+                return nullableWarnings;
+            }
+
+            protected override ParseOptions CreateParseOptions()
+            {
+                return ((CSharpParseOptions)base.CreateParseOptions()).WithLanguageVersion(this.LanguageVersion);
+            }
+        }
+    }
+}
diff --git a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/DncHostGeneratorTests.cs b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/DncHostGeneratorTests.cs
new file mode 100644
index 00000000..6ede1089
--- /dev/null
+++ b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/DncHostGeneratorTests.cs
@@ -0,0 +1,88 @@
+// 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.
+
+namespace WixToolsetTest.Dnc.HostGenerator
+{
+    using System;
+    using System.Text;
+    using System.Threading.Tasks;
+    using Microsoft.CodeAnalysis;
+    using Microsoft.CodeAnalysis.Testing;
+    using Microsoft.CodeAnalysis.Text;
+    using WixToolset.Dnc.HostGenerator;
+    using WixToolset.Mba.Core;
+    using Xunit;
+
+    using VerifyCS = CSharpSourceGeneratorVerifier<WixToolset.Dnc.HostGenerator.DncHostGenerator>;
+
+    public class DncHostGeneratorTests
+    {
+        static readonly MetadataReference MbaCoreAssembly = MetadataReference.CreateFromFile(typeof(BootstrapperApplicationFactoryAttribute).Assembly.Location);
+
+        [Fact]
+        public async Task FailsBuildWhenMissingAttribute()
+        {
+            var code = @"
+//[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Test.BAFactory))]
+namespace Test
+{
+    using WixToolset.Mba.Core;
+
+    public class BAFactory : BaseBootstrapperApplicationFactory
+    {
+        protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand)
+        {
+            return null;
+        }
+    }
+}
+";
+
+            await new VerifyCS.Test
+            {
+                TestState = 
+                {
+                    Sources = { code },
+                    AdditionalReferences = { MbaCoreAssembly },
+                    ExpectedDiagnostics =
+                    {
+                        new DiagnosticResult(DncHostGenerator.MissingFactoryAttributeDescriptor),
+                    },
+                },
+            }.RunAsync();
+        }
+
+        [Fact]
+        public async Task GeneratesEntryPoint()
+        {
+            var code = @"
+[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Test.BAFactory))]
+namespace Test
+{
+    using WixToolset.Mba.Core;
+
+    public class BAFactory : BaseBootstrapperApplicationFactory
+    {
+        protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand)
+        {
+            return null;
+        }
+    }
+}
+";
+            var generated = String.Format(DncHostGenerator.Template, DncHostGenerator.Version, "Test.BAFactory");
+
+            await new VerifyCS.Test
+            {
+                TestState =
+                {
+                    Sources = { code },
+                    GeneratedSources =
+                    {
+                        (typeof(DncHostGenerator), "WixToolset.Dnc.Host.g.cs", SourceText.From(generated, Encoding.UTF8, SourceHashAlgorithm.Sha256)),
+                    },
+                    AdditionalReferences = { MbaCoreAssembly },
+                },
+            }.RunAsync();
+        }
+    }
+}
diff --git a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj
new file mode 100644
index 00000000..0c2b33fd
--- /dev/null
+++ b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj
@@ -0,0 +1,27 @@
+<?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">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <SignOutput>false</SignOutput>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\WixToolset.Dnc.HostGenerator\WixToolset.Dnc.HostGenerator.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixBuildTools.TestSupport" />
+    <PackageReference Include="WixToolset.Mba.Core" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
+  </ItemGroup>
+</Project>
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
index 8dd5ff11..14b80fe8 100644
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
+++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
@@ -2,9 +2,7 @@
 
 namespace WixToolsetTest.ManagedHost
 {
-    using System.IO;
     using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
     using Xunit;
 
     public class DncHostFixture
@@ -21,11 +19,13 @@ namespace WixToolsetTest.ManagedHost
                 var testEngine = new TestEngine();
 
                 var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                var logMessages = result.Output;
-                Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
-                Assert.Equal("EarliestCoreBA", logMessages[2]);
-                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading .NET Core FDD bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "EarliestCoreBA",
+                    "Shutdown,ReloadBootstrapper,0",
+                }, result.Output.ToArray());
             }
         }
 
@@ -39,14 +39,17 @@ namespace WixToolsetTest.ManagedHost
                 var testEngine = new TestEngine();
 
                 var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                var logMessages = result.Output;
-                Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
-                Assert.Equal("EarliestCoreBA", logMessages[2]);
-                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading .NET Core SCD bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "EarliestCoreBA",
+                    "Shutdown,ReloadBootstrapper,0",
+                }, result.Output.ToArray());
             }
         }
 
+        [Fact]
         public void CanLoadTrimmedSCDEarliestCoreMBA()
         {
             using (var fs = new DisposableFileSystem())
@@ -56,11 +59,13 @@ namespace WixToolsetTest.ManagedHost
                 var testEngine = new TestEngine();
 
                 var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                var logMessages = result.Output;
-                Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
-                Assert.Equal("EarliestCoreBA", logMessages[2]);
-                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading .NET Core SCD bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "EarliestCoreBA",
+                    "Shutdown,ReloadBootstrapper,0",
+                }, result.Output.ToArray());
             }
         }
 
@@ -74,16 +79,19 @@ namespace WixToolsetTest.ManagedHost
                 var testEngine = new TestEngine();
 
                 var result = testEngine.RunReloadEngine(bundleFile, baseFolder);
-                var logMessages = result.Output;
-                Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
-                Assert.Equal("EarliestCoreBA", logMessages[2]);
-                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
-                Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[4]);
-                Assert.Equal("Reloaded 1 time(s)", logMessages[5]); // dnchost doesn't currently support unloading
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[6]);
-                Assert.Equal("EarliestCoreBA", logMessages[7]);
-                Assert.Equal("Shutdown,Restart,0", logMessages[8]);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading .NET Core SCD bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "EarliestCoreBA",
+                    "Shutdown,ReloadBootstrapper,0",
+                    "Loading .NET Core SCD bootstrapper application.",
+                    "Reloaded 1 time(s)", // dnchost doesn't currently support unloading
+                    "Creating BA thread to run asynchronously.",
+                    "EarliestCoreBA",
+                    "Shutdown,Restart,0",
+
+                }, result.Output.ToArray());
             }
         }
 
@@ -97,11 +105,13 @@ namespace WixToolsetTest.ManagedHost
                 var testEngine = new TestEngine();
 
                 var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                var logMessages = result.Output;
-                Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
-                Assert.Equal("LatestCoreBA", logMessages[2]);
-                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading .NET Core FDD bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "LatestCoreBA",
+                    "Shutdown,ReloadBootstrapper,0",
+                }, result.Output.ToArray());
             }
         }
 
@@ -115,16 +125,18 @@ namespace WixToolsetTest.ManagedHost
                 var testEngine = new TestEngine();
 
                 var result = testEngine.RunReloadEngine(bundleFile, baseFolder);
-                var logMessages = result.Output;
-                Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
-                Assert.Equal("LatestCoreBA", logMessages[2]);
-                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
-                Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[4]);
-                Assert.Equal("Reloaded 1 time(s)", logMessages[5]); // dnchost doesn't currently support unloading
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[6]);
-                Assert.Equal("LatestCoreBA", logMessages[7]);
-                Assert.Equal("Shutdown,Restart,0", logMessages[8]);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading .NET Core FDD bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "LatestCoreBA",
+                    "Shutdown,ReloadBootstrapper,0",
+                    "Loading .NET Core FDD bootstrapper application.",
+                    "Reloaded 1 time(s)", // dnchost doesn't currently support unloading
+                    "Creating BA thread to run asynchronously.",
+                    "LatestCoreBA",
+                    "Shutdown,Restart,0",
+                }, result.Output.ToArray());
             }
         }
 
@@ -138,11 +150,14 @@ namespace WixToolsetTest.ManagedHost
                 var testEngine = new TestEngine();
 
                 var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading .NET Core SCD bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "LatestCoreBA",
+                    "Shutdown,ReloadBootstrapper,0",
+                }, result.Output.ToArray());
                 var logMessages = result.Output;
-                Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
-                Assert.Equal("LatestCoreBA", logMessages[2]);
-                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
             }
         }
 
@@ -156,11 +171,13 @@ namespace WixToolsetTest.ManagedHost
                 var testEngine = new TestEngine();
 
                 var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                var logMessages = result.Output;
-                Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
-                Assert.Equal("LatestCoreBA", logMessages[2]);
-                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading .NET Core SCD bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "LatestCoreBA",
+                    "Shutdown,ReloadBootstrapper,0",
+                }, result.Output.ToArray());
             }
         }
 
@@ -174,16 +191,18 @@ namespace WixToolsetTest.ManagedHost
                 var testEngine = new TestEngine();
 
                 var result = testEngine.RunReloadEngine(bundleFile, baseFolder);
-                var logMessages = result.Output;
-                Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
-                Assert.Equal("LatestCoreBA", logMessages[2]);
-                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
-                Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[4]);
-                Assert.Equal("Reloaded 1 time(s)", logMessages[5]); // dnchost doesn't currently support unloading
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[6]);
-                Assert.Equal("LatestCoreBA", logMessages[7]);
-                Assert.Equal("Shutdown,Restart,0", logMessages[8]);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading .NET Core SCD bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "LatestCoreBA",
+                    "Shutdown,ReloadBootstrapper,0",
+                    "Loading .NET Core SCD bootstrapper application.",
+                    "Reloaded 1 time(s)", // dnchost doesn't currently support unloading
+                    "Creating BA thread to run asynchronously.",
+                    "LatestCoreBA",
+                    "Shutdown,Restart,0",
+                }, result.Output.ToArray());
             }
         }
 
@@ -197,11 +216,13 @@ namespace WixToolsetTest.ManagedHost
                 var testEngine = new TestEngine();
 
                 var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                var logMessages = result.Output;
-                Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
-                Assert.Equal("WPFCoreBA", logMessages[2]);
-                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading .NET Core FDD bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "WPFCoreBA",
+                    "Shutdown,ReloadBootstrapper,0",
+                }, result.Output.ToArray());
             }
         }
     }
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
index dd37ee58..b4ebe1c6 100644
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
+++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
@@ -2,9 +2,7 @@
 
 namespace WixToolsetTest.ManagedHost
 {
-    using System.IO;
     using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
     using Xunit;
 
     public class MbaHostFixture
@@ -21,11 +19,13 @@ namespace WixToolsetTest.ManagedHost
                 var testEngine = new TestEngine();
 
                 var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                var logMessages = result.Output;
-                Assert.Equal("Loading managed bootstrapper application.", logMessages[0]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
-                Assert.Equal("FullFramework2BA", logMessages[2]);
-                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading managed bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "FullFramework2BA",
+                    "Shutdown,ReloadBootstrapper,0",
+                }, result.Output.ToArray());
             }
         }
 
@@ -39,11 +39,13 @@ namespace WixToolsetTest.ManagedHost
                 var testEngine = new TestEngine();
 
                 var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                var logMessages = result.Output;
-                Assert.Equal("Loading managed bootstrapper application.", logMessages[0]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
-                Assert.Equal("FullFramework4BA", logMessages[2]);
-                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading managed bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "FullFramework4BA",
+                    "Shutdown,ReloadBootstrapper,0",
+                }, result.Output.ToArray());
             }
         }
 
@@ -57,15 +59,17 @@ namespace WixToolsetTest.ManagedHost
                 var testEngine = new TestEngine();
 
                 var result = testEngine.RunReloadEngine(bundleFile, baseFolder);
-                var logMessages = result.Output;
-                Assert.Equal("Loading managed bootstrapper application.", logMessages[0]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
-                Assert.Equal("FullFramework2BA", logMessages[2]);
-                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
-                Assert.Equal("Loading managed bootstrapper application.", logMessages[4]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[5]);
-                Assert.Equal("FullFramework2BA", logMessages[6]);
-                Assert.Equal("Shutdown,Restart,0", logMessages[7]);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading managed bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "FullFramework2BA",
+                    "Shutdown,ReloadBootstrapper,0",
+                    "Loading managed bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "FullFramework2BA",
+                    "Shutdown,Restart,0",
+                }, result.Output.ToArray());
             }
         }
 
@@ -79,15 +83,17 @@ namespace WixToolsetTest.ManagedHost
                 var testEngine = new TestEngine();
 
                 var result = testEngine.RunReloadEngine(bundleFile, baseFolder);
-                var logMessages = result.Output;
-                Assert.Equal("Loading managed bootstrapper application.", logMessages[0]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
-                Assert.Equal("FullFramework4BA", logMessages[2]);
-                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
-                Assert.Equal("Loading managed bootstrapper application.", logMessages[4]);
-                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[5]);
-                Assert.Equal("FullFramework4BA", logMessages[6]);
-                Assert.Equal("Shutdown,Restart,0", logMessages[7]);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "Loading managed bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "FullFramework4BA",
+                    "Shutdown,ReloadBootstrapper,0",
+                    "Loading managed bootstrapper application.",
+                    "Creating BA thread to run asynchronously.",
+                    "FullFramework4BA",
+                    "Shutdown,Restart,0",
+                }, result.Output.ToArray());
             }
         }
     }
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs
index 9d7fc9db..30d97f3e 100644
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs
+++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs
@@ -2,6 +2,7 @@
 
 namespace WixToolsetTest.ManagedHost
 {
+    using System;
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.IO;
@@ -41,7 +42,7 @@ namespace WixToolsetTest.ManagedHost
         {
             var startInfo = new ProcessStartInfo(executablePath)
             {
-                Arguments = string.Join(' ', arguments),
+                Arguments = String.Join(' ', arguments),
                 CreateNoWindow = true,
                 RedirectStandardError = true,
                 RedirectStandardOutput = true,
diff --git a/src/ext/Bal/test/examples/Directory.Build.props b/src/ext/Bal/test/examples/Directory.Build.props
index 52b931f6..7f38564a 100644
--- a/src/ext/Bal/test/examples/Directory.Build.props
+++ b/src/ext/Bal/test/examples/Directory.Build.props
@@ -2,5 +2,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>
   <Import Project="$(MsbuildThisFileDirectory)..\..\Directory.Build.props" />
-  <Import Project="Wix.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " />
+  <Import Project="Directory.csproj.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' " />
+  <Import Project="Directory.wixproj.props" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " />
 </Project>
diff --git a/src/ext/Bal/test/examples/Directory.Build.targets b/src/ext/Bal/test/examples/Directory.Build.targets
index 35946585..b27a1a41 100644
--- a/src/ext/Bal/test/examples/Directory.Build.targets
+++ b/src/ext/Bal/test/examples/Directory.Build.targets
@@ -2,5 +2,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>
   <Import Project="$(MsbuildThisFileDirectory)..\..\..\..\Directory.Build.targets" />
-  <Import Project="Wix.Build.targets" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " />
+  <Import Project="Directory.wixproj.targets" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " />
+  <Import Project="DncBA.targets" Condition=" '$(IsDncBA)'=='true' " />
 </Project>
diff --git a/src/ext/Bal/test/examples/Directory.csproj.props b/src/ext/Bal/test/examples/Directory.csproj.props
new file mode 100644
index 00000000..e314ca20
--- /dev/null
+++ b/src/ext/Bal/test/examples/Directory.csproj.props
@@ -0,0 +1,5 @@
+<?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>
+  <Import Project="$(MsbuildThisFileDirectory)..\..\WixToolset.Dnc.HostGenerator\build\WixToolset.Dnc.HostGenerator.props" />
+</Project>
diff --git a/src/ext/Bal/test/examples/Wix.Build.props b/src/ext/Bal/test/examples/Directory.wixproj.props
index 78ad462f..78ad462f 100644
--- a/src/ext/Bal/test/examples/Wix.Build.props
+++ b/src/ext/Bal/test/examples/Directory.wixproj.props
diff --git a/src/ext/Bal/test/examples/Wix.Build.targets b/src/ext/Bal/test/examples/Directory.wixproj.targets
index 7e6fe9f2..7e6fe9f2 100644
--- a/src/ext/Bal/test/examples/Wix.Build.targets
+++ b/src/ext/Bal/test/examples/Directory.wixproj.targets
diff --git a/src/ext/Bal/test/examples/DncBA.targets b/src/ext/Bal/test/examples/DncBA.targets
new file mode 100644
index 00000000..2b8c1428
--- /dev/null
+++ b/src/ext/Bal/test/examples/DncBA.targets
@@ -0,0 +1,19 @@
+<?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>
+  <Import Project="$(MsbuildThisFileDirectory)..\..\WixToolset.Dnc.HostGenerator\build\WixToolset.Dnc.HostGenerator.targets" />
+
+  <PropertyGroup>
+    <ILLinkTreatWarningsAsErrors>false</ILLinkTreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(MsbuildThisFileDirectory)..\..\WixToolset.Dnc.HostGenerator\WixToolset.Dnc.HostGenerator.csproj"
+                      OutputItemType="Analyzer"
+                      ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Mba.Core" />
+  </ItemGroup>
+</Project>
diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
index 8069df45..9b9f2bf6 100644
--- a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
+++ b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
@@ -3,15 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
-    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <IsDncBA>true</IsDncBA>
     <Description>Earliest .NET Core MBA</Description>
   </PropertyGroup>
-
-  <ItemGroup>
-    <TrimmerRootAssembly Include="System.Runtime.Loader" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
index aad56a3e..a884fa07 100644
--- a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
+++ b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
@@ -3,18 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
-    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <IsDncBA>true</IsDncBA>
     <Description>Latest .NET Core MBA</Description>
   </PropertyGroup>
-
-  <ItemGroup>
-    <TrimmerRootAssembly Include="System.Diagnostics.Tools" />
-    <TrimmerRootAssembly Include="System.Runtime" />
-    <TrimmerRootAssembly Include="System.Runtime.InteropServices" />
-    <TrimmerRootAssembly Include="System.Runtime.Loader" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
index 3d63e7b9..3186148b 100644
--- a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
+++ b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
@@ -3,22 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net5.0-windows</TargetFramework>
     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
-    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <IsDncBA>true</IsDncBA>
     <Description>WPF .NET Core MBA</Description>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
-  </ItemGroup>
-
-  <Target Name="GitVersion">
-    <PropertyGroup>
-      <GitBaseVersionMajor>42</GitBaseVersionMajor>
-      <GitBaseVersionMinor>42</GitBaseVersionMinor>
-      <GitBaseVersionPatch>42</GitBaseVersionPatch>
-      <GitCommits>42</GitCommits>
-      <GitSha>abc123def456</GitSha>
-    </PropertyGroup>
-  </Target>
 </Project>
diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj
index 5722cfcb..a16af2a4 100644
--- a/src/ext/Bal/test/examples/examples.proj
+++ b/src/ext/Bal/test/examples/examples.proj
@@ -17,14 +17,15 @@
   <ItemGroup>
     <CoreMBAProject Include="$(EarliestCoreMBAProjectPath)">
       <PublishPath>$(MBAPublishPath)Example.EarliestCoreMBA</PublishPath>
+      <TrimMode>CopyUsed</TrimMode>
     </CoreMBAProject>
     <CoreMBAProject Include="$(LatestCoreMBAProjectPath)">
       <PublishPath>$(MBAPublishPath)Example.LatestCoreMBA</PublishPath>
+      <TrimMode>Link</TrimMode>
     </CoreMBAProject>
     <CoreMBAProject Include="$(WPFCoreMBAProjectPath)">
       <PublishPath>$(MBAPublishPath)Example.WPFCoreMBA</PublishPath>
       <SkipSCD>true</SkipSCD>
-      <SkipTrimmedSCD>true</SkipTrimmedSCD>
     </CoreMBAProject>
     
     <FullMBAProject Include="$(FullFramework2MBAProjectPath)" />
@@ -38,8 +39,8 @@
           Condition="'%(CoreMBAProject.SkipFDD)'==''" />
     <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\scd" -r win-x86 -c $(Configuration) --self-contained true "%(CoreMBAProject.Identity)"'
           Condition="'%(CoreMBAProject.SkipSCD)'==''" />
-    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\trimmedscd" -r win-x86 -c $(Configuration) --self-contained true -p:PublishTrimmed=true "%(CoreMBAProject.Identity)"'
-          Condition="'%(CoreMBAProject.SkipTrimmedSCD)'==''" />
+    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\trimmedscd" -r win-x86 -c $(Configuration) --self-contained true -p:PublishTrimmed=true -p:TrimMode=%(CoreMBAProject.TrimMode) "%(CoreMBAProject.Identity)"'
+          Condition="'%(CoreMBAProject.TrimMode)'!=''" />
   </Target>
 
   <Target Name="Build" DependsOnTargets="PublishCoreExamples">