diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d8e42af056d7..19629e95a0a1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -125,47 +125,47 @@
       <Sha>4ba36db1f42f33a66d9677f0b9d589d39b204a9c</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25179.1">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25209.15">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
+      <Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25179.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="5.0.0-1.25209.15">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
+      <Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25179.1">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="5.0.0-1.25209.15">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
+      <Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25179.1">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-1.25209.15">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
+      <Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25179.1">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25209.15">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
+      <Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25179.1">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="5.0.0-1.25209.15">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
+      <Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25179.1">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25209.15">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
+      <Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25179.1">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25209.15">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
+      <Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0-3.25179.1">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25209.15">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
+      <Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25179.1">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25209.15">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
+      <Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.102">
       <Uri>https://github.com/nuget/nuget.client</Uri>
@@ -467,9 +467,9 @@
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
       <Sha>d98c60c0da655de406d3c45d0c82bfd82cc15a66</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25177.1">
-      <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>d98c60c0da655de406d3c45d0c82bfd82cc15a66</Sha>
+    <Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25209.15">
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
     <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.12.0-beta1.25177.1">
diff --git a/eng/Versions.props b/eng/Versions.props
index a2fff40a1ee0..cce55be86056 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -177,7 +177,7 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
     <MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25177.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
-    <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25177.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
+    <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25209.15</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -222,15 +222,15 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn -->
-    <MicrosoftNetCompilersToolsetVersion>4.14.0-3.25179.1</MicrosoftNetCompilersToolsetVersion>
-    <MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.14.0-3.25179.1</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
-    <MicrosoftCodeAnalysisPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
-    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftNetCompilersToolsetVersion>5.0.0-1.25209.15</MicrosoftNetCompilersToolsetVersion>
+    <MicrosoftNetCompilersToolsetFrameworkPackageVersion>5.0.0-1.25209.15</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
+    <MicrosoftCodeAnalysisPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
+    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
diff --git a/src/SourceBuild/patches/roslyn/0001-Update-maintenance-packages-versions-78005.patch b/src/SourceBuild/patches/roslyn/0001-Update-maintenance-packages-versions-78005.patch
deleted file mode 100644
index 0e76605df53e..000000000000
--- a/src/SourceBuild/patches/roslyn/0001-Update-maintenance-packages-versions-78005.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
- <1175054+carlossanlop@users.noreply.github.com>
-Date: Sat, 5 Apr 2025 01:36:10 -0700
-Subject: [PATCH] Update maintenance-packages versions (#78005)
-
-Backport: https://github.com/dotnet/roslyn/pull/78005
-
----------
-
-Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
----
- eng/Directory.Packages.props |  6 ++----
- eng/Versions.props           | 10 ++++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
-index 20ded129bd6..048a4bdd8d0 100644
---- a/eng/Directory.Packages.props
-+++ b/eng/Directory.Packages.props
-@@ -197,18 +197,16 @@
-     <PackageVersion Include="System.IO.Pipes.AccessControl" Version="5.0.0" />
-     <PackageVersion Include="System.Memory" Version="$(SystemMemoryVersion)" />
-     <PackageVersion Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" />
--    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
-     <PackageVersion Include="System.Resources.Extensions" Version="$(SystemResourcesExtensionsVersion)" />
-+    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
-     <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="$(SystemSecurityCryptographyProtectedDataVersion)" />
-     <PackageVersion Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
-     <PackageVersion Include="System.Text.Encoding.CodePages" Version="7.0.0" />
-     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowVersion)" />
-     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
-+    <PackageVersion Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
-     <PackageVersion Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsVersion)" />
- 
--    <!-- We need System.ValueTuple assembly version at least 4.0.3.0 on net47 to make F5 work against Dev15 - see https://github.com/dotnet/roslyn/issues/29705 -->
--    <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
--
-     <!--
-       When updating the S.C.I or S.R.M version please let the MSBuild team know in advance so they
-       can update to the same version. Version changes require a VS test insertion for validation.
-diff --git a/eng/Versions.props b/eng/Versions.props
-index 79b3276a372..f2eec08df24 100644
---- a/eng/Versions.props
-+++ b/eng/Versions.props
-@@ -21,13 +21,14 @@
-     https://github.com/dotnet/sdk/issues/45155
-   -->
-   <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
--    <MicrosoftIORedistVersion>6.1.2</MicrosoftIORedistVersion>
-+    <MicrosoftIORedistVersion>6.1.3</MicrosoftIORedistVersion>
-     <SystemBuffersVersion>4.6.1</SystemBuffersVersion>
-     <SystemDataSqlClientVersion>4.9.0</SystemDataSqlClientVersion>
--    <SystemMemoryVersion>4.6.2</SystemMemoryVersion>
-+    <SystemMemoryVersion>4.6.3</SystemMemoryVersion>
-     <SystemNumericsVectorsVersion>4.6.1</SystemNumericsVectorsVersion>
--    <SystemRuntimeCompilerServicesUnsafeVersion>6.1.1</SystemRuntimeCompilerServicesUnsafeVersion>
--    <SystemThreadingTasksExtensionsVersion>4.6.2</SystemThreadingTasksExtensionsVersion>
-+    <SystemRuntimeCompilerServicesUnsafeVersion>6.1.2</SystemRuntimeCompilerServicesUnsafeVersion>
-+    <SystemThreadingTasksExtensionsVersion>4.6.3</SystemThreadingTasksExtensionsVersion>
-+    <SystemValueTupleVersion>4.6.1</SystemValueTupleVersion>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
-     <MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
-@@ -41,6 +42,7 @@
-     <SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
-     <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
-     <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
-+    <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
-   </PropertyGroup>
-   <!--
-     Versions managed by Arcade (see Versions.Details.xml)
diff --git a/src/SourceBuild/patches/vstest/0001-Fix-formatting.patch b/src/SourceBuild/patches/vstest/0001-Fix-formatting.patch
new file mode 100644
index 000000000000..c9f9e0af65c0
--- /dev/null
+++ b/src/SourceBuild/patches/vstest/0001-Fix-formatting.patch
@@ -0,0 +1,101 @@
+From 0fc879489677500f088774f1e5f0b45f7457680e Mon Sep 17 00:00:00 2001
+From: Viktor Hofer <viktor.hofer@microsoft.com>
+Date: Thu, 10 Apr 2025 14:05:56 +0200
+Subject: [PATCH] Fix formatting in two files
+
+Backport: https://github.com/microsoft/vstest/pull/15047
+
+---
+ src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs         | 1 +
+ .../ExtensionDecorators/ExtensionDecoratorFactory.cs             | 1 +
+ .../ProtocolVersioning.cs                                        | 1 +
+ .../EventHandlers/NullPathConverter.cs                           | 1 +
+ .../ShowDeprecateDotnetVStestMessageArgumentProcessor.cs         | 1 +
+ test/TestAssets/NetStandard2Library/Class1.cs                    | 1 +
+ test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs                | 1 +
+ 7 files changed, 7 insertions(+)
+
+diff --git a/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs b/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs
+index d5dfe8c7d..7e1a0dd8b 100644
+--- a/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs
++++ b/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs
+@@ -7,6 +7,7 @@ using Microsoft.Build.Framework;
+ using Microsoft.Build.Utilities;
+ 
+ namespace Microsoft.TestPlatform.Build.Tasks;
++
+ public class VSTestLogsTask : Task
+ {
+     public string? LogType { get; set; }
+diff --git a/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs b/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs
+index 7a82106c7..498593b48 100644
+--- a/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs
++++ b/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs
+@@ -5,6 +5,7 @@ using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+ using Microsoft.VisualStudio.TestPlatform.Utilities;
+ 
+ namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionDecorators;
++
+ internal class ExtensionDecoratorFactory
+ {
+     private readonly IFeatureFlag _featureFlag;
+diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs
+index 20ce0c44d..577c849a0 100644
+--- a/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs
++++ b/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs
+@@ -4,6 +4,7 @@
+ using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+ 
+ namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
++
+ internal static class ProtocolVersioning
+ {
+     public const int HighestSupportedVersion = Version7;
+diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs
+index 9460f19b0..3f699402e 100644
+--- a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs
++++ b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs
+@@ -10,6 +10,7 @@ using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+ using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+ 
+ namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
++
+ internal class NullPathConverter : IPathConverter
+ {
+     private static readonly Lazy<NullPathConverter> LazyInstance = new(() => new NullPathConverter());
+diff --git a/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs b/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs
+index 71db32aa9..686c3a44a 100644
+--- a/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs
++++ b/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs
+@@ -5,6 +5,7 @@ using System;
+ using System.Linq;
+ 
+ namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
++
+ internal class ShowDeprecateDotnetVStestMessageArgumentProcessor : IArgumentProcessor
+ {
+     public const string CommandName = "/ShowDeprecateDotnetVSTestMessage";
+diff --git a/test/TestAssets/NetStandard2Library/Class1.cs b/test/TestAssets/NetStandard2Library/Class1.cs
+index 7d5d17aa1..036fa82d3 100644
+--- a/test/TestAssets/NetStandard2Library/Class1.cs
++++ b/test/TestAssets/NetStandard2Library/Class1.cs
+@@ -4,6 +4,7 @@
+ using System;
+ 
+ namespace NetStandard2Library;
++
+ public class Class1
+ {
+ 
+diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs
+index 3a1cb11ab..5be76c100 100644
+--- a/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs
++++ b/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs
+@@ -2,6 +2,7 @@
+ // Licensed under the MIT license. See LICENSE file in the project root for full license information.
+ 
+ namespace vstest.ProgrammerTests.Fakes;
++
+ internal class FakeTestHostFixture : IDisposable
+ {
+     public int Id { get; }