diff options
author | Vance Morrison <vancem@microsoft.com> | 2017-07-07 15:02:12 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-07 15:02:12 -0700 |
commit | 597a7996c5a7d2a0b52e0c9b404f6fbff0d34aad (patch) | |
tree | ca7fc06f530674c86fa59ed79fa1ea4fa68d048a /src/.nuget/dir.targets | |
parent | 14908c750664a000c45936a7b42532a2ed2ad233 (diff) | |
download | coreclr-597a7996c5a7d2a0b52e0c9b404f6fbff0d34aad.tar.gz coreclr-597a7996c5a7d2a0b52e0c9b404f6fbff0d34aad.tar.bz2 coreclr-597a7996c5a7d2a0b52e0c9b404f6fbff0d34aad.zip |
Restore missing native *.ni.pdb file from the Microsoft.NETCore.Runtime.CoreCLR (#12677)
* Restore missing native *.ni.pdb file from the Microsoft.NETCore.Runtime.CoreCLR package
DLLs that have native code, need both the *.pdb (for IL information) and the *.ni.pdb (for
native information).
When System.Private.Corlib was renamed from System.Private.Corlib.ni.pdb to System.Private.Corlib,
the logic that decides what goes into the Microsoft.NETCore.Runtime.CoreCLR package lost
the *.ni.pdb for System.Private.Corlib.
This change basically causes this logic to search both for *.ni.pdb as well as the *.pdb file and
thus fixes this issue.
* Remove unnecessary condition (review feedback)
Diffstat (limited to 'src/.nuget/dir.targets')
-rw-r--r-- | src/.nuget/dir.targets | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/.nuget/dir.targets b/src/.nuget/dir.targets index 447b071a56..fe7938d419 100644 --- a/src/.nuget/dir.targets +++ b/src/.nuget/dir.targets @@ -51,6 +51,8 @@ <WindowsNativeFile Include="@(NativeWithSymbolFile)" Condition="'%(NativeWithSymbolFile.Extension)'=='.dll' OR '%(NativeWithSymbolFile.Extension)'=='.exe'" /> <WindowsSymbolFile Include="@(WindowsNativeFile -> '%(RootDir)%(Directory)PDB\%(Filename).pdb')" /> + <!-- Crossgened files (on windows) have both a *.pdb and a *.ni.pdb symbol file. Include the *.ni.pdb file as well if it exists. --> + <WindowsSymbolFile Include="@(WindowsNativeFile -> '%(RootDir)%(Directory)PDB\%(Filename).ni.pdb')" /> <!-- Search for all xplat symbol file extensions on every xplat native binary. Some binaries have |