Skip to content

[browser] Check also corePdb to see if we have any pdb to start debugging #117978

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
maraf merged 2 commits into from
Jul 24, 2025
Merged

[browser] Check also corePdb to see if we have any pdb to start debugging #117978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
077660d
Check also corePdb to see if we have any pdb to start debugging
maraf Jul 23, 2025
78fda97
Merge branch 'main' into maraf/BrowserAotDebug
maraf Jul 24, 2025
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
6 changes: 6 additions & 0 deletions src/mono/browser/runtime/loader/config.ts
View file
Open in desktop
Comment thread
maraf marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,18 @@ function deep_merge_resources (target: Assets, source: Assets): Assets {
if (target === source) return target;

const providedResources: Assets = { ...source };
if (providedResources.coreAssembly !== undefined) {
providedResources.coreAssembly = [...(target.coreAssembly || []), ...(providedResources.coreAssembly || [])];
Comment thread
maraf marked this conversation as resolved.
}
if (providedResources.assembly !== undefined) {
providedResources.assembly = [...(target.assembly || []), ...(providedResources.assembly || [])];
}
if (providedResources.lazyAssembly !== undefined) {
providedResources.lazyAssembly = [...(target.lazyAssembly || []), ...(providedResources.lazyAssembly || [])];
}
if (providedResources.corePdb !== undefined) {
providedResources.corePdb = [...(target.corePdb || []), ...(providedResources.corePdb || [])];
Comment thread
maraf marked this conversation as resolved.
}
if (providedResources.pdb !== undefined) {
providedResources.pdb = [...(target.pdb || []), ...(providedResources.pdb || [])];
}
Expand Down
2 changes: 1 addition & 1 deletion src/mono/browser/runtime/startup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ export function mono_wasm_load_runtime (): void {
debugLevel = 0 + debugLevel;
}
}
if (!loaderHelpers.isDebuggingSupported() || !runtimeHelpers.config.resources!.pdb) {
if (!loaderHelpers.isDebuggingSupported() || !(runtimeHelpers.config.resources!.corePdb || runtimeHelpers.config.resources!.pdb)) {
debugLevel = 0;
}

Expand Down
Loading