Skip to content

Commit dafa51b

Browse files
JoeRobichJoeRobich
authored
Update to OmniSharp 1.37.3 and revert useGlobalMono meaning. (#4115)
1 parent 48187ca commit dafa51b

File tree

7 files changed

+58
-45
lines changed

7 files changed

+58
-45
lines changed

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@
139139
"updatePackageDependencies"
140140
],
141141
"env": {
142-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/629d3d3b-feb3-4034-a8f7-3262b4bcdace/503ebd3f8f242394cebd496b76e726c7/omnisharp-linux-x64-1.37.2.zip,https://download.visualstudio.microsoft.com/download/pr/629d3d3b-feb3-4034-a8f7-3262b4bcdace/4cf34bc86b969db7a466d4cdd00c1d7b/omnisharp-linux-x86-1.37.2.zip,https://download.visualstudio.microsoft.com/download/pr/629d3d3b-feb3-4034-a8f7-3262b4bcdace/f57fe2aed239711c69cda6c82ee7a2bf/omnisharp-osx-1.37.2.zip,https://download.visualstudio.microsoft.com/download/pr/629d3d3b-feb3-4034-a8f7-3262b4bcdace/97dcfcf480bf1bd5c8bb0a10ac3e5782/omnisharp-win-x64-1.37.2.zip,https://download.visualstudio.microsoft.com/download/pr/629d3d3b-feb3-4034-a8f7-3262b4bcdace/2b796a0bb27b816d543577d519b6a5a2/omnisharp-win-x86-1.37.2.zip",
143-
"NEW_DEPS_VERSION": "1.37.2"
142+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/4d682ee649bcf084eee3d6b675157541/omnisharp-linux-x64-1.37.3.zip,https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/d86b6a136dd8b420d101bcc5bfed442d/omnisharp-linux-x86-1.37.3.zip,https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/0b3f4fd3384777867ebe50923b6dee90/omnisharp-osx-1.37.3.zip,https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/fd2b97e2a06208d965a3abeb19d87e47/omnisharp-win-x64-1.37.3.zip,https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/a1bbd300586e592052207344cc47073d/omnisharp-win-x86-1.37.3.zip",
143+
"NEW_DEPS_VERSION": "1.37.3"
144144
},
145145
"cwd": "${workspaceFolder}"
146146
}

‎CHANGELOG.md‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
## Known Issues in 1.23.3
1+
## Known Issues in 1.23.4
22

3-
* For Mono-based development (e.g. Unity) that requires full .NET framework, you need to set `"omnisharp.useGlobalMono": "always"`. This is needed until Mono [upgrades their bundled MSBuild version](https://github.com/mono/mono/issues/20250)
43
* Known limitations with the preview Razor (cshtml) language service to be addressed in a future release:
54
* Only ASP.NET Core projects are supported (no support for ASP.NET projects)
65
* Limited support for formatting
@@ -11,7 +10,15 @@
1110
* Renaming symbol fails within a file that had recently been renamed without saving changes.
1211
* As a workaround, make an edit within the file before using Rename Symbol.
1312

14-
## 1.23.3 (Not yet released)
13+
## 1.23.4 (Not yet released)
14+
* Use incremental changes to update language server (PR: [#4088](https://github.com/OmniSharp/omnisharp-vscode/pull/4088))
15+
* Set meaning of UseGlobalMono "auto" to "always" now that Mono 6.12.0 ships with MSBuild 16.8 (PR: [#4115](https://github.com/OmniSharp/omnisharp-vscode/pull/4115))
16+
* Updated OmniSharp to 1.37.3
17+
* Fixed a bug when the server wouldn't start on MacOS/Linux when a username contained a space (PR: [omnisharp-roslyn/#1979](https://github.com/OmniSharp/omnisharp-roslyn/pull/1979))
18+
* Update to Mono 6.12.0 (PR: [omnisharp-roslyn/#1981](https://github.com/OmniSharp/omnisharp-roslyn/pull/1981))
19+
* Fix responsiveness regression with targeted DiagnosticWorker revert ([omnisharp-roslyn/#1982](https://github.com/OmniSharp/omnisharp-roslyn/issues/1982), [omnisharp-roslyn/#1983](https://github.com/OmniSharp/omnisharp-roslyn/issues/1983), PR: [omnisharp-roslyn/#1984](https://github.com/OmniSharp/omnisharp-roslyn/pull/1984))
20+
21+
## 1.23.3 (October 12, 2020)
1522
* Fix ps call for Alpine images ([#4023](https://github.com/OmniSharp/omnisharp-vscode/issues/4023), PR: [#4097](https://github.com/OmniSharp/omnisharp-vscode/pull/4097))
1623
* Support TextEdit in completion responses (PR: [@4073](https://github.com/OmniSharp/omnisharp-vscode/pull/4073))
1724
* Updated Razor support

‎README.md‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,20 @@ 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-
## Note about using .NET Core 3.1.401 or .NET 5 Preview 8 SDKs on Mono platforms
23+
## Note about using .NET 5 SDKs
2424

25-
Because of the new minimum MSBuild version requirement of these new SDKs, it will be necessary to use the Mono packaged with the C# extension. The meaning of "omnisharp.useGlobalMono" has change to "never", this forces the use of the included Mono. To use your system
26-
install of Mono set the value to "always" although it may not be compatible with newer SDKs.
25+
The .NET 5 SDK requires version 16.8 of MSBuild.
26+
27+
For Windows users who have Visual Studio installed, this means you will need to be on the latest Visual Studio 16.8 Preview.
28+
For MacOS and Linux users who have Mono installed, this means you will need to be on the latest stable Mono (6.12.0).
29+
30+
## What's new in 1.23.4
31+
- Use incremental changes to update language server (PR: [#4088](https://github.com/OmniSharp/omnisharp-vscode/pull/4088))
32+
- Set meaning of UseGlobalMono "auto" to "always" now that Mono 6.12.0 ships with MSBuild 16.8 (PR: [#4115](https://github.com/OmniSharp/omnisharp-vscode/pull/4115))
33+
- Updated OmniSharp to 1.37.3
34+
- Fixed a bug when the server wouldn't start on MacOS/Linux when a username contained a space (PR: [omnisharp-roslyn/#1979](https://github.com/OmniSharp/omnisharp-roslyn/pull/1979))
35+
- Update to Mono 6.12.0 (PR: [omnisharp-roslyn/#1981](https://github.com/OmniSharp/omnisharp-roslyn/pull/1981))
36+
- Fix responsiveness regression with targeted DiagnosticWorker revert ([omnisharp-roslyn/#1982](https://github.com/OmniSharp/omnisharp-roslyn/issues/1982), [omnisharp-roslyn/#1983](https://github.com/OmniSharp/omnisharp-roslyn/issues/1983), PR: [omnisharp-roslyn/#1984](https://github.com/OmniSharp/omnisharp-roslyn/pull/1984))
2737

2838
## What's new in 1.23.3
2939
- Fix ps call for Alpine images ([#4023](https://github.com/OmniSharp/omnisharp-vscode/issues/4023), PR: [#4097](https://github.com/OmniSharp/omnisharp-vscode/pull/4097))

‎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.3",
4+
"version": "1.23.4",
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.37.2",
32+
"omniSharp": "1.37.3",
3333
"razor": "6.0.0-alpha.1.20479.2"
3434
},
3535
"main": "./dist/extension",
@@ -161,58 +161,58 @@
161161
{
162162
"id": "OmniSharp",
163163
"description": "OmniSharp for Windows (.NET 4.6 / x86)",
164-
"url": "https://download.visualstudio.microsoft.com/download/pr/629d3d3b-feb3-4034-a8f7-3262b4bcdace/2b796a0bb27b816d543577d519b6a5a2/omnisharp-win-x86-1.37.2.zip",
165-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.2/omnisharp-win-x86-1.37.2.zip",
166-
"installPath": ".omnisharp/1.37.2",
164+
"url": "https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/a1bbd300586e592052207344cc47073d/omnisharp-win-x86-1.37.3.zip",
165+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.3/omnisharp-win-x86-1.37.3.zip",
166+
"installPath": ".omnisharp/1.37.3",
167167
"platforms": [
168168
"win32"
169169
],
170170
"architectures": [
171171
"x86"
172172
],
173-
"installTestPath": "./.omnisharp/1.37.2/OmniSharp.exe",
173+
"installTestPath": "./.omnisharp/1.37.3/OmniSharp.exe",
174174
"platformId": "win-x86",
175-
"integrity": "1AE479E04E1C73A5991FAB22FD1110DE614E7182FA3B65940DD0995CD113E2EA"
175+
"integrity": "AA2544E73A17760BF6699A7C0580610FC610D63A434CEB3CCF307A772AA365C6"
176176
},
177177
{
178178
"id": "OmniSharp",
179179
"description": "OmniSharp for Windows (.NET 4.6 / x64)",
180-
"url": "https://download.visualstudio.microsoft.com/download/pr/629d3d3b-feb3-4034-a8f7-3262b4bcdace/97dcfcf480bf1bd5c8bb0a10ac3e5782/omnisharp-win-x64-1.37.2.zip",
181-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.2/omnisharp-win-x64-1.37.2.zip",
182-
"installPath": ".omnisharp/1.37.2",
180+
"url": "https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/fd2b97e2a06208d965a3abeb19d87e47/omnisharp-win-x64-1.37.3.zip",
181+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.3/omnisharp-win-x64-1.37.3.zip",
182+
"installPath": ".omnisharp/1.37.3",
183183
"platforms": [
184184
"win32"
185185
],
186186
"architectures": [
187187
"x86_64"
188188
],
189-
"installTestPath": "./.omnisharp/1.37.2/OmniSharp.exe",
189+
"installTestPath": "./.omnisharp/1.37.3/OmniSharp.exe",
190190
"platformId": "win-x64",
191-
"integrity": "E06C415107A8874A323C1B9779F699A2143EB2D3B4B84B8E765120BC921105C7"
191+
"integrity": "542841E6ECCAA3FF545BFA8778CB0CC4F4BEB5A6D2E55D5A9972E02DAB5ED993"
192192
},
193193
{
194194
"id": "OmniSharp",
195195
"description": "OmniSharp for OSX",
196-
"url": "https://download.visualstudio.microsoft.com/download/pr/629d3d3b-feb3-4034-a8f7-3262b4bcdace/f57fe2aed239711c69cda6c82ee7a2bf/omnisharp-osx-1.37.2.zip",
197-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.2/omnisharp-osx-1.37.2.zip",
198-
"installPath": ".omnisharp/1.37.2",
196+
"url": "https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/0b3f4fd3384777867ebe50923b6dee90/omnisharp-osx-1.37.3.zip",
197+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.3/omnisharp-osx-1.37.3.zip",
198+
"installPath": ".omnisharp/1.37.3",
199199
"platforms": [
200200
"darwin"
201201
],
202202
"binaries": [
203203
"./mono.osx",
204204
"./run"
205205
],
206-
"installTestPath": "./.omnisharp/1.37.2/run",
206+
"installTestPath": "./.omnisharp/1.37.3/run",
207207
"platformId": "osx",
208-
"integrity": "94CAF422B6FA516BE4DCAA2BBBBB6D657CAC957B134FD5AF614FA58665E1A9A7"
208+
"integrity": "A146279775CCFE4CFF45964DB83CF293BD9F0C0E9FD11A517E912A5EC1B20BC9"
209209
},
210210
{
211211
"id": "OmniSharp",
212212
"description": "OmniSharp for Linux (x86)",
213-
"url": "https://download.visualstudio.microsoft.com/download/pr/629d3d3b-feb3-4034-a8f7-3262b4bcdace/4cf34bc86b969db7a466d4cdd00c1d7b/omnisharp-linux-x86-1.37.2.zip",
214-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.2/omnisharp-linux-x86-1.37.2.zip",
215-
"installPath": ".omnisharp/1.37.2",
213+
"url": "https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/d86b6a136dd8b420d101bcc5bfed442d/omnisharp-linux-x86-1.37.3.zip",
214+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.3/omnisharp-linux-x86-1.37.3.zip",
215+
"installPath": ".omnisharp/1.37.3",
216216
"platforms": [
217217
"linux"
218218
],
@@ -224,16 +224,16 @@
224224
"./mono.linux-x86",
225225
"./run"
226226
],
227-
"installTestPath": "./.omnisharp/1.37.2/run",
227+
"installTestPath": "./.omnisharp/1.37.3/run",
228228
"platformId": "linux-x86",
229-
"integrity": "7813A9F3DD5E32EAE106F9172BB39EB7F441AA2A32B81709A454DCBE5A347B45"
229+
"integrity": "BBA9D8B8D894D50E3B191D7980680A93D1A493EDD77BB09A82093742AC56BFD4"
230230
},
231231
{
232232
"id": "OmniSharp",
233233
"description": "OmniSharp for Linux (x64)",
234-
"url": "https://download.visualstudio.microsoft.com/download/pr/629d3d3b-feb3-4034-a8f7-3262b4bcdace/503ebd3f8f242394cebd496b76e726c7/omnisharp-linux-x64-1.37.2.zip",
235-
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.2/omnisharp-linux-x64-1.37.2.zip",
236-
"installPath": ".omnisharp/1.37.2",
234+
"url": "https://download.visualstudio.microsoft.com/download/pr/53b6d57a-1e5c-46bd-a64f-35011a3a2180/4d682ee649bcf084eee3d6b675157541/omnisharp-linux-x64-1.37.3.zip",
235+
"fallbackUrl": "https://roslynomnisharp.blob.core.windows.net/releases/1.37.3/omnisharp-linux-x64-1.37.3.zip",
236+
"installPath": ".omnisharp/1.37.3",
237237
"platforms": [
238238
"linux"
239239
],
@@ -244,9 +244,9 @@
244244
"./mono.linux-x86_64",
245245
"./run"
246246
],
247-
"installTestPath": "./.omnisharp/1.37.2/run",
247+
"installTestPath": "./.omnisharp/1.37.3/run",
248248
"platformId": "linux-x64",
249-
"integrity": "41A1111915AA66224174B561FA70B1C88340AA5D9FEBC8B8583B19B68F8A4F00"
249+
"integrity": "DAB96800C45650A7BBEE1E6EDC1A96CD71B4D2C9BACED4E126A45101D30CA8E8"
250250
},
251251
{
252252
"id": "Debugger",

‎src/omnisharp/OmniSharpMonoResolver.ts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,9 @@ export class OmniSharpMonoResolver implements IMonoResolver {
4545

4646
return monoInfo;
4747
}
48-
49-
// While wwaiting for Mono to ship with a MSBuild version 16.7 or higher, we will treat "auto"
50-
// as "Use included Mono".
51-
52-
// else if (options.useGlobalMono === "auto" && isValid) {
53-
// return monoInfo;
54-
//}
48+
else if (options.useGlobalMono === "auto" && isValid) {
49+
return monoInfo;
50+
}
5551

5652
return undefined;
5753
}

‎test/unitTests/omnisharp/OmniSharpMonoResolver.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ suite(`${OmniSharpMonoResolver.name}`, () => {
2424
const higherMonoVersion = "6.6.0";
2525

2626
// Sets the meaning of UseGlobalMono "auto". When false, "auto" means "never".
27-
const autoMeansAlways = false;
27+
const autoMeansAlways = true;
2828

2929
const getMono = (version: string) => async (env: NodeJS.ProcessEnv) => {
3030
getMonoCalled = true;

0 commit comments

Comments
 (0)