From bcd8ce1162f7a0a94ba689bf4da75b7b3b92d6e8 Mon Sep 17 00:00:00 2001
From: Steve Pfister <stpfiste@microsoft.com>
Date: Tue, 11 Jun 2024 15:45:29 -0400
Subject: [PATCH 1/3] [osx][linux] Make sure host symbols are copied to
 testhost & in-tree runtime pack

Fixes the glitch for linux and mac in case you want to debug the host
---
 src/libraries/externals.csproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj
index 6aa753ec79b239..68fa01bcb1fe95 100644
--- a/src/libraries/externals.csproj
+++ b/src/libraries/externals.csproj
@@ -27,6 +27,7 @@
   <ItemGroup>
     <HostFxrFile Include="$(DotNetHostBinDir)$(LibPrefix)hostfxr$(LibSuffix)" />
     <HostPolicyFile Include="$(DotNetHostBinDir)$(LibPrefix)hostpolicy$(LibSuffix)" />
+    <_HostSymbols Condition="'$(TargetOS)' != 'windows'" Include="$(DotNetHostBinDir)$(LibPrefix)*$(LibSuffix)$(SymbolsSuffix)" />
     <DotnetExe Include="$(DotNetHostBinDir)dotnet$(ExeSuffix)" />
   </ItemGroup>
 
@@ -82,6 +83,7 @@
     <ItemGroup>
       <RuntimeFiles Include="@(HostFxrFile)" Condition="Exists('@(HostFxrFile)')" />
       <RuntimeFiles Include="@(HostPolicyFile)" Condition="Exists('@(HostPolicyFile)')" />
+      <RuntimeFiles Include="@(_HostSymbols)" IsNative="true" />
       <!-- CoreRun is not used for testing anymore, but we still use it for benchmarking and profiling -->
       <RuntimeFiles Include="$(CoreCLRArtifactsPath)\corerun*" />
       <RuntimeFiles Include="$(CoreCLRArtifactsPath)\PDB\corerun*" />
@@ -117,9 +119,9 @@
           AfterTargets="AfterResolveReferences"
           Condition="'$(RuntimeFlavor)' == 'Mono'">
     <ItemGroup>
-      <!-- copy the host files to make the desktop samples work -->
       <RuntimeFiles Include="@(HostFxrFile)" Condition="Exists('@(HostFxrFile)') and '$(TargetsMobile)' != 'true'"/>
       <RuntimeFiles Include="@(HostPolicyFile)" Condition="Exists('@(HostPolicyFile)') and '$(TargetsMobile)' != 'true'" />
+      <RuntimeFiles Include="@(_HostSymbols)" IsNative="true" Condition="'$(TargetsMobile)' != 'true'" />
       <ReferenceCopyLocalPaths Include="@(RuntimeFiles)" />
       <!-- Setup runtime pack native. -->
       <ReferenceCopyLocalPaths Include="@(MonoCrossFiles)"

From 2c67458cceeea819d6de4df5ea5fde77ec221446 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steveisok@users.noreply.github.com>
Date: Tue, 11 Jun 2024 18:50:47 -0400
Subject: [PATCH 2/3] Update src/libraries/externals.csproj

Co-authored-by: Elinor Fung <elfung@microsoft.com>
---
 src/libraries/externals.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj
index 68fa01bcb1fe95..509cb0c9477782 100644
--- a/src/libraries/externals.csproj
+++ b/src/libraries/externals.csproj
@@ -27,7 +27,8 @@
   <ItemGroup>
     <HostFxrFile Include="$(DotNetHostBinDir)$(LibPrefix)hostfxr$(LibSuffix)" />
     <HostPolicyFile Include="$(DotNetHostBinDir)$(LibPrefix)hostpolicy$(LibSuffix)" />
-    <_HostSymbols Condition="'$(TargetOS)' != 'windows'" Include="$(DotNetHostBinDir)$(LibPrefix)*$(LibSuffix)$(SymbolsSuffix)" />
+    <_HostSymbols Include="$(DotNetHostBinDir)$(LibPrefix)hostfxr$(LibSuffix)$(SymbolsSuffix)" />
+    <_HostSymbols Include="$(DotNetHostBinDir)$(LibPrefix)hostpolicy$(LibSuffix)$(SymbolsSuffix)" />
     <DotnetExe Include="$(DotNetHostBinDir)dotnet$(ExeSuffix)" />
   </ItemGroup>
 

From c0b4e9c54586f0974a17588b064542db0cac5b14 Mon Sep 17 00:00:00 2001
From: Steve Pfister <stpfiste@microsoft.com>
Date: Thu, 13 Jun 2024 15:51:34 -0400
Subject: [PATCH 3/3] Make sure the symbol files exist before adding them to
 <RuntimeFiles>

---
 src/libraries/externals.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj
index 509cb0c9477782..5aec1c8d2a6923 100644
--- a/src/libraries/externals.csproj
+++ b/src/libraries/externals.csproj
@@ -84,7 +84,7 @@
     <ItemGroup>
       <RuntimeFiles Include="@(HostFxrFile)" Condition="Exists('@(HostFxrFile)')" />
       <RuntimeFiles Include="@(HostPolicyFile)" Condition="Exists('@(HostPolicyFile)')" />
-      <RuntimeFiles Include="@(_HostSymbols)" IsNative="true" />
+      <RuntimeFiles Include="@(_HostSymbols)" Condition="Exists('@(_HostSymbols)')" IsNative="true" />
       <!-- CoreRun is not used for testing anymore, but we still use it for benchmarking and profiling -->
       <RuntimeFiles Include="$(CoreCLRArtifactsPath)\corerun*" />
       <RuntimeFiles Include="$(CoreCLRArtifactsPath)\PDB\corerun*" />