Skip to content

Commit b199f0e

Browse files
committed
Depend on Microsoft.CodeAnalysis 4.13.0
Closes #34637
1 parent ce99d82 commit b199f0e

File tree

4 files changed

+7
-13
lines changed

4 files changed

+7
-13
lines changed

Diff for: Directory.Packages.props

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
<PackageVersion Include="Microsoft.Extensions.HostFactoryResolver.Sources" Version="$(MicrosoftExtensionsHostFactoryResolverSourcesVersion)" />
2222
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsVersion)" />
2323

24-
<!-- Roslyn dependencies-->
24+
<!-- Roslyn/MSBuild dependencies-->
2525
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
2626
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
2727
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisVersion)" />
28+
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
2829

2930
<!-- analyzer dependencies-->
3031
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
@@ -56,8 +57,6 @@
5657
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="$(SQLitePCLRawVersion)" />
5758

5859
<!-- Pinned versions for Component Governance/NuGetAudit - Remove when root dependencies are updated -->
59-
<!--Workaround for Microsoft.CodeAnalysis.Workspaces.MSBuild 4.8.0, see https://github.com/dotnet/efcore/issues/34637-->
60-
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
6160
<!--Workaround for Microsoft.Data.SqlClient v5.1.6 and Microsoft.CodeAnalysis.Analyzer.Testing v1.1.2-->
6261
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
6362
<PackageVersion Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />

Diff for: eng/Versions.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25126.4</MicrosoftDotNetBuildTasksTemplatingVersion>
3737
</PropertyGroup>
3838
<PropertyGroup Label="Other dependencies">
39-
<MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion>
40-
<MicrosoftBuildUtilitiesCoreVersion>17.8.3</MicrosoftBuildUtilitiesCoreVersion>
41-
<!-- NB: This version affects Visual Studio compatibility. See https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support and https://github.com/dotnet/efcore/issues/34637 -->
42-
<MicrosoftCodeAnalysisVersion>4.8.0</MicrosoftCodeAnalysisVersion>
39+
<MicrosoftBuildFrameworkVersion>17.13.9</MicrosoftBuildFrameworkVersion>
40+
<MicrosoftBuildUtilitiesCoreVersion>17.13.9</MicrosoftBuildUtilitiesCoreVersion>
41+
<!-- NB: This version affects Visual Studio compatibility. See https://github.com/dotnet/roslyn/blob/main/docs/wiki/NuGet-packages.md and https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support -->
42+
<MicrosoftCodeAnalysisVersion>4.13.0</MicrosoftCodeAnalysisVersion>
4343
<MicrosoftCodeAnalysisTestingVersion>1.1.2</MicrosoftCodeAnalysisTestingVersion>
4444
<AzureIdentityVersion>1.13.1</AzureIdentityVersion>
4545
<AzureResourceManagerCosmosDBVersion>1.3.2</AzureResourceManagerCosmosDBVersion>

Diff for: src/EFCore.Analyzers/EFCore.Analyzers.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<ImplicitUsings>true</ImplicitUsings>
1212
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
1313
<NoWarn>$(NoWarn);NU5128</NoWarn>
14+
<NoWarn>$(NoWarn);RS1038</NoWarn> <!-- Compiler extensions should be implemented in assemblies with compiler-provided references, #35752 -->
1415
</PropertyGroup>
1516

1617
<ItemGroup>

Diff for: test/Directory.Packages.props

-6
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
2121
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3mc" Version="$(SQLitePCLRawVersion)" />
2222
<PackageVersion Include="SQLitePCLRaw.bundle_winsqlite3" Version="$(SQLitePCLRawVersion)" />
2323

24-
<!-- Newer version of Roslyn used in tests for testing -->
25-
<!--https://github.com/dotnet/efcore/issues/34637-->
26-
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
27-
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />
28-
<PackageVersion Update="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0" />
29-
3024
<!-- Pinned versions for Component Governance/NuGetAudit - Remove when root dependencies are updated -->
3125
<!--Workaround for IdentityServer4.EntityFramework v4.1.2-->
3226
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.8" />

0 commit comments

Comments
 (0)