Skip to content

Commit 8d72cc7

Browse files
JoeRobichJoeRobich
authored
Merge pull request #4643 from JoeRobich/update-omnisharp-1.37.12
Update OmniSharp version to 1.37.12
2 parents a42a175 + a48d623 commit 8d72cc7

29 files changed

+102
-82
lines changed

‎.vscode/launch.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,10 @@
188188
"updatePackageDependencies"
189189
],
190190
"env": {
191-
"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",
192-
"NEW_DEPS_VERSION": "1.37.11"
191+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/3c4f351cd57f4ee47da8fe4c0f8c1ec2/omnisharp-linux-x64-1.37.12.zip,https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/e98ac03c455ed07c02df937f873c4647/omnisharp-linux-x86-1.37.12.zip,https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/5011d2b538f09203b0d46ffc35c425ae/omnisharp-osx-1.37.12.zip,https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/c9a3648abc9b449dc8a20bbbb9cf7836/omnisharp-win-x64-1.37.12.zip,https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/fb84198a5897439914e28e3954639c7f/omnisharp-win-x86-1.37.12.zip",
192+
"NEW_DEPS_VERSION": "1.37.12"
193193
},
194194
"cwd": "${workspaceFolder}"
195195
}
196196
]
197-
}
197+
}

‎CHANGELOG.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,20 @@
1515
* Support V2 version of GoToDefinition, which can show more than one location for partial types and show source-generated file information (PR: [#4581](https://github.com/OmniSharp/omnisharp-vscode/pull/4581))
1616
* 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))
1717
* Ensure we only start one instance of OmniSharp server (PR: [#4612](https://www.github.com/OmniSharp/omnisharp-vscode/pull/4612))
18-
* Update OmniSharp version to 1.37.11
18+
* Set the names of status bar items (PR: [#4621](https://github.com/OmniSharp/omnisharp-vscode/pull/4621))
19+
* Add Debugger Languages (PR: [#4626](https://github.com/OmniSharp/omnisharp-vscode/pull/4626))
20+
* Use temporary directory for debug sockets on NIX systems (PR: [#4637](https://github.com/OmniSharp/omnisharp-vscode/pull/4637))
21+
* Update OmniSharp version to 1.37.12
1922
* Include timing info in logged responses (PR: [omnisharp-roslyn#2173](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2173))
2023
* 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))
2124
* Updated to all the latest .NET SDKs (PR: [omnisharp-roslyn#2166](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2166))
2225
* Add support for GoToDefinition on source-generated files (PR: [omnisharp-roslyn#2170](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2170))
2326
* Add V2 version of GotoDefinitionService (PR: [omnisharp-roslyn#2168](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2168))
2427
* avoid NRE when document is null (PR: [omnisharp-roslyn#2163](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2163)))
28+
* Update Roslyn to 4.0.0-2.21322.50 (PR: [omnisharp-roslyn#2183](https://www.github.com/OmniSharp/omnisharp-roslyn/pull/2183))
29+
* Added support for diagnostic suppressors ([omnisharp-roslyn#1711](https://github.com/OmniSharp/omnisharp-roslyn/issues/1711), PR: [omnisharp-roslyn#2182](https://www.github.com/OmniSharp/omnisharp-roslyn/pull/2182))
30+
* Use the Microsoft.Build.Locator package for discovery (PR: [omnisharp-roslyn#2181](https://www.github.com/OmniSharp/omnisharp-roslyn/pull/2181))
31+
* Update build tools to match NET 6 Preview 5 (PR: [omnisharp-roslyn#2175](https://www.github.com/OmniSharp/omnisharp-roslyn/pull/2175))
2532

2633
## 1.23.12 (May 26th, 2021)
2734
* Support experimental async completion (PR: [#4116](https://www.github.com/OmniSharp/omnisharp-vscode/pull/4116))

‎README.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,20 @@ For MacOS and Linux users who have Mono installed, this means you will need to s
3131
- Support V2 version of GoToDefinition, which can show more than one location for partial types and show source-generated file information (PR: [#4581](https://github.com/OmniSharp/omnisharp-vscode/pull/4581))
3232
- 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))
3333
- Ensure we only start one instance of OmniSharp server (PR: [#4612](https://www.github.com/OmniSharp/omnisharp-vscode/pull/4612))
34-
- Update OmniSharp version to 1.37.11
34+
- Set the names of status bar items (PR: [#4621](https://github.com/OmniSharp/omnisharp-vscode/pull/4621))
35+
- Add Debugger Languages (PR: [#4626](https://github.com/OmniSharp/omnisharp-vscode/pull/4626))
36+
- Use temporary directory for debug sockets on NIX systems (PR: [#4637](https://github.com/OmniSharp/omnisharp-vscode/pull/4637))
37+
- Update OmniSharp version to 1.37.12
3538
- Include timing info in logged responses (PR: [omnisharp-roslyn#2173](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2173))
3639
- 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))
3740
- Updated to all the latest .NET SDKs (PR: [omnisharp-roslyn#2166](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2166))
3841
- Add support for GoToDefinition on source-generated files (PR: [omnisharp-roslyn#2170](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2170))
3942
- Add V2 version of GotoDefinitionService (PR: [omnisharp-roslyn#2168](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2168))
4043
- avoid NRE when document is null (PR: [omnisharp-roslyn#2163](https://www.github.com/omnisharp/omnisharp-roslyn/pull/2163)))
44+
- Update Roslyn to 4.0.0-2.21322.50 (PR: [omnisharp-roslyn#2183](https://www.github.com/OmniSharp/omnisharp-roslyn/pull/2183))
45+
- Added support for diagnostic suppressors ([omnisharp-roslyn#1711](https://github.com/OmniSharp/omnisharp-roslyn/issues/1711), PR: [omnisharp-roslyn#2182](https://www.github.com/OmniSharp/omnisharp-roslyn/pull/2182))
46+
- Use the Microsoft.Build.Locator package for discovery (PR: [omnisharp-roslyn#2181](https://www.github.com/OmniSharp/omnisharp-roslyn/pull/2181))
47+
- Update build tools to match NET 6 Preview 5 (PR: [omnisharp-roslyn#2175](https://www.github.com/OmniSharp/omnisharp-roslyn/pull/2175))
4148

4249
## What's new in 1.23.12
4350
- Support experimental async completion (PR: [#4116](https://www.github.com/OmniSharp/omnisharp-vscode/pull/4116))

‎package.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
}
3636
},
3737
"defaults": {
38-
"omniSharp": "1.37.11",
38+
"omniSharp": "1.37.12",
3939
"razor": "6.0.0-preview.5.21271.1"
4040
},
4141
"main": "./dist/extension",
@@ -126,59 +126,59 @@
126126
{
127127
"id": "OmniSharp",
128128
"description": "OmniSharp for Windows (.NET 4.6 / x86)",
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",
129+
"url": "https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/fb84198a5897439914e28e3954639c7f/omnisharp-win-x86-1.37.12.zip",
130+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.12/omnisharp-win-x86-1.37.12.zip",
131+
"installPath": ".omnisharp/1.37.12",
132132
"platforms": [
133133
"win32"
134134
],
135135
"architectures": [
136136
"x86",
137137
"arm64"
138138
],
139-
"installTestPath": "./.omnisharp/1.37.11/OmniSharp.exe",
139+
"installTestPath": "./.omnisharp/1.37.12/OmniSharp.exe",
140140
"platformId": "win-x86",
141-
"integrity": "C7C816D2AF6214102A867F3089C7ABB44CE5464B0F675AF074C76EBEFFD05AEA"
141+
"integrity": "B37631B7B24D6675A726A24D50913380F5B0009A003A6D87024C4CDB6CBA5F76"
142142
},
143143
{
144144
"id": "OmniSharp",
145145
"description": "OmniSharp for Windows (.NET 4.6 / x64)",
146-
"url": "https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/6644e2c58c93bc4c67e846ceea47eab0/omnisharp-win-x64-1.37.11.zip",
147-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.11/omnisharp-win-x64-1.37.11.zip",
148-
"installPath": ".omnisharp/1.37.11",
146+
"url": "https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/c9a3648abc9b449dc8a20bbbb9cf7836/omnisharp-win-x64-1.37.12.zip",
147+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.12/omnisharp-win-x64-1.37.12.zip",
148+
"installPath": ".omnisharp/1.37.12",
149149
"platforms": [
150150
"win32"
151151
],
152152
"architectures": [
153153
"x86_64"
154154
],
155-
"installTestPath": "./.omnisharp/1.37.11/OmniSharp.exe",
155+
"installTestPath": "./.omnisharp/1.37.12/OmniSharp.exe",
156156
"platformId": "win-x64",
157-
"integrity": "8B534A7A4A756E4EC09ECABE771BCBE8AE312070B3AA78B42F187ADFEC44C341"
157+
"integrity": "32DE8DF9BBBB7D65FAF742AC6001E1E2AAF26F6B0C7576B70982559565BA6EB0"
158158
},
159159
{
160160
"id": "OmniSharp",
161161
"description": "OmniSharp for OSX",
162-
"url": "https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/1e6ff3628ffa5f0506e40681efab9dc2/omnisharp-osx-1.37.11.zip",
163-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.11/omnisharp-osx-1.37.11.zip",
164-
"installPath": ".omnisharp/1.37.11",
162+
"url": "https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/5011d2b538f09203b0d46ffc35c425ae/omnisharp-osx-1.37.12.zip",
163+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.12/omnisharp-osx-1.37.12.zip",
164+
"installPath": ".omnisharp/1.37.12",
165165
"platforms": [
166166
"darwin"
167167
],
168168
"binaries": [
169169
"./mono.osx",
170170
"./run"
171171
],
172-
"installTestPath": "./.omnisharp/1.37.11/run",
172+
"installTestPath": "./.omnisharp/1.37.12/run",
173173
"platformId": "osx",
174-
"integrity": "F44E6289A4AC4176B08FF76FBC089EC1E5EF33935878B00F63921B7238E3FCB9"
174+
"integrity": "3BE059E300393E9CAC108D4120E4D43720C87F7087D10E3AAEEFDD4895C91405"
175175
},
176176
{
177177
"id": "OmniSharp",
178178
"description": "OmniSharp for Linux (x86)",
179-
"url": "https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/38f3ae1091fa7fcfcdb3f053f18ec2cd/omnisharp-linux-x86-1.37.11.zip",
180-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.11/omnisharp-linux-x86-1.37.11.zip",
181-
"installPath": ".omnisharp/1.37.11",
179+
"url": "https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/e98ac03c455ed07c02df937f873c4647/omnisharp-linux-x86-1.37.12.zip",
180+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.12/omnisharp-linux-x86-1.37.12.zip",
181+
"installPath": ".omnisharp/1.37.12",
182182
"platforms": [
183183
"linux"
184184
],
@@ -190,16 +190,16 @@
190190
"./mono.linux-x86",
191191
"./run"
192192
],
193-
"installTestPath": "./.omnisharp/1.37.11/run",
193+
"installTestPath": "./.omnisharp/1.37.12/run",
194194
"platformId": "linux-x86",
195-
"integrity": "09245FCD0FCD79E2D6AEB5113AA7FFDB5E082B830C18EAB4647C5363F757C967"
195+
"integrity": "FF894406DC3518877F3E00CD13DBD61AAC745E9425AD404F297FC5C512D49799"
196196
},
197197
{
198198
"id": "OmniSharp",
199199
"description": "OmniSharp for Linux (x64)",
200-
"url": "https://download.visualstudio.microsoft.com/download/pr/af91f196-4d66-4263-995b-463056b536ab/5d7959540d6bbcadb8c62ed029666b50/omnisharp-linux-x64-1.37.11.zip",
201-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.11/omnisharp-linux-x64-1.37.11.zip",
202-
"installPath": ".omnisharp/1.37.11",
200+
"url": "https://download.visualstudio.microsoft.com/download/pr/e0ec0683-568e-4729-826c-925cb904e0e4/3c4f351cd57f4ee47da8fe4c0f8c1ec2/omnisharp-linux-x64-1.37.12.zip",
201+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.12/omnisharp-linux-x64-1.37.12.zip",
202+
"installPath": ".omnisharp/1.37.12",
203203
"platforms": [
204204
"linux"
205205
],
@@ -210,9 +210,9 @@
210210
"./mono.linux-x86_64",
211211
"./run"
212212
],
213-
"installTestPath": "./.omnisharp/1.37.11/run",
213+
"installTestPath": "./.omnisharp/1.37.12/run",
214214
"platformId": "linux-x64",
215-
"integrity": "C04B2C4F5881E5AEDCBD7E13C650153BD405B881EA341C996BFDE729EE00058E"
215+
"integrity": "FB468802F7B7CEC76CEFFA306C1995F70819FC9A20AE2498196B38B68E607917"
216216
},
217217
{
218218
"id": "Debugger",

‎src/main.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,17 @@ export async function activate(context: vscode.ExtensionContext): Promise<CSharp
9494
let errorMessageObserver = new ErrorMessageObserver(vscode);
9595
eventStream.subscribe(errorMessageObserver.post);
9696

97-
let omnisharpStatusBar = new StatusBarItemAdapter(vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, Number.MIN_VALUE + 2));
97+
let omnisharpStatusBar = new StatusBarItemAdapter(vscode.window.createStatusBarItem("C#-Language-Service-Status", vscode.StatusBarAlignment.Left, Number.MIN_VALUE + 2));
9898
omnisharpStatusBar.name = "C# Language Service Status";
9999
let omnisharpStatusBarObserver = new OmnisharpStatusBarObserver(omnisharpStatusBar);
100100
eventStream.subscribe(omnisharpStatusBarObserver.post);
101101

102-
let projectStatusBar = new StatusBarItemAdapter(vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, Number.MIN_VALUE + 1));
102+
let projectStatusBar = new StatusBarItemAdapter(vscode.window.createStatusBarItem("C#-Project-Selector", vscode.StatusBarAlignment.Left, Number.MIN_VALUE + 1));
103103
projectStatusBar.name = "C# Project Selector";
104104
let projectStatusBarObserver = new ProjectStatusBarObserver(projectStatusBar);
105105
eventStream.subscribe(projectStatusBarObserver.post);
106106

107-
let backgroundWorkStatusBar = new StatusBarItemAdapter(vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, Number.MIN_VALUE));
107+
let backgroundWorkStatusBar = new StatusBarItemAdapter(vscode.window.createStatusBarItem("C#-Code-Analysis", vscode.StatusBarAlignment.Left, Number.MIN_VALUE));
108108
backgroundWorkStatusBar.name = "C# Code Analysis";
109109
let backgroundWorkStatusBarObserver = new BackgroundWorkStatusBarObserver(backgroundWorkStatusBar);
110110
eventStream.subscribe(backgroundWorkStatusBarObserver.post);

‎test/integrationTests/advisor.integration.test.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import * as vscode from 'vscode';
77

8-
import { expect } from 'chai';
8+
import { expect, should } from 'chai';
99
import * as path from 'path';
1010
import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
1111
import testAssetWorkspace from './testAssets/testAssetWorkspace';
@@ -25,7 +25,8 @@ suite(`Advisor ${testAssetWorkspace.description}`, function () {
2525
let advisor: Advisor;
2626

2727
suiteSetup(async function () {
28-
// These tests don't run on the BasicRazorApp2_1 solution
28+
should();
29+
2930
if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
3031
this.skip();
3132
}

‎test/integrationTests/codeActionRename.integration.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ suite(`Code Action Rename ${testAssetWorkspace.description}`, function () {
2121
suiteSetup(async function () {
2222
should();
2323

24-
// These tests don't run on the BasicRazorApp2_1 solution
2524
if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
2625
this.skip();
2726
}

‎test/integrationTests/completionProvider.integration.test.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ import OmniSharpCompletionProvider from "../../src/features/completionProvider";
77
import * as vscode from 'vscode';
88
import testAssetWorkspace from "./testAssets/testAssetWorkspace";
99
import * as path from "path";
10-
import { expect } from "chai";
10+
import { expect, should } from "chai";
1111
import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from "./integrationHelpers";
1212

1313
suite(`${OmniSharpCompletionProvider.name}: Returns the completion items`, () => {
1414
let fileUri: vscode.Uri;
1515

1616
suiteSetup(async function () {
17-
// These tests don't run on the BasicRazorApp2_1 solution
17+
should();
18+
1819
if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
1920
this.skip();
2021
}

‎test/integrationTests/definitionProvider.test.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ import * as vscode from "vscode";
77
import CSharpDefinitionProvider from "../../src/features/definitionProvider";
88
import * as path from "path";
99
import testAssetWorkspace from "./testAssets/testAssetWorkspace";
10-
import { expect } from "chai";
10+
import { expect, should } from "chai";
1111
import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator, restartOmniSharpServer } from './integrationHelpers';
1212

1313
suite(`${CSharpDefinitionProvider.name}: ${testAssetWorkspace.description}`, () => {
1414
let fileUri: vscode.Uri;
1515

1616
suiteSetup(async function () {
17-
// These tests don't run on the BasicRazorApp2_1 solution
17+
should();
18+
1819
if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
1920
this.skip();
2021
}

‎test/integrationTests/diagnostics.integration.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ suite(`DiagnosticProvider: ${testAssetWorkspace.description}`, function () {
5050
suiteSetup(async function () {
5151
should();
5252

53-
// These tests only run on the BasicRazorApp2_1 solution
5453
if (!isRazorWorkspace(vscode.workspace)) {
5554
this.skip();
5655
}

0 commit comments

Comments
 (0)