From 82ee82903f747fddd64b8dde24db69a110b7ff9c Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Tue, 17 Mar 2026 11:40:57 -0700
Subject: [PATCH] Revert "[release/9.0-staging] Update dependencies from
 dotnet/roslyn (#121343)"

This reverts commit f505b9455c334cb1107a1db30daeeb3930b7e58c.
---
 eng/SourceBuildPrebuiltBaseline.xml           | 13 -----------
 eng/Version.Details.xml                       | 22 +++++++++----------
 eng/Versions.props                            | 12 +++++-----
 ...StatefulLinearCollectionShapeValidation.cs |  1 +
 ...FixerTests_StatefulValueShapeValidation.cs |  1 +
 ...tatelessLinearCollectionShapeValidation.cs |  1 +
 ...ixerTests_StatelessValueShapeValidation.cs |  1 +
 .../UpgradeToGeneratedRegexAnalyzerTests.cs   |  8 +++++--
 ...Link.RoslynAnalyzer.Tests.Generator.csproj |  2 +-
 ...pilerGeneratedCodeAccessedViaReflection.cs |  2 +-
 10 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 296c7a7f4b81df..4185d755fa6129 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -35,18 +35,5 @@
     <UsagePattern IdentityGlob="System.IO.Pipelines/7.0.0" />
     <UsagePattern IdentityGlob="System.IO.Pipelines/8.0.*" />
     <UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/5.0.0" />
-
-    <!-- Dependencies of Roslyn, replaced with live packages during full source build
-         https://github.com/dotnet/runtime/pull/112937#discussion_r2022951143 -->
-    <UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/9.0.0" />
-    <UsagePattern IdentityGlob="System.Collections.Immutable/9.0.0" />
-    <UsagePattern IdentityGlob="System.Composition/9.0.0" />
-    <UsagePattern IdentityGlob="System.Composition.AttributedModel/9.0.0" />
-    <UsagePattern IdentityGlob="System.Composition.Convention/9.0.0" />
-    <UsagePattern IdentityGlob="System.Composition.Hosting/9.0.0" />
-    <UsagePattern IdentityGlob="System.Composition.Runtime/9.0.0" />
-    <UsagePattern IdentityGlob="System.Composition.TypedParts/9.0.0" />
-    <UsagePattern IdentityGlob="System.IO.Pipelines/9.0.0" />
-    <UsagePattern IdentityGlob="System.Reflection.Metadata/9.0.0" />
   </IgnorePatterns>
 </UsageData>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d3a065fc6da91a..65280e8ade75b5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -360,30 +360,30 @@
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
       <Sha>70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.26111.11">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25569.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
+      <Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.26111.11">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25569.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
+      <Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.26111.11">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25569.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
+      <Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.26111.11">
-      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.26057.1">
+      <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
+      <Sha>5ef1abb57ce3df89eae65ecadeb1ddbab323ae05</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.26057.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
       <Sha>5ef1abb57ce3df89eae65ecadeb1ddbab323ae05</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.26111.11">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25569.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
+      <Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.109">
diff --git a/eng/Versions.props b/eng/Versions.props
index 3f2666c454b8c3..6d00900a6e7b31 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -27,23 +27,25 @@
     <FlagNetStandard1XDependencies Condition="'$(FlagNetStandard1XDependencies)' == ''">true</FlagNetStandard1XDependencies>
     <!-- Runtime controls its dependency graph via Traversal projects and doesn't want or need Arcade's ExcludeFrom infrastructure. -->
     <DisableArcadeExcludeFromBuildSupport>true</DisableArcadeExcludeFromBuildSupport>
+    <!-- Use SDK compilers in full VMR builds. -->
+    <UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildOrchestrator)' != 'true'">true</UsingToolMicrosoftNetCompilers>
   </PropertyGroup>
   <ItemGroup>
     <WorkloadSdkBandVersions Include="$(SdkBandVersion)" SupportsMachineArch="true" />
   </ItemGroup>
   <PropertyGroup>
     <!-- dotnet/roslyn-analyzers dependencies -->
-    <MicrosoftCodeAnalysisAnalyzersVersion>3.12.0-beta1.26111.11</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25615.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.26057.1</MicrosoftCodeAnalysisAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.26057.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <!-- dotnet/roslyn dependencies -->
     <!--
       These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.
       Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
       they do not break the local dev experience.
     -->
-    <MicrosoftCodeAnalysisCSharpVersion>4.14.0-3.26111.11</MicrosoftCodeAnalysisCSharpVersion>
-    <MicrosoftCodeAnalysisVersion>4.14.0-3.26111.11</MicrosoftCodeAnalysisVersion>
-    <MicrosoftNetCompilersToolsetVersion>4.14.0-3.26111.11</MicrosoftNetCompilersToolsetVersion>
+    <MicrosoftCodeAnalysisCSharpVersion>4.12.0-3.25569.8</MicrosoftCodeAnalysisCSharpVersion>
+    <MicrosoftCodeAnalysisVersion>4.12.0-3.25569.8</MicrosoftCodeAnalysisVersion>
+    <MicrosoftNetCompilersToolsetVersion>4.12.0-3.25569.8</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>
   <!--
     For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulLinearCollectionShapeValidation.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulLinearCollectionShapeValidation.cs
index eb60cf353dbcce..2aedfde9936f47 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulLinearCollectionShapeValidation.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulLinearCollectionShapeValidation.cs
@@ -602,6 +602,7 @@ public void FromManaged(ManagedType m, Span<byte> buffer) {}
                     public void Free() {}
                     public ReadOnlySpan<byte> GetManagedValuesSource() => default;
                     public Span<T> GetUnmanagedValuesDestination() => default;
+
                     public static int BufferSize
                     {
                         get
diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulValueShapeValidation.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulValueShapeValidation.cs
index cb2c5d8caf10ec..9a72a5fbc4916f 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulValueShapeValidation.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulValueShapeValidation.cs
@@ -382,6 +382,7 @@ public void FromManaged(ManagedType m, Span<byte> b) {}
                     public int ToUnmanaged() => default;
 
                     public void Free() {}
+
                     public static int BufferSize
                     {
                         get
diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessLinearCollectionShapeValidation.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessLinearCollectionShapeValidation.cs
index b60bb78f2acc2b..fec16b2bc7ff7c 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessLinearCollectionShapeValidation.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessLinearCollectionShapeValidation.cs
@@ -614,6 +614,7 @@ static class MarshallerType<T>
                     public static ReadOnlySpan<int> GetManagedValuesSource(ManagedType m) => default;
 
                     public static Span<T> GetUnmanagedValuesDestination(nint unmanaged, int numElements) => default;
+
                     public static int BufferSize
                     {
                         get
diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessValueShapeValidation.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessValueShapeValidation.cs
index 35c90af32f81b2..7d94afb9985f79 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessValueShapeValidation.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessValueShapeValidation.cs
@@ -363,6 +363,7 @@ class ManagedType {}
                 static class MarshallerType
                 {
                     public static nint ConvertToUnmanaged(ManagedType m, Span<byte> b) => default;
+
                     public static int BufferSize
                     {
                         get
diff --git a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/UpgradeToGeneratedRegexAnalyzerTests.cs b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/UpgradeToGeneratedRegexAnalyzerTests.cs
index c1a704287c87be..feca0c535edf97 100644
--- a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/UpgradeToGeneratedRegexAnalyzerTests.cs
+++ b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/UpgradeToGeneratedRegexAnalyzerTests.cs
@@ -85,7 +85,9 @@ public async Task TopLevelStatements(InvocationType invocationType)
             string test = @"using System.Text.RegularExpressions;
 var isMatch = [|" + ConstructRegexInvocation(invocationType, pattern: "\"\"") + @"|]" + isMatchInvocation + ";";
             string fixedCode = @"using System.Text.RegularExpressions;
-var isMatch = MyRegex().IsMatch(""""); partial class Program
+var isMatch = MyRegex().IsMatch("""");
+
+partial class Program
 {
     [GeneratedRegex("""")]
     private static partial Regex MyRegex();
@@ -848,7 +850,9 @@ public async Task TopLevelStatements_MultipleSourceFiles()
                 },
                 FixedState =
                 {
-                    Sources = { "public class C { }", @"var r = MyRegex(); partial class Program
+                    Sources = { "public class C { }", @"var r = MyRegex();
+
+partial class Program
 {
     [System.Text.RegularExpressions.GeneratedRegex("""")]
     private static partial System.Text.RegularExpressions.Regex MyRegex();
diff --git a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.Generator.csproj b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.Generator.csproj
index 17489190fc16b5..095efe39a63b9a 100644
--- a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.Generator.csproj
+++ b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.Generator.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedCodeAccessedViaReflection.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedCodeAccessedViaReflection.cs
index ced127facc27d5..4ac5bfc3c06cf3 100644
--- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedCodeAccessedViaReflection.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedCodeAccessedViaReflection.cs
@@ -64,7 +64,7 @@ public static IEnumerable<int> IteratorWithCorrectDataflow ()
 			}
 
 			// Using C# 14 compiler changes codegen in a way that introduces this warning
-			[UnexpectedWarning("IL2062", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/runtime/issues/110553", CompilerGeneratedCode = true)]
+			// [UnexpectedWarning("IL2062", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/runtime/issues/110553", CompilerGeneratedCode = true)]
 			public static IEnumerable<int> IteratorWithIntegerDataflow ()
 			{
 				int integerLocal = 0;