Skip to content

Commit

Permalink
Merge pull request #549 from microsoft/renovate/microsoft.codeanalysi…
Browse files Browse the repository at this point in the history
…s.analyzers-3.x

Update dependency Microsoft.CodeAnalysis.Analyzers to 3.11.0
  • Loading branch information
AArnott authored Feb 10, 2025
2 parents d8d8f05 + 9404ba3 commit 5a9118d
Show file tree
Hide file tree
Showing 11 changed files with 132 additions and 19 deletions.
2 changes: 2 additions & 0 deletions Directory.Packages.Analyzers.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
<ItemGroup>
<!-- These versions carefully chosen to support VS 2019 Update 11. -->
<PackageVersion Update="Microsoft.CodeAnalysis" Version="$(CodeAnalysisVersionForAnalyzers)" />
<PackageVersion Update="Microsoft.CodeAnalysis.Common" Version="$(CodeAnalysisVersionForAnalyzers)" />
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersionForAnalyzers)" />
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp.Workspaces" version="$(CodeAnalysisVersionForAnalyzers)" />
<PackageVersion Update="Microsoft.CodeAnalysis.VisualBasic" version="$(CodeAnalysisVersionForAnalyzers)" />
<PackageVersion Update="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="$(CodeAnalysisVersionForAnalyzers)" />
<PackageVersion Update="System.Collections.Immutable" Version="5.0.0" />
<PackageVersion Update="System.Memory" Version="4.5.4" />
Expand Down
4 changes: 3 additions & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@
<PackageVersion Include="DiffPlex" Version="1.7.2" />
<PackageVersion Include="MessagePack" Version="$(MessagePackVersion)" />
<PackageVersion Include="MessagePackAnalyzer" Version="$(MessagePackVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" version="$(CodeAnalysisVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="$(CodefixTestingVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" version="$(CodeAnalysisVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" version="$(CodeAnalysisVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(CodefixTestingVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="$(CodeAnalysisVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(CodeAnalysisVersion)" />
Expand Down
21 changes: 21 additions & 0 deletions Microsoft.VisualStudio.Composition.sln
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VS.Mefx.Tests", "test\VS.Me
{50CB5BF1-2661-4CFE-946E-CF38768C6B2E} = {50CB5BF1-2661-4CFE-946E-CF38768C6B2E}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualStudio.Composition.Analyzers.VB", "src\Microsoft.VisualStudio.Composition.Analyzers.VB\Microsoft.VisualStudio.Composition.Analyzers.VB.csproj", "{B549FB28-EEB8-4DDC-8E3E-2D81027B96F8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualStudio.Composition.Analyzers.CSharp", "src\Microsoft.VisualStudio.Composition.Analyzers.CSharp\Microsoft.VisualStudio.Composition.Analyzers.CSharp.csproj", "{DDF990F0-124A-4942-8CC0-C8E33F13A297}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualStudio.Composition.Analyzers.CodeFixes", "src\Microsoft.VisualStudio.Composition.Analyzers.CodeFixes\Microsoft.VisualStudio.Composition.Analyzers.CodeFixes.csproj", "{898924AE-F646-4D65-BD39-48E9ACFD8A98}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -181,6 +187,18 @@ Global
{2AA6770C-C5E5-48A4-BFA3-6C59B3726E1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2AA6770C-C5E5-48A4-BFA3-6C59B3726E1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2AA6770C-C5E5-48A4-BFA3-6C59B3726E1C}.Release|Any CPU.Build.0 = Release|Any CPU
{B549FB28-EEB8-4DDC-8E3E-2D81027B96F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B549FB28-EEB8-4DDC-8E3E-2D81027B96F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B549FB28-EEB8-4DDC-8E3E-2D81027B96F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B549FB28-EEB8-4DDC-8E3E-2D81027B96F8}.Release|Any CPU.Build.0 = Release|Any CPU
{DDF990F0-124A-4942-8CC0-C8E33F13A297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DDF990F0-124A-4942-8CC0-C8E33F13A297}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DDF990F0-124A-4942-8CC0-C8E33F13A297}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DDF990F0-124A-4942-8CC0-C8E33F13A297}.Release|Any CPU.Build.0 = Release|Any CPU
{898924AE-F646-4D65-BD39-48E9ACFD8A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{898924AE-F646-4D65-BD39-48E9ACFD8A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
{898924AE-F646-4D65-BD39-48E9ACFD8A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
{898924AE-F646-4D65-BD39-48E9ACFD8A98}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -209,6 +227,9 @@ Global
{50CB5BF1-2661-4CFE-946E-CF38768C6B2E} = {FDF383ED-AFFB-4FFD-833C-159114A986EC}
{99BE0080-919C-43F5-8827-F021EA080464} = {FDF383ED-AFFB-4FFD-833C-159114A986EC}
{2AA6770C-C5E5-48A4-BFA3-6C59B3726E1C} = {34FA3DAA-1CE6-4D26-9802-681043203006}
{B549FB28-EEB8-4DDC-8E3E-2D81027B96F8} = {C1E69228-5ECA-4B33-A08C-F60908B1A31A}
{DDF990F0-124A-4942-8CC0-C8E33F13A297} = {C1E69228-5ECA-4B33-A08C-F60908B1A31A}
{898924AE-F646-4D65-BD39-48E9ACFD8A98} = {C1E69228-5ECA-4B33-A08C-F60908B1A31A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {595F7089-18B6-4D24-8F38-7FFCCE2F5F0E}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<IsPackable>false</IsPackable>
<IsAnalyzerProject>true</IsAnalyzerProject>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.VisualStudio.Composition.Analyzers\Microsoft.VisualStudio.Composition.Analyzers.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"inherit": true,
"assemblyVersion": {
"precision": "revision"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<IsAnalyzerProject>true</IsAnalyzerProject>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>

<Description>Analyzers for MEF consumers to help identify common errors in MEF parts.</Description>
<DevelopmentDependency>true</DevelopmentDependency>
<PackageId>Microsoft.VisualStudio.Composition.Analyzers</PackageId>
<PackageTags>MEF;Analyzers</PackageTags>

<!-- Analyzers should not be added to the lib folder. -->
<IncludeBuildOutput>false</IncludeBuildOutput>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
<IncludeSymbols>false</IncludeSymbols>

<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackBuildOutputs</TargetsForTfmSpecificContentInPackage>
</PropertyGroup>
<ItemGroup>
<None Update="tools\*.ps1" Pack="true" PackagePath="tools\" />
</ItemGroup>
<ItemDefinitionGroup>
<PackageReference>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<ProjectReference>
<PrivateAssets>all</PrivateAssets>
</ProjectReference>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.VisualStudio.Composition.Analyzers\Microsoft.VisualStudio.Composition.Analyzers.csproj" />
<ProjectReference Include="..\Microsoft.VisualStudio.Composition.Analyzers.CSharp\Microsoft.VisualStudio.Composition.Analyzers.CSharp.csproj" />
<ProjectReference Include="..\Microsoft.VisualStudio.Composition.Analyzers.VB\Microsoft.VisualStudio.Composition.Analyzers.VB.csproj" />
</ItemGroup>

<Target Name="PackBuildOutputs" DependsOnTargets="ResolveProjectReferences;SatelliteDllsProjectOutputGroup;SatelliteDllsProjectOutputGroupDependencies">
<ItemGroup>
<!-- Analysis of C# projects -->
<TfmSpecificPackageFile Include="$(TargetPath)" PackagePath="analyzers\cs\" />
<TfmSpecificPackageFile Include="@(SatelliteDllsProjectOutputGroupDependency)" PackagePath="analyzers\cs\%(SatelliteDllsProjectOutputGroupDependency.DestinationSubDirectory)" Condition=" '%(SatelliteDllsProjectOutputGroupDependency.DestinationSubDirectory)' != '' " />
<TfmSpecificPackageFile Include="@(SatelliteDllsProjectOutputGroupOutput->'%(FinalOutputPath)')" PackagePath="analyzers\cs\%(SatelliteDllsProjectOutputGroupOutput.Culture)\" />
<TfmSpecificPackageFile Include="%(_ResolvedProjectReferencePaths.Identity)" Condition="'%(FileName)' != 'Microsoft.VisualStudio.Composition.Analyzers.VB'" PackagePath="analyzers\cs\" />

<!-- Analysis of VB projects -->
<TfmSpecificPackageFile Include="$(TargetPath)" PackagePath="analyzers\vb\" />
<TfmSpecificPackageFile Include="@(SatelliteDllsProjectOutputGroupDependency)" PackagePath="analyzers\vb\%(SatelliteDllsProjectOutputGroupDependency.DestinationSubDirectory)" Condition=" '%(SatelliteDllsProjectOutputGroupDependency.DestinationSubDirectory)' != '' " />
<TfmSpecificPackageFile Include="@(SatelliteDllsProjectOutputGroupOutput->'%(FinalOutputPath)')" PackagePath="analyzers\vb\%(SatelliteDllsProjectOutputGroupOutput.Culture)\" />
<TfmSpecificPackageFile Include="%(_ResolvedProjectReferencePaths.Identity)" Condition="'%(FileName)' != 'Microsoft.VisualStudio.Composition.Analyzers.CSharp'" PackagePath="analyzers\vb\" />
</ItemGroup>
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"inherit": true,
"assemblyVersion": {
"precision": "revision"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<IsPackable>false</IsPackable>
<IsAnalyzerProject>true</IsAnalyzerProject>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.VisualStudio.Composition.Analyzers\Microsoft.VisualStudio.Composition.Analyzers.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"inherit": true,
"assemblyVersion": {
"precision": "revision"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Analyzers for MEF consumers to help identify common errors in MEF parts.</Description>
<PackageTags>MEF;Analyzers</PackageTags>
<IncludeBuildOutput>false</IncludeBuildOutput>
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackBuildOutputs</TargetsForTfmSpecificContentInPackage>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
<IncludeSymbols>false</IncludeSymbols>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
<PackageId>Microsoft.VisualStudio.Composition.Analyzers.Only</PackageId>
<IsAnalyzerProject>true</IsAnalyzerProject>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
</ItemGroup>

Expand All @@ -32,20 +28,9 @@
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<None Update="tools\*.ps1" Pack="true" PackagePath="tools\" />
</ItemGroup>

<ItemGroup>
<Using Include="Microsoft.CodeAnalysis" />
<Using Include="Microsoft.CodeAnalysis.Diagnostics" />
<Using Include="System.Collections.Immutable" />
</ItemGroup>

<Target Name="PackBuildOutputs" DependsOnTargets="SatelliteDllsProjectOutputGroup;DebugSymbolsProjectOutputGroup">
<ItemGroup>
<TfmSpecificPackageFile Include="$(TargetPath)" PackagePath="analyzers\dotnet\" />
<TfmSpecificPackageFile Include="@(SatelliteDllsProjectOutputGroupOutput->'%(FinalOutputPath)')" PackagePath="analyzers\dotnet\%(SatelliteDllsProjectOutputGroupOutput.Culture)\" />
</ItemGroup>
</Target>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@

<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.VisualStudio.Composition.Analyzers\Microsoft.VisualStudio.Composition.Analyzers.csproj" />
<ProjectReference Include="..\..\src\Microsoft.VisualStudio.Composition.Analyzers.CSharp\Microsoft.VisualStudio.Composition.Analyzers.CSharp.csproj" />
<ProjectReference Include="..\..\src\Microsoft.VisualStudio.Composition.Analyzers.VB\Microsoft.VisualStudio.Composition.Analyzers.VB.csproj" />
<ProjectReference Include="..\..\src\Microsoft.VisualStudio.Composition.Analyzers.CodeFixes\Microsoft.VisualStudio.Composition.Analyzers.CodeFixes.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 5a9118d

Please sign in to comment.