Skip to content

Commit 7fa25e8

Browse files
authored
[browser] Remove check for user agent when attaching debugger (#105559)
1 parent e4bef7c commit 7fa25e8

File tree

7 files changed

+7
-19
lines changed

7 files changed

+7
-19
lines changed

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/JSImportTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public unsafe void CreateFunctionString()
238238
[Fact]
239239
public unsafe void CreateFunctionInternal()
240240
{
241-
Func<bool> internals = Utils.CreateFunctionBool("return INTERNAL.mono_wasm_runtime_is_ready");
241+
Func<bool> internals = Utils.CreateFunctionBool("return true");
242242
Assert.True(internals());
243243
}
244244

src/mono/browser/runtime/lazyLoading.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export async function loadLazyAssembly (assemblyNameToLoad: string): Promise<boo
5353

5454
let pdbNameToLoad = assemblyNameWithoutExtension + ".pdb";
5555
let shouldLoadPdb = false;
56-
if (loaderHelpers.config.debugLevel != 0 && loaderHelpers.isDebuggingSupported()) {
56+
if (loaderHelpers.config.debugLevel != 0) {
5757
shouldLoadPdb = Object.prototype.hasOwnProperty.call(lazyAssemblies, pdbNameToLoad);
5858
if (loaderHelpers.config.resources!.fingerprinting) {
5959
const map = loaderHelpers.config.resources!.fingerprinting;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ export function prepareAssets () {
350350
}
351351

352352

353-
if (config.debugLevel != 0 && loaderHelpers.isDebuggingSupported()) {
353+
if (config.debugLevel != 0) {
354354
if (resources.corePdb) {
355355
for (const name in resources.corePdb) {
356356
addAsset({

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,6 @@ export async function mono_wasm_load_config (module: DotnetModuleInternal): Prom
278278
}
279279
}
280280

281-
export function isDebuggingSupported (): boolean {
282-
// Copied from blazor MonoDebugger.ts/attachDebuggerHotkey
283-
if (!globalThis.navigator) {
284-
return false;
285-
}
286-
287-
return loaderHelpers.isChromium || loaderHelpers.isFirefox;
288-
}
289-
290281
async function loadBootConfig (module: DotnetModuleInternal): Promise<void> {
291282
const defaultConfigSrc = loaderHelpers.locateFile(module.configSrc!);
292283

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { assertIsControllablePromise, createPromiseController, getPromiseControl
1515
import { mono_download_assets, resolve_single_asset_path, retrieve_asset_download } from "./assets";
1616
import { mono_log_error, set_thread_prefix, setup_proxy_console } from "./logging";
1717
import { invokeLibraryInitializers } from "./libraryInitializers";
18-
import { deep_merge_config, isDebuggingSupported } from "./config";
18+
import { deep_merge_config } from "./config";
1919
import { logDownloadStatsToConsole, purgeUnusedCacheEntriesAsync } from "./assetsCache";
2020

2121
// if we are the first script loaded in the web worker, we are expected to become the sidecar
@@ -128,7 +128,6 @@ export function setLoaderGlobals (
128128

129129
retrieve_asset_download,
130130
invokeLibraryInitializers,
131-
isDebuggingSupported,
132131

133132
// from wasm-feature-detect npm package
134133
exceptions,

src/mono/browser/runtime/startup.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,9 @@ async function onRuntimeInitializedAsync (userOnRuntimeInitialized: () => void)
328328

329329
runtimeList.registerRuntime(exportedRuntimeAPI);
330330

331-
if (!runtimeHelpers.mono_wasm_runtime_is_ready) mono_wasm_runtime_ready();
331+
if (loaderHelpers.config.debugLevel !== 0 && !runtimeHelpers.mono_wasm_runtime_is_ready) {
332+
mono_wasm_runtime_ready();
333+
}
332334

333335
if (loaderHelpers.config.debugLevel !== 0 && loaderHelpers.config.cacheBootResources) {
334336
loaderHelpers.logDownloadStatsToConsole();
@@ -600,9 +602,6 @@ export function mono_wasm_load_runtime (): void {
600602
debugLevel = 0 + debugLevel;
601603
}
602604
}
603-
if (!loaderHelpers.isDebuggingSupported() || !runtimeHelpers.config.resources!.pdb) {
604-
debugLevel = 0;
605-
}
606605
cwraps.mono_wasm_load_runtime(debugLevel);
607606
endMeasure(mark, MeasuredBlock.loadRuntime);
608607

src/mono/browser/runtime/types/internal.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ export type LoaderHelpers = {
172172
invokeLibraryInitializers: (functionName: string, args: any[]) => Promise<void>,
173173
libraryInitializers?: { scriptName: string, exports: any }[];
174174

175-
isDebuggingSupported(): boolean,
176175
isChromium: boolean,
177176
isFirefox: boolean
178177

0 commit comments

Comments
 (0)