Skip to content

Commit d7f58ab

Browse files
authored
[browser] Check also corePdb to see if we have any pdb to start debugging (#117978)
1 parent 167d862 commit d7f58ab

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/mono/browser/runtime/loader/config.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,18 @@ function deep_merge_resources (target: Assets, source: Assets): Assets {
5656
if (target === source) return target;
5757

5858
const providedResources: Assets = { ...source };
59+
if (providedResources.coreAssembly !== undefined) {
60+
providedResources.coreAssembly = [...(target.coreAssembly || []), ...(providedResources.coreAssembly || [])];
61+
}
5962
if (providedResources.assembly !== undefined) {
6063
providedResources.assembly = [...(target.assembly || []), ...(providedResources.assembly || [])];
6164
}
6265
if (providedResources.lazyAssembly !== undefined) {
6366
providedResources.lazyAssembly = [...(target.lazyAssembly || []), ...(providedResources.lazyAssembly || [])];
6467
}
68+
if (providedResources.corePdb !== undefined) {
69+
providedResources.corePdb = [...(target.corePdb || []), ...(providedResources.corePdb || [])];
70+
}
6571
if (providedResources.pdb !== undefined) {
6672
providedResources.pdb = [...(target.pdb || []), ...(providedResources.pdb || [])];
6773
}

src/mono/browser/runtime/startup.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ export function mono_wasm_load_runtime (): void {
611611
debugLevel = 0 + debugLevel;
612612
}
613613
}
614-
if (!loaderHelpers.isDebuggingSupported() || !runtimeHelpers.config.resources!.pdb) {
614+
if (!loaderHelpers.isDebuggingSupported() || !(runtimeHelpers.config.resources!.corePdb || runtimeHelpers.config.resources!.pdb)) {
615615
debugLevel = 0;
616616
}
617617

0 commit comments

Comments
 (0)