From 690ebe86df772d9eb891232419dbdb0a9105af7a Mon Sep 17 00:00:00 2001 From: "DESKTOP-GEPIA6N\\Thays" Date: Wed, 5 Jan 2022 14:59:14 -0300 Subject: [PATCH 1/2] Fixing how we test and the implementation after #62627 --- src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs | 2 +- src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs index 42c30e89f5e6d3..3d5b8592a0c3cb 100644 --- a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs +++ b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs @@ -698,7 +698,7 @@ internal async Task RuntimeGetPropertiesInternal(SessionId id, DotnetObj case "methodId": { var resMethod = await context.SdbAgent.InvokeMethodInObject(objectId.Value, objectId.SubValue, "", token); - return sortByAccessLevel ? JObject.FromObject(new { result = resMethod }) : new JArray(resMethod); + return sortByAccessLevel ? JObject.FromObject(new { result = new JArray(resMethod) }) : new JArray(resMethod); } case "object": { diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs index f5a9033a21662c..d6fcc282f09cd6 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestBase.cs @@ -627,7 +627,7 @@ internal async Task CheckCustomType(JToken actual_val, JToken exp_val, string la if (expectedValue.Type != JTokenType.Null) { var valueAfterRunGet = await GetProperties(get["objectId"]?.Value()); - await CheckValue(valueAfterRunGet["value"], expectedValue, exp_val["type_name"]?.Value()); + await CheckValue(valueAfterRunGet[0]["value"], expectedValue, exp_val["type_name"]?.Value()); } break; } From 58eae50f23f44faeb680d4f0b3a9213d7e18a1ca Mon Sep 17 00:00:00 2001 From: "DESKTOP-GEPIA6N\\Thays" Date: Wed, 5 Jan 2022 15:25:53 -0300 Subject: [PATCH 2/2] Passing null to name. --- src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs index 3d5b8592a0c3cb..6866feaf54c542 100644 --- a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs +++ b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs @@ -697,7 +697,7 @@ internal async Task RuntimeGetPropertiesInternal(SessionId id, DotnetObj } case "methodId": { - var resMethod = await context.SdbAgent.InvokeMethodInObject(objectId.Value, objectId.SubValue, "", token); + var resMethod = await context.SdbAgent.InvokeMethodInObject(objectId.Value, objectId.SubValue, null, token); return sortByAccessLevel ? JObject.FromObject(new { result = new JArray(resMethod) }) : new JArray(resMethod); } case "object":