diff --git a/CHANGELOG.md b/CHANGELOG.md index d60967613a..98961983cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,15 @@ # Changelog All changes to the project will be documented in this file. -## [1.37.4] - not yet released +## [1.37.5] - not yet released +* Update Roslyn version to 3.9.0-2.20570.24 (PR: [#2022](https://github.com/OmniSharp/omnisharp-roslyn/pull/2022)) + +## [1.37.4] - 2020-11-20 * Fixed global Mono MSBuild version reporting (PR: [#1988](https://github.com/OmniSharp/omnisharp-roslyn/pull/1988)) * Fixed incremental changes and completion in Cake (PR: [#1997](https://github.com/OmniSharp/omnisharp-roslyn/pull/1997)) * Omnisharp now uses libPaths and sourcePaths defined in custom .rsp file for scripting (PR: [#2000](https://github.com/OmniSharp/omnisharp-roslyn/pull/2000)) * C# scripting should use language version "latest" by default (PR: [#2001](https://github.com/OmniSharp/omnisharp-roslyn/pull/2001)) -* Fixed null references in LSP mode when requests are handled before the server fully initializes ([#1742](https://github.com/OmniSharp/omnisharp-roslyn/issues/1742https://github.com/OmniSharp/omnisharp-roslyn/issues/1742), [#1515](https://github.com/OmniSharp/omnisharp-roslyn/issues/1515), [#1083](https://github.com/OmniSharp/omnisharp-roslyn/issues/1083)), PR: [#2005](https://github.com/OmniSharp/omnisharp-roslyn/pull/2005)) +* Fixed null references in LSP mode when requests are handled before the server fully initializes ([#1742](https://github.com/OmniSharp/omnisharp-roslyn/issues/1742https://github.com/OmniSharp/omnisharp-roslyn/issues/1742), [#1515](https://github.com/OmniSharp/omnisharp-roslyn/issues/1515), [#1083](https://github.com/OmniSharp/omnisharp-roslyn/issues/1083), PR: [#2005](https://github.com/OmniSharp/omnisharp-roslyn/pull/2005)) * Fixed logging in LSP mode (PR: [#2002](https://github.com/OmniSharp/omnisharp-roslyn/pull/2002)) * Upgraded LSP mode to `OmniSharp.Extensions.LanguageServer 0.18.3` (PR: [#1998](https://github.com/OmniSharp/omnisharp-roslyn/pull/1998)) * Improve handling with Cake Script Service (PR: [#2013](https://github.com/OmniSharp/omnisharp-roslyn/pull/2013)) diff --git a/build/Packages.props b/build/Packages.props index 268c7a27a8..da54845ed3 100644 --- a/build/Packages.props +++ b/build/Packages.props @@ -5,7 +5,7 @@ 16.8.0 5.2.0 - 3.8.0 + 3.9.0-2.20570.24 2.4.1 diff --git a/src/OmniSharp.Abstractions/Configuration.cs b/src/OmniSharp.Abstractions/Configuration.cs index fb00c0cf61..d34e9120c1 100644 --- a/src/OmniSharp.Abstractions/Configuration.cs +++ b/src/OmniSharp.Abstractions/Configuration.cs @@ -4,7 +4,7 @@ internal static class Configuration { public static bool ZeroBasedIndices = false; - public const string RoslynVersion = "3.8.0.0"; + public const string RoslynVersion = "3.9.0.0"; public const string RoslynPublicKeyToken = "31bf3856ad364e35"; public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features"); diff --git a/src/OmniSharp.Http.Driver/app.config b/src/OmniSharp.Http.Driver/app.config index 23121dd95e..751f54f28d 100644 --- a/src/OmniSharp.Http.Driver/app.config +++ b/src/OmniSharp.Http.Driver/app.config @@ -7,23 +7,23 @@ - + - + - + - + - + diff --git a/src/OmniSharp.LanguageServerProtocol/app.config b/src/OmniSharp.LanguageServerProtocol/app.config index 043865801c..3e467078a0 100644 --- a/src/OmniSharp.LanguageServerProtocol/app.config +++ b/src/OmniSharp.LanguageServerProtocol/app.config @@ -7,23 +7,23 @@ - + - + - + - + - + @@ -42,7 +42,7 @@ - + diff --git a/src/OmniSharp.Stdio.Driver/app.config b/src/OmniSharp.Stdio.Driver/app.config index 23121dd95e..751f54f28d 100644 --- a/src/OmniSharp.Stdio.Driver/app.config +++ b/src/OmniSharp.Stdio.Driver/app.config @@ -7,23 +7,23 @@ - + - + - + - + - + diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/ReAnalysisFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/ReAnalysisFacts.cs index 35f9f7450c..f302430cb0 100644 --- a/tests/OmniSharp.Roslyn.CSharp.Tests/ReAnalysisFacts.cs +++ b/tests/OmniSharp.Roslyn.CSharp.Tests/ReAnalysisFacts.cs @@ -32,7 +32,9 @@ public async Task WhenReAnalyzeIsExecutedForAll_ThenReanalyzeAllFiles() var changeBufferHandler = host.GetRequestHandler(OmniSharpEndpoints.ChangeBuffer); var reAnalyzeHandler = host.GetRequestHandler(OmniSharpEndpoints.ReAnalyze); - host.AddFilesToWorkspace(new TestFile("a.cs", "public class A: B { }"), new TestFile("b.cs", "public class B { }")); + var bContent = "public class B { }"; + + host.AddFilesToWorkspace(new TestFile("a.cs", "public class A: B { }"), new TestFile("b.cs", bContent)); await host.RequestCodeCheckAsync("a.cs"); @@ -43,7 +45,7 @@ await changeBufferHandler.Handle(new ChangeBufferRequest() StartLine = 0, StartColumn = 0, EndLine = 0, - EndColumn = newContent.Length, + EndColumn = bContent.Length, NewText = newContent, FileName = "b.cs" }); @@ -127,4 +129,4 @@ private OmniSharpTestHost GetHost() configurationData: TestHelpers.GetConfigurationDataWithAnalyzerConfig(roslynAnalyzersEnabled: true), eventEmitter: _eventListener); } } -} \ No newline at end of file +} diff --git a/tests/app.config b/tests/app.config index 5121e50da6..1eb08705b3 100644 --- a/tests/app.config +++ b/tests/app.config @@ -7,23 +7,23 @@ - + - + - + - + - +