Skip to content

Remove MoveSymbolFiles PDB consolidation; read CoreLib PDB from its natural location #135434

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
sbomer merged 4 commits into from
Oct 14, 2026
Merged

Remove MoveSymbolFiles PDB consolidation; read CoreLib PDB from its natural location #135434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5732e8a
Remove MoveSymbolFiles PDB consolidation and read CoreLib PDB from it…
sbomer Oct 7, 2026
32a23e4
Fix NU5118 pack collision for System.Private.CoreLib.pdb on Windows
sbomer Oct 8, 2026
a451f19
Add IL/ to _NT_SYMBOL_PATH so managed CoreLib PDB stays discoverable
sbomer Oct 8, 2026
9f2fd22
Escape semicolon in _NT_SYMBOL_PATH HelixPreCommand
sbomer Oct 8, 2026
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
9 changes: 5 additions & 4 deletions eng/liveBuilds.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
<PropertyGroup Condition="'$(RuntimeFlavor)' == 'CoreCLR'">
<CoreCLRArtifactsPath>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)'))</CoreCLRArtifactsPath>
<CoreCLRArtifactsPdbDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)','PDB'))</CoreCLRArtifactsPdbDir>
<CoreCLRArtifactsILDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)','IL'))</CoreCLRArtifactsILDir>
<!--
Even though CoreCLRSharedFrameworkDir is statically initialized, set it again in case the
value is different after CoreCLRArtifactsPath is normalized.
Expand Down Expand Up @@ -116,16 +117,16 @@
</RuntimeFiles>
<_systemPrivateCoreLib Include="$(CoreCLRArtifactsPath)System.Private.CoreLib.dll"
Condition="Exists('$(CoreCLRArtifactsPath)System.Private.CoreLib.dll')" />
<_systemPrivateCoreLib Include="$(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll"
Condition="Exists('$(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll') and '@(_systemPrivateCoreLib)' == ''" />
<_systemPrivateCoreLib Include="$(CoreCLRArtifactsILDir)System.Private.CoreLib.dll"
Condition="Exists('$(CoreCLRArtifactsILDir)System.Private.CoreLib.dll') and '@(_systemPrivateCoreLib)' == ''" />
<RuntimeFiles Include="@(_systemPrivateCoreLib)" />
<RuntimeFiles
Include="
$(CoreCLRSharedFrameworkPdbDir)*.pdb;
$(CoreCLRSharedFrameworkPdbDir)*.dbg;
$(CoreCLRSharedFrameworkPdbDir)*.dwarf" IsNative="true" />
<RuntimeFiles Condition="Exists('$(CoreCLRArtifactsPdbDir)System.Private.CoreLib.pdb')"
Include="$(CoreCLRArtifactsPdbDir)System.Private.CoreLib.pdb" />
<RuntimeFiles Condition="Exists('$(CoreCLRArtifactsILDir)System.Private.CoreLib.pdb')"
Include="$(CoreCLRArtifactsILDir)System.Private.CoreLib.pdb" />
<RuntimeFiles Condition="Exists('$(CoreCLRArtifactsPdbDir)System.Private.CoreLib.ni.pdb')"
Include="$(CoreCLRArtifactsPdbDir)System.Private.CoreLib.ni.pdb" />

Expand Down
25 changes: 0 additions & 25 deletions src/coreclr/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,6 @@

<Import Project="..\..\Directory.Build.targets" />

<ItemGroup Condition="'$(UsingMicrosoftNoTargetsSdk)' != 'true'">
<_DebugSymbolToMove Include="@(DebugSymbolsProjectOutputGroupOutput->Metadata('FinalOutputPath'))"
FolderName="$([System.IO.Directory]::GetParent('%(Identity)').Name)" />
<_DebugSymbolToMoveToExclude Include="@(_DebugSymbolToMove->WithMetadataValue('FolderName', 'aotsdk'))" />
<_DebugSymbolToMoveToUpdate Include="@(_DebugSymbolToMove)"
Exclude="@(_DebugSymbolToMoveToExclude)" />
<!-- Remove the FolderName metadata for projects that don't reside under an aotsdk folder. -->
<_DebugSymbolToMove Update="@(_DebugSymbolToMoveToUpdate)"
FolderName="" />
<_DebugSymbolToMove Update="@(_DebugSymbolToMove)"
Destination="$(RuntimeBinDir)PDB\%(FolderName)\%(Filename)%(Extension)" />
</ItemGroup>

<!-- Consolidate all PDBs into a single location, except the aotsdk PDBs, as S.P.C will overwrite the coreclr PDBs. -->
<Target Name="MoveSymbolFiles"
AfterTargets="CopyFilesToOutputDirectory"
DependsOnTargets="_CheckForCompileOutputs"
Inputs="@(_DebugSymbolToMove)"
Outputs="@(_DebugSymbolToMove->Metadata('Destination'))"
Condition="'$(_DebugSymbolsProduced)' == 'true'">
<Copy SourceFiles="@(_DebugSymbolToMove)"
DestinationFiles="@(_DebugSymbolToMove->Metadata('Destination'))"
UseHardlinksIfPossible="false" />
</Target>

<!-- Import targets here to have TargetPath and other macros defined. Limit to CoreLib. -->
<Import Condition="'$(MSBuildProjectName)' == 'System.Private.CoreLib' or '$(IsNativeAotProject)' == 'true'" Project="$(RepositoryEngineeringDir)illink.targets" />
<Import Project="$(RepositoryEngineeringDir)liveILLink.targets" />
Expand Down
6 changes: 4 additions & 2 deletions src/tests/Common/helixpublishwitharcade.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,8 +638,10 @@
<ItemGroup Condition=" '$(TestWrapperTargetsWindows)' == 'true' ">
<HelixPreCommand Include="taskkill.exe /f /im corerun.exe 2&gt;nul" />
<HelixPreCommand Include="set CORE_ROOT=%HELIX_CORRELATION_PAYLOAD%" />
<!-- Set _NT_SYMBOL_PATH so VM _ASSERTE() asserts can find the symbol files when doing stack walks -->
<HelixPreCommand Include="set _NT_SYMBOL_PATH=%HELIX_CORRELATION_PAYLOAD%\PDB" />
<!-- Set _NT_SYMBOL_PATH so VM _ASSERTE() asserts can find the symbol files when doing stack walks.
PDB has the native (coreclr, clrjit, etc.) symbols; IL has managed symbols resolved directly
from their build output, such as System.Private.CoreLib.pdb. -->
<HelixPreCommand Include="set _NT_SYMBOL_PATH=%HELIX_CORRELATION_PAYLOAD%\PDB%3B%HELIX_CORRELATION_PAYLOAD%\IL" />
Comment thread
sbomer marked this conversation as resolved.
<HelixPreCommand Include="set RunCrossGen2=1" Condition=" '$(RunCrossGen2)' == 'true' " />
<HelixPreCommand Include="set CompositeBuildMode=1" Condition=" '$(CompositeBuildMode)' == 'true' " />
<HelixPreCommand Include="set RunningLongGCTests=1" Condition=" '$(LongRunningGCTests)' == 'true' " />
Expand Down
Loading