Skip to content

Fix missing symbols for singlefilehost #73269

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

Merged
elinor-fung merged 3 commits into from
Aug 3, 2022
Merged

Fix missing symbols for singlefilehost #73269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
868b624
Fix missing symbols for singlefilehost
elinor-fung Aug 2, 2022
8df1062
Remove unused SymbolFileExtension property
elinor-fung Aug 2, 2022
be12dda
Fix build when symbols aren't stripped
elinor-fung Aug 3, 2022
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
6 changes: 0 additions & 6 deletions eng/native/naming.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,4 @@
<AdditionalSymbolPackageExcludes Condition="'$(LibSuffix)' != ''" Include="%2A%2A\%2A.a;%2A%2A\%2A$(LibSuffix)" />
</ItemGroup>

<!-- arcade is using long name for this property; 'SymbolFileExtension'.
remove this property group when arcade is updated with short name (SymbolsSuffix). -->
<PropertyGroup>
<SymbolFileExtension>$(SymbolsSuffix)</SymbolFileExtension>
</PropertyGroup>

</Project>
17 changes: 14 additions & 3 deletions src/native/corehost/corehost.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,19 @@
<Target Name="PrepareSingleFileHostWithEmbeddedDacPrereqs">
<PropertyGroup>
<SingleFileHostPath>$(CoreCLRArtifactsPath)/corehost/singlefilehost$(ExeSuffix)</SingleFileHostPath>
<SingleFileHostSymbolsPath>$(CoreCLRArtifactsPath)/corehost/PDB/singlefilehost$(SymbolsSuffix)</SingleFileHostSymbolsPath>
<DacPath>$(CoreCLRArtifactsPath)/mscordaccore$(LibSuffix)</DacPath>
<SingleFileHostDestinationPath>$(DotNetHostBinDir)/singlefilehost$(ExeSuffix)</SingleFileHostDestinationPath>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetOS)' == 'windows'">
<!-- Symbols for Windows are in a PDB subdirectory -->
<SingleFileHostSymbolsPath>$(CoreCLRArtifactsPath)/corehost/PDB/singlefilehost$(SymbolsSuffix)</SingleFileHostSymbolsPath>
<SingleFileHostSymbolsDestinationPath>$(DotNetHostBinDir)/PDB/singlefilehost$(SymbolsSuffix)</SingleFileHostSymbolsDestinationPath>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetOS)' != 'windows'">
<!-- Symbols for non-Windows are next to the binary -->
<SingleFileHostSymbolsPath>$(CoreCLRArtifactsPath)/corehost/singlefilehost$(SymbolsSuffix)</SingleFileHostSymbolsPath>
<SingleFileHostSymbolsDestinationPath>$(DotNetHostBinDir)/singlefilehost$(SymbolsSuffix)</SingleFileHostSymbolsDestinationPath>
</PropertyGroup>
</Target>

<!--
Expand All @@ -37,11 +45,14 @@
Outputs="$(SingleFileHostDestinationPath);$(SingleFileHostSymbolsDestinationPath)"
DependsOnTargets="ResolveProjectReferences"
Condition="'$(RuntimeFlavor)' != 'Mono'">
<Copy SourceFiles="$(SingleFileHostPath);$(SingleFileHostSymbolsPath)" DestinationFiles="$(SingleFileHostDestinationPath);$(SingleFileHostSymbolsPath)" />
<Copy SourceFiles="$(SingleFileHostPath)" DestinationFiles="$(SingleFileHostDestinationPath)" />
<Exec Condition="'$(TargetOS)' == 'windows'"
Command="&quot;$(DotNetTool)&quot; exec @(InjectResourceTool) --bin &quot;$(DacPath)&quot; --image &quot;$(SingleFileHostDestinationPath)&quot; --name MINIDUMP_EMBEDDED_AUXILIARY_PROVIDER" />

<!-- Copy symbols if they exist. We may not have separate symbols if they were not stripped from the native binary itself. -->
<Copy SourceFiles="$(SingleFileHostSymbolsPath)" DestinationFiles="$(SingleFileHostSymbolsDestinationPath)" Condition="Exists('$(SingleFileHostSymbolsPath)')" />
</Target>

<Target Name="PrepareSingleFileHostWithEmbeddedDac"
DependsOnTargets="PrepareSingleFileHostWithEmbeddedDacPrereqs;PrepareSingleFileHostWithEmbeddedDacCore"
AfterTargets="Build"/>
Expand Down