Skip to content

Remodel how analyzer dependencies are managed #1622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AArnott merged 2 commits into from
Jul 15, 2026
Merged

Remodel how analyzer dependencies are managed #1622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86f25f0
Remodel how analyzer dependencies are managed
AArnott Jul 15, 2026
a71fbbb
Retarget analyzers to .NET 8 SDK
AArnott Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"packageRules": [
{
"matchJsonata": ["sharedVariableName='CodeAnalysisVersion'"],
"matchFileNames": ["Directory.Packages.Analyzers.props"],
"enabled": false
}
],
Expand Down
2 changes: 2 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@
<Using Remove="System.Net.Http" Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'" />
</ItemGroup>

<Import Project="Directory.Packages.Analyzers.props" Condition="'$(IsAnalyzerProject)'=='true'" />

<Import Project="Directory.Traversal.targets" Condition="'$(IsTraversal)'=='true'" />
</Project>
21 changes: 21 additions & 0 deletions Directory.Packages.Analyzers.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<Project>
<!-- These versions are chosen to support the .NET 8 SDK. -->
<PropertyGroup>
<CodeAnalysisVersionForAnalyzers>4.11.0</CodeAnalysisVersionForAnalyzers>
</PropertyGroup>
<ItemGroup>
<PackageVersion Update="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageVersion Update="Microsoft.CodeAnalysis" Version="$(CodeAnalysisVersionForAnalyzers)" />
<PackageVersion Update="Microsoft.CodeAnalysis.Common" Version="$(CodeAnalysisVersionForAnalyzers)" />
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersionForAnalyzers)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(CodeAnalysisVersionForAnalyzers)" />
<PackageVersion Update="Microsoft.CodeAnalysis.VisualBasic" Version="$(CodeAnalysisVersionForAnalyzers)" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(CodeAnalysisVersionForAnalyzers)" />
<PackageVersion Update="System.Collections.Immutable" Version="8.0.0" />
<PackageVersion Update="System.Memory" Version="4.5.5" />
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
<PackageVersion Update="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.0" />
<PackageVersion Update="System.Threading.Tasks.Extensions" Version="4.5.4" />
</ItemGroup>
</Project>
10 changes: 2 additions & 8 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<MicrosoftTestingPlatformVersion>2.3.0</MicrosoftTestingPlatformVersion>
<MicroBuildVersion>2.0.226</MicroBuildVersion>
<CodeAnalysisVersion>3.11.0</CodeAnalysisVersion>
<CodeAnalysisVersion>5.6.0</CodeAnalysisVersion>
<CodefixTestingVersion>1.1.4</CodefixTestingVersion>
<CodeAnalysisAnalyzerVersion>3.11.0-beta1.26226.5</CodeAnalysisAnalyzerVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="DNNE" Version="2.1.2" />
Expand Down Expand Up @@ -41,11 +40,6 @@
<PackageVersion Include="Xunit.Combinatorial" Version="2.0.24" />
<PackageVersion Include="Xunit.StaFact" Version="3.0.13" />
</ItemGroup>
<!-- Analyzer projects must use versions of these packages that the VS host provides.
Pinning here ensures a dependency update bot won't silently upgrade them to versions VS can't load. -->
<ItemGroup Condition="'$(IsAnalyzerProject)'=='true'">
<PackageVersion Update="System.Memory" Version="4.5.5" />
</ItemGroup>
<ItemGroup Label="Library.Template">
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.9.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="$(MicrosoftTestingPlatformVersion)" />
Expand All @@ -56,7 +50,7 @@
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
</ItemGroup>
<ItemGroup>
<GlobalPackageReference Include="Microsoft.CodeAnalysis.ResxSourceGenerator" Version="$(CodeAnalysisAnalyzerVersion)" />
<GlobalPackageReference Include="Microsoft.CodeAnalysis.ResxSourceGenerator" Version="5.0.0-1.25277.114" />
</ItemGroup>
<ItemGroup Label="Library.Template">
<GlobalPackageReference Include="CSharpIsNullAnalyzer" Version="0.1.593" />
Expand Down
3 changes: 1 addition & 2 deletions src/Microsoft.VisualStudio.Threading.Analyzers.CodeFixes/FixUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,8 @@ internal static AnonymousFunctionExpressionSyntax MakeMethodAsync(this Anonymous
Solution? solution = await Renamer.RenameSymbolAsync(
document.Project.Solution,
methodSymbol,
////new SymbolRenameOptions { RenameInComments = true }, // Required by later compiler version
default(SymbolRenameOptions),
newName,
document.Project.Solution.Workspace.Options,
cancellationToken).ConfigureAwait(false);
Comment thread
AArnott marked this conversation as resolved.
Comment thread
AArnott marked this conversation as resolved.
document = solution.GetDocumentOrThrow(document.Id);
semanticModel = null;
Expand Down
2 changes: 1 addition & 1 deletion ...ft.VisualStudio.Threading.Analyzers.CodeFixes/VSTHRD200UseAsyncNamingConventionCodeFix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ public AddAsyncSuffixCodeAction(Document document, Diagnostic diagnostic, string
Solution? updatedSolution = await Renamer.RenameSymbolAsync(
solution,
methodSymbol,
default(SymbolRenameOptions),
this.newName,
solution.Workspace.Options,
cancellationToken).ConfigureAwait(false);
Comment thread
AArnott marked this conversation as resolved.
Comment thread
AArnott marked this conversation as resolved.

return updatedSolution;
Expand Down
9 changes: 1 addition & 8 deletions test/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,7 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove($(MSBuildThisFile), $(MSBuildThisFileDirectory)..))" />

<PropertyGroup>
<CodeAnalysisVersionForTests>5.3.0</CodeAnalysisVersionForTests>
</PropertyGroup>
<ItemGroup>
<PackageVersion Update="Microsoft.CodeAnalysis" Version="$(CodeAnalysisVersionForTests)" />
<PackageVersion Update="Microsoft.CodeAnalysis.Common" Version="$(CodeAnalysisVersionForTests)" />
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersionForTests)" />
<PackageVersion Update="Microsoft.CodeAnalysis.VisualBasic" Version="$(CodeAnalysisVersionForTests)" />
<PackageVersion Update="System.Collections.Immutable" Version="9.0.13" />
<PackageVersion Update="System.Collections.Immutable" Version="10.0.1" />
</ItemGroup>
</Project>
Loading