Skip to content

Commit e13c78d

Browse files
committed
Fix csharp.downloadDebugger command and remove addtasks.json command
1 parent e0fd885 commit e13c78d

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
"onCommand:o.showOutput",
5151
"onCommand:o.execute-last-command",
5252
"onCommand:dotnet.restore",
53-
"onCommand:csharp.addTasksJson",
5453
"onCommand:csharp.downloadDebugger",
5554
"workspaceContains:project.json"
5655
],
@@ -109,7 +108,7 @@
109108
"category": "dotnet"
110109
},
111110
{
112-
"command": "charp.downloadDebugger",
111+
"command": "csharp.downloadDebugger",
113112
"title": "Download .NET Core Debugger",
114113
"category": "Debug"
115114
}

src/features/commands.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,12 @@ export default function registerCommands(server: OmnisharpServer, extensionPath:
2323
let d5 = vscode.commands.registerCommand('o.execute-last-command', () => dnxExecuteLastCommand(server));
2424
let d6 = vscode.commands.registerCommand('o.showOutput', () => server.getChannel().show(vscode.ViewColumn.Three));
2525
let d7 = vscode.commands.registerCommand('dotnet.restore', () => dotnetRestore(server));
26+
27+
// register empty handler for csharp.installDebugger
28+
// running the command activates the extension, which is all we need for installation to kickoff
29+
let d8 = vscode.commands.registerCommand('csharp.downloadDebugger', () => { });
2630

27-
return vscode.Disposable.from(d1, d2, d3, d4, d5, d6, d7);
31+
return vscode.Disposable.from(d1, d2, d3, d4, d5, d6, d7, d8);
2832
}
2933

3034
function pickProjectAndStart(server: OmnisharpServer) {

src/omnisharpMain.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,7 @@ export function activate(context: vscode.ExtensionContext): any {
9090
server.reportAndClearTelemetry();
9191
server.stop();
9292
}));
93-
94-
// register empty handler for csharp.installDebugger
95-
// running the command activates the extension, which is all we need for installation to kickoff
96-
disposables.push(vscode.commands.registerCommand('csharp.downloadDebugger', () => { }));
97-
93+
9894
// install coreclr-debug
9995
coreclrdebug.activate(context, reporter);
10096

0 commit comments

Comments
 (0)