mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[source-build infra] Ensure unique keys for symbols hashtable (#17533)

Browse source
This commit is contained in:
Nikola Milosavljevic 2023-10-17 13:05:03 -07:00 • committed by GitHub
parent 6e925dd900
commit d485886d55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/CreateSdkSymbolsLayout.cs
View file

@ -57,7 +57,7 @@ namespace Microsoft.DotNet.Build.Tasks
private void LogErrorOrWarning(bool isError, string message) private void LogErrorOrWarning(bool isError, string message)
{ {
if (FailOnMissingPDBs) if (isError)
{ {
Log.LogError(message); Log.LogError(message);
} }
@ -104,14 +104,15 @@ namespace Microsoft.DotNet.Build.Tasks
if (guid != string.Empty) if (guid != string.Empty)
{ {
if (!allPdbGuids.ContainsKey(guid)) string debugId = GetDebugId(guid, file);
if (!allPdbGuids.ContainsKey(debugId))
{ {
filesWithoutPDBs.Add(file.Substring(SdkLayoutPath.Length + 1)); filesWithoutPDBs.Add(file.Substring(SdkLayoutPath.Length + 1));
} }
else else
{ {
// Copy matching pdb to symbols path, preserving sdk binary's hierarchy // Copy matching pdb to symbols path, preserving sdk binary's hierarchy
string sourcePath = (string)allPdbGuids[guid]!; string sourcePath = (string)allPdbGuids[debugId]!;
string destinationPath = string destinationPath =
file.Replace(SdkLayoutPath, SdkSymbolsLayoutPath) file.Replace(SdkLayoutPath, SdkSymbolsLayoutPath)
.Replace(Path.GetFileName(file), Path.GetFileName(sourcePath)); .Replace(Path.GetFileName(file), Path.GetFileName(sourcePath));
@ -142,13 +143,21 @@ namespace Microsoft.DotNet.Build.Tasks
var id = new BlobContentId(metadataReader.DebugMetadataHeader.Id); var id = new BlobContentId(metadataReader.DebugMetadataHeader.Id);
string guid = $"{id.Guid:N}"; string guid = $"{id.Guid:N}";
if (!string.IsNullOrEmpty(guid) && !allPdbGuids.ContainsKey(guid)) string debugId = GetDebugId(guid, file);
if (!string.IsNullOrEmpty(guid) && !allPdbGuids.ContainsKey(debugId))
{ {
allPdbGuids.Add(guid, file); allPdbGuids.Add(debugId, file);
} }
} }
return allPdbGuids; return allPdbGuids;
} }
/// <summary>
/// Calculates a debug Id from debug guid and filename. We use this as a key
/// in PDB hashtable. Guid is not enough due to collisions in several PDBs.
/// </summary>
private string GetDebugId(string guid, string file) =>
$"{guid}.{Path.GetFileNameWithoutExtension(file)}".ToLower();
} }
} }