diff --git a/package.json b/package.json index 63b7083..9f4c8ab 100644 --- a/package.json +++ b/package.json @@ -837,8 +837,8 @@ "keybindings": [ { "command": "o.showOutput", - "key": "Ctrl+L L", - "mac": "Cmd+L L" + "key": "Ctrl+Shift+F9", + "mac": "Cmd+Shift+F9" }, { "command": "csharp.setNextStatement", diff --git a/src/observers/TelemetryObserver.ts b/src/observers/TelemetryObserver.ts index b502e1b..7d07710 100644 --- a/src/observers/TelemetryObserver.ts +++ b/src/observers/TelemetryObserver.ts @@ -46,7 +46,7 @@ export class TelemetryObserver { break; case EventType.ProjectConfigurationReceived: let projectConfig = (event).projectConfiguration; - telemetryProps['ProjectId'] = projectConfig.ProjectGuid; + telemetryProps['ProjectId'] = projectConfig.ProjectId; telemetryProps['TargetFrameworks'] = projectConfig.TargetFrameworks.join("|"); telemetryProps['References'] = projectConfig.References.join("|"); telemetryProps['FileExtensions'] = projectConfig.FileExtensions.join("|"); diff --git a/src/omnisharp/protocol.ts b/src/omnisharp/protocol.ts index 21a2153..4e968a3 100644 --- a/src/omnisharp/protocol.ts +++ b/src/omnisharp/protocol.ts @@ -431,7 +431,7 @@ export interface UnresolvedDependenciesMessage { } export interface ProjectConfigurationMessage { - ProjectGuid: string; + ProjectId: string; TargetFrameworks: string[]; References: string[]; FileExtensions: string[]; diff --git a/test/unitTests/logging/TelemetryObserver.test.ts b/test/unitTests/logging/TelemetryObserver.test.ts index c0152cb..adc668f 100644 --- a/test/unitTests/logging/TelemetryObserver.test.ts +++ b/test/unitTests/logging/TelemetryObserver.test.ts @@ -49,14 +49,14 @@ suite('TelemetryReporterObserver', () => { expect(property).to.have.property("installStage", "completeSuccess"); }); - test(`${ProjectConfiguration.name}: Telemetry props contains project file path and target framework`, () => { + test(`${ProjectConfiguration.name}: Telemetry props contains project id and target framework`, () => { const targetFrameworks = new Array("tfm1", "tfm2"); - const projectId = "projectFilePath"; + const projectId = "sample"; const references = new Array("ref1", "ref2"); const fileExtensions = new Array(".cs", ".cshtml"); let event = new ProjectConfiguration({ TargetFrameworks: targetFrameworks, - ProjectGuid: projectId, + ProjectId: projectId, References: references, FileExtensions: fileExtensions });