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

6 files changed, 35 insertions, 27 deletions

diff --git a/src/ext/Bal/dnchost/dnchost.cpp b/src/ext/Bal/dnchost/dnchost.cpp
index 8ca326fc..dcc9fa56 100644
--- a/src/ext/Bal/dnchost/dnchost.cpp
+++ b/src/ext/Bal/dnchost/dnchost.cpp
@@ -154,9 +154,6 @@ static HRESULT LoadModulePaths(
     hr = PathGetDirectory(pState->sczModuleFullPath, &pState->sczAppBase);
     BalExitOnFailure(hr, "Failed to get the directory of the full process path.");
 
-    hr = PathConcat(pState->sczAppBase, DNC_ASSEMBLY_FILE_NAME, &pState->sczManagedHostPath);
-    BalExitOnFailure(hr, "Failed to create managed host path.");
-
 LExit:
     return hr;
 }
@@ -249,7 +246,7 @@ static HRESULT LoadRuntime(
     hr = DnchostLoadRuntime(
         &pState->hostfxrState,
         pState->sczModuleFullPath,
-        pState->sczManagedHostPath,
+        pState->sczBaFactoryAssemblyPath,
         pState->sczBaFactoryDepsJsonPath,
         pState->sczBaFactoryRuntimeConfigPath);
 
diff --git a/src/ext/Bal/dnchost/dnchost.h b/src/ext/Bal/dnchost/dnchost.h
index 22fd8f5e..b0ba9638 100644
--- a/src/ext/Bal/dnchost/dnchost.h
+++ b/src/ext/Bal/dnchost/dnchost.h
@@ -23,7 +23,6 @@ struct DNCSTATE
     HINSTANCE hInstance;
     LPWSTR sczModuleFullPath;
     LPWSTR sczAppBase;
-    LPWSTR sczManagedHostPath;
     LPWSTR sczBaFactoryAssemblyName;
     LPWSTR sczBaFactoryAssemblyPath;
     LPWSTR sczBaFactoryDepsJsonPath;
diff --git a/src/ext/Bal/dnchost/dnchost.vcxproj b/src/ext/Bal/dnchost/dnchost.vcxproj
index 66e52c6f..1fd2ebed 100644
--- a/src/ext/Bal/dnchost/dnchost.vcxproj
+++ b/src/ext/Bal/dnchost/dnchost.vcxproj
@@ -81,14 +81,6 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj">
-      <Project>{0D780900-C2FF-4FA2-8CB5-8A19768724C5}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
-    </ProjectReference>
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="WixToolset.BalUtil" />
 
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
diff --git a/src/ext/Bal/dnchost/dncutil.cpp b/src/ext/Bal/dnchost/dncutil.cpp
index 34d14911..6486e6e9 100644
--- a/src/ext/Bal/dnchost/dncutil.cpp
+++ b/src/ext/Bal/dnchost/dncutil.cpp
@@ -2,6 +2,12 @@
 
 #include "precomp.h"
 
+#define DNC_ENTRY_TYPE "WixToolset.Dnc.Host.BootstrapperApplicationFactory"
+#define DNC_ENTRY_TYPEW L"WixToolset.Dnc.Host.BootstrapperApplicationFactory"
+#define DNC_STATIC_ENTRY_METHOD "CreateBAFactory"
+#define DNC_STATIC_ENTRY_METHODW L"CreateBAFactory"
+#define DNC_STATIC_ENTRY_DELEGATEW L"WixToolset.Dnc.Host.StaticEntryDelegate"
+
 // https://github.com/dotnet/runtime/blob/master/src/installer/corehost/error_codes.h
 #define InvalidArgFailure 0x80008081
 #define HostApiBufferTooSmall 0x80008098
@@ -74,19 +80,28 @@ LExit:
 HRESULT DnchostCreateFactory(
     __in HOSTFXR_STATE* pState,
     __in LPCWSTR wzBaFactoryAssemblyName,
-    __in LPCWSTR wzBaFactoryAssemblyPath,
+    __in LPCWSTR /*wzBaFactoryAssemblyPath*/,
     __out IBootstrapperApplicationFactory** ppAppFactory
     )
 {
     HRESULT hr = S_OK;
     PFNCREATEBAFACTORY pfnCreateBAFactory = NULL;
+    LPWSTR sczEntryType = NULL;
+    LPWSTR sczEntryDelegate = NULL;
+    LPSTR sczBaFactoryAssemblyName = NULL;
 
     if (pState->pfnGetFunctionPointer)
     {
+        hr = StrAllocFormatted(&sczEntryType, L"%ls,%ls", DNC_ENTRY_TYPEW, wzBaFactoryAssemblyName);
+        BalExitOnFailure(hr, "Failed to format entry type.");
+
+        hr = StrAllocFormatted(&sczEntryDelegate, L"%ls,%ls", DNC_STATIC_ENTRY_DELEGATEW, wzBaFactoryAssemblyName);
+        BalExitOnFailure(hr, "Failed to format entry delegate.");
+
         hr = pState->pfnGetFunctionPointer(
-            DNC_ENTRY_TYPEW,
+            sczEntryType,
             DNC_STATIC_ENTRY_METHODW,
-            DNC_STATIC_ENTRY_DELEGATEW,
+            sczEntryDelegate,
             NULL,
             NULL,
             reinterpret_cast<void**>(&pfnCreateBAFactory));
@@ -94,19 +109,26 @@ HRESULT DnchostCreateFactory(
     }
     else
     {
+        hr = StrAnsiAllocString(&sczBaFactoryAssemblyName, wzBaFactoryAssemblyName, 0, CP_UTF8);
+        BalExitOnFailure(hr, "Failed to convert assembly name to UTF8: %ls", wzBaFactoryAssemblyName);
+
         hr = pState->pfnCoreclrCreateDelegate(
             pState->pClrHandle,
             pState->dwDomainId,
-            DNC_ASSEMBLY_FULL_NAME,
+            sczBaFactoryAssemblyName,
             DNC_ENTRY_TYPE,
             DNC_STATIC_ENTRY_METHOD,
             reinterpret_cast<void**>(&pfnCreateBAFactory));
         BalExitOnFailure(hr, "Failed to create delegate in app domain.");
     }
 
-    *ppAppFactory = pfnCreateBAFactory(wzBaFactoryAssemblyName, wzBaFactoryAssemblyPath);
+    *ppAppFactory = pfnCreateBAFactory();
 
 LExit:
+    ReleaseStr(sczEntryType);
+    ReleaseStr(sczEntryDelegate);
+    ReleaseStr(sczBaFactoryAssemblyName);
+
     return hr;
 }
 
@@ -233,7 +255,7 @@ static HRESULT InitializeCoreClr(
     }
     else
     {
-        ExitOnFailure(hr, "HostfxrGetRuntimeDelegate failed");
+        BalExitOnFailure(hr, "HostfxrGetRuntimeDelegate failed");
     }
 
 LExit:
@@ -295,6 +317,8 @@ static HRESULT InitializeCoreClrPre5(
 
     for (DWORD i = 0; i < cDirectories; ++i)
     {
+        Assert(rgDirectories);
+
         hr = PathConcat(rgDirectories[i], L"coreclr.dll", &sczCoreClrPath);
         BalExitOnFailure(hr, "Failed to allocate path to coreclr.");
 
@@ -324,9 +348,9 @@ static HRESULT InitializeCoreClrPre5(
     BalExitOnFailure(hr, "Failed to start coreclr.");
 
 LExit:
-    MemFree(rgDirectories);
-    MemFree(rgPropertyValues);
-    MemFree(rgPropertyKeys);
+    ReleaseMem(rgDirectories);
+    ReleaseMem(rgPropertyValues);
+    ReleaseMem(rgPropertyKeys);
     ReleaseStr(sczCoreClrPath);
 
     return hr;
diff --git a/src/ext/Bal/dnchost/dncutil.h b/src/ext/Bal/dnchost/dncutil.h
index 85eda3b2..f88e3f77 100644
--- a/src/ext/Bal/dnchost/dncutil.h
+++ b/src/ext/Bal/dnchost/dncutil.h
@@ -1,10 +1,7 @@
 #pragma once
 // 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.
 
-typedef IBootstrapperApplicationFactory* (STDMETHODCALLTYPE* PFNCREATEBAFACTORY)(
-    __in LPCWSTR wzBaFactoryAssemblyName,
-    __in LPCWSTR wzBaFactoryAssemblyPath
-    );
+typedef IBootstrapperApplicationFactory* (STDMETHODCALLTYPE* PFNCREATEBAFACTORY)();
 
 struct HOSTFXR_STATE
 {
diff --git a/src/ext/Bal/dnchost/precomp.h b/src/ext/Bal/dnchost/precomp.h
index 84ff6424..7aefc4e3 100644
--- a/src/ext/Bal/dnchost/precomp.h
+++ b/src/ext/Bal/dnchost/precomp.h
@@ -20,7 +20,6 @@
 #include <IBootstrapperApplicationFactory.h>
 #include <balutil.h>
 
-#include <WixToolset.Dnc.Host.h>
 #define NETHOST_USE_AS_STATIC
 #include <nethost.h>
 #include <hostfxr.h>