Merge pull request #1663 from JoeRobich/update-roslyn-3.5.0-beta2-196…

…06-01 Update Roslyn to 3.5.0-beta2-19606-01
OmniSharp · Dec 9, 2019 · dacbb91 · dacbb91
2 parents 34d2c54 + 0381a36
commit dacbb91
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ All changes to the project will be documented in this file.
 * Line pragma is now respected in find references ([#1649](https://github.com/OmniSharp/omnisharp-roslyn/issues/1649), PR:[#1660](https://github.com/OmniSharp/omnisharp-roslyn/pull/1660))
 * Do not set mono paths when running in standalone mode ([omnisharp-vscode#3410](https://github.com/OmniSharp/omnisharp-vscode/issues/3410), [omnisharp-vscode#3340](https://github.com/OmniSharp/omnisharp-vscode/issues/3340), [#1650](https://github.com/OmniSharp/omnisharp-roslyn/issues/1650), PR:[#1656](https://github.com/OmniSharp/omnisharp-roslyn/pull/1656))
 * Fixed a bug where OmniSharp would crash on startup if the path contained `=` sign ([omnisharp-vscode#3436](https://github.com/OmniSharp/omnisharp-vscode/issues/3436), PR:[#1661](https://github.com/OmniSharp/omnisharp-roslyn/pull/1661))
+* Update to Roslyn `3.5.0-beta2-19606-01` (PR:[#1663](https://github.com/OmniSharp/omnisharp-roslyn/pull/1663))
 
 ## [1.34.8] - 2019-11-21
 * Update to Roslyn `3.5.0-beta1-19571-01` (PR:[#1653](https://github.com/OmniSharp/omnisharp-roslyn/pull/1653))

diff --git a/build/Packages.props b/build/Packages.props
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <MSBuildPackageVersion>16.4.0</MSBuildPackageVersion>
     <NuGetPackageVersion>5.2.0</NuGetPackageVersion>
-    <RoslynPackageVersion>3.5.0-beta1-19571-01</RoslynPackageVersion>
+    <RoslynPackageVersion>3.5.0-beta2-19606-01</RoslynPackageVersion>
     <XunitPackageVersion>2.4.0</XunitPackageVersion>
   </PropertyGroup>
 

diff --git a/tests/OmniSharp.Cake.Tests/CodeActionsV2Facts.cs b/tests/OmniSharp.Cake.Tests/CodeActionsV2Facts.cs
@@ -44,7 +44,7 @@ public void Whatever()
                 }";
 
             var refactorings = await FindRefactoringNamesAsync(code);
-            Assert.Contains("Extract Method", refactorings);
+            Assert.Contains("Extract method", refactorings);
         }
 
         [Fact]
@@ -64,7 +64,8 @@ public void Whatever()
             {
                 "using System.Text.RegularExpressions;",
                 "System.Text.RegularExpressions.Regex",
-                "Extract Method",
+                "Extract method",
+                "Extract local function",
                 "Introduce local for 'Regex.Match(\"foo\", \"bar\")'"
             };
             Assert.Equal(expected, refactorings);
@@ -91,7 +92,7 @@ public void Whatever()
                 EndColumn = 8
             };
 
-            var response = await RunRefactoringAsync(code, "Extract Method");
+            var response = await RunRefactoringAsync(code, "Extract method");
             var modifiedFile = response.Changes.FirstOrDefault() as ModifiedFileResponse;
 
             Assert.Single(response.Changes);

diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/CodeActionsV2Facts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/CodeActionsV2Facts.cs
@@ -105,7 +105,7 @@ public void Whatever()
                 }";
 
             var refactorings = await FindRefactoringNamesAsync(code, roslynAnalyzersEnabled);
-            Assert.Contains("Extract Method", refactorings);
+            Assert.Contains("Extract method", refactorings);
         }
 
         [Theory]
@@ -137,7 +137,8 @@ public void Whatever()
                 "Generate type 'Console' -> Generate class 'Console' in new file",
                 "Generate type 'Console' -> Generate class 'Console'",
                 "Generate type 'Console' -> Generate nested class 'Console'",
-                "Extract Method",
+                "Extract local function",
+                "Extract method",
                 "Introduce local for 'Console.Write(\"should be using System;\")'"
             } : new List<string>
             {
@@ -151,7 +152,8 @@ public void Whatever()
                 "Generate type 'Console' -> Generate class 'Console' in new file",
                 "Generate type 'Console' -> Generate class 'Console'",
                 "Generate type 'Console' -> Generate nested class 'Console'",
-                "Extract Method",
+                "Extract local function",
+                "Extract method",
                 "Introduce local for 'Console.Write(\"should be using System;\")'"
             };
             Assert.Equal(expected.OrderBy(x => x), refactorings.OrderBy(x => x));
@@ -183,7 +185,7 @@ private static void NewMethod()
                         Console.Write(""should be using System;"");
                     }
                 }";
-            var response = await RunRefactoringAsync(code, "Extract Method", isAnalyzersEnabled: roslynAnalyzersEnabled);
+            var response = await RunRefactoringAsync(code, "Extract method", isAnalyzersEnabled: roslynAnalyzersEnabled);
             AssertIgnoringIndent(expected, ((ModifiedFileResponse)response.Changes.First()).Buffer);
         }
 

diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/CodeActionsWithOptionsFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/CodeActionsWithOptionsFacts.cs
@@ -185,7 +185,7 @@ public class Class1 : IClass1
                     public string PropertyHere { get; set; }
                 }
                 ";
-            var response = await RunRefactoringAsync(code, "Extract Interface...");
+            var response = await RunRefactoringAsync(code, "Extract interface...");
 
             AssertIgnoringIndent(expected, ((ModifiedFileResponse)response.Changes.First()).Buffer);
         }

diff --git a/tools/packages.config b/tools/packages.config
@@ -6,7 +6,7 @@
     <package id="Microsoft.Build.Runtime" version="16.4.0" />
     <package id="Microsoft.Build.Tasks.Core" version="16.4.0" />
     <package id="Microsoft.Build.Utilities.Core" version="16.4.0" />
-    <package id="Microsoft.Net.Compilers" version="3.3.1" />
+    <package id="Microsoft.Net.Compilers" version="3.4.0" />
     <package id="Microsoft.DotNet.MSBuildSdkResolver" version="3.0.101-servicing.19476.7" />
     <package id="NuGet.Build.Tasks" version="5.3.1" />
     <package id="NuGet.Commands" version="5.3.1" />