From 715b91b8722377d3a2fc8de58ef0caa1fe10b3c2 Mon Sep 17 00:00:00 2001 From: Rajkumar Janakiraman Date: Wed, 25 May 2016 15:36:36 -0700 Subject: [PATCH 1/4] Schema for pipe transport options. --- package.json | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/package.json b/package.json index 3bf121fce1..4fd7e321e0 100644 --- a/package.json +++ b/package.json @@ -280,6 +280,86 @@ "type": "string" }, "default": [] + }, + "pipeTransport": { + "type": "object", + "description": "Describes options to launch a program through a pipe transport.", + "default": { + "pipeProgram": "enter pipe program name, for example plink.exe", + "pipeArgs": [] + }, + "properties" : { + "pipeProgram": { + "type": "string", + "description": "The pipe command to execute.", + "default": "enter pipe program name, for example plink.exe" + }, + "pipeArgs": { + "type": "array", + "description": "Command line arguments passed to the pipe program.", + "default": [] + }, + "windows": { + "type": "object", + "description": "Windows-specific pipe launch configuration options", + "default": { + "pipeProgram": "enter pipe program name, for example plink.exe", + "pipeArgs": [] + }, + "properties": { + "pipeProgram": { + "type": "string", + "description": "The pipe command to execute.", + "default": "enter pipe program name, for example plink.exe" + }, + "pipeArgs": { + "type": "array", + "description": "Command line arguments passed to the pipe program.", + "default": [] + } + } + }, + "osx": { + "type": "object", + "description": "OSX-specific pipe launch configuration options", + "default": { + "pipeProgram": "enter pipe program name, for example ssh", + "pipeArgs": [] + }, + "properties": { + "pipeProgram": { + "type": "string", + "description": "The pipe command to execute.", + "default": "enter pipe program name, for example ssh" + }, + "pipeArgs": { + "type": "array", + "description": "Command line arguments passed to the pipe program.", + "default": [] + } + } + }, + "linux": { + "type": "object", + "description": "Linux-specific pipe launch configuration options", + "default": { + "pipeProgram": "enter pipe program name, for example ssh", + "pipeArgs": [] + }, + "properties": { + "pipeProgram": { + "type": "string", + "description": "The pipe command to execute.", + "default": "enter pipe program name, for example ssh" + }, + "pipeArgs": { + "type": "array", + "description": "Command line arguments passed to the pipe program.", + "default": [] + } + } + } + } } } }, From 32514adfb9cfac447dda1089663e4c24636498b0 Mon Sep 17 00:00:00 2001 From: Rajkumar Janakiraman Date: Thu, 26 May 2016 13:27:58 -0700 Subject: [PATCH 2/4] Incorporating code review comments. --- package.json | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 4fd7e321e0..a2f603f370 100644 --- a/package.json +++ b/package.json @@ -283,38 +283,44 @@ }, "pipeTransport": { "type": "object", - "description": "Describes options to launch a program through a pipe transport.", + "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": { - "pipeProgram": "enter pipe program name, for example plink.exe", + "pipeProgram": "enter the fully qualified path for the pipe program name, for example 'c:\\tools\\plink.exe'", "pipeArgs": [] }, "properties" : { "pipeProgram": { "type": "string", - "description": "The pipe command to execute.", - "default": "enter pipe program name, for example plink.exe" + "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": [] }, "windows": { "type": "object", "description": "Windows-specific pipe launch configuration options", "default": { - "pipeProgram": "enter pipe program name, for example plink.exe", + "pipeProgram": "enter the fully qualified path for the pipe program name, for example 'c:\\tools\\plink.exe'", "pipeArgs": [] }, "properties": { "pipeProgram": { "type": "string", - "description": "The pipe command to execute.", - "default": "enter pipe program name, for example plink.exe" + "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": [] } } @@ -323,18 +329,21 @@ "type": "object", "description": "OSX-specific pipe launch configuration options", "default": { - "pipeProgram": "enter pipe program name, for example ssh", + "pipeProgram": "enter the fully qualified path for the pipe program name, for example '/usr/bin/ssh'", "pipeArgs": [] }, "properties": { "pipeProgram": { "type": "string", - "description": "The pipe command to execute.", - "default": "enter pipe program name, for example ssh" + "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": [] } } @@ -343,18 +352,21 @@ "type": "object", "description": "Linux-specific pipe launch configuration options", "default": { - "pipeProgram": "enter pipe program name, for example ssh", + "pipeProgram": "enter the fully qualified path for the pipe program name, for example '/usr/bin/ssh'", "pipeArgs": [] }, "properties": { "pipeProgram": { "type": "string", - "description": "The pipe command to execute.", - "default": "enter pipe program name, for example ssh" + "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": [] } } From da8361253427ecc0da04a12e01affa299c5f22ce Mon Sep 17 00:00:00 2001 From: Rajkumar Janakiraman Date: Fri, 27 May 2016 10:31:30 -0700 Subject: [PATCH 3/4] Updating package dependency for OpenDebugAD7. --- coreclr-debug/NuGet.config | 1 + src/coreclr-debug/main.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/coreclr-debug/NuGet.config b/coreclr-debug/NuGet.config index 5db080cb7d..3c00eb9901 100644 --- a/coreclr-debug/NuGet.config +++ b/coreclr-debug/NuGet.config @@ -4,5 +4,6 @@ + diff --git a/src/coreclr-debug/main.ts b/src/coreclr-debug/main.ts index 6a44192d1e..711b2ccfc4 100644 --- a/src/coreclr-debug/main.ts +++ b/src/coreclr-debug/main.ts @@ -334,7 +334,7 @@ function createProjectJson(targetRuntime: string): any dependencies: { "Microsoft.VisualStudio.clrdbg": "14.0.25229-preview-2963841", "Microsoft.VisualStudio.clrdbg.MIEngine": "14.0.30401-preview-1", - "Microsoft.VisualStudio.OpenDebugAD7": "1.0.20405-preview-1", + "Microsoft.VisualStudio.OpenDebugAD7": "1.0.20527-preview-1", "NETStandard.Library": "1.5.0-rc2-24027", "Newtonsoft.Json": "7.0.1", "Microsoft.VisualStudio.Debugger.Interop.Portable": "1.0.1", From 23728120decd0585a306f29449c0fcfbd17dd6d6 Mon Sep 17 00:00:00 2001 From: Rajkumar Janakiraman Date: Fri, 27 May 2016 13:13:46 -0700 Subject: [PATCH 4/4] Updating the version of MIEngine. --- src/coreclr-debug/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr-debug/main.ts b/src/coreclr-debug/main.ts index 7c0e399b9a..e0c45ff228 100644 --- a/src/coreclr-debug/main.ts +++ b/src/coreclr-debug/main.ts @@ -333,7 +333,7 @@ function createProjectJson(targetRuntime: string): any }, dependencies: { "Microsoft.VisualStudio.clrdbg": "14.0.25320-preview-3008693", - "Microsoft.VisualStudio.clrdbg.MIEngine": "14.0.30520-preview-9", + "Microsoft.VisualStudio.clrdbg.MIEngine": "14.0.30527-preview-1", "Microsoft.VisualStudio.OpenDebugAD7": "1.0.20527-preview-1", "NETStandard.Library": "1.5.0-rc2-24027", "Newtonsoft.Json": "7.0.1",