Adding changes to support use monovsdbg to debug wasm apps.

.vscodeignore

@@ -57,3 +57,4 @@ webpack.config.js
 
 +RuntimeLicenses/dependencies/*
 coreclr-debug/install.log
+!.vswebassemblybridge/**

omnisharptest/omnisharpUnitTests/assets.test.ts

@@ -503,7 +503,8 @@ function createMSBuildWorkspaceInformation(
     isExe = true,
     isWebProject = false,
     isBlazorWebAssemblyStandalone = false,
-    isBlazorWebAssemblyHosted = false
+    isBlazorWebAssemblyHosted = false,
+    isWebAssemblyProject = false
 ): ProjectDebugInformation[] {
     return [
         {
@@ -525,6 +526,7 @@ function createMSBuildWorkspaceInformation(
             isWebProject: isWebProject,
             isBlazorWebAssemblyHosted: isBlazorWebAssemblyHosted,
             isBlazorWebAssemblyStandalone: isBlazorWebAssemblyStandalone,
+            isWebAssemblyProject: isWebAssemblyProject,
         },
     ];
 }

package.json

@@ -686,6 +686,23 @@
       "binaries": [
         "./rzls"
       ]
+    },
+    {
+      "id": "VSWebAssemblyBridge",
+      "description": "VSWebAssemblyBridge (Platform Agnostic)",
+      "url": "https://vsdebugger.blob.core.windows.net/vswebassemblybridge-8-0-532005/vswebassemblybridge.zip",
+      "installPath": ".vswebassemblybridge",
+      "platforms": [
+        "win32",
+        "linux",
+        "darwin"
+      ],
+      "architectures": [
+        "x86",
+        "x86_64",
+        "arm64"
+      ],
+      "integrity": "4C4B641AF5F8EFC975EB26D71A6DB052DDF2E3AF3AA263FC660C65F0B7044DDD"
     }
   ],
   "engines": {
@@ -1155,6 +1172,11 @@
             "description": "%generateOptionsSchema.expressionEvaluationOptions.showRawValues.description%",
             "default": false
           },
+          "csharp.wasm.debug.useVSDbg": {
+            "type": "boolean",
+            "description": "%generateOptionsSchema.useVSDbg.description%",
+            "default": false
+          },
           "dotnet.unitTestDebuggingOptions": {
             "type": "object",
             "description": "%configuration.dotnet.unitTestDebuggingOptions%",
@@ -5570,4 +5592,4 @@
       }
     ]
   }
-}
+}

package.nls.json

@@ -489,5 +489,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/coreclrDebug/activate.ts

@@ -92,12 +92,6 @@ 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));

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') {
             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

@@ -26,6 +26,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.ts

@@ -52,6 +52,11 @@ export function registerDebugger(
     context.subscriptions.push(
         vscode.debug.registerDebugConfigurationProvider('coreclr', dotnetWorkspaceConfigurationProvider)
     );
+
+    context.subscriptions.push(
+        vscode.debug.registerDebugConfigurationProvider('monovsdbg', dotnetWorkspaceConfigurationProvider)
+    );
+
     context.subscriptions.push(
         vscode.commands.registerCommand('dotnet.generateAssets', async (selectedIndex) =>
             generateAssets(workspaceInformationProvider, selectedIndex)

src/lsptoolshost/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/services/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

@@ -100,6 +100,8 @@ export async function activate(
         requiredPackageIds.push('OmniSharp');
     }
 
+    requiredPackageIds.push('VSWebAssemblyBridge');
+
     // If the dotnet bundle is installed, this will ensure the dotnet CLI is on the path.
     await initializeDotnetPath();
 
@@ -360,6 +362,7 @@ export async function activate(
             getComponentFolder: (componentName) => {
                 return getComponentFolder(componentName, languageServerOptions);
             },
+            tryToUseVSDbgForMono: BlazorDebugConfigurationProvider.tryToUseVSDbgForMono,
         };
     } else {
         return {

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 =

src/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,
             };
         });