diff --git a/src/mono/browser/runtime/loader/config.ts b/src/mono/browser/runtime/loader/config.ts index 9de5c7bb26c2be..8f5cf705b1d8fa 100644 --- a/src/mono/browser/runtime/loader/config.ts +++ b/src/mono/browser/runtime/loader/config.ts @@ -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 || [])]; + } 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 || [])]; + } if (providedResources.pdb !== undefined) { providedResources.pdb = [...(target.pdb || []), ...(providedResources.pdb || [])]; } diff --git a/src/mono/browser/runtime/startup.ts b/src/mono/browser/runtime/startup.ts index 083071124f6d2c..0bfa9466553abc 100644 --- a/src/mono/browser/runtime/startup.ts +++ b/src/mono/browser/runtime/startup.ts @@ -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; }