From a3aa75eb1921dbb4b932af8a13db67218ecb5d71 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 12 Jan 2021 15:34:24 -0600
Subject: [PATCH] Publish hostfxr static library. (#46787)

---
 .../corehost/cli/fxr/standalone/CMakeLists.txt  | 17 +++++++++++++++++
 .../Microsoft.NETCore.DotNetAppHost.pkgproj     |  5 +++++
 2 files changed, 22 insertions(+)

diff --git a/src/installer/corehost/cli/fxr/standalone/CMakeLists.txt b/src/installer/corehost/cli/fxr/standalone/CMakeLists.txt
index 78f43925f15d2..42785ac91d4b6 100644
--- a/src/installer/corehost/cli/fxr/standalone/CMakeLists.txt
+++ b/src/installer/corehost/cli/fxr/standalone/CMakeLists.txt
@@ -28,6 +28,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 endif(CLR_CMAKE_TARGET_WIN32)
 
 include(../../lib.cmake)
+include(../../lib_static.cmake)
 
 if(CLR_CMAKE_HOST_UNIX)
     add_custom_target(hostfxr_exports DEPENDS ${EXPORTS_FILE})
@@ -37,5 +38,21 @@ if(CLR_CMAKE_HOST_UNIX)
     set_property(TARGET hostfxr APPEND_STRING PROPERTY LINK_DEPENDS ${EXPORTS_FILE})
 endif(CLR_CMAKE_HOST_UNIX)
 
+# Copy static lib PDB to the project output directory
+if (WIN32)
+    set_target_properties(libhostfxr PROPERTIES
+        COMPILE_PDB_NAME "libhostfxr"
+        COMPILE_PDB_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}"
+    )
+endif(WIN32)
+
 install_with_stripped_symbols(hostfxr TARGETS corehost)
+
+# Only Windows creates a symbols file for static libs.
+if (WIN32)
+    install_with_stripped_symbols(libhostfxr TARGETS corehost)
+else()
+    install(TARGETS libhostfxr DESTINATION corehost)
+endif(WIN32)
+
 target_link_libraries(hostfxr libhostcommon)
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj
index 75a51d51cb9e6..73768455ceddc 100644
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj
+++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj
@@ -22,6 +22,11 @@
         binaries that link against the static version. -->
     <NativeBinary Include="$(DotNetHostBinDir)/libnethost.lib" />
     <NativeBinary Include="$(DotNetHostBinDir)/PDB/libnethost.pdb" />
+    <NativeBinary Include="$(DotNetHostBinDir)/libhostfxr.lib" />
+    <NativeBinary Include="$(DotNetHostBinDir)/PDB/libhostfxr.pdb" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetOS)' != 'windows'">
+    <NativeBinary Include="$(DotNetHostBinDir)/$(LibPrefix)hostfxr$(StaticLibSuffix)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">