Skip to content

Commit 3aa3167

Browse files
JoeRobichJoeRobich
authored
Merge pull request #4619 from JoeRobich/update-omnisharp-1.37.11
Update OmniSharp to 1.37.11
2 parents 5ae9984 + fca17f3 commit 3aa3167

File tree

8 files changed

+78
-64
lines changed

8 files changed

+78
-64
lines changed

‎.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@
163163
"updatePackageDependencies"
164164
],
165165
"env": {
166-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/c330c5bf-aa2e-43f6-ae59-d9e5274a0741/abbdf147583dfbcf108ae3925f175f30/omnisharp-linux-x64-1.37.10.zip,https://download.visualstudio.microsoft.com/download/pr/c330c5bf-aa2e-43f6-ae59-d9e5274a0741/796c7a02ddab5b8eb9556722b0e60f03/omnisharp-linux-x86-1.37.10.zip,https://download.visualstudio.microsoft.com/download/pr/c330c5bf-aa2e-43f6-ae59-d9e5274a0741/73e0f5e02297e2bde431c3260af009d5/omnisharp-osx-1.37.10.zip,https://download.visualstudio.microsoft.com/download/pr/c330c5bf-aa2e-43f6-ae59-d9e5274a0741/36b11846b33ff828daf09a85d86f6867/omnisharp-win-x64-1.37.10.zip,https://download.visualstudio.microsoft.com/download/pr/c330c5bf-aa2e-43f6-ae59-d9e5274a0741/6ab5c4c22325946cca0653b2035c7af6/omnisharp-win-x86-1.37.10.zip",
167-
"NEW_DEPS_VERSION": "1.37.10"
166+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/5d7959540d6bbcadb8c62ed029666b50/omnisharp-linux-x64-1.37.11.zip,https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/38f3ae1091fa7fcfcdb3f053f18ec2cd/omnisharp-linux-x86-1.37.11.zip,https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/1e6ff3628ffa5f0506e40681efab9dc2/omnisharp-osx-1.37.11.zip,https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/6644e2c58c93bc4c67e846ceea47eab0/omnisharp-win-x64-1.37.11.zip,https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/708153288283687c692e6a8ace64ba5d/omnisharp-win-x86-1.37.11.zip",
167+
"NEW_DEPS_VERSION": "1.37.11"
168168
},
169169
"cwd": "${workspaceFolder}"
170170
}

‎CHANGELOG.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,18 @@
1111
* Renaming symbol fails within a file that had recently been renamed without saving changes.
1212
* As a workaround, make an edit within the file before using Rename Symbol.
1313

14-
## 1.23.12 (Not yet released)
14+
## 1.23.13 (Not yet released)
15+
* Add command 'listRemoteDockerProcess' and variable 'pickRemoteDockerProcess' ([#4607](https://github.com/OmniSharp/omnisharp-vscode/issues/4607), PR: [#4617](https://www.github.com/OmniSharp/omnisharp-vscode/pull/4617))
16+
* Ensure we only start one instance of OmniSharp server (PR: [#4612](https://www.github.com/OmniSharp/omnisharp-vscode/pull/4612))
17+
* Update OmniSharp version to 1.37.11
18+
* Include timing info in logged responses (PR: [omnisharp-roslyn#2173](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2173))
19+
* Defend against null value in BuildErrorEventArgs ([omnisharp-roslyn#2171](https://github.com/OmniSharp/omnisharp-roslyn/issues/2171), PR: [omnisharp-roslyn#2172](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2172))
20+
* Updated to all the latest .NET SDKs (PR: [omnisharp-roslyn#2166](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2166))
21+
* Add support for GoToDefinition on source-generated files (PR: [omnisharp-roslyn#2170](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2170))
22+
* Add V2 version of GotoDefinitionService (PR: [omnisharp-roslyn#2168](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2168))
23+
* avoid NRE when document is null (PR: [omnisharp-roslyn#2163](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2163)))
24+
25+
## 1.23.12 (May 26th, 2021)
1526
* Support experimental async completion (PR: [#4116](https://www.github.com/OmniSharp/omnisharp-vscode/pull/4116))
1627
* Add option to to exclude custom symbols from codelens ([#4335](https://github.com/OmniSharp/omnisharp-vscode/issues/4335), PR: [#4418](https://www.github.com/OmniSharp/omnisharp-vscode/pull/4418))
1728
* Handle ProcessPicker via resolveDebugConfiguration (PR: [#4509](https://www.github.com/OmniSharp/omnisharp-vscode/pull/4509))

‎README.md

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,17 @@ The .NET 5 SDK requires version 16.8 of MSBuild.
2727
For Windows users who have Visual Studio installed, this means you will need to be on the latest Visual Studio 16.8 Preview.
2828
For MacOS and Linux users who have Mono installed, this means you will need to set `omnisharp.useGlobalMono` to `never` until a version of Mono ships with MSBuild 16.8.
2929

30+
## What's new in 1.23.13
31+
- Add command 'listRemoteDockerProcess' and variable 'pickRemoteDockerProcess' ([#4607](https://github.com/OmniSharp/omnisharp-vscode/issues/4607), PR: [#4617](https://www.github.com/OmniSharp/omnisharp-vscode/pull/4617))
32+
- Ensure we only start one instance of OmniSharp server (PR: [#4612](https://www.github.com/OmniSharp/omnisharp-vscode/pull/4612))
33+
- Update OmniSharp version to 1.37.11
34+
- Include timing info in logged responses (PR: [omnisharp-roslyn#2173](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2173))
35+
- Defend against null value in BuildErrorEventArgs ([omnisharp-roslyn#2171](https://github.com/OmniSharp/omnisharp-roslyn/issues/2171), PR: [omnisharp-roslyn#2172](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2172))
36+
- Updated to all the latest .NET SDKs (PR: [omnisharp-roslyn#2166](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2166))
37+
- Add support for GoToDefinition on source-generated files (PR: [omnisharp-roslyn#2170](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2170))
38+
- Add V2 version of GotoDefinitionService (PR: [omnisharp-roslyn#2168](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2168))
39+
- avoid NRE when document is null (PR: [omnisharp-roslyn#2163](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2163)))
40+
3041
## What's new in 1.23.12
3142
- Support experimental async completion (PR: [#4116](https://www.github.com/OmniSharp/omnisharp-vscode/pull/4116))
3243
- Add option to to exclude custom symbols from codelens ([#4335](https://github.com/OmniSharp/omnisharp-vscode/issues/4335), PR: [#4418](https://www.github.com/OmniSharp/omnisharp-vscode/pull/4418))
@@ -77,21 +88,6 @@ For MacOS and Linux users who have Mono installed, this means you will need to s
7788
- Updated Razor support (PR: [#4470](https://github.com/OmniSharp/omnisharp-vscode/pull/4470))
7889
- Bug fixes
7990

80-
## What's new in 1.23.9
81-
- Add option to organize imports during document formatting. (PR: [#4302](https://github.com/OmniSharp/omnisharp-vscode/pull/4302))
82-
- Update to use zero based indexes (PR: [#4300](https://github.com/OmniSharp/omnisharp-vscode/pull/4300))
83-
- Improve request queues to improve code completion performance (PR: [#4310](https://github.com/OmniSharp/omnisharp-vscode/pull/4310))
84-
- Add setting to control whether to show the OmniSharp log on error ([#4102](https://github.com/OmniSharp/omnisharp-vscode/issues/4102), [#4330](https://github.com/OmniSharp/omnisharp-vscode/issues/4330), PR: [#4333](https://github.com/OmniSharp/omnisharp-vscode/pull/4333))
85-
- Support building launch assets for NET6-NET9 projects ([#4346](https://github.com/OmniSharp/omnisharp-vscode/issues/4346), PR: [#4349](https://github.com/OmniSharp/omnisharp-vscode/pull/4349))
86-
- Add debugger support for Concord extensions. See the [ConcordExtensibilitySamples wiki](https://github.com/microsoft/ConcordExtensibilitySamples/wiki/Support-for-cross-platform-.NET-scenarios) for more information.
87-
- Update OmniSharp version to 1.37.6
88-
- Handle records in syntax highlighting ([#2048](https://github.com/OmniSharp/omnisharp-roslyn/issues/2048), PR: [#2049](https://github.com/OmniSharp/omnisharp-roslyn/pull/2049))
89-
- Remove formatting on new line (PR: [#2053](https://github.com/OmniSharp/omnisharp-roslyn/pull/2053))
90-
- Validate highlighting ranges in semantic highlighting requests (PR: [#2055](https://github.com/OmniSharp/omnisharp-roslyn/pull/2055))
91-
- Delay project system init to avoid solution update race (PR: [#2057](https://github.com/OmniSharp/omnisharp-roslyn/pull/2057))
92-
- Use "variable" kind for parameter completion ([#2060](https://github.com/OmniSharp/omnisharp-roslyn/issues/2060), PR: [#2061](https://github.com/OmniSharp/omnisharp-roslyn/pull/2061))
93-
- Log request when response fails ([#2064](https://github.com/OmniSharp/omnisharp-roslyn/pull/2064))
94-
9591
### Emmet support in Razor files
9692

9793
To enable emmet support, add the following to your settings.json:

‎package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "csharp",
33
"publisher": "ms-dotnettools",
4-
"version": "1.23.12",
4+
"version": "1.23.13",
55
"description": "C# for Visual Studio Code (powered by OmniSharp).",
66
"displayName": "C#",
77
"author": "Microsoft Corporation",
@@ -35,7 +35,7 @@
3535
}
3636
},
3737
"defaults": {
38-
"omniSharp": "1.37.10",
38+
"omniSharp": "1.37.11",
3939
"razor": "6.0.0-preview.5.21271.1"
4040
},
4141
"main": "./dist/extension",
@@ -126,58 +126,58 @@
126126
{
127127
"id": "OmniSharp",
128128
"description": "OmniSharp for Windows (.NET 4.6 / x86)",
129-
"url": "https://download.visualstudio.microsoft.com/download/pr/c330c5bf-aa2e-43f6-ae59-d9e5274a0741/6ab5c4c22325946cca0653b2035c7af6/omnisharp-win-x86-1.37.10.zip",
130-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.10/omnisharp-win-x86-1.37.10.zip",
131-
"installPath": ".omnisharp/1.37.10",
129+
"url": "https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/708153288283687c692e6a8ace64ba5d/omnisharp-win-x86-1.37.11.zip",
130+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.11/omnisharp-win-x86-1.37.11.zip",
131+
"installPath": ".omnisharp/1.37.11",
132132
"platforms": [
133133
"win32"
134134
],
135135
"architectures": [
136136
"x86"
137137
],
138-
"installTestPath": "./.omnisharp/1.37.10/OmniSharp.exe",
138+
"installTestPath": "./.omnisharp/1.37.11/OmniSharp.exe",
139139
"platformId": "win-x86",
140-
"integrity": "631743A52EBAE569E717C829BEB0F0F3C48743D896FDB2E5F13DA7EC818DD480"
140+
"integrity": "C7C816D2AF6214102A867F3089C7ABB44CE5464B0F675AF074C76EBEFFD05AEA"
141141
},
142142
{
143143
"id": "OmniSharp",
144144
"description": "OmniSharp for Windows (.NET 4.6 / x64)",
145-
"url": "https://download.visualstudio.microsoft.com/download/pr/c330c5bf-aa2e-43f6-ae59-d9e5274a0741/36b11846b33ff828daf09a85d86f6867/omnisharp-win-x64-1.37.10.zip",
146-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.10/omnisharp-win-x64-1.37.10.zip",
147-
"installPath": ".omnisharp/1.37.10",
145+
"url": "https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/6644e2c58c93bc4c67e846ceea47eab0/omnisharp-win-x64-1.37.11.zip",
146+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.11/omnisharp-win-x64-1.37.11.zip",
147+
"installPath": ".omnisharp/1.37.11",
148148
"platforms": [
149149
"win32"
150150
],
151151
"architectures": [
152152
"x86_64"
153153
],
154-
"installTestPath": "./.omnisharp/1.37.10/OmniSharp.exe",
154+
"installTestPath": "./.omnisharp/1.37.11/OmniSharp.exe",
155155
"platformId": "win-x64",
156-
"integrity": "FB945A13F4A7514A0AFCECDFBD4941E2E2D79CF94C8938C89AA8CA1D8CC74FB4"
156+
"integrity": "8B534A7A4A756E4EC09ECABE771BCBE8AE312070B3AA78B42F187ADFEC44C341"
157157
},
158158
{
159159
"id": "OmniSharp",
160160
"description": "OmniSharp for OSX",
161-
"url": "https://download.visualstudio.microsoft.com/download/pr/c330c5bf-aa2e-43f6-ae59-d9e5274a0741/73e0f5e02297e2bde431c3260af009d5/omnisharp-osx-1.37.10.zip",
162-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.10/omnisharp-osx-1.37.10.zip",
163-
"installPath": ".omnisharp/1.37.10",
161+
"url": "https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/1e6ff3628ffa5f0506e40681efab9dc2/omnisharp-osx-1.37.11.zip",
162+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.11/omnisharp-osx-1.37.11.zip",
163+
"installPath": ".omnisharp/1.37.11",
164164
"platforms": [
165165
"darwin"
166166
],
167167
"binaries": [
168168
"./mono.osx",
169169
"./run"
170170
],
171-
"installTestPath": "./.omnisharp/1.37.10/run",
171+
"installTestPath": "./.omnisharp/1.37.11/run",
172172
"platformId": "osx",
173-
"integrity": "E7ABDFF23F590999D227FCDA7A8FD2345773DB20343B276A36C2DC7A7D6C0996"
173+
"integrity": "F44E6289A4AC4176B08FF76FBC089EC1E5EF33935878B00F63921B7238E3FCB9"
174174
},
175175
{
176176
"id": "OmniSharp",
177177
"description": "OmniSharp for Linux (x86)",
178-
"url": "https://download.visualstudio.microsoft.com/download/pr/c330c5bf-aa2e-43f6-ae59-d9e5274a0741/796c7a02ddab5b8eb9556722b0e60f03/omnisharp-linux-x86-1.37.10.zip",
179-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.10/omnisharp-linux-x86-1.37.10.zip",
180-
"installPath": ".omnisharp/1.37.10",
178+
"url": "https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/38f3ae1091fa7fcfcdb3f053f18ec2cd/omnisharp-linux-x86-1.37.11.zip",
179+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.11/omnisharp-linux-x86-1.37.11.zip",
180+
"installPath": ".omnisharp/1.37.11",
181181
"platforms": [
182182
"linux"
183183
],
@@ -189,16 +189,16 @@
189189
"./mono.linux-x86",
190190
"./run"
191191
],
192-
"installTestPath": "./.omnisharp/1.37.10/run",
192+
"installTestPath": "./.omnisharp/1.37.11/run",
193193
"platformId": "linux-x86",
194-
"integrity": "19137B44AAA09E571E7978A830CCD0D57071D709EC1B4BFA0A51A28503C7AEF3"
194+
"integrity": "09245FCD0FCD79E2D6AEB5113AA7FFDB5E082B830C18EAB4647C5363F757C967"
195195
},
196196
{
197197
"id": "OmniSharp",
198198
"description": "OmniSharp for Linux (x64)",
199-
"url": "https://download.visualstudio.microsoft.com/download/pr/c330c5bf-aa2e-43f6-ae59-d9e5274a0741/abbdf147583dfbcf108ae3925f175f30/omnisharp-linux-x64-1.37.10.zip",
200-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.10/omnisharp-linux-x64-1.37.10.zip",
201-
"installPath": ".omnisharp/1.37.10",
199+
"url": "https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/5d7959540d6bbcadb8c62ed029666b50/omnisharp-linux-x64-1.37.11.zip",
200+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.11/omnisharp-linux-x64-1.37.11.zip",
201+
"installPath": ".omnisharp/1.37.11",
202202
"platforms": [
203203
"linux"
204204
],
@@ -209,9 +209,9 @@
209209
"./mono.linux-x86_64",
210210
"./run"
211211
],
212-
"installTestPath": "./.omnisharp/1.37.10/run",
212+
"installTestPath": "./.omnisharp/1.37.11/run",
213213
"platformId": "linux-x64",
214-
"integrity": "A7430DFA0C41853958B199B7F96DEF1E6D0086B9E130063CC1388BA1AD2A178B"
214+
"integrity": "C04B2C4F5881E5AEDCBD7E13C650153BD405B881EA341C996BFDE729EE00058E"
215215
},
216216
{
217217
"id": "Debugger",

‎test/integrationTests/reAnalyze.integration.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ suite(`ReAnalyze: ${testAssetWorkspace.description}`, function () {
4444
this.skip();
4545
}
4646

47-
eventStream = (await activateCSharpExtension()).eventStream;
48-
await testAssetWorkspace.restore();
47+
const activation = await activateCSharpExtension();
48+
await testAssetWorkspace.restoreAndWait(activation);
49+
50+
eventStream = activation.eventStream;
4951

5052
let projectDirectory = testAssetWorkspace.projects[0].projectDirectoryPath;
5153
interfaceUri = vscode.Uri.file(path.join(projectDirectory, 'ISomeInterface.cs'));

‎test/integrationTests/semanticTokensProvider.test.ts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import * as path from 'path';
99
import { should, assert } from 'chai';
1010
import { activateCSharpExtension, isRazorWorkspace } from './integrationHelpers';
1111
import testAssetWorkspace from './testAssets/testAssetWorkspace';
12-
import { EventType } from '../../src/omnisharp/EventType';
13-
import { poll } from './poll';
1412

1513
const chai = require('chai');
1614
chai.use(require('chai-arrays'));
@@ -60,19 +58,7 @@ suite(`SemanticTokensProvider: ${testAssetWorkspace.description}`, function () {
6058
}
6159

6260
const activation = await activateCSharpExtension();
63-
await testAssetWorkspace.restore();
64-
65-
// Wait for workspace information to be returned
66-
let isWorkspaceLoaded = false;
67-
68-
const subscription = activation.eventStream.subscribe(event => {
69-
if (event.type === EventType.WorkspaceInformationUpdated) {
70-
isWorkspaceLoaded = true;
71-
subscription.unsubscribe();
72-
}
73-
});
74-
75-
await poll(() => isWorkspaceLoaded, 25000, 500);
61+
await testAssetWorkspace.restoreAndWait(activation);
7662

7763
const fileName = 'semantictokens.cs';
7864
const projectDirectory = testAssetWorkspace.projects[0].projectDirectoryPath;

‎test/integrationTests/testAssets/testAssets.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import * as fs from 'async-file';
77
import * as path from 'path';
88
import * as vscode from 'vscode';
9+
import { EventType } from '../../../src/omnisharp/EventType';
10+
import { ActivationResult } from '../integrationHelpers';
11+
import { poll } from '../poll';
912
import spawnGit from './spawnGit';
1013

1114
export class TestAssetProject {
@@ -41,6 +44,22 @@ export class TestAssetWorkspace {
4144
await vscode.commands.executeCommand("dotnet.restore.all");
4245
}
4346

47+
async restoreAndWait(activation: ActivationResult): Promise<void> {
48+
await this.restore();
49+
50+
// Wait for workspace information to be returned
51+
let isWorkspaceLoaded = false;
52+
53+
const subscription = activation.eventStream.subscribe(event => {
54+
if (event.type === EventType.WorkspaceInformationUpdated) {
55+
isWorkspaceLoaded = true;
56+
subscription.unsubscribe();
57+
}
58+
});
59+
60+
await poll(() => isWorkspaceLoaded, 25000, 500);
61+
}
62+
4463
get vsCodeDirectoryPath(): string {
4564
return path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, ".vscode");
4665
}

0 commit comments

Comments
 (0)