Adding changes to support use monovsdbg to debug wasm apps.

.gitignore

@@ -36,3 +36,4 @@ coverage/
 
 \.DS_Store
 vsix/
+.vswebassemblybridge/

.vscodeignore

@@ -62,3 +62,4 @@ esbuild.js
 
 +RuntimeLicenses/dependencies/*
 coreclr-debug/install.log
+!.vswebassemblybridge/**

package.json

@@ -707,6 +707,23 @@
       "binaries": [
         "./rzls"
       ]
+    },
+    {
+      "id": "VSWebAssemblyBridge",
+      "description": "VSWebAssemblyBridge (Platform Agnostic)",
+      "url": "https://vsdebugger.blob.core.windows.net/vswebassemblybridge-9-0-640601/vswebassemblybridge.zip",
+      "installPath": ".vswebassemblybridge",
+      "platforms": [
+        "win32",
+        "linux",
+        "darwin"
+      ],
+      "architectures": [
+        "x86",
+        "x86_64",
+        "arm64"
+      ],
+      "integrity": "2D3BA529626307448281E719BC3182E09475A4571741E08AFA401579E8895AFA"
     }
   ],
   "engines": {
@@ -718,6 +735,7 @@
     "onDebugResolve:coreclr",
     "onDebugResolve:clr",
     "onDebugResolve:monovsdbg",
+    "onDebugResolve:monovsdbg_wasm",
     "onDebugResolve:dotnet",
     "onLanguage:csharp",
     "onCommand:o.showOutput",
@@ -1204,6 +1222,11 @@
             "description": "%generateOptionsSchema.expressionEvaluationOptions.showRawValues.description%",
             "default": false
           },
+          "csharp.wasm.debug.useVSDbg": {
+            "type": "boolean",
+            "description": "%generateOptionsSchema.useVSDbg.description%",
+            "default": true
+          },
           "dotnet.unitTestDebuggingOptions": {
             "type": "object",
             "description": "%configuration.dotnet.unitTestDebuggingOptions%",
@@ -4811,6 +4834,15 @@
           "csharp"
         ],
         "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255"
+      },
+      {
+        "type": "monovsdbg_wasm",
+        "label": ".NET Core using Mono Runtime",
+        "hiddenWhen": "true",
+        "languages": [
+          "csharp"
+        ],
+        "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255"
       }
     ],
     "semanticTokenTypes": [
@@ -5645,4 +5677,4 @@
       }
     }
   }
-}
+}

package.nls.json

@@ -499,5 +499,6 @@
     "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
-  }
-}
+  },
+  "generateOptionsSchema.useVSDbg.description": "Enable new .NET 9+ Wasm Debugger (preview)"
+}

src/activateRoslyn.ts

@@ -107,6 +107,7 @@ export function activateRoslyn(
         getComponentFolder: (componentName) => {
             return getComponentFolder(componentName, languageServerOptions);
         },
+        tryToUseVSDbgForMono: BlazorDebugConfigurationProvider.tryToUseVSDbgForMono,
     };
 
     return exports;

src/coreclrDebug/activate.ts

@@ -109,15 +109,10 @@ export async function activate(
             new BaseVsDbgConfigurationProvider(platformInformation, csharpOutputChannel)
         )
     );
-    context.subscriptions.push(
-        vscode.debug.registerDebugConfigurationProvider(
-            'monovsdbg',
-            new BaseVsDbgConfigurationProvider(platformInformation, csharpOutputChannel)
-        )
-    );
     disposables.add(vscode.debug.registerDebugAdapterDescriptorFactory('coreclr', factory));
     disposables.add(vscode.debug.registerDebugAdapterDescriptorFactory('clr', factory));
     disposables.add(vscode.debug.registerDebugAdapterDescriptorFactory('monovsdbg', factory));
+    disposables.add(vscode.debug.registerDebugAdapterDescriptorFactory('monovsdbg_wasm', factory));
 
     context.subscriptions.push(disposables);
 }

src/coreclrDebug/provisionalDebugSessionTracker.ts

@@ -40,7 +40,7 @@ export class ProvisionalDebugSessionTracker {
      * @param session Debug session.
      */
     onDidStartDebugSession(session: vscode.DebugSession): void {
-        if (session.type !== 'coreclr') {
+        if (session.type !== 'coreclr' && session.type !== 'monovsdbg' && session.type !== 'monovsdbg_wasm') {
             return;
         }
 
@@ -88,6 +88,18 @@ export class ProvisionalDebugSessionTracker {
         this._onDidStartDebugSession?.dispose();
         this._onDidTerminateDebugSession?.dispose();
     }
+    getDebugSessionByType(type: string): vscode.DebugSession | undefined {
+        const sessions = this._sessions;
+        if (sessions != undefined) {
+            const sessionsIt = sessions.entries();
+            for (const session of sessionsIt) {
+                if (session[0].type == type) {
+                    return session[0];
+                }
+            }
+        }
+        return undefined;
+    }
 }
 
 export const debugSessionTracker = new ProvisionalDebugSessionTracker();

src/csharpExtensionExports.ts

@@ -32,6 +32,7 @@ export interface CSharpExtensionExports {
     determineBrowserType: () => Promise<string | undefined>;
     experimental: CSharpExtensionExperimentalExports;
     getComponentFolder: (componentName: string) => string;
+    tryToUseVSDbgForMono: (urlStr: string, projectPath: string) => Promise<[string, number, number]>;
 }
 
 export interface CSharpExtensionExperimentalExports {

src/lsptoolshost/debugger/debugger.ts

@@ -52,6 +52,14 @@ export function registerDebugger(
         vscode.debug.registerDebugConfigurationProvider('coreclr', dotnetWorkspaceConfigurationProvider)
     );
 
+    context.subscriptions.push(
+        vscode.debug.registerDebugConfigurationProvider('monovsdbg', dotnetWorkspaceConfigurationProvider)
+    );
+
+    context.subscriptions.push(
+        vscode.debug.registerDebugConfigurationProvider('monovsdbg_wasm', dotnetWorkspaceConfigurationProvider)
+    );
+
     context.subscriptions.push(
         vscode.commands.registerCommand('dotnet.generateAssets', async (selectedIndex) => {
             if (!(await promptForDevKitDebugConfigurations())) {

src/lsptoolshost/debugger/roslynWorkspaceDebugConfigurationProvider.ts

@@ -49,7 +49,7 @@ export class RoslynWorkspaceDebugInformationProvider implements IWorkspaceDebugI
 
         // LSP serializes and deserializes URIs as (URI formatted) strings not actual types.  So convert to the actual type here.
         const projects: ProjectDebugInformation[] | undefined = await mapAsync(response, async (p) => {
-            const webProject = isWebProject(p.projectPath);
+            const [webProject, webAssemblyProject] = isWebProject(p.projectPath);
             const webAssemblyBlazor = await isBlazorWebAssemblyProject(p.projectPath);
             return {
                 projectPath: p.projectPath,
@@ -58,6 +58,7 @@ export class RoslynWorkspaceDebugInformationProvider implements IWorkspaceDebugI
                 targetsDotnetCore: p.targetsDotnetCore,
                 isExe: p.isExe,
                 isWebProject: webProject,
+                isWebAssemblyProject: webAssemblyProject,
                 isBlazorWebAssemblyHosted: isBlazorWebAssemblyHosted(
                     p.isExe,
                     webProject,

src/lsptoolshost/solutionSnapshot/descriptors.ts

@@ -41,4 +41,16 @@ export default class Descriptors {
             protocolMajorVersion: 3,
         }
     );
+
+    /**
+     * The descriptor for token acquisition service that is hosted within the VS Code Extension Host process.
+     * Use {@link IQueryExecutionService} for the RPC interface.
+     */
+    static readonly projectQueryExecutionService: ServiceRpcDescriptor = Object.freeze(
+        new ServiceJsonRpcDescriptor(
+            ServiceMoniker.create('Microsoft.VisualStudio.ProjectSystem.Query.Remoting.QueryExecutionService', '0.2'),
+            Formatters.Utf8,
+            MessageDelimiters.HttpLikeHeaders
+        )
+    );
 }

src/main.ts

@@ -78,6 +78,7 @@ export async function activate(
     if (useOmnisharpServer) {
         requiredPackageIds.push('OmniSharp');
     }
+    requiredPackageIds.push('VSWebAssemblyBridge');
     if (csharpDevkitExtension) {
         requiredPackageIds.push('RoslynCopilot');
     }

src/omnisharp/omnisharpWorkspaceDebugInformationProvider.ts

@@ -36,6 +36,7 @@ export class OmnisharpWorkspaceDebugInformationProvider implements IWorkspaceDeb
                 isWebProject: p.IsWebProject,
                 isBlazorWebAssemblyHosted: p.IsBlazorWebAssemblyHosted,
                 isBlazorWebAssemblyStandalone: p.IsBlazorWebAssemblyStandalone,
+                isWebAssemblyProject: p.IsWebAssemblyProject,
                 solutionPath: null,
             };
         });

src/omnisharp/protocol.ts

@@ -343,6 +343,7 @@ export interface MSBuildProject {
     IsWebProject: boolean;
     IsBlazorWebAssemblyStandalone: boolean;
     IsBlazorWebAssemblyHosted: boolean;
+    IsWebAssemblyProject: boolean;
 }
 
 export interface TargetFramework {

src/omnisharp/utils.ts

@@ -170,8 +170,7 @@ export async function requestWorkspaceInformation(server: OmniSharpServer) {
     const response = await server.makeRequest<protocol.WorkspaceInformationResponse>(protocol.Requests.Projects);
     if (response.MsBuild && response.MsBuild.Projects) {
         for (const project of response.MsBuild.Projects) {
-            project.IsWebProject = isWebProject(project.Path);
-
+            [project.IsWebProject, project.IsWebAssemblyProject] = isWebProject(project.Path);
             const isProjectBlazorWebAssemblyProject = await isBlazorWebAssemblyProject(project.Path);
 
             const targetsDotnetCore =