diff --git a/package.json b/package.json index 3171c4aa97..567fb8dc58 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 to the working directory for the pipe program.", + "default": "${workspaceRoot}" + }, "pipeProgram": { "type": "string", "description": "The fully qualified pipe command to execute.", @@ -315,14 +321,26 @@ }, "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", "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.", @@ -335,6 +353,12 @@ "type": "string" }, "default": [] + }, + "pipeEnv": { + "type": "object", + "additionalProperties": { "type": "string" }, + "description": "Environment variables passed to the pipe program.", + "default": { } } } }, @@ -342,10 +366,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 to the working directory for the pipe program.", + "default": "${workspaceRoot}" + }, "pipeProgram": { "type": "string", "description": "The fully qualified pipe command to execute.", @@ -358,17 +388,29 @@ "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.", @@ -381,6 +423,12 @@ "type": "string" }, "default": [] + }, + "pipeEnv": { + "type": "object", + "additionalProperties": { "type": "string" }, + "description": "Environment variables passed to the pipe program.", + "default": { } } } } 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",