From 120827e00ab6261c78b35c099d942ef94d4ab30e Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 17 Jun 2021 21:14:55 -0700 Subject: [PATCH 1/4] Update minimal build tools to match NET 6 Preview 5 --- tools/packages.config | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tools/packages.config b/tools/packages.config index db67b13d05..ace04ea705 100644 --- a/tools/packages.config +++ b/tools/packages.config @@ -13,15 +13,15 @@ --> - - + + - - - - - + + + + + - - - - - + + + + + - + - + - - - - + + + + From 29468d40892e0059d21b51de83bf8593c5e0278b Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 17 Jun 2021 21:15:50 -0700 Subject: [PATCH 2/4] Update ICSharpCode.Decompiler to 7.1.0.6543 --- build/Packages.props | 2 +- .../AbstractGoToDefinitionFacts.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Packages.props b/build/Packages.props index 915d38877c..0a6a32c7d0 100644 --- a/build/Packages.props +++ b/build/Packages.props @@ -15,7 +15,7 @@ - + diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/AbstractGoToDefinitionFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/AbstractGoToDefinitionFacts.cs index 128ae01d95..b46029629f 100644 --- a/tests/OmniSharp.Roslyn.CSharp.Tests/AbstractGoToDefinitionFacts.cs +++ b/tests/OmniSharp.Roslyn.CSharp.Tests/AbstractGoToDefinitionFacts.cs @@ -160,13 +160,13 @@ public static void main() public async Task ReturnsPartialMethodDefinitionWithBody(string filename) { var testFile = new TestFile(filename, @" - public partial class MyClass + public partial class MyClass { public MyClass() { Met$$hod(); } - + partial void {|def:Method|}() { //do stuff @@ -468,7 +468,7 @@ public void Baz() { // second comment should indicate we have decompiled var comments = compilationUnit.DescendantTrivia().Where(t => t.Kind() == SyntaxKind.SingleLineCommentTrivia).ToArray(); Assert.NotNull(comments); - Assert.Equal("// Decompiled with ICSharpCode.Decompiler 7.0.0.6488", comments[1].ToString()); + Assert.Equal("// Decompiled with ICSharpCode.Decompiler 7.1.0.6543", comments[1].ToString()); // contrary to regular metadata, we should have methods with full bodies // this condition would fail if decompilation wouldn't work From 1f0bc6b0159f4e231eac47d26f8fa0ba967ab27b Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 17 Jun 2021 21:22:44 -0700 Subject: [PATCH 3/4] Bump Roslyn version to 4.0.0-2.21314.7 --- build/Packages.props | 2 +- src/OmniSharp.Abstractions/Configuration.cs | 2 +- src/OmniSharp.Http.Driver/app.config | 10 +++++----- src/OmniSharp.LanguageServerProtocol/app.config | 10 +++++----- src/OmniSharp.Stdio.Driver/app.config | 10 +++++----- tests/app.config | 10 +++++----- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/build/Packages.props b/build/Packages.props index 0a6a32c7d0..940b93e11f 100644 --- a/build/Packages.props +++ b/build/Packages.props @@ -6,7 +6,7 @@ 3.1.12 16.9.0 5.2.0 - 3.11.0-1.21262.10 + 4.0.0-2.21314.7 2.4.1 diff --git a/src/OmniSharp.Abstractions/Configuration.cs b/src/OmniSharp.Abstractions/Configuration.cs index d1fdb0608d..b71b63600a 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.11.0.0"; + public const string RoslynVersion = "4.0.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 6059f18713..3a77d18a2f 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 b8876024b9..3b0727ac32 100644 --- a/src/OmniSharp.LanguageServerProtocol/app.config +++ b/src/OmniSharp.LanguageServerProtocol/app.config @@ -7,23 +7,23 @@ - + - + - + - + - + diff --git a/src/OmniSharp.Stdio.Driver/app.config b/src/OmniSharp.Stdio.Driver/app.config index 6059f18713..3a77d18a2f 100644 --- a/src/OmniSharp.Stdio.Driver/app.config +++ b/src/OmniSharp.Stdio.Driver/app.config @@ -7,23 +7,23 @@ - + - + - + - + - + diff --git a/tests/app.config b/tests/app.config index 0e65730d17..6d00653995 100644 --- a/tests/app.config +++ b/tests/app.config @@ -7,23 +7,23 @@ - + - + - + - + - + From 913eaff8469e10de9811e788943846ab8093869f Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 17 Jun 2021 21:24:10 -0700 Subject: [PATCH 4/4] Port version upgrades from the feature/omnisharp-vnext --- build/Packages.props | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/build/Packages.props b/build/Packages.props index 940b93e11f..026e490bba 100644 --- a/build/Packages.props +++ b/build/Packages.props @@ -2,9 +2,10 @@ - 2.1.1 - 3.1.12 - 16.9.0 + 2.2.0 + 5.0.0 + 16.9.4 + 16.10.0 5.2.0 4.0.0-2.21314.7 2.4.1 @@ -45,7 +46,7 @@ - + @@ -54,8 +55,10 @@ - - + + + +