Skip to content
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

Fix extension launch #752

Merged
merged 2 commits into from
Sep 8, 2016
Merged

Fix extension launch #752

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da488c5
Fix location of 'main' in package.json
DustinCampbell Sep 8, 2016
af373a3
Reformat whitespace in package.json
DustinCampbell Sep 8, 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
138 changes: 74 additions & 64 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"Linters",
"Snippets"
],
"main": "./out/main",
"main": "./out/src/main",
"scripts": {
"compile": "node ./node_modules/vscode/bin/compile -p ./",
"watch": "node ./node_modules/vscode/bin/compile -watch -p ./",
Expand Down Expand Up @@ -149,7 +149,7 @@
{
"command": "csharp.listProcess",
"title": "List process for attach",
"category": "CSharp"
"category": "CSharp"
}
],
"keybindings": [
Expand Down Expand Up @@ -317,9 +317,11 @@
},
"env": {
"type": "object",
"additionalProperties": { "type": "string" },
"additionalProperties": {
"type": "string"
},
"description": "Environment variables passed to the program.",
"default": { }
"default": {}
},
"externalConsole": {
"type": "boolean",
Expand Down Expand Up @@ -363,34 +365,34 @@
"description": "Optional flags to determine what types of messages should be logged to the output window.",
"properties": {
"exceptions": {
"type": "boolean",
"description": "Optional flag to determine whether exception messages should be logged to the output window.",
"default": true
"type": "boolean",
"description": "Optional flag to determine whether exception messages should be logged to the output window.",
"default": true
},
"moduleLoad": {
"type": "boolean",
"description": "Optional flag to determine whether module load events should be logged to the output window.",
"default": true
"type": "boolean",
"description": "Optional flag to determine whether module load events should be logged to the output window.",
"default": true
},
"programOutput": {
"type": "boolean",
"description": "Optional flag to determine whether program output should be logged to the output window when not using an external console.",
"default": true
"type": "boolean",
"description": "Optional flag to determine whether program output should be logged to the output window when not using an external console.",
"default": true
},
"engineLogging": {
"type": "boolean",
"description": "Optional flag to determine whether diagnostic engine logs should be logged to the output window.",
"default": false
"type": "boolean",
"description": "Optional flag to determine whether diagnostic engine logs should be logged to the output window.",
"default": false
},
"trace": {
"type": "boolean",
"description": "Optional flag to determine whether diagnostic adapter command tracing should be logged to the output window.",
"default": false
"type": "boolean",
"description": "Optional flag to determine whether diagnostic adapter command tracing should be logged to the output window.",
"default": false
},
"traceResponse": {
"type": "boolean",
"description": "Optional flag to determine whether diagnostic adapter command and response tracing should be logged to the output window.",
"default": false
"type": "boolean",
"description": "Optional flag to determine whether diagnostic adapter command and response tracing should be logged to the output window.",
"default": false
}
}
},
Expand All @@ -402,7 +404,7 @@
"pipeProgram": "enter the fully qualified path for the pipe program name, for example 'c:\\tools\\plink.exe'",
"pipeArgs": []
},
"properties" : {
"properties": {
"pipeCwd": {
"type": "string",
"description": "The fully qualified path to the working directory for the pipe program.",
Expand All @@ -423,9 +425,11 @@
},
"pipeEnv": {
"type": "object",
"additionalProperties": { "type": "string" },
"additionalProperties": {
"type": "string"
},
"description": "Environment variables passed to the pipe program.",
"default": { }
"default": {}
},
"windows": {
"type": "object",
Expand Down Expand Up @@ -456,9 +460,11 @@
},
"pipeEnv": {
"type": "object",
"additionalProperties": { "type": "string" },
"additionalProperties": {
"type": "string"
},
"description": "Environment variables passed to the pipe program.",
"default": { }
"default": {}
}
}
},
Expand Down Expand Up @@ -491,10 +497,12 @@
},
"pipeEnv": {
"type": "object",
"additionalProperties": { "type": "string" },
"additionalProperties": {
"type": "string"
},
"description": "Environment variables passed to the pipe program.",
"default": { }
}
"default": {}
}
}
},
"linux": {
Expand Down Expand Up @@ -526,9 +534,11 @@
},
"pipeEnv": {
"type": "object",
"additionalProperties": { "type": "string" },
"additionalProperties": {
"type": "string"
},
"description": "Environment variables passed to the pipe program.",
"default": { }
"default": {}
}
}
}
Expand All @@ -545,18 +555,18 @@
"default": "The process name to attach to. If this is used, 'processId' should not be used."
},
"processId": {
"anyOf": [
{
"type": "string",
"description": "The process id to attach to. Use \"${command.pickProcesss}\" to get a list of running processes to attach to. If 'processId' used, 'processName' should not be used.",
"default": "${command.pickProcess}"
},
{
"type": "integer",
"description": "The process id to attach to. Use \"${command.pickProcesss}\" to get a list of running processes to attach to. If 'processId' used, 'processName' should not be used.",
"default": 0
}
]
"anyOf": [
{
"type": "string",
"description": "The process id to attach to. Use \"${command.pickProcesss}\" to get a list of running processes to attach to. If 'processId' used, 'processName' should not be used.",
"default": "${command.pickProcess}"
},
{
"type": "integer",
"description": "The process id to attach to. Use \"${command.pickProcesss}\" to get a list of running processes to attach to. If 'processId' used, 'processName' should not be used.",
"default": 0
}
]
},
"sourceFileMap": {
"type": "object",
Expand Down Expand Up @@ -595,34 +605,34 @@
"description": "Optional flags to determine what types of messages should be logged to the output window.",
"properties": {
"exceptions": {
"type": "boolean",
"description": "Optional flag to determine whether exception messages should be logged to the output window.",
"default": true
"type": "boolean",
"description": "Optional flag to determine whether exception messages should be logged to the output window.",
"default": true
},
"moduleLoad": {
"type": "boolean",
"description": "Optional flag to determine whether module load events should be logged to the output window.",
"default": true
"type": "boolean",
"description": "Optional flag to determine whether module load events should be logged to the output window.",
"default": true
},
"programOutput": {
"type": "boolean",
"description": "Optional flag to determine whether program output should be logged to the output window when not using an external console.",
"default": true
"type": "boolean",
"description": "Optional flag to determine whether program output should be logged to the output window when not using an external console.",
"default": true
},
"engineLogging": {
"type": "boolean",
"description": "Optional flag to determine whether diagnostic engine logs should be logged to the output window.",
"default": false
"type": "boolean",
"description": "Optional flag to determine whether diagnostic engine logs should be logged to the output window.",
"default": false
},
"trace": {
"type": "boolean",
"description": "Optional flag to determine whether diagnostic adapter command tracing should be logged to the output window.",
"default": false
"type": "boolean",
"description": "Optional flag to determine whether diagnostic adapter command tracing should be logged to the output window.",
"default": false
},
"traceResponse": {
"type": "boolean",
"description": "Optional flag to determine whether diagnostic adapter command and response tracing should be logged to the output window.",
"default": false
"type": "boolean",
"description": "Optional flag to determine whether diagnostic adapter command and response tracing should be logged to the output window.",
"default": false
}
}
}
Expand Down Expand Up @@ -668,7 +678,7 @@
"ASPNETCORE_ENVIRONMENT": "Development"
},
"sourceFileMap": {
"/Views": "${workspaceRoot}/Views"
"/Views": "${workspaceRoot}/Views"
}
},
{
Expand All @@ -681,4 +691,4 @@
}
]
}
}
}