From bb221df30f0de413a8a9864de099cc70ded12dd5 Mon Sep 17 00:00:00 2001 From: Rajkumar Janakiraman Date: Wed, 8 Jun 2016 11:05:22 -0700 Subject: [PATCH 1/4] Adding pipeCwd to schema. --- package.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/package.json b/package.json index 3171c4aa97..21c9495c55 100644 --- a/package.json +++ b/package.json @@ -298,10 +298,16 @@ "type": "object", "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": [] }, "properties" : { + "pipeCwd": { + "type": "string", + "description": "The fully qualified path where the pipe command to execute.", + "default": "${workspaceRoot}" + }, "pipeProgram": { "type": "string", "description": "The fully qualified pipe command to execute.", @@ -319,10 +325,16 @@ "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 where the pipe command to execute.", + "default": "${workspaceRoot}" + }, "pipeProgram": { "type": "string", "description": "The fully qualified pipe command to execute.", @@ -342,10 +354,16 @@ "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 where the pipe command to execute.", + "default": "${workspaceRoot}" + }, "pipeProgram": { "type": "string", "description": "The fully qualified pipe command to execute.", @@ -365,10 +383,16 @@ "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 where the pipe command to execute.", + "default": "${workspaceRoot}" + }, "pipeProgram": { "type": "string", "description": "The fully qualified pipe command to execute.", From 95205e9e2efc5cbfdd7081e36fdec8ab346692bd Mon Sep 17 00:00:00 2001 From: Rajkumar Janakiraman Date: Wed, 8 Jun 2016 11:32:05 -0700 Subject: [PATCH 2/4] Incorporating code review comments. --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 21c9495c55..5f01d68f38 100644 --- a/package.json +++ b/package.json @@ -305,7 +305,7 @@ "properties" : { "pipeCwd": { "type": "string", - "description": "The fully qualified path where the pipe command to execute.", + "description": "The fully qualified path to the working directory for the pipe program.", "default": "${workspaceRoot}" }, "pipeProgram": { @@ -332,7 +332,7 @@ "properties": { "pipeCwd": { "type": "string", - "description": "The fully qualified path where the pipe command to execute.", + "description": "The fully qualified path to the working directory for the pipe program.", "default": "${workspaceRoot}" }, "pipeProgram": { @@ -361,7 +361,7 @@ "properties": { "pipeCwd": { "type": "string", - "description": "The fully qualified path where the pipe command to execute.", + "description": "The fully qualified path to the working directory for the pipe program.", "default": "${workspaceRoot}" }, "pipeProgram": { @@ -390,7 +390,7 @@ "properties": { "pipeCwd": { "type": "string", - "description": "The fully qualified path where the pipe command to execute.", + "description": "The fully qualified path to the working directory for the pipe program.", "default": "${workspaceRoot}" }, "pipeProgram": { From 9cf430d0ae45fe92058a143ad76959eae8b878b5 Mon Sep 17 00:00:00 2001 From: Rajkumar Janakiraman Date: Thu, 9 Jun 2016 10:56:50 -0700 Subject: [PATCH 3/4] Adding pipeEnv. Adding the option to provide environment variables to the pipe program. --- package.json | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 5f01d68f38..567fb8dc58 100644 --- a/package.json +++ b/package.json @@ -321,6 +321,12 @@ }, "default": [] }, + "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", @@ -347,6 +353,12 @@ "type": "string" }, "default": [] + }, + "pipeEnv": { + "type": "object", + "additionalProperties": { "type": "string" }, + "description": "Environment variables passed to the pipe program.", + "default": { } } } }, @@ -376,7 +388,13 @@ "type": "string" }, "default": [] - } + }, + "pipeEnv": { + "type": "object", + "additionalProperties": { "type": "string" }, + "description": "Environment variables passed to the pipe program.", + "default": { } + } } }, "linux": { @@ -405,6 +423,12 @@ "type": "string" }, "default": [] + }, + "pipeEnv": { + "type": "object", + "additionalProperties": { "type": "string" }, + "description": "Environment variables passed to the pipe program.", + "default": { } } } } From d79017ebf2795c50fe9d2f2a427ee16157ed9f5f Mon Sep 17 00:00:00 2001 From: Rajkumar Janakiraman Date: Thu, 9 Jun 2016 17:53:33 -0700 Subject: [PATCH 4/4] Updating MIEngine and OpenDebugAD7 dependencies. --- src/coreclr-debug/main.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr-debug/main.ts b/src/coreclr-debug/main.ts index f8c77524c0..4fcc27c0d3 100644 --- a/src/coreclr-debug/main.ts +++ b/src/coreclr-debug/main.ts @@ -337,8 +337,8 @@ function createProjectJson(targetRuntime: string): any }, dependencies: { "Microsoft.VisualStudio.clrdbg": "14.0.25406-preview-3044032", - "Microsoft.VisualStudio.clrdbg.MIEngine": "14.0.30606-preview-1", - "Microsoft.VisualStudio.OpenDebugAD7": "1.0.20527-preview-1", + "Microsoft.VisualStudio.clrdbg.MIEngine": "14.0.30610-preview-1", + "Microsoft.VisualStudio.OpenDebugAD7": "1.0.20610-preview-3", "NETStandard.Library": "1.5.0-rc2-24027", "Newtonsoft.Json": "7.0.1", "Microsoft.VisualStudio.Debugger.Interop.Portable": "1.0.1",