Skip to content

Commit b520f10

Browse files
AndriySvyrydAndriySvyryd
authored
Revert to stable MSBuild and Roslyn versions (#36742)
1 parent e91d005 commit b520f10

File tree

4 files changed

+23
-38
lines changed

4 files changed

+23
-38
lines changed

‎eng/Version.Details.props‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftBuildFrameworkPackageVersion>17.15.0-preview-25460-104</MicrosoftBuildFrameworkPackageVersion>
10-
<MicrosoftBuildTasksCorePackageVersion>17.15.0-preview-25460-104</MicrosoftBuildTasksCorePackageVersion>
11-
<MicrosoftBuildUtilitiesCorePackageVersion>17.15.0-preview-25460-104</MicrosoftBuildUtilitiesCorePackageVersion>
12-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25460.104</MicrosoftCodeAnalysisCSharpPackageVersion>
13-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-2.25460.104</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
14-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-2.25460.104</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
159
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25460.104</MicrosoftDotNetArcadeSdkPackageVersion>
1610
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25460.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
1711
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25460.104</MicrosoftDotNetHelixSdkPackageVersion>
@@ -34,12 +28,6 @@ This file should be imported by eng/Versions.props
3428
<!--Property group for alternate package version names-->
3529
<PropertyGroup>
3630
<!-- dotnet/dotnet dependencies -->
37-
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkVersion>
38-
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
39-
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildUtilitiesCorePackageVersion)</MicrosoftBuildUtilitiesCoreVersion>
40-
<MicrosoftCodeAnalysisCSharpVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisCSharpVersion>
41-
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
42-
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>$(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
4331
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
4432
<MicrosoftDotNetBuildTasksTemplatingVersion>$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)</MicrosoftDotNetBuildTasksTemplatingVersion>
4533
<MicrosoftDotNetHelixSdkVersion>$(MicrosoftDotNetHelixSdkPackageVersion)</MicrosoftDotNetHelixSdkVersion>

‎eng/Version.Details.xml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,30 +62,6 @@
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
6363
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.Build.Framework" Version="17.15.0-preview-25460-104">
66-
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
68-
</Dependency>
69-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25460-104">
70-
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
72-
</Dependency>
73-
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25460-104">
74-
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
76-
</Dependency>
77-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25460.104">
78-
<Uri>https://github.com/dotnet/dotnet</Uri>
79-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
80-
</Dependency>
81-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-2.25460.104">
82-
<Uri>https://github.com/dotnet/dotnet</Uri>
83-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
84-
</Dependency>
85-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-2.25460.104">
86-
<Uri>https://github.com/dotnet/dotnet</Uri>
87-
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
88-
</Dependency>
8965
</ProductDependencies>
9066
<ToolsetDependencies>
9167
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25460.104">

‎eng/Versions.props‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,23 @@
1616
<PropertyGroup Label="Arcade settings">
1717
<UsingToolXliff>False</UsingToolXliff>
1818
</PropertyGroup>
19+
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(IsServicingBuild)' != 'true'">
20+
<!-- For MSBuild and Roslyn packages use the previous stable version until the current stable build is released. -->
21+
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>
22+
<MicrosoftBuildUtilitiesCoreVersion>17.14.8</MicrosoftBuildUtilitiesCoreVersion>
23+
<MicrosoftBuildTasksCoreVersion>17.14.8</MicrosoftBuildTasksCoreVersion>
24+
<MicrosoftCodeAnalysisCSharpVersion>4.14.0</MicrosoftCodeAnalysisCSharpVersion>
25+
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.14.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
26+
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>4.14.0</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
27+
</PropertyGroup>
28+
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(IsServicingBuild)' == 'true'">
29+
<MicrosoftBuildFrameworkVersion>17.15.0</MicrosoftBuildFrameworkVersion>
30+
<MicrosoftBuildUtilitiesCoreVersion>17.15.0</MicrosoftBuildUtilitiesCoreVersion>
31+
<MicrosoftBuildTasksCoreVersion>17.15.0</MicrosoftBuildTasksCoreVersion>
32+
<MicrosoftCodeAnalysisCSharpVersion>5.0.0</MicrosoftCodeAnalysisCSharpVersion>
33+
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>5.0.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
34+
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>5.0.0</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
35+
</PropertyGroup>
1936
<PropertyGroup Label="Other dependencies">
2037
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.3-beta1.24423.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
2138
<MicrosoftCodeAnalysisCSharpTestingVersion>1.1.3-beta1.24352.1</MicrosoftCodeAnalysisCSharpTestingVersion>

‎src/EFCore.Design/Design/Internal/DbContextOperations.cs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,14 @@ private IReadOnlyList<string> PrecompileQueries(
305305
{
306306
workspace = MSBuildWorkspace.Create();
307307
workspace.LoadMetadataForReferencedProjects = true;
308-
workspace.RegisterWorkspaceFailedHandler(e =>
308+
#pragma warning disable CS0612 // Obsolete
309+
#pragma warning disable CS0618 // Obsolete
310+
workspace.WorkspaceFailed += (_, e) =>
309311
{
310312
_reporter.WriteError(DesignStrings.MSBuildWorkspaceFailure(e.Diagnostic.Kind, e.Diagnostic.Message));
311-
});
313+
};
314+
#pragma warning restore CS0618 // Obsolete
315+
#pragma warning restore CS0612 // Obsolete
312316
project = workspace.OpenProjectAsync(_project).GetAwaiter().GetResult();
313317
}
314318
catch (Exception ex)

0 commit comments

Comments
 (0)