.Net Core Attach support for windows container

src/debugging/netcore/NetCoreDebugHelper.ts

@@ -13,6 +13,7 @@ import { localize } from '../../localize';
 import { NetCoreTaskHelper, NetCoreTaskOptions } from '../../tasks/netcore/NetCoreTaskHelper';
 import { ContainerTreeItem } from '../../tree/containers/ContainerTreeItem';
 import { LocalOSProvider } from '../../utils/LocalOSProvider';
+import { ContainerOSType, getContainerOSType } from '../../utils/osUtils';
 import { pathNormalize } from '../../utils/pathNormalize';
 import { PlatformOS } from '../../utils/platform';
 import { unresolveWorkspaceFolder } from '../../utils/resolveVariables';
@@ -194,11 +195,15 @@ export class NetCoreDebugHelper implements DebugHelper {
 
         // If debugger path is not specified, then install the debugger if it doesn't exist in the container
         if (!debuggerPath) {
-            const debuggerDirectory = '/remote_debugger';
-            debuggerPath = `${debuggerDirectory}/vsdbg`;
-            const isDebuggerInstalled: boolean = await this.isDebuggerInstalled(containerName, debuggerPath);
+            const containerOS = await getContainerOSType(containerName);
+            const osProvider = new LocalOSProvider();
+            const debuggerDirectory = containerOS === 'windows' ? 'C:\\remote_debugger' : '/remote_debugger';
+            debuggerPath = containerOS === 'windows'
+                ? osProvider.pathJoin(osProvider.os, debuggerDirectory, 'win7-x64', 'latest', 'vsdbg.exe')
+                : osProvider.pathJoin(osProvider.os, debuggerDirectory, 'vsdbg');
+            const isDebuggerInstalled: boolean = await this.isDebuggerInstalled(containerName, debuggerPath, containerOS);
             if (!isDebuggerInstalled) {
-                debuggerPath = await this.copyDebuggerToContainer(containerName, debuggerDirectory);
+                await this.copyDebuggerToContainer(context, containerName, debuggerDirectory, containerOS);
             }
         }
 
@@ -287,20 +292,32 @@ export class NetCoreDebugHelper implements DebugHelper {
         return pathNormalize(result, platformOS);
     }
 
-    private async copyDebuggerToContainer(containerName: string, containerDebuggerDirectory: string): Promise<string> {
+    private async copyDebuggerToContainer(context: DockerDebugContext, containerName: string, containerDebuggerDirectory: string, containerOS: ContainerOSType): Promise<void> {
+        const dockerClient = new CliDockerClient(new ChildProcessProvider());
+        if (containerOS === 'windows') {
+            const isolation = await dockerClient.inspectObject(containerName, { format: '{{ .HostConfig.Isolation}}' });
+            if (isolation && isolation === 'hyperv') {
+                context.actionContext.errorHandling.suppressReportIssue = true;
+                throw new Error(localize('vscode-docker.debug.netcore.isolationNotSupported', 'Attaching a debugger to a Hyper-V container is not supported.'));
+            }
+        }
+
         const yesItem: MessageItem = DialogResponses.yes;
         const message = localize('vscode-docker.debug.netcore.attachingRequiresDebugger', 'Attaching to container requires .NET Core debugger in the container. Do you want to copy the debugger to the container?');
         const install = (yesItem === await window.showInformationMessage(message, ...[DialogResponses.yes, DialogResponses.no]));
         if (!install) {
             throw new UserCancelledError();
         }
 
-        // TODO: Attach doesn't support Windows yet.
-        await this.acquireDebuggers('Linux');
+        if (containerOS === 'windows') {
+            await this.acquireDebuggers('Windows');
+        } else {
+            await this.acquireDebuggers('Linux');
+        }
+
         const hostDebuggerPath = await this.vsDbgClientFactory().getVsDbgFolder();
         const containerDebuggerPath = `${containerName}:${containerDebuggerDirectory}`;
         const outputManager = new DefaultOutputManager(ext.outputChannel);
-        const dockerClient = new CliDockerClient(new ChildProcessProvider());
 
         await outputManager.performOperation(
             localize('vscode-docker.debug.netcore.copyDebugger', 'Copying the .NET Core debugger to the container...'),
@@ -310,15 +327,20 @@ export class NetCoreDebugHelper implements DebugHelper {
             localize('vscode-docker.debug.netcore.debuggerInstalled', 'Debugger copied'),
             localize('vscode-docker.debug.netcore.unableToInstallDebugger', 'Unable to copy the .NET Core debugger.')
         );
-        return `${containerDebuggerDirectory}/vsdbg`;
     }
 
-    private async isDebuggerInstalled(containerName: string, debuggerPath: string): Promise<boolean> {
+    private async isDebuggerInstalled(containerName: string, debuggerPath: string, containerOS: ContainerOSType): Promise<boolean> {
         const dockerClient = new CliDockerClient(new ChildProcessProvider());
         const osProvider = new LocalOSProvider();
-        const command: string = osProvider.os === 'Windows' ?
-            `/bin/sh -c "if [ -f ${debuggerPath} ]; then echo true; fi;"`
-            : `/bin/sh -c 'if [ -f ${debuggerPath} ]; then echo true; fi;'`
+        let command: string;
+
+        if (containerOS === 'windows') {
+            command = `cmd /C "IF EXIST "${debuggerPath}" (echo true) else (echo false)"`;
+        } else {
+            command = osProvider.os === 'Windows' ?
+                `/bin/sh -c "if [ -f ${debuggerPath} ]; then echo true; fi;"`
+                : `/bin/sh -c 'if [ -f ${debuggerPath} ]; then echo true; fi;'`
+        }
         const result: string = await dockerClient.exec(containerName, command, {});
         return result === 'true';
     }

src/utils/osUtils.ts

@@ -7,6 +7,7 @@ import * as semver from 'semver';
 import { IActionContext } from 'vscode-azureextensionui';
 import { ext } from '../extensionVariables';
 import { callDockerodeWithErrorHandling } from './callDockerode';
+import { execAsync } from './spawnAsync';
 
 // Minimum Windows RS3 version number
 const windows10RS3MinVersion = '10.0.16299';
@@ -76,6 +77,7 @@ export function isMac(): boolean {
 }
 
 export type DockerOSType = "windows" | "linux";
+export type ContainerOSType = "windows" | "linux";
 
 export async function getDockerOSType(context: IActionContext): Promise<DockerOSType> {
     if (!isWindows()) {
@@ -88,3 +90,9 @@ export async function getDockerOSType(context: IActionContext): Promise<DockerOS
         return info.OSType;
     }
 }
+
+export async function getContainerOSType(containerId: string): Promise<ContainerOSType> {
+    const inspectCmd: string = `docker inspect --format="{{ .Platform}}" ${containerId}`;
+    const execResult = await execAsync(inspectCmd);
+    return execResult.stdout.trim().toLowerCase() === 'windows' ? 'windows' : 'linux';
+}