Skip to content

Commit 471c863

Browse files
Merge pull request #752 from DustinCampbell/fix-extension-launch
Fix extension launch
2 parents 3f50222 + af373a3 commit 471c863

File tree

1 file changed

+74
-64
lines changed

1 file changed

+74
-64
lines changed

package.json

Lines changed: 74 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"Linters",
1818
"Snippets"
1919
],
20-
"main": "./out/main",
20+
"main": "./out/src/main",
2121
"scripts": {
2222
"compile": "node ./node_modules/vscode/bin/compile -p ./",
2323
"watch": "node ./node_modules/vscode/bin/compile -watch -p ./",
@@ -149,7 +149,7 @@
149149
{
150150
"command": "csharp.listProcess",
151151
"title": "List process for attach",
152-
"category": "CSharp"
152+
"category": "CSharp"
153153
}
154154
],
155155
"keybindings": [
@@ -317,9 +317,11 @@
317317
},
318318
"env": {
319319
"type": "object",
320-
"additionalProperties": { "type": "string" },
320+
"additionalProperties": {
321+
"type": "string"
322+
},
321323
"description": "Environment variables passed to the program.",
322-
"default": { }
324+
"default": {}
323325
},
324326
"externalConsole": {
325327
"type": "boolean",
@@ -363,34 +365,34 @@
363365
"description": "Optional flags to determine what types of messages should be logged to the output window.",
364366
"properties": {
365367
"exceptions": {
366-
"type": "boolean",
367-
"description": "Optional flag to determine whether exception messages should be logged to the output window.",
368-
"default": true
368+
"type": "boolean",
369+
"description": "Optional flag to determine whether exception messages should be logged to the output window.",
370+
"default": true
369371
},
370372
"moduleLoad": {
371-
"type": "boolean",
372-
"description": "Optional flag to determine whether module load events should be logged to the output window.",
373-
"default": true
373+
"type": "boolean",
374+
"description": "Optional flag to determine whether module load events should be logged to the output window.",
375+
"default": true
374376
},
375377
"programOutput": {
376-
"type": "boolean",
377-
"description": "Optional flag to determine whether program output should be logged to the output window when not using an external console.",
378-
"default": true
378+
"type": "boolean",
379+
"description": "Optional flag to determine whether program output should be logged to the output window when not using an external console.",
380+
"default": true
379381
},
380382
"engineLogging": {
381-
"type": "boolean",
382-
"description": "Optional flag to determine whether diagnostic engine logs should be logged to the output window.",
383-
"default": false
383+
"type": "boolean",
384+
"description": "Optional flag to determine whether diagnostic engine logs should be logged to the output window.",
385+
"default": false
384386
},
385387
"trace": {
386-
"type": "boolean",
387-
"description": "Optional flag to determine whether diagnostic adapter command tracing should be logged to the output window.",
388-
"default": false
388+
"type": "boolean",
389+
"description": "Optional flag to determine whether diagnostic adapter command tracing should be logged to the output window.",
390+
"default": false
389391
},
390392
"traceResponse": {
391-
"type": "boolean",
392-
"description": "Optional flag to determine whether diagnostic adapter command and response tracing should be logged to the output window.",
393-
"default": false
393+
"type": "boolean",
394+
"description": "Optional flag to determine whether diagnostic adapter command and response tracing should be logged to the output window.",
395+
"default": false
394396
}
395397
}
396398
},
@@ -402,7 +404,7 @@
402404
"pipeProgram": "enter the fully qualified path for the pipe program name, for example 'c:\\tools\\plink.exe'",
403405
"pipeArgs": []
404406
},
405-
"properties" : {
407+
"properties": {
406408
"pipeCwd": {
407409
"type": "string",
408410
"description": "The fully qualified path to the working directory for the pipe program.",
@@ -423,9 +425,11 @@
423425
},
424426
"pipeEnv": {
425427
"type": "object",
426-
"additionalProperties": { "type": "string" },
428+
"additionalProperties": {
429+
"type": "string"
430+
},
427431
"description": "Environment variables passed to the pipe program.",
428-
"default": { }
432+
"default": {}
429433
},
430434
"windows": {
431435
"type": "object",
@@ -456,9 +460,11 @@
456460
},
457461
"pipeEnv": {
458462
"type": "object",
459-
"additionalProperties": { "type": "string" },
463+
"additionalProperties": {
464+
"type": "string"
465+
},
460466
"description": "Environment variables passed to the pipe program.",
461-
"default": { }
467+
"default": {}
462468
}
463469
}
464470
},
@@ -491,10 +497,12 @@
491497
},
492498
"pipeEnv": {
493499
"type": "object",
494-
"additionalProperties": { "type": "string" },
500+
"additionalProperties": {
501+
"type": "string"
502+
},
495503
"description": "Environment variables passed to the pipe program.",
496-
"default": { }
497-
}
504+
"default": {}
505+
}
498506
}
499507
},
500508
"linux": {
@@ -526,9 +534,11 @@
526534
},
527535
"pipeEnv": {
528536
"type": "object",
529-
"additionalProperties": { "type": "string" },
537+
"additionalProperties": {
538+
"type": "string"
539+
},
530540
"description": "Environment variables passed to the pipe program.",
531-
"default": { }
541+
"default": {}
532542
}
533543
}
534544
}
@@ -545,18 +555,18 @@
545555
"default": "The process name to attach to. If this is used, 'processId' should not be used."
546556
},
547557
"processId": {
548-
"anyOf": [
549-
{
550-
"type": "string",
551-
"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.",
552-
"default": "${command.pickProcess}"
553-
},
554-
{
555-
"type": "integer",
556-
"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.",
557-
"default": 0
558-
}
559-
]
558+
"anyOf": [
559+
{
560+
"type": "string",
561+
"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.",
562+
"default": "${command.pickProcess}"
563+
},
564+
{
565+
"type": "integer",
566+
"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.",
567+
"default": 0
568+
}
569+
]
560570
},
561571
"sourceFileMap": {
562572
"type": "object",
@@ -595,34 +605,34 @@
595605
"description": "Optional flags to determine what types of messages should be logged to the output window.",
596606
"properties": {
597607
"exceptions": {
598-
"type": "boolean",
599-
"description": "Optional flag to determine whether exception messages should be logged to the output window.",
600-
"default": true
608+
"type": "boolean",
609+
"description": "Optional flag to determine whether exception messages should be logged to the output window.",
610+
"default": true
601611
},
602612
"moduleLoad": {
603-
"type": "boolean",
604-
"description": "Optional flag to determine whether module load events should be logged to the output window.",
605-
"default": true
613+
"type": "boolean",
614+
"description": "Optional flag to determine whether module load events should be logged to the output window.",
615+
"default": true
606616
},
607617
"programOutput": {
608-
"type": "boolean",
609-
"description": "Optional flag to determine whether program output should be logged to the output window when not using an external console.",
610-
"default": true
618+
"type": "boolean",
619+
"description": "Optional flag to determine whether program output should be logged to the output window when not using an external console.",
620+
"default": true
611621
},
612622
"engineLogging": {
613-
"type": "boolean",
614-
"description": "Optional flag to determine whether diagnostic engine logs should be logged to the output window.",
615-
"default": false
623+
"type": "boolean",
624+
"description": "Optional flag to determine whether diagnostic engine logs should be logged to the output window.",
625+
"default": false
616626
},
617627
"trace": {
618-
"type": "boolean",
619-
"description": "Optional flag to determine whether diagnostic adapter command tracing should be logged to the output window.",
620-
"default": false
628+
"type": "boolean",
629+
"description": "Optional flag to determine whether diagnostic adapter command tracing should be logged to the output window.",
630+
"default": false
621631
},
622632
"traceResponse": {
623-
"type": "boolean",
624-
"description": "Optional flag to determine whether diagnostic adapter command and response tracing should be logged to the output window.",
625-
"default": false
633+
"type": "boolean",
634+
"description": "Optional flag to determine whether diagnostic adapter command and response tracing should be logged to the output window.",
635+
"default": false
626636
}
627637
}
628638
}
@@ -668,7 +678,7 @@
668678
"ASPNETCORE_ENVIRONMENT": "Development"
669679
},
670680
"sourceFileMap": {
671-
"/Views": "${workspaceRoot}/Views"
681+
"/Views": "${workspaceRoot}/Views"
672682
}
673683
},
674684
{
@@ -681,4 +691,4 @@
681691
}
682692
]
683693
}
684-
}
694+
}

0 commit comments

Comments
 (0)