Fix debugging when JMC is enabled (#105815)

github-actions[bot] · thaystg · web-flow · commit 4c1262559f23 · 2024-08-01T10:34:36.000-07:00
Co-authored-by: Thays Grazia &lt;thtaglia@microsoft.com&gt;
diff --git a/src/mono/browser/debugger/BrowserDebugProxy/DebugStore.cs b/src/mono/browser/debugger/BrowserDebugProxy/DebugStore.cs
@@ -1769,6 +1769,8 @@ public async IAsyncEnumerable<SourceFile> Load(SessionId id, string[] loaded_fil
                     if (assemblyAndPdbData == null || assemblyAndPdbData.AsmBytes == null)
                     {
                         var unescapedFileName = Uri.UnescapeDataString(step.Url);
+                        if (isFingerprinted)
+                            unescapedFileName = string.Concat(Path.GetFileNameWithoutExtension(Path.GetFileNameWithoutExtension(unescapedFileName)), Path.GetExtension(unescapedFileName));
                         assemblies.Add(AssemblyInfo.WithoutDebugInfo(Path.GetFileName(unescapedFileName), logger));
                         logger.LogDebug($"Bytes from assembly {step.Url} is NULL");
                         continue;

Original file line number	Diff line number	Diff line change
`@@ -1769,6 +1769,8 @@ public async IAsyncEnumerable<SourceFile> Load(SessionId id, string[] loaded_fil`
`1769`	`1769`	`if (assemblyAndPdbData == null \|\| assemblyAndPdbData.AsmBytes == null)`
`1770`	`1770`	`{`
`1771`	`1771`	`var unescapedFileName = Uri.UnescapeDataString(step.Url);`
	`1772`	`+ if (isFingerprinted)`
	`1773`	`+ unescapedFileName = string.Concat(Path.GetFileNameWithoutExtension(Path.GetFileNameWithoutExtension(unescapedFileName)), Path.GetExtension(unescapedFileName));`
`1772`	`1774`	`assemblies.Add(AssemblyInfo.WithoutDebugInfo(Path.GetFileName(unescapedFileName), logger));`
`1773`	`1775`	`logger.LogDebug($"Bytes from assembly {step.Url} is NULL");`
`1774`	`1776`	`continue;`