Skip to content

Adding support for Remote .NET Attach and tsc fix on Windows #798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

Adding support for Remote .NET Attach and tsc fix on Windows #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fabd9e7
Fixing tsc error TS1252 in platform.ts.
WardenGnaw Sep 29, 2016
a11991b
Adding feature for Remote .NET Attach
WardenGnaw Sep 30, 2016
c35c116
Putting back accidentally deleted lines
WardenGnaw Oct 3, 2016
72a3dea
Matching style
WardenGnaw Oct 3, 2016
f81f8c2
Reverting platform.ts and fixing code review issues
WardenGnaw Oct 3, 2016
39e6649
Updating processPicker RemoteAttach to chain pipe commands
WardenGnaw Oct 5, 2016
479750b
Merge remote-tracking branch 'upstream/master'
WardenGnaw Oct 7, 2016
9cb8f0f
Fixing code review issues
WardenGnaw Oct 7, 2016
a9102a4
Fixed code review issues: errors & formatting
WardenGnaw Oct 10, 2016
ee1ad71
More code review fixes.
WardenGnaw Oct 11, 2016
cf53b64
Merge remote-tracking branch 'upstream/master'
WardenGnaw Oct 11, 2016
9adb2dc
More code review fixes, again.
WardenGnaw Oct 11, 2016
83659b5
Merge remote-tracking branch 'upstream/master'
WardenGnaw Nov 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
175 changes: 173 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"onCommand:dotnet.restore",
"onCommand:csharp.downloadDebugger",
"onCommand:csharp.listProcess",
"onCommand:csharp.listRemoteProcess",
"workspaceContains:project.json"
],
"contributes": {
Expand Down Expand Up @@ -158,6 +159,11 @@
"command": "csharp.listProcess",
"title": "List process for attach",
"category": "CSharp"
},
{
"command" : "csharp.listRemoteProcess",
"title" : "List processes on remote connection for attach",
"category": "CSharp"
Copy link
Member

@DustinCampbell DustinCampbell Oct 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I notice that this command and "csharp.listProcess" have a category of "CSharp", but chsarp.downloadDebugger" has a category of "Debug". Is that intentional? Also, should the category be "C#"?

Copy link
Contributor Author

@WardenGnaw WardenGnaw Oct 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This I am not to sure of, @rajkumar42 or @gregg-miskelly

Copy link
Contributor

@gregg-miskelly gregg-miskelly Oct 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know what category is supposed to be for. You can see if the schema will tell you. @chuckries created the downladDebugger command, so he might know. Otherwise you can look at the VS Code source to see if that has the answer (http://github.com/Microsoft/VSCode)

Copy link
Member

@DustinCampbell DustinCampbell Oct 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

category appears in the Command Palette:

image

Copy link
Contributor

@gregg-miskelly gregg-miskelly Oct 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at https://github.com/Microsoft/vscode-node-debug/search?utf8=%E2%9C%93&q=pickNodeProcess, I wonder if there is a way to avoid declaring this command entirely since it shouldn't actually show up in the command well.

Copy link
Contributor Author

@WardenGnaw WardenGnaw Oct 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing it from the commands JSON prevents it from showing up in the command well but functionality is kept.

}
],
"keybindings": [
Expand Down Expand Up @@ -201,7 +207,8 @@
"runtime": "node",
"runtimeArgs": [],
"variables": {
"pickProcess": "csharp.listProcess"
"pickProcess": "csharp.listProcess",
"pickRemoteProcess": "csharp.listRemoteProcess"
},
"program": "./out/src/coreclr-debug/proxy.js",
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
Expand Down Expand Up @@ -410,7 +417,8 @@
"default": {
"pipeCwd": "${workspaceRoot}",
"pipeProgram": "enter the fully qualified path for the pipe program name, for example 'c:\\tools\\plink.exe'",
"pipeArgs": []
"pipeArgs": [],
"debuggerPath" : "enter the path for the debugger on the target machine, for example ~/clrdbg/clrdbg"
},
"properties": {
"pipeCwd": {
Expand All @@ -431,6 +439,11 @@
},
"default": []
},
"debuggerPath" : {
"type" : "string",
"description" : "The full path to the debugger on the target machine.",
"default" : "~/clrdbg/clrdbg"
},
"pipeEnv": {
"type": "object",
"additionalProperties": {
Expand Down Expand Up @@ -643,6 +656,163 @@
"default": false
}
}
},
"pipeTransport": {
"type": "object",
"required": [
"debuggerPath"
],
"description": "When present, this tells the debugger to connect to a remote computer using another executable as a pipe that will relay standard input/output between VS Code and the .NET Core debugger backend executable (clrdbg).",
"default": {
"pipeCwd": "${workspaceRoot}",
"pipeProgram": "enter the fully qualified path for the pipe program name, for example 'c:\\tools\\plink.exe'",
"pipeArgs": [],
"debuggerPath" : "enter the path for the debugger, for example ~/clrdbg/clrdbg"
},
"properties": {
"pipeCwd": {
"type": "string",
"description": "The fully qualified path to the working directory for the pipe program.",
"default": "${workspaceRoot}"
},
"pipeProgram": {
"type": "string",
"description": "The fully qualified pipe command to execute.",
"default": "enter the fully qualified path for the pipe program name, for example 'c:\\tools\\plink.exe'"
},
"pipeArgs": {
"type": "array",
"description": "Command line arguments passed to the pipe program.",
"items": {
"type": "string"
},
"default": []
},
"debuggerPath" : {
"type" : "string",
"description" : "The full path to the debugger on the target machine.",
"default" : "~/clrdbg/clrdbg"
},
"pipeEnv": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"description": "Environment variables passed to the pipe program.",
"default": {}
},
"windows": {
"type": "object",
"description": "Windows-specific pipe launch configuration options",
"default": {
"pipeCwd": "${workspaceRoot}",
"pipeProgram": "enter the fully qualified path for the pipe program name, for example 'c:\\tools\\plink.exe'",
"pipeArgs": []
},
"properties": {
"pipeCwd": {
"type": "string",
"description": "The fully qualified path to the working directory for the pipe program.",
"default": "${workspaceRoot}"
},
"pipeProgram": {
"type": "string",
"description": "The fully qualified pipe command to execute.",
"default": "enter the fully qualified path for the pipe program name, for example 'c:\\tools\\plink.exe'"
},
"pipeArgs": {
"type": "array",
"description": "Command line arguments passed to the pipe program.",
"items": {
"type": "string"
},
"default": []
},
"pipeEnv": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"description": "Environment variables passed to the pipe program.",
"default": {}
}
}
},
"osx": {
"type": "object",
"description": "OSX-specific pipe launch configuration options",
"default": {
"pipeCwd": "${workspaceRoot}",
"pipeProgram": "enter the fully qualified path for the pipe program name, for example '/usr/bin/ssh'",
"pipeArgs": []
},
"properties": {
"pipeCwd": {
"type": "string",
"description": "The fully qualified path to the working directory for the pipe program.",
"default": "${workspaceRoot}"
},
"pipeProgram": {
"type": "string",
"description": "The fully qualified pipe command to execute.",
"default": "enter the fully qualified path for the pipe program name, for example '/usr/bin/ssh'"
},
"pipeArgs": {
"type": "array",
"description": "Command line arguments passed to the pipe program.",
"items": {
"type": "string"
},
"default": []
},
"pipeEnv": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"description": "Environment variables passed to the pipe program.",
"default": {}
}
}
},
"linux": {
"type": "object",
"description": "Linux-specific pipe launch configuration options",
"default": {
"pipeCwd": "${workspaceRoot}",
"pipeProgram": "enter the fully qualified path for the pipe program name, for example '/usr/bin/ssh'",
"pipeArgs": []
},
"properties": {
"pipeCwd": {
"type": "string",
"description": "The fully qualified path to the working directory for the pipe program.",
"default": "${workspaceRoot}"
},
"pipeProgram": {
"type": "string",
"description": "The fully qualified pipe command to execute.",
"default": "enter the fully qualified path for the pipe program name, for example '/usr/bin/ssh'"
},
"pipeArgs": {
"type": "array",
"description": "Command line arguments passed to the pipe program.",
"items": {
"type": "string"
},
"default": []
},
"pipeEnv": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"description": "Environment variables passed to the pipe program.",
"default": {}
}
}
}
}
}
}
}
Expand Down Expand Up @@ -700,3 +870,4 @@
]
}
}

8 changes: 4 additions & 4 deletions src/features/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import * as path from 'path';
import * as protocol from '../omnisharp/protocol';
import * as vscode from 'vscode';
import * as dotnetTest from './dotnetTest'
import {DotNetAttachItemsProviderFactory, AttachPicker} from './processPicker';
import {DotNetAttachItemsProviderFactory, AttachPicker, RemoteAttachPicker} from './processPicker'
import {generateAssets} from '../assets';

let channel = vscode.window.createOutputChannel('.NET');
Expand All @@ -37,11 +37,11 @@ export default function registerCommands(server: OmnisharpServer, extensionPath:
let attachItemsProvider = DotNetAttachItemsProviderFactory.Get();
let attacher = new AttachPicker(attachItemsProvider);
let d8 = vscode.commands.registerCommand('csharp.listProcess', () => attacher.ShowAttachEntries());

// Register command for generating tasks.json and launch.json assets.
let d9 = vscode.commands.registerCommand('dotnet.generateAssets', () => generateAssets(server));
let d10 = vscode.commands.registerCommand('csharp.listRemoteProcess', (args) => RemoteAttachPicker.ShowAttachEntries(args));

return vscode.Disposable.from(d1, d2, d3, d4, d5, d6, d7, d8, d9);
return vscode.Disposable.from(d1, d2, d3, d4, d5, d6, d7, d8, d9, d10);
}

function restartOmniSharp(server: OmnisharpServer) {
Expand Down Expand Up @@ -186,4 +186,4 @@ function dotnetRestore(cwd: string, fileName?: string) {
reject(err)
});
});
}
}
Loading