Skip to content

[release/7.0] Fixes not find assembly and pdb if it's not using the default path #92955

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
carlossanlop merged 4 commits into from
Oct 16, 2023
Merged

[release/7.0] Fixes not find assembly and pdb if it's not using the default path #92955

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b8eed7
Fixing https://github.com/dotnet/aspnetcore/issues/51093
thaystg Oct 3, 2023
20576a4
Addressing comments
thaystg Oct 3, 2023
2d98575
Addressing comments
thaystg Oct 3, 2023
f4978c5
Addressing comments
thaystg Oct 3, 2023
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
62 changes: 26 additions & 36 deletions src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1491,50 +1491,24 @@ public async IAsyncEnumerable<SourceFile> Load(SessionId id, string[] loaded_fil

foreach (string url in asm_files)
{
try
{
string candidate_pdb = Path.ChangeExtension(url, "pdb");
string pdb = pdb_files.FirstOrDefault(n => n == candidate_pdb);
string candidate_pdb = Path.ChangeExtension(url, "pdb");
string pdb = pdb_files.FirstOrDefault(n => n == candidate_pdb);

steps.Add(
new DebugItem
{
Url = url,
Data = Task.WhenAll(MonoProxy.HttpClient.GetByteArrayAsync(url, token), pdb != null ? MonoProxy.HttpClient.GetByteArrayAsync(pdb, token) : Task.FromResult<byte[]>(null))
});
}
catch (Exception e)
{
if (tryUseDebuggerProtocol)
{
try
{
string unescapedFileName = Uri.UnescapeDataString(url);
steps.Add(
new DebugItem
{
Url = url,
Data = context.SdbAgent.GetBytesFromAssemblyAndPdb(Path.GetFileName(unescapedFileName), token)
});
}
catch (Exception ex)
{
logger.LogDebug($"Failed to get bytes using debugger protocol {url} ({ex.Message})");
}
}
else
steps.Add(
new DebugItem
{
logger.LogDebug($"Failed to read {url} ({e.Message})");
}
}
Url = url,
Data = Task.WhenAll(MonoProxy.HttpClient.GetByteArrayAsync(url, token), pdb != null ? MonoProxy.HttpClient.GetByteArrayAsync(pdb, token) : Task.FromResult<byte[]>(null))
});
}

foreach (DebugItem step in steps)
{
AssemblyInfo assembly = null;
byte[][] bytes;
try
{
byte[][] bytes = await step.Data.ConfigureAwait(false);
bytes = await step.Data.ConfigureAwait(false);
if (bytes[0] == null)
{
logger.LogDebug($"Bytes from assembly {step.Url} is NULL");
Expand All @@ -1544,7 +1518,23 @@ public async IAsyncEnumerable<SourceFile> Load(SessionId id, string[] loaded_fil
}
catch (Exception e)
{
logger.LogError($"Failed to load {step.Url} ({e.Message})");
try
{
if (tryUseDebuggerProtocol)
{
string unescapedFileName = Uri.UnescapeDataString(step.Url);
bytes = await context.SdbAgent.GetBytesFromAssemblyAndPdb(Path.GetFileName(unescapedFileName), token);
Copy link
Member

@radical radical Oct 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ConfigureAwait(false)

assembly = new AssemblyInfo(monoProxy, id, step.Url, bytes[0], bytes[1], logger, token);
}
else
{
logger.LogDebug($"Failed to read {step.Url} ({e.Message})");
}
}
catch (Exception ex)
{
logger.LogError($"Failed to load {step.Url} ({ex.Message})");
Copy link
Contributor

@dlemstra dlemstra Oct 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wondering why ex is not passed as an argument to LogError? This might provide the user with more information?

}
}
if (assembly == null)
continue;
Expand Down