Skip to content

Commit af7c31f

Browse files
akshita31akshita31
authored
Merge pull request #2979 from akshita31/rename_project_id_and_change_key_binding
Update omnisharp 1.32.18
2 parents 12bdde3 + 563e122 commit af7c31f

File tree

8 files changed

+44
-43
lines changed

8 files changed

+44
-43
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Known Issues in 1.18.0
1+
## Known Issues in 1.18.1
22

33
* Known limitations with the preview Razor (cshtml) language service to be addressed in a future release:
44
* Only ASP.NET Core projects are supported (no support for ASP.NET projects)
@@ -11,7 +11,7 @@
1111
* There currently is no completion support for package references in csproj files. ([#1156](https://github.com/OmniSharp/omnisharp-vscode/issues/1156))
1212
* As an alternative, consider installing the [MSBuild Project Tools](https://marketplace.visualstudio.com/items?itemName=tintoy.msbuild-project-tools) extension by @tintoy.
1313

14-
## 1.18.1 (April 11, 2019)
14+
## 1.18.1 (April 16, 2019)
1515
* Improved support for .NET Core 3
1616

1717
## 1.18.0 (March 26, 2019)

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ The C# extension is powered by [OmniSharp](https://github.com/OmniSharp/omnishar
2020
* [Documentation](https://code.visualstudio.com/docs/languages/csharp)
2121
* [Video Tutorial compiling with .NET Core](https://channel9.msdn.com/Blogs/dotnet/Get-started-VSCode-Csharp-NET-Core-Windows)
2222

23-
### What's new in 1.18.0
23+
### What's new in 1.18.1
2424

25+
* Added support for roslyn analyzers, code fixes and rulesets which can be enabled via`omnisharp.enableRoslynAnalyzers` setting.
2526
* Added a `csharp.maxProjectFileCountForDiagnosticAnalysis` setting to configure the file limit when the extension stops reporting errors for whole workspace. When this threshold is reached, the diagnostics are reported for currently opened files only.
2627
* Added a `omnisharp.enableMsBuildLoadProjectsOnDemand` setting to load project for files that were opened in the editor. This enables faster navigation of the codebase for the larger codebases.
2728
* Added initial support for C# 8.
@@ -30,7 +31,7 @@ The C# extension is powered by [OmniSharp](https://github.com/OmniSharp/omnishar
3031
* Added support for set next statement. This feature allows developers to change what code is executed next in the target program.
3132
* Added support for showing return values in the variables window.
3233

33-
See our [change log](https://github.com/OmniSharp/omnisharp-vscode/blob/v1.18.0/CHANGELOG.md) for more detail.
34+
See our [change log](https://github.com/OmniSharp/omnisharp-vscode/blob/v1.18.1/CHANGELOG.md) for more detail.
3435

3536
### Supported Operating Systems for Debugging
3637

‎package.json‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "csharp",
33
"publisher": "ms-vscode",
4-
"version": "1.18.1",
4+
"version": "1.18.1-beta1",
55
"description": "C# for Visual Studio Code (powered by OmniSharp).",
66
"displayName": "C#",
77
"author": "Microsoft Corporation",
@@ -29,7 +29,7 @@
2929
"dotnet"
3030
],
3131
"defaults": {
32-
"omniSharp": "1.32.16",
32+
"omniSharp": "1.32.18",
3333
"razor": "1.0.0-alpha3-20190409.2"
3434
},
3535
"main": "./dist/extension",
@@ -159,58 +159,58 @@
159159
{
160160
"id": "OmniSharp",
161161
"description": "OmniSharp for Windows (.NET 4.6 / x86)",
162-
"url": "https://download.visualstudio.microsoft.com/download/pr/ba66444a-c3da-4fab-85fa-02b28bbc1b46/95904a314bfae3b848bb5e19817d2cce/omnisharp-win-x86-1.32.16.zip",
163-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.32.16.zip",
164-
"installPath": ".omnisharp/1.32.16",
162+
"url": "https://download.visualstudio.microsoft.com/download/pr/c0b4bf36-facb-4452-af75-b5e93e148b37/9c60b572bf5fed76ec4e1c6b04f5b65f/omnisharp-win-x86-1.32.18.zip",
163+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.32.18.zip",
164+
"installPath": ".omnisharp/1.32.18",
165165
"platforms": [
166166
"win32"
167167
],
168168
"architectures": [
169169
"x86"
170170
],
171-
"installTestPath": "./.omnisharp/1.32.16/OmniSharp.exe",
171+
"installTestPath": "./.omnisharp/1.32.18/OmniSharp.exe",
172172
"platformId": "win-x86",
173-
"integrity": "6CE553CB8928CD5A72EDB29B21BBAD6E35DB80CCEE0F5364554BB0BF2E55DA8E"
173+
"integrity": "6FF9B0B95C3C34E10FF016FBCBB10106E07135426269619371E54C88DD5B02D5"
174174
},
175175
{
176176
"id": "OmniSharp",
177177
"description": "OmniSharp for Windows (.NET 4.6 / x64)",
178-
"url": "https://download.visualstudio.microsoft.com/download/pr/ba66444a-c3da-4fab-85fa-02b28bbc1b46/008bfbe8f03a1d91161cbf2394067665/omnisharp-win-x64-1.32.16.zip",
179-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.32.16.zip",
180-
"installPath": ".omnisharp/1.32.16",
178+
"url": "https://download.visualstudio.microsoft.com/download/pr/c0b4bf36-facb-4452-af75-b5e93e148b37/157272f608686947dce8cb0cd8ea7ada/omnisharp-win-x64-1.32.18.zip",
179+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.32.18.zip",
180+
"installPath": ".omnisharp/1.32.18",
181181
"platforms": [
182182
"win32"
183183
],
184184
"architectures": [
185185
"x86_64"
186186
],
187-
"installTestPath": "./.omnisharp/1.32.16/OmniSharp.exe",
187+
"installTestPath": "./.omnisharp/1.32.18/OmniSharp.exe",
188188
"platformId": "win-x64",
189-
"integrity": "5C1C55FE8083AC086F25A0F3B6D0F0D1D323D35F5DB3C18BD79425BAAA673B73"
189+
"integrity": "FB83CC91993E0C52CCDD123B51A3305855694BBA80E3CDD7967F34BCC7FF4435"
190190
},
191191
{
192192
"id": "OmniSharp",
193193
"description": "OmniSharp for OSX",
194-
"url": "https://download.visualstudio.microsoft.com/download/pr/ba66444a-c3da-4fab-85fa-02b28bbc1b46/a1a36262d7a9d0618efc22aa13e2de59/omnisharp-osx-1.32.16.zip",
195-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-osx-1.32.16.zip",
196-
"installPath": ".omnisharp/1.32.16",
194+
"url": "https://download.visualstudio.microsoft.com/download/pr/c0b4bf36-facb-4452-af75-b5e93e148b37/b90a6de6bca1688c7eaf6311423f640a/omnisharp-osx-1.32.18.zip",
195+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-osx-1.32.18.zip",
196+
"installPath": ".omnisharp/1.32.18",
197197
"platforms": [
198198
"darwin"
199199
],
200200
"binaries": [
201201
"./mono.osx",
202202
"./run"
203203
],
204-
"installTestPath": "./.omnisharp/1.32.16/run",
204+
"installTestPath": "./.omnisharp/1.32.18/run",
205205
"platformId": "osx",
206-
"integrity": "026193AF37D25F88D3D875E111A4177A311839A08FF8D46B8AB5F096C0715A29"
206+
"integrity": "8E03EE297AB3F340D8710ACB3615BE5585C64AA745AA85455C1D90BDDE19585E"
207207
},
208208
{
209209
"id": "OmniSharp",
210210
"description": "OmniSharp for Linux (x86)",
211-
"url": "https://download.visualstudio.microsoft.com/download/pr/ba66444a-c3da-4fab-85fa-02b28bbc1b46/dfb6e5ad1aac9e18a3b01f237852e90a/omnisharp-linux-x86-1.32.16.zip",
212-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x86-1.32.16.zip",
213-
"installPath": ".omnisharp/1.32.16",
211+
"url": "https://download.visualstudio.microsoft.com/download/pr/c0b4bf36-facb-4452-af75-b5e93e148b37/caec9dabd06141754afb54070b641640/omnisharp-linux-x86-1.32.18.zip",
212+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x86-1.32.18.zip",
213+
"installPath": ".omnisharp/1.32.18",
214214
"platforms": [
215215
"linux"
216216
],
@@ -222,16 +222,16 @@
222222
"./mono.linux-x86",
223223
"./run"
224224
],
225-
"installTestPath": "./.omnisharp/1.32.16/run",
225+
"installTestPath": "./.omnisharp/1.32.18/run",
226226
"platformId": "linux-x86",
227-
"integrity": "9E977DAB6507347DD54F2D2DB2E6366C600C9B7674768F8C9989DFA373B385C0"
227+
"integrity": "E1C6DC2CEE4A8D03E7F3800EA032DFF0489126619737DFB5C475C172AFCF67CB"
228228
},
229229
{
230230
"id": "OmniSharp",
231231
"description": "OmniSharp for Linux (x64)",
232-
"url": "https://download.visualstudio.microsoft.com/download/pr/ba66444a-c3da-4fab-85fa-02b28bbc1b46/8d6798bfe8bc0f5204613cff635cc0e2/omnisharp-linux-x64-1.32.16.zip",
233-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x64-1.32.16.zip",
234-
"installPath": ".omnisharp/1.32.16",
232+
"url": "https://download.visualstudio.microsoft.com/download/pr/c0b4bf36-facb-4452-af75-b5e93e148b37/94f8f0a6e290246aafe26e2ec2013525/omnisharp-linux-x64-1.32.18.zip",
233+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x64-1.32.18.zip",
234+
"installPath": ".omnisharp/1.32.18",
235235
"platforms": [
236236
"linux"
237237
],
@@ -242,9 +242,9 @@
242242
"./mono.linux-x86_64",
243243
"./run"
244244
],
245-
"installTestPath": "./.omnisharp/1.32.16/run",
245+
"installTestPath": "./.omnisharp/1.32.18/run",
246246
"platformId": "linux-x64",
247-
"integrity": "5A69B04064412465746643772B9CB07C780CB79146BF50F7039CB8A5E80BB6DD"
247+
"integrity": "F1B07F367972B6326A266EC409C01AD8688C4247A04C4867B85FDBD5F0AA43AF"
248248
},
249249
{
250250
"id": "Debugger",
@@ -837,8 +837,8 @@
837837
"keybindings": [
838838
{
839839
"command": "o.showOutput",
840-
"key": "Ctrl+L L",
841-
"mac": "Cmd+L L"
840+
"key": "Ctrl+Shift+F9",
841+
"mac": "Cmd+Shift+F9"
842842
},
843843
{
844844
"command": "csharp.setNextStatement",

‎src/observers/OptionChangeObserver.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@ function hasChanged(oldOptions: Options, newOptions: Options): boolean {
3333
return (oldOptions.path != newOptions.path ||
3434
oldOptions.useGlobalMono != newOptions.useGlobalMono ||
3535
oldOptions.enableMsBuildLoadProjectsOnDemand != newOptions.enableMsBuildLoadProjectsOnDemand ||
36-
oldOptions.waitForDebugger != newOptions.waitForDebugger);
36+
oldOptions.waitForDebugger != newOptions.waitForDebugger ||
37+
oldOptions.loggingLevel != newOptions.loggingLevel);
3738
}

‎src/observers/TelemetryObserver.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class TelemetryObserver {
4646
break;
4747
case EventType.ProjectConfigurationReceived:
4848
let projectConfig = (<ProjectConfiguration>event).projectConfiguration;
49-
telemetryProps['ProjectId'] = projectConfig.ProjectGuid;
49+
telemetryProps['ProjectId'] = projectConfig.ProjectId;
5050
telemetryProps['TargetFrameworks'] = projectConfig.TargetFrameworks.join("|");
5151
telemetryProps['References'] = projectConfig.References.join("|");
5252
telemetryProps['FileExtensions'] = projectConfig.FileExtensions.join("|");

‎src/omnisharp/protocol.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ export interface UnresolvedDependenciesMessage {
431431
}
432432

433433
export interface ProjectConfigurationMessage {
434-
ProjectGuid: string;
434+
ProjectId: string;
435435
TargetFrameworks: string[];
436436
References: string[];
437437
FileExtensions: string[];

‎test/unitTests/OptionObserver/OptionChangeObserver.test.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ suite("OmniSharpConfigChangeObserver", () => {
3939
{ config: "omnisharp", section: "path", value: "somePath" },
4040
{ config: "omnisharp", section: "waitForDebugger", value: true },
4141
{ config: "omnisharp", section: "enableMsBuildLoadProjectsOnDemand", value: true },
42-
{ config: "omnisharp", section: "useGlobalMono", value: "always" }
43-
42+
{ config: "omnisharp", section: "useGlobalMono", value: "always" },
43+
{ config: "omnisharp", section: 'loggingLevel', value: 'verbose' }
4444
].forEach(elem => {
4545
suite(`When the ${elem.config} ${elem.section} changes`, () => {
4646
setup(() => {
@@ -77,8 +77,7 @@ suite("OmniSharpConfigChangeObserver", () => {
7777
{ config: "omnisharp", section: 'useEditorFormattingSettings', value: false },
7878
{ config: "omnisharp", section: 'maxProjectResults', value: 1000 },
7979
{ config: "omnisharp", section: 'projectLoadTimeout', value: 1000 },
80-
{ config: "omnisharp", section: 'autoStart', value: false },
81-
{ config: "omnisharp", section: 'loggingLevel', value: 'verbose' }
80+
{ config: "omnisharp", section: 'autoStart', value: false }
8281
].forEach(elem => {
8382
test(`${elem.config} ${elem.section}`, async () => {
8483
expect(infoMessage).to.be.undefined;

‎test/unitTests/logging/TelemetryObserver.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ suite('TelemetryReporterObserver', () => {
4949
expect(property).to.have.property("installStage", "completeSuccess");
5050
});
5151

52-
test(`${ProjectConfiguration.name}: Telemetry props contains project file path and target framework`, () => {
52+
test(`${ProjectConfiguration.name}: Telemetry props contains project id and target framework`, () => {
5353
const targetFrameworks = new Array("tfm1", "tfm2");
54-
const projectId = "projectFilePath";
54+
const projectId = "sample";
5555
const references = new Array("ref1", "ref2");
5656
const fileExtensions = new Array(".cs", ".cshtml");
5757
let event = new ProjectConfiguration({
5858
TargetFrameworks: targetFrameworks,
59-
ProjectGuid: projectId,
59+
ProjectId: projectId,
6060
References: references,
6161
FileExtensions: fileExtensions
6262
});

0 commit comments

Comments
 (0)