Update roslyn 5.3.0 2.25557.6 (#2696)

JoeRobich · web-flow · commit 745725e1ab81 · 2025-11-12T17:54:38.000-08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,8 +1,8 @@
 name: "Build"
 env:
   DotNetVersion: "10.0.100-preview.6.25358.103"
-  DotNetVersion2: "9.0.303"
-  DotNetVersion3: "8.0.412"
+  DotNetVersion2: "9.0.306"
+  DotNetVersion3: "8.0.415"
   DotNetVersion4: "6.0.428"
   DotNetVersion5: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
   NuGetVersion: "6.5.0"
diff --git a/.github/workflows/tests-net6.yml b/.github/workflows/tests-net6.yml
@@ -1,8 +1,8 @@
 name: "Tests net6.0"
 env:
   DotNetVersion: "10.0.100-preview.6.25358.103"
-  DotNetVersion2: "9.0.303"
-  DotNetVersion3: "8.0.412"
+  DotNetVersion2: "9.0.306"
+  DotNetVersion3: "8.0.415"
   DotNetVersion4: "6.0.428"
   DotNetVersion5: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
   NuGetVersion: "6.5.0"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,8 +1,8 @@
 name: "Tests"
 env:
   DotNetVersion: "10.0.100-preview.6.25358.103"
-  DotNetVersion2: "9.0.303"
-  DotNetVersion3: "8.0.412"
+  DotNetVersion2: "9.0.306"
+  DotNetVersion3: "8.0.415"
   DotNetVersion4: "6.0.428"
   DotNetVersion5: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
   NuGetVersion: "6.5.0"
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -10,7 +10,7 @@
         <MicrosoftTestPackageVersion>17.14.0-preview-25107-01</MicrosoftTestPackageVersion>
         <MSBuildPackageVersion>17.3.2</MSBuildPackageVersion>
         <NuGetPackageVersion>6.15.0-preview.1.86</NuGetPackageVersion>
-        <RoslynPackageVersion>5.1.0-1.25475.3</RoslynPackageVersion>
+        <RoslynPackageVersion>5.3.0-2.25557.5</RoslynPackageVersion>
         <XunitPackageVersion>2.8.1</XunitPackageVersion>
     </PropertyGroup>
 
@@ -62,7 +62,7 @@
         <PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionPackageVersion)" />
         <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionPackageVersion)" />
 
-        <PackageVersion Include="Microsoft.IO.Redist" Version="6.1.0" />
+        <PackageVersion Include="Microsoft.IO.Redist" Version="6.1.3" />
 
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestPackageVersion)" />
         <PackageVersion Include="Microsoft.TestPlatform.TranslationLayer" Version="$(MicrosoftTestPackageVersion)" />
@@ -90,7 +90,7 @@
         <PackageVersion Include="System.ComponentModel.Composition" Version="$(MicrosoftBaseCommonLibraryVersion)" />
         <PackageVersion Include="System.Composition" Version="$(MicrosoftBaseCommonLibraryVersion)" />
         <PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(MicrosoftBaseCommonLibraryVersion)" />
-        <PackageVersion Include="System.Memory" Version="4.6.0" />
+        <PackageVersion Include="System.Memory" Version="4.6.3" />
         <PackageVersion Include="System.Reflection.Metadata" Version="$(MicrosoftBaseCommonLibraryVersion)" />
         <PackageVersion Include="System.Text.Json" Version="$(MicrosoftBaseCommonLibraryVersion)" />
         <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="$(MicrosoftBaseCommonLibraryVersion)" />
@@ -106,9 +106,10 @@
         <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     </ItemGroup>
     <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
-        <PackageVersion Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
-        <PackageVersion Include="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
-        <PackageVersion Include="Microsoft.AspNetCore.Http.Features" Version="2.2.0" />
-        <PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
+        <PackageVersion Include="Microsoft.AspNetCore.Diagnostics" Version="2.3.0" />
+        <PackageVersion Include="Microsoft.AspNetCore.Hosting" Version="2.3.0" />
+        <PackageVersion Include="Microsoft.AspNetCore.Http.Features" Version="2.3.0" />
+        <PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.3.0" />
+        <PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.3.6" />
     </ItemGroup>
 </Project>
diff --git a/build.json b/build.json
@@ -4,16 +4,13 @@
     "DotNetVersions": [
         "6.0.203",
         "6.0.428",
-        "8.0.412",
-        "9.0.303",
+        "8.0.415",
+        "9.0.306",
         "10.0.100-preview.6.25358.103"
     ],
     "RequiredMonoVersion": "6.6.0",
     "DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext",
-    "HostProjects": [
-        "OmniSharp.Stdio.Driver",
-        "OmniSharp.Http.Driver"
-    ],
+    "HostProjects": ["OmniSharp.Stdio.Driver", "OmniSharp.Http.Driver"],
     "TestProjects": [
         "OmniSharp.MSBuild.Tests",
         "OmniSharp.Roslyn.CSharp.Tests",
@@ -47,13 +44,7 @@
         "ProjectWithParentEditorConfig",
         "TwoProjectsWithAnalyzerSuppressor"
     ],
-    "CakeTestAssets": [
-        "CakeProject"
-    ],
-    "WindowsOnlyTestAssets": [
-        "AntlrGeneratedFiles"
-    ],
-    "RestoreOnlyTestAssets": [
-        "ProjectWithMissingType"
-    ]
-}
+    "CakeTestAssets": ["CakeProject"],
+    "WindowsOnlyTestAssets": ["AntlrGeneratedFiles"],
+    "RestoreOnlyTestAssets": ["ProjectWithMissingType"]
+}
diff --git a/build/Settings.props b/build/Settings.props
@@ -8,6 +8,7 @@
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <NoWarn>NU1701;NU5104;NU1901;NU1903</NoWarn>
     <IsPackable>false</IsPackable>
     <Authors>OmniSharp Contributors</Authors>
diff --git a/global.json b/global.json
@@ -3,4 +3,4 @@
         "version": "10.0.100-preview.6.25358.103",
         "rollForward": "latestMinor"
     }
-}
+}
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 = "5.1.0.0";
+        public const string RoslynVersion = "5.3.0.0";
         public const string RoslynPublicKeyToken = "31bf3856ad364e35";
 
         public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features");
diff --git a/src/OmniSharp.Http/OmniSharp.Http.csproj b/src/OmniSharp.Http/OmniSharp.Http.csproj
@@ -21,6 +21,7 @@
     <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
         <PackageReference Include="Microsoft.AspNetCore.Diagnostics" />
         <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" />
+        <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
         <PackageReference Include="Microsoft.AspNetCore.Hosting" />
         <PackageReference Include="Microsoft.AspNetCore.Http.Features" />
     </ItemGroup>
diff --git a/test-assets/test-projects/Net80Project/global.json b/test-assets/test-projects/Net80Project/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.412"
+        "version": "8.0.415"
     }
 }
diff --git a/test-assets/test-projects/Net90Project/global.json b/test-assets/test-projects/Net90Project/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.303"
+        "version": "9.0.306"
     }
-}
+}
diff --git a/test-assets/test-projects/global.net.json b/test-assets/test-projects/global.net.json
@@ -3,4 +3,4 @@
         "version": "10.0.100-preview.6.25358.103",
         "rollForward": "latestMinor"
     }
-}
+}
diff --git a/tests/OmniSharp.Lsp.Tests/OmnisharpCompletionHandlerFacts.cs b/tests/OmniSharp.Lsp.Tests/OmnisharpCompletionHandlerFacts.cs
@@ -1119,13 +1119,18 @@ public class MyClass1 {
             var completions = await FindCompletionsAsync(filename, source);
             Assert.Equal(new[] { "<!--$0-->",
                                  "<![CDATA[$0]]>",
+                                 "b",
                                  "c",
                                  "code",
+                                 "em",
+                                 "i",
                                  "<inheritdoc$0/>",
                                  "<list type=\"$0\"",
                                  "para",
                                  "<see cref=\"$0\"/>",
-                                 "<seealso cref=\"$0\"/>"
+                                 "<seealso cref=\"$0\"/>",
+                                 "strong",
+                                 "tt"
                          },
                          completions.Items.Select(c => c.TextEdit.TextEdit.NewText));
             Assert.All(completions.Items, c => Assert.Equal(c.TextEdit.TextEdit.NewText.Contains("$0"), c.InsertTextFormat == InsertTextFormat.Snippet));
diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs
@@ -231,7 +231,7 @@ public async Task The_correct_sdk_version_is_emitted_NET8()
             using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net80Project");
             using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
             Assert.Single(emitter.ReceivedMessages);
-            Assert.Equal(GetHashedFileExtension("8.0.412"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("8.0.415"), emitter.ReceivedMessages[0].SdkVersion);
         }
 
         [ConditionalFact(typeof(DotnetRuntimeOnly))]
@@ -243,7 +243,7 @@ public async Task The_correct_sdk_version_is_emitted_NET9()
             using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net90Project");
             using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
             Assert.Single(emitter.ReceivedMessages);
-            Assert.Equal(GetHashedFileExtension("9.0.303"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("9.0.306"), emitter.ReceivedMessages[0].SdkVersion);
         }
 
         [ConditionalFact(typeof(DotnetRuntimeOnly))]
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/CompletionFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/CompletionFacts.cs
@@ -1696,13 +1696,18 @@ public class MyClass1 {
             var completions = await FindCompletionsAsync(filename, source, SharedOmniSharpTestHost);
             Assert.Equal(new[] { "<!--$0-->",
                                  "<![CDATA[$0]]>",
+                                 "b",
                                  "c",
                                  "code",
+                                 "em",
+                                 "i",
                                  "<inheritdoc$0/>",
                                  "<list type=\"$0\"",
                                  "para",
                                  "<see cref=\"$0\"/>",
-                                 "<seealso cref=\"$0\"/>"
+                                 "<seealso cref=\"$0\"/>",
+                                 "strong",
+                                 "tt"
                          },
                          completions.Items.Select(c => c.TextEdit.NewText));
             Assert.All(completions.Items, c =>

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@`
`3`	`3`	`"version": "10.0.100-preview.6.25358.103",`
`4`	`4`	`"rollForward": "latestMinor"`
`5`	`5`	`}`
`6`		`-}`
	`6`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ internal static class Configuration`
`4`	`4`	`{`
`5`	`5`	`public static bool ZeroBasedIndices = false;`
`6`	`6`
`7`		`- public const string RoslynVersion = "5.1.0.0";`
	`7`	`+ public const string RoslynVersion = "5.3.0.0";`
`8`	`8`	`public const string RoslynPublicKeyToken = "31bf3856ad364e35";`
`9`	`9`
`10`	`10`	`public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features");`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "8.0.412"`
	`3`	`+ "version": "8.0.415"`
`4`	`4`	`}`
`5`	`5`	`}`