Skip to content

Commit 4ca5155

Browse files
authored
Merge pull request #3554 from JoeRobich/update-omnisharp-1.34.11
Update OmniSharp to 1.34.11
2 parents 4acb01d + a41c4df commit 4ca5155

File tree

7 files changed

+54
-46
lines changed

7 files changed

+54
-46
lines changed

.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@
119119
"updatePackageDependencies"
120120
],
121121
"env": {
122-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/b146ec31-8d19-45ca-96ff-d04a8b436b25/c5dea00c97eb01516686d944801dce8a/omnisharp-linux-x64-1.34.10.zip,https://download.visualstudio.microsoft.com/download/pr/b146ec31-8d19-45ca-96ff-d04a8b436b25/d557fd237873e4e41835b150972c0f6d/omnisharp-linux-x86-1.34.10.zip,https://download.visualstudio.microsoft.com/download/pr/b146ec31-8d19-45ca-96ff-d04a8b436b25/9fb60fbaf6a2a21a063782ec64a3604b/omnisharp-osx-1.34.10.zip,https://download.visualstudio.microsoft.com/download/pr/b146ec31-8d19-45ca-96ff-d04a8b436b25/24bc14b24a159bd155a0a82560a9bbb4/omnisharp-win-x64-1.34.10.zip,https://download.visualstudio.microsoft.com/download/pr/b146ec31-8d19-45ca-96ff-d04a8b436b25/5b6193019dbeab0eceb1d6b7aa4baebf/omnisharp-win-x86-1.34.10.zip",
123-
"NEW_DEPS_VERSION": "1.34.10"
122+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/c45cccfd-d481-48f9-941d-2f31712f3edc/b90373027676c50db323ac424f2ff1f4/omnisharp-linux-x64-1.34.11.zip,https://download.visualstudio.microsoft.com/download/pr/c45cccfd-d481-48f9-941d-2f31712f3edc/c83ce7b1e7a9f642c892a0d77b8db57f/omnisharp-linux-x86-1.34.11.zip,https://download.visualstudio.microsoft.com/download/pr/c45cccfd-d481-48f9-941d-2f31712f3edc/bbd8cf76d4c78513b0774cd9740276c7/omnisharp-osx-1.34.11.zip,https://download.visualstudio.microsoft.com/download/pr/c45cccfd-d481-48f9-941d-2f31712f3edc/19ae4e7c8e788df2ae1d8b03f7c737d2/omnisharp-win-x64-1.34.11.zip,https://download.visualstudio.microsoft.com/download/pr/c45cccfd-d481-48f9-941d-2f31712f3edc/7b7101973ef0ba0915df58b9d205f8c7/omnisharp-win-x86-1.34.11.zip",
123+
"NEW_DEPS_VERSION": "1.34.11"
124124
},
125125
"cwd": "${workspaceFolder}"
126126
}

CHANGELOG.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Known Issues in 1.21.10
1+
## Known Issues in 1.21.11
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)
@@ -9,7 +9,13 @@
99
* There currently is no completion support for package references in csproj files. ([#1156](https://github.com/OmniSharp/omnisharp-vscode/issues/1156))
1010
* As an alternative, consider installing the [MSBuild Project Tools](https://marketplace.visualstudio.com/items?itemName=tintoy.msbuild-project-tools) extension by @tintoy.
1111

12-
## 1.21.10 (Not yet released)
12+
## 1.21.11 (Not Yet Released)
13+
* Updated the bundled to Mono 6.8.0 and MSBuild to be copied from Mono 6.8.0 ([omnisharp-roslyn/#1693](https://github.com/OmniSharp/omnisharp-roslyn/issues/1693), PR: [omnisharp-roslyn/#1697](https://github.com/OmniSharp/omnisharp-roslyn/pull/1697))
14+
* Included NugetSDKResolver in the minimal MSBuild, which introduces support for Nuget based project SDKs like Arcade ([omnisharp-roslyn/#1678](https://github.com/OmniSharp/omnisharp-roslyn/issues/1678), PR: [omnisharp-roslyn/#1696](https://github.com/OmniSharp/omnisharp-roslyn/pull/1696))
15+
* Added option (`csharp.supressBuildAssetsNotification`) to surpress missing build asset notifications (PR:[#3538](https://github.com/OmniSharp/omnisharp-vscode/pull/3538))
16+
* The minimum Mono version required to run OmniSharp on has been increased to 6.4.0
17+
18+
## 1.21.10 (February 2, 2020)
1319
* Updated Razor support (PR:[#3524](https://github.com/OmniSharp/omnisharp-vscode/pull/3524))
1420
* Added quick info (hover) support for TagHelper and Blazor components. You can now hover over TagHelpers, Components and their attributes to understand what associated C# type you're hovering over in addition to an attributes expected value type.
1521
* Migrated Razor's project understanding from the VSCode extension into the Language Server. This enables the language server to reboot without extra assistance (reliability) from an LSP client and also enables future Razor LSP clients to have richer functionality with less "work".

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ 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.21.11
24+
* Updated the bundled to Mono 6.8.0 and MSBuild to be copied from Mono 6.8.0 ([omnisharp-roslyn/#1693](https://github.com/OmniSharp/omnisharp-roslyn/issues/1693), PR: [omnisharp-roslyn/#1697](https://github.com/OmniSharp/omnisharp-roslyn/pull/1697))
25+
* Included NugetSDKResolver in the minimal MSBuild, which introduces support for Nuget based project SDKs like Arcade ([omnisharp-roslyn/#1678](https://github.com/OmniSharp/omnisharp-roslyn/issues/1678), PR: [omnisharp-roslyn/#1696](https://github.com/OmniSharp/omnisharp-roslyn/pull/1696))
26+
* Added option (`csharp.supressBuildAssetsNotification`) to surpress missing build asset notifications (PR:[#3538](https://github.com/OmniSharp/omnisharp-vscode/pull/3538))
27+
* The minimum Mono version required to run OmniSharp on has been increased to 6.4.0
28+
2329
## What's new in 1.21.10
2430
* Updated Razor support (PR:[#3524](https://github.com/OmniSharp/omnisharp-vscode/pull/3524))
2531
* Added quick info (hover) support for TagHelper and Blazor components. You can now hover over TagHelpers, Components and their attributes to understand what associated C# type you're hovering over in addition to an attributes expected value type.
@@ -58,10 +64,6 @@ The C# extension is powered by [OmniSharp](https://github.com/OmniSharp/omnishar
5864
* Support plugins configuration in omnisharp.json (PR:[omnisharp-roslyn/#1615](https://github.com/OmniSharp/omnisharp-roslyn/pull/1615))
5965
* Improved support for .NET Core 3.1
6066

61-
# What's new in 1.21.7
62-
* Updated the embedded Mono to 6.4.0 (PR:[omnisharp-roslyn/#1640](https://github.com/OmniSharp/omnisharp-roslyn/pull/1640))
63-
* Improved support for .NET Core 3
64-
6567
### Supported Operating Systems for Debugging
6668

6769
* Currently, the C# debugger officially supports the following operating systems:

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "csharp",
33
"publisher": "ms-vscode",
4-
"version": "1.21.10",
4+
"version": "1.21.11",
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.34.10",
32+
"omniSharp": "1.34.11",
3333
"razor": "1.0.0-alpha3-5.0.0-alpha.1.20073.7"
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/b146ec31-8d19-45ca-96ff-d04a8b436b25/5b6193019dbeab0eceb1d6b7aa4baebf/omnisharp-win-x86-1.34.10.zip",
163-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.34.10.zip",
164-
"installPath": ".omnisharp/1.34.10",
162+
"url": "https://download.visualstudio.microsoft.com/download/pr/c45cccfd-d481-48f9-941d-2f31712f3edc/7b7101973ef0ba0915df58b9d205f8c7/omnisharp-win-x86-1.34.11.zip",
163+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.34.11.zip",
164+
"installPath": ".omnisharp/1.34.11",
165165
"platforms": [
166166
"win32"
167167
],
168168
"architectures": [
169169
"x86"
170170
],
171-
"installTestPath": "./.omnisharp/1.34.10/OmniSharp.exe",
171+
"installTestPath": "./.omnisharp/1.34.11/OmniSharp.exe",
172172
"platformId": "win-x86",
173-
"integrity": "FCE930D345C02BAB46BE22B3570A1DCEFFB3495CB71FDF02A83E7F74B210ECED"
173+
"integrity": "3477A8343F4110E3996A1290E88CE27082F7F8C725186911F202D41FE38EB64A"
174174
},
175175
{
176176
"id": "OmniSharp",
177177
"description": "OmniSharp for Windows (.NET 4.6 / x64)",
178-
"url": "https://download.visualstudio.microsoft.com/download/pr/b146ec31-8d19-45ca-96ff-d04a8b436b25/24bc14b24a159bd155a0a82560a9bbb4/omnisharp-win-x64-1.34.10.zip",
179-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.34.10.zip",
180-
"installPath": ".omnisharp/1.34.10",
178+
"url": "https://download.visualstudio.microsoft.com/download/pr/c45cccfd-d481-48f9-941d-2f31712f3edc/19ae4e7c8e788df2ae1d8b03f7c737d2/omnisharp-win-x64-1.34.11.zip",
179+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.34.11.zip",
180+
"installPath": ".omnisharp/1.34.11",
181181
"platforms": [
182182
"win32"
183183
],
184184
"architectures": [
185185
"x86_64"
186186
],
187-
"installTestPath": "./.omnisharp/1.34.10/OmniSharp.exe",
187+
"installTestPath": "./.omnisharp/1.34.11/OmniSharp.exe",
188188
"platformId": "win-x64",
189-
"integrity": "00B46E3004D7A4FF5F9DEADDBAFDD62A44DBB74EF79E1A49B770E95A4DEC211B"
189+
"integrity": "CE8FBB8B22FF9E25361EF78E677A3E600F61008FDB793E693060CFF6505EC200"
190190
},
191191
{
192192
"id": "OmniSharp",
193193
"description": "OmniSharp for OSX",
194-
"url": "https://download.visualstudio.microsoft.com/download/pr/b146ec31-8d19-45ca-96ff-d04a8b436b25/9fb60fbaf6a2a21a063782ec64a3604b/omnisharp-osx-1.34.10.zip",
195-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-osx-1.34.10.zip",
196-
"installPath": ".omnisharp/1.34.10",
194+
"url": "https://download.visualstudio.microsoft.com/download/pr/c45cccfd-d481-48f9-941d-2f31712f3edc/bbd8cf76d4c78513b0774cd9740276c7/omnisharp-osx-1.34.11.zip",
195+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-osx-1.34.11.zip",
196+
"installPath": ".omnisharp/1.34.11",
197197
"platforms": [
198198
"darwin"
199199
],
200200
"binaries": [
201201
"./mono.osx",
202202
"./run"
203203
],
204-
"installTestPath": "./.omnisharp/1.34.10/run",
204+
"installTestPath": "./.omnisharp/1.34.11/run",
205205
"platformId": "osx",
206-
"integrity": "240668FF2771D682282DCE117ACDB7AEC977FF0445624933436A852257EA64CE"
206+
"integrity": "6B63DCE0519E5BF1CFAA4DAEE19834A6B348C0ED450D05B53C2A694338C44DAA"
207207
},
208208
{
209209
"id": "OmniSharp",
210210
"description": "OmniSharp for Linux (x86)",
211-
"url": "https://download.visualstudio.microsoft.com/download/pr/b146ec31-8d19-45ca-96ff-d04a8b436b25/d557fd237873e4e41835b150972c0f6d/omnisharp-linux-x86-1.34.10.zip",
212-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x86-1.34.10.zip",
213-
"installPath": ".omnisharp/1.34.10",
211+
"url": "https://download.visualstudio.microsoft.com/download/pr/c45cccfd-d481-48f9-941d-2f31712f3edc/c83ce7b1e7a9f642c892a0d77b8db57f/omnisharp-linux-x86-1.34.11.zip",
212+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x86-1.34.11.zip",
213+
"installPath": ".omnisharp/1.34.11",
214214
"platforms": [
215215
"linux"
216216
],
@@ -222,16 +222,16 @@
222222
"./mono.linux-x86",
223223
"./run"
224224
],
225-
"installTestPath": "./.omnisharp/1.34.10/run",
225+
"installTestPath": "./.omnisharp/1.34.11/run",
226226
"platformId": "linux-x86",
227-
"integrity": "399D4CCBE46573F5084657B5D0D7D56AED516EAEB673960BE80B475D1A70DF4B"
227+
"integrity": "F550E3AD4A2A394CCE5023D2A8588B3D23FDDEE8E3B7FEEB694DB51BE1E5C8E2"
228228
},
229229
{
230230
"id": "OmniSharp",
231231
"description": "OmniSharp for Linux (x64)",
232-
"url": "https://download.visualstudio.microsoft.com/download/pr/b146ec31-8d19-45ca-96ff-d04a8b436b25/c5dea00c97eb01516686d944801dce8a/omnisharp-linux-x64-1.34.10.zip",
233-
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x64-1.34.10.zip",
234-
"installPath": ".omnisharp/1.34.10",
232+
"url": "https://download.visualstudio.microsoft.com/download/pr/c45cccfd-d481-48f9-941d-2f31712f3edc/b90373027676c50db323ac424f2ff1f4/omnisharp-linux-x64-1.34.11.zip",
233+
"fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x64-1.34.11.zip",
234+
"installPath": ".omnisharp/1.34.11",
235235
"platforms": [
236236
"linux"
237237
],
@@ -242,9 +242,9 @@
242242
"./mono.linux-x86_64",
243243
"./run"
244244
],
245-
"installTestPath": "./.omnisharp/1.34.10/run",
245+
"installTestPath": "./.omnisharp/1.34.11/run",
246246
"platformId": "linux-x64",
247-
"integrity": "6CAE32D0C60D9535C86F175FB71A0B16F8CD293947C1E674C85ECD1AFF970890"
247+
"integrity": "B1E56C7AC62F6E8B6C6D680DA3A7FAD35599304D1F6BBA763D4E8301A3CAF362"
248248
},
249249
{
250250
"id": "Debugger",
@@ -661,11 +661,11 @@
661661
"never"
662662
],
663663
"enumDescriptions": [
664-
"Automatically launch OmniSharp with \"mono\" if version 5.8.1 or greater is available on the PATH.",
665-
"Always launch OmniSharp with \"mono\". If version 5.8.1 or greater is not available on the PATH, an error will be printed.",
664+
"Automatically launch OmniSharp with \"mono\" if version 6.4.0 or greater is available on the PATH.",
665+
"Always launch OmniSharp with \"mono\". If version 6.4.0 or greater is not available on the PATH, an error will be printed.",
666666
"Never launch OmniSharp on a globally-installed Mono."
667667
],
668-
"description": "Launch OmniSharp with the globally-installed Mono. If set to \"always\", \"mono\" version 5.8.1 or greater must be available on the PATH. If set to \"auto\", OmniSharp will be launched with \"mono\" if version 5.8.1 or greater is available on the PATH."
668+
"description": "Launch OmniSharp with the globally-installed Mono. If set to \"always\", \"mono\" version 6.4.0 or greater must be available on the PATH. If set to \"auto\", OmniSharp will be launched with \"mono\" if version 6.4.0 or greater is available on the PATH."
669669
},
670670
"omnisharp.monoPath": {
671671
"type": [

src/omnisharp/OmniSharpMonoResolver.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import { IMonoResolver } from '../constants/IMonoResolver';
1010
import { MonoInformation } from '../constants/MonoInformation';
1111
import { IGetMonoVersion } from '../constants/IGetMonoVersion';
1212

13-
export class OmniSharpMonoResolver implements IMonoResolver {
14-
private minimumMonoVersion = "6.6.0";
15-
13+
export class OmniSharpMonoResolver implements IMonoResolver {
14+
private minimumMonoVersion = "6.4.0";
15+
1616
constructor(private getMonoVersion: IGetMonoVersion) {
1717
}
1818

@@ -24,7 +24,7 @@ export class OmniSharpMonoResolver implements IMonoResolver {
2424
env['MONO_GAC_PREFIX'] = options.monoPath;
2525
monoPath = options.monoPath;
2626
}
27-
27+
2828
let version = await this.getMonoVersion(env);
2929

3030
return {

test/unitTests/omnisharp/OmniSharpMonoResolver.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ suite(`${OmniSharpMonoResolver.name}`, () => {
1919

2020
const monoPath = "monoPath";
2121

22-
const lowerMonoVersion = "6.4.0";
23-
const requiredMonoVersion = "6.6.0";
24-
const higherMonoVersion = "6.8.0";
22+
const lowerMonoVersion = "6.2.0";
23+
const requiredMonoVersion = "6.4.0";
24+
const higherMonoVersion = "6.6.0";
2525

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

0 commit comments

Comments
 (0)