From ae750fa0dfd4bba70c4d3aabc87a30c3246189d2 Mon Sep 17 00:00:00 2001
From: Andriy Svyryd <Andriy.Svyryd@microsoft.com>
Date: Wed, 10 Sep 2025 16:48:55 -0700
Subject: [PATCH] Revert to stable MSBuild and Roslyn versions

---
 eng/Version.Details.props                     | 12 ----------
 eng/Version.Details.xml                       | 24 -------------------
 eng/Versions.props                            | 17 +++++++++++++
 .../Design/Internal/DbContextOperations.cs    |  8 +++++--
 4 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 7cf42476829..f062ca64f9a 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -6,12 +6,6 @@ This file should be imported by eng/Versions.props
 <Project>
   <PropertyGroup>
     <!-- dotnet/dotnet dependencies -->
-    <MicrosoftBuildFrameworkPackageVersion>17.15.0-preview-25459-101</MicrosoftBuildFrameworkPackageVersion>
-    <MicrosoftBuildTasksCorePackageVersion>17.15.0-preview-25459-101</MicrosoftBuildTasksCorePackageVersion>
-    <MicrosoftBuildUtilitiesCorePackageVersion>17.15.0-preview-25459-101</MicrosoftBuildUtilitiesCorePackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25459.101</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-2.25459.101</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-2.25459.101</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
     <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25459.101</MicrosoftDotNetArcadeSdkPackageVersion>
     <MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25459.101</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
     <MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25459.101</MicrosoftDotNetHelixSdkPackageVersion>
@@ -34,12 +28,6 @@ This file should be imported by eng/Versions.props
   <!--Property group for alternate package version names-->
   <PropertyGroup>
     <!-- dotnet/dotnet dependencies -->
-    <MicrosoftBuildFrameworkVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkVersion>
-    <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
-    <MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildUtilitiesCorePackageVersion)</MicrosoftBuildUtilitiesCoreVersion>
-    <MicrosoftCodeAnalysisCSharpVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisCSharpVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesVersion>$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildVersion>$(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
     <MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
     <MicrosoftDotNetBuildTasksTemplatingVersion>$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)</MicrosoftDotNetBuildTasksTemplatingVersion>
     <MicrosoftDotNetHelixSdkVersion>$(MicrosoftDotNetHelixSdkPackageVersion)</MicrosoftDotNetHelixSdkVersion>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c5ada7eda98..88561527231 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -62,30 +62,6 @@
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>13a7588dc6e538cc938ea1277a37f756a80c7f03</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Framework" Version="17.15.0-preview-25459-101">
-      <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>13a7588dc6e538cc938ea1277a37f756a80c7f03</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25459-101">
-      <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>13a7588dc6e538cc938ea1277a37f756a80c7f03</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25459-101">
-      <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>13a7588dc6e538cc938ea1277a37f756a80c7f03</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25459.101">
-      <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>13a7588dc6e538cc938ea1277a37f756a80c7f03</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-2.25459.101">
-      <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>13a7588dc6e538cc938ea1277a37f756a80c7f03</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-2.25459.101">
-      <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>13a7588dc6e538cc938ea1277a37f756a80c7f03</Sha>
-    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25459.101">
diff --git a/eng/Versions.props b/eng/Versions.props
index ab4f7d976d5..dc41fdad138 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -16,6 +16,23 @@
   <PropertyGroup Label="Arcade settings">
     <UsingToolXliff>False</UsingToolXliff>
   </PropertyGroup>
+  <PropertyGroup Label="MSBuild and Roslyn" Condition="'$(IsServicingBuild)' != 'true'">
+    <!-- For MSBuild and Roslyn packages use the previous stable version until the current stable build is released. -->
+    <MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>
+    <MicrosoftBuildUtilitiesCoreVersion>17.14.8</MicrosoftBuildUtilitiesCoreVersion>
+    <MicrosoftBuildTasksCoreVersion>17.14.8</MicrosoftBuildTasksCoreVersion>
+    <MicrosoftCodeAnalysisCSharpVersion>4.14.0</MicrosoftCodeAnalysisCSharpVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.14.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildVersion>4.14.0</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
+  </PropertyGroup>
+  <PropertyGroup Label="MSBuild and Roslyn" Condition="'$(IsServicingBuild)' == 'true'">
+    <MicrosoftBuildFrameworkVersion>17.15.0</MicrosoftBuildFrameworkVersion>
+    <MicrosoftBuildUtilitiesCoreVersion>17.15.0</MicrosoftBuildUtilitiesCoreVersion>
+    <MicrosoftBuildTasksCoreVersion>17.15.0</MicrosoftBuildTasksCoreVersion>
+    <MicrosoftCodeAnalysisCSharpVersion>5.0.0</MicrosoftCodeAnalysisCSharpVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesVersion>5.0.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildVersion>5.0.0</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
+  </PropertyGroup>
   <PropertyGroup Label="Other dependencies">
     <MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.3-beta1.24423.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
     <MicrosoftCodeAnalysisCSharpTestingVersion>1.1.3-beta1.24352.1</MicrosoftCodeAnalysisCSharpTestingVersion>
diff --git a/src/EFCore.Design/Design/Internal/DbContextOperations.cs b/src/EFCore.Design/Design/Internal/DbContextOperations.cs
index 00cf2f787dd..c0a1e9e096c 100644
--- a/src/EFCore.Design/Design/Internal/DbContextOperations.cs
+++ b/src/EFCore.Design/Design/Internal/DbContextOperations.cs
@@ -305,10 +305,14 @@ private IReadOnlyList<string> PrecompileQueries(
         {
             workspace = MSBuildWorkspace.Create();
             workspace.LoadMetadataForReferencedProjects = true;
-            workspace.RegisterWorkspaceFailedHandler(e =>
+#pragma warning disable CS0612 // Obsolete
+#pragma warning disable CS0618 // Obsolete
+            workspace.WorkspaceFailed += (_, e) =>
             {
                 _reporter.WriteError(DesignStrings.MSBuildWorkspaceFailure(e.Diagnostic.Kind, e.Diagnostic.Message));
-            });
+            };
+#pragma warning restore CS0618 // Obsolete
+#pragma warning restore CS0612 // Obsolete
             project = workspace.OpenProjectAsync(_project).GetAwaiter().GetResult();
         }
         catch (Exception ex)