Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[osx][linux] Make sure host symbols are copied to testhost & in-tree runtime pack #103304

Merged
merged 3 commits into from
Jun 17, 2024
Merged

[osx][linux] Make sure host symbols are copied to testhost & in-tree runtime pack #103304

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcd8ce1
[osx][linux] Make sure host symbols are copied to testhost & in-tree …
steveisok Jun 11, 2024
2c67458
Update src/libraries/externals.csproj
steveisok Jun 11, 2024
c0b4e9c
Make sure the symbol files exist before adding them to <RuntimeFiles>
steveisok Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/libraries/externals.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
<ItemGroup>
<HostFxrFile Include="$(DotNetHostBinDir)$(LibPrefix)hostfxr$(LibSuffix)" />
<HostPolicyFile Include="$(DotNetHostBinDir)$(LibPrefix)hostpolicy$(LibSuffix)" />
<_HostSymbols Include="$(DotNetHostBinDir)$(LibPrefix)hostfxr$(LibSuffix)$(SymbolsSuffix)" />
<_HostSymbols Include="$(DotNetHostBinDir)$(LibPrefix)hostpolicy$(LibSuffix)$(SymbolsSuffix)" />
<DotnetExe Include="$(DotNetHostBinDir)dotnet$(ExeSuffix)" />
</ItemGroup>

Expand Down Expand Up @@ -82,6 +84,7 @@
<ItemGroup>
<RuntimeFiles Include="@(HostFxrFile)" Condition="Exists('@(HostFxrFile)')" />
<RuntimeFiles Include="@(HostPolicyFile)" Condition="Exists('@(HostPolicyFile)')" />
<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*" />
Expand Down Expand Up @@ -117,9 +120,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)"
Expand Down
Loading