Merge pull request #1832 from JoeRobich/update-roslyn-3.7.0-4

Update Roslyn to 3.7.0-4.20311.4
OmniSharp · Jun 11, 2020 · a769e4a · a769e4a
2 parents 8bba43d + 453a516
commit a769e4a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,14 @@
 # Changelog
 All changes to the project will be documented in this file.
 
-## [1.35.3] - not yet released
+## [1.35.4] - Not yet released
+
+## [1.35.3] - 2020-06-11
 * Added LSP handler for `textDocument/codeAction` request. (PR: [#1795](https://github.com/OmniSharp/omnisharp-roslyn/pull/1795))
 * Expose a custom LSP `omnisharp/client/findReferences` command via code lens (meant to be handled by LSP client). (PR: [#1807](https://github.com/OmniSharp/omnisharp-roslyn/pull/1807))
 * Added `DirectoryDelete` option to `FileChangeType` allowing clients to report deleted directories that need to be removed (along all the files) from the workspace (PR: [#1821](https://github.com/OmniSharp/omnisharp-roslyn/pull/1821))
 * Do not crash when plugin assembly cannot be loaded ([#1307](https://github.com/OmniSharp/omnisharp-roslyn/issues/1307), PR: [#1827](https://github.com/OmniSharp/omnisharp-roslyn/pull/1827))
+* Update to Roslyn `3.7.0-4.20311.4` (PR: [#1832](https://github.com/OmniSharp/omnisharp-roslyn/pull/1832))
 
 ## [1.35.2] - 2020-05-20
 * Added support for `WarningsAsErrors` in csproj files (PR: [#1779](https://github.com/OmniSharp/omnisharp-roslyn/pull/1779))

diff --git a/build/Packages.props b/build/Packages.props
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <MSBuildPackageVersion>16.5.0</MSBuildPackageVersion>
     <NuGetPackageVersion>5.2.0</NuGetPackageVersion>
-    <RoslynPackageVersion>3.7.0-2.20269.10</RoslynPackageVersion>
+    <RoslynPackageVersion>3.7.0-4.20311.4</RoslynPackageVersion>
     <XunitPackageVersion>2.4.0</XunitPackageVersion>
   </PropertyGroup>
 

diff --git a/src/OmniSharp.Roslyn/BaseExternalSourceService.cs b/src/OmniSharp.Roslyn/BaseExternalSourceService.cs
@@ -55,7 +55,7 @@ public Document FindDocumentInCache(string fileName)
 
         public async Task<Location> GetExternalSymbolLocation(ISymbol symbol, Document metadataDocument, CancellationToken cancellationToken = new CancellationToken())
         {
-            var symbolKeyCreateMethod = _symbolKey.GetMethod(Create, BindingFlags.Static | BindingFlags.NonPublic);
+            var symbolKeyCreateMethod = _symbolKey.GetMethod(Create, BindingFlags.Static | BindingFlags.Public);
             var symboldId = symbolKeyCreateMethod.InvokeStatic(new object[] { symbol, cancellationToken });
 
             return await _getLocationInGeneratedSourceAsync.InvokeStatic<Task<Location>>(new object[] { symboldId, metadataDocument, cancellationToken });

diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/FindSymbolsFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/FindSymbolsFacts.cs
@@ -161,7 +161,7 @@ public async Task Returns_struct_kind(string filename)
 
             var usages = await FindSymbolsAsync(code, filename);
             var symbols = usages.QuickFixes.Cast<SymbolLocation>().Select(q => q.Kind);
-            Assert.Equal("Struct", symbols.First());
+            Assert.Equal("Structure", symbols.First());
         }
 
         [Theory]
@@ -182,12 +182,12 @@ public async Task Returns_delegate_kind(string filename)
         public async Task Finds_partial_method_with_body(string filename)
         {
             const string code = @"
-public partial class MyClass  
+public partial class MyClass
 {
     partial void Method();
 }
 
-public partial class MyClass 
+public partial class MyClass
 {
     partial void Method()
     {
@@ -330,7 +330,8 @@ private async Task<QuickFixResponse> FindSymbolsWithFilterAsync(string code, str
             SharedOmniSharpTestHost.AddFilesToWorkspace(testFile);
             var requestHandler = GetRequestHandler(SharedOmniSharpTestHost);
 
-            return await requestHandler.Handle(new FindSymbolsRequest {
+            return await requestHandler.Handle(new FindSymbolsRequest
+            {
                 Filter = filter,
                 MinFilterLength = minFilterLength,
                 MaxItemsToReturn = maxItemsToReturn

diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/ImplementTypeFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/ImplementTypeFacts.cs
@@ -120,7 +120,7 @@ private async Task VerifyImplementType(string code, string expectedChange, Dicti
                     Column = point.Offset,
                     FileName = testFile.FileName,
                     Buffer = testFile.Content.Code,
-                    Identifier = "False;False;True:AssemblyName;global::IFoo;Microsoft.CodeAnalysis.ImplementInterface.AbstractImplementInterfaceService+ImplementInterfaceCodeAction",
+                    Identifier = "False;False;True:global::IFoo;AssemblyName;Microsoft.CodeAnalysis.ImplementInterface.AbstractImplementInterfaceService+ImplementInterfaceCodeAction;",
                     WantsTextChanges = true,
                     WantsAllCodeActionOperations = true
                 };