Update Roslyn to 4.10.0-2.24112.8

- Remove EA.RazorCompiler - Switch to using CodeAction.NestedActions directly
OmniSharp · Feb 16, 2024 · 476a2bd · 476a2bd
1 parent f768329
commit 476a2bd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -9,7 +9,7 @@
         <MicrosoftTestPackageVersion>17.8.0</MicrosoftTestPackageVersion>
         <MSBuildPackageVersion>17.3.2</MSBuildPackageVersion>
         <NuGetPackageVersion>6.10.0-preview.1.18</NuGetPackageVersion>
-        <RoslynPackageVersion>4.9.0-3.23611.3</RoslynPackageVersion>
+        <RoslynPackageVersion>4.10.0-2.24112.8</RoslynPackageVersion>
         <XunitPackageVersion>2.6.1</XunitPackageVersion>
     </PropertyGroup>
 
@@ -42,7 +42,6 @@
         <PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" Version="$(RoslynPackageVersion)" />
         <PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp" Version="$(RoslynPackageVersion)" />
         <PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" Version="$(RoslynPackageVersion)" />
-        <PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler" Version="$(RoslynPackageVersion)" />
 
         <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionPackageVersion)" />
         <PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionPackageVersion)" />

diff --git 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 = "4.9.0.0";
+        public const string RoslynVersion = "4.10.0.0";
         public const string RoslynPublicKeyToken = "31bf3856ad364e35";
 
         public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features");

diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Refactoring/V2/BaseCodeActionService.cs b/src/OmniSharp.Roslyn.CSharp/Services/Refactoring/V2/BaseCodeActionService.cs
@@ -227,7 +227,7 @@ private IEnumerable<AvailableCodeAction> ConvertToAvailableCodeAction(IEnumerabl
         {
             return actions.SelectMany(action =>
             {
-                var nestedActions = action.CodeAction.GetNestedCodeActions();
+                var nestedActions = action.CodeAction.NestedActions;
                 if (!nestedActions.IsDefaultOrEmpty)
                 {
                     return nestedActions.Select(nestedAction => new AvailableCodeAction(nestedAction, action.CodeActionKind, action.CodeAction));

diff --git a/src/OmniSharp.Roslyn/OmniSharp.Roslyn.csproj b/src/OmniSharp.Roslyn/OmniSharp.Roslyn.csproj
@@ -21,9 +21,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- Not directly referenced but needed for Razor source generators -->
-    <PackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler" ReferenceOutputAssembly="false" />
-
     <!-- Not directly referenced but needed for Route embedded language features -->
     <PackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" ReferenceOutputAssembly="false" />
   </ItemGroup>

diff --git a/tools/packages.config b/tools/packages.config
@@ -4,7 +4,7 @@
     <package id="xunit.runner.console" version="2.4.0" />
 
     <!-- These packages are dependencies of the .NET Framework builds of OmniSharp -->
-    <package id="SQLitePCLRaw.bundle_green" version="2.1.0" />
-    <package id="SQLitePCLRaw.core" version="2.1.0" />
-    <package id="SQLitePCLRaw.provider.e_sqlite3" version="2.1.0" />
+    <package id="SQLitePCLRaw.bundle_green" version="2.1.8" />
+    <package id="SQLitePCLRaw.core" version="2.1.8" />
+    <package id="SQLitePCLRaw.provider.e_sqlite3" version="2.1.8" />
 </packages>