Merge pull request #3629 from sonyps5201314/fix_pdb_mismatch

siegfriedpammer · web-flow · commit 67bc204589fd · 2025-12-21T12:08:39.000+01:00
Fix the issue where PDBs generated by ILSpy do not match certain asse…
diff --git a/ICSharpCode.Decompiler/DebugInfo/PortablePdbWriter.cs b/ICSharpCode.Decompiler/DebugInfo/PortablePdbWriter.cs
@@ -235,8 +235,9 @@ string BuildFileNameFromTypeName(TypeDefinitionHandle handle)
 
 			if (pdbId == null)
 			{
-				var debugDir = file.Reader.ReadDebugDirectory().FirstOrDefault(dir => dir.Type == DebugDirectoryEntryType.CodeView);
+				var debugDir = file.Reader.ReadDebugDirectory().LastOrDefault(dir => dir.Type == DebugDirectoryEntryType.CodeView);
 				var portable = file.Reader.ReadCodeViewDebugDirectoryData(debugDir);
+				Debug.Assert(!portable.Path.EndsWith(".ni.pdb"));
 				pdbId = new BlobContentId(portable.Guid, debugDir.Stamp);
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -235,8 +235,9 @@ string BuildFileNameFromTypeName(TypeDefinitionHandle handle)`
`235`	`235`
`236`	`236`	`if (pdbId == null)`
`237`	`237`	`{`
`238`		`- var debugDir = file.Reader.ReadDebugDirectory().FirstOrDefault(dir => dir.Type == DebugDirectoryEntryType.CodeView);`
	`238`	`+ var debugDir = file.Reader.ReadDebugDirectory().LastOrDefault(dir => dir.Type == DebugDirectoryEntryType.CodeView);`
`239`	`239`	`var portable = file.Reader.ReadCodeViewDebugDirectoryData(debugDir);`
	`240`	`+ Debug.Assert(!portable.Path.EndsWith(".ni.pdb"));`
`240`	`241`	`pdbId = new BlobContentId(portable.Guid, debugDir.Stamp);`
`241`	`242`	`}`
`242`	`243`