From daa8d53a060d05f0d434be07bed3a1c1737c247d Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 21 Oct 2020 10:13:22 -0700 Subject: [PATCH] Set useGlobalMono 'auto' meaning back to 'never' --- CHANGELOG.md | 8 ++++++-- README.md | 5 ++++- src/omnisharp/OmniSharpMonoResolver.ts | 4 +++- test/unitTests/omnisharp/OmniSharpMonoResolver.test.ts | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4672c65e..19efc1f70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ -## Known Issues in 1.23.4 +## Known Issues in 1.23.5 +* 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) * Known limitations with the preview Razor (cshtml) language service to be addressed in a future release: * Only ASP.NET Core projects are supported (no support for ASP.NET projects) * Limited support for formatting @@ -10,7 +11,10 @@ * Renaming symbol fails within a file that had recently been renamed without saving changes. * As a workaround, make an edit within the file before using Rename Symbol. -## 1.23.4 (Not yet released) +## 1.23.5 (Not yet released) +* Set meaning of UseGlobalMono "auto" to "never" since Mono 6.12.0 still ships with MSBuild 16.7 (PR: [#4130](https://github.com/OmniSharp/omnisharp-vscode/pull/4130)) + +## 1.23.4 (October, 19, 2020) * Use incremental changes to update language server (PR: [#4088](https://github.com/OmniSharp/omnisharp-vscode/pull/4088)) * 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)) * Updated OmniSharp to 1.37.3 diff --git a/README.md b/README.md index 9bca87236..faf0844cd 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,10 @@ The C# extension is powered by [OmniSharp](https://github.com/OmniSharp/omnishar The .NET 5 SDK requires version 16.8 of MSBuild. For Windows users who have Visual Studio installed, this means you will need to be on the latest Visual Studio 16.8 Preview. -For MacOS and Linux users who have Mono installed, this means you will need to be on the latest stable Mono (6.12.0). +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. + +## What's new in 1.23.5 +- Set meaning of UseGlobalMono "auto" to "never" since Mono 6.12.0 still ships with MSBuild 16.7 (PR: [#4130](https://github.com/OmniSharp/omnisharp-vscode/pull/4130)) ## What's new in 1.23.4 - Use incremental changes to update language server (PR: [#4088](https://github.com/OmniSharp/omnisharp-vscode/pull/4088)) diff --git a/src/omnisharp/OmniSharpMonoResolver.ts b/src/omnisharp/OmniSharpMonoResolver.ts index 730471442..655d5a93a 100644 --- a/src/omnisharp/OmniSharpMonoResolver.ts +++ b/src/omnisharp/OmniSharpMonoResolver.ts @@ -46,7 +46,9 @@ export class OmniSharpMonoResolver implements IMonoResolver { return monoInfo; } else if (options.useGlobalMono === "auto" && isValid) { - return monoInfo; + // While waiting for Mono to ship with a MSBuild version 16.8 or higher, we will treat "auto" + // as "Use included Mono". + // return monoInfo; } return undefined; diff --git a/test/unitTests/omnisharp/OmniSharpMonoResolver.test.ts b/test/unitTests/omnisharp/OmniSharpMonoResolver.test.ts index 1691c5ece..66fff512e 100644 --- a/test/unitTests/omnisharp/OmniSharpMonoResolver.test.ts +++ b/test/unitTests/omnisharp/OmniSharpMonoResolver.test.ts @@ -24,7 +24,7 @@ suite(`${OmniSharpMonoResolver.name}`, () => { const higherMonoVersion = "6.6.0"; // Sets the meaning of UseGlobalMono "auto". When false, "auto" means "never". - const autoMeansAlways = true; + const autoMeansAlways = false; const getMono = (version: string) => async (env: NodeJS.ProcessEnv) => { getMonoCalled = true;