Skip to content

Commit e14d0e3

Browse files
authored
Move Microsoft.CodeAnalysis.NetAnalyzers from roslyn-analyzers into sdk (#50167)
Brings along commit history from https://github.com/dotnet/roslyn-analyzers
2 parents 6769668 + 7aded0a commit e14d0e3

File tree

1,515 files changed

+511488
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,515 files changed

+511488
-30
lines changed

Directory.Build.props

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<PackageProjectUrl>https://github.com/dotnet/sdk</PackageProjectUrl>
3939
<PackageLicenseExpression>MIT</PackageLicenseExpression>
4040
<LangVersion>Preview</LangVersion>
41+
<LangVersion Condition="'$(Language)' == 'VB'">16</LangVersion>
4142
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
4243
<DebugSymbols>true</DebugSymbols>
4344
<!-- Default to all packages generating a corresponding symbol package -->
@@ -63,9 +64,9 @@
6364
<UseSharedCompilation Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</UseSharedCompilation>
6465
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
6566

66-
<DefineConstants Condition="'$(ContinuousIntegrationBuild)' == 'true'">$(DefineConstants);CI_BUILD</DefineConstants>
67-
<DefineConstants Condition="'$(OfficialBuilder)' == 'Microsoft'">$(DefineConstants);MICROSOFT_ENABLE_TELEMETRY</DefineConstants>
68-
<DefineConstants Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(DefineConstants);DOT_NET_BUILD_FROM_SOURCE</DefineConstants>
67+
<DefineConstants Condition="'$(ContinuousIntegrationBuild)' == 'true'">$(DefineConstants),CI_BUILD</DefineConstants>
68+
<DefineConstants Condition="'$(OfficialBuilder)' == 'Microsoft'">$(DefineConstants),MICROSOFT_ENABLE_TELEMETRY</DefineConstants>
69+
<DefineConstants Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(DefineConstants),DOT_NET_BUILD_FROM_SOURCE</DefineConstants>
6970

7071
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
7172
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>

Directory.Build.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
5959
and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))
6060
and '$(MSBuildProjectName)' != 'sdk-tasks'
61+
and '$(MSBuildProjectName)' != 'GenerateDocumentationAndConfigFiles'
6162
and ('$(DotNetBuild)' != 'true' or '$(PackAsToolShimRuntimeIdentifiers)' == '')">
6263
<FrameworkReference
6364
Update="Microsoft.NETCore.App"

Directory.Packages.props

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,32 @@
1616
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
1717
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesPackageVersion)" />
1818
<PackageVersion Include="Microsoft.Build.NuGetSdkResolver" Version="$(MicrosoftBuildNuGetSdkResolverPackageVersion)" />
19+
20+
<!-- roslyn dependencies -->
1921
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
2022
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalyzerTestingVersion)" />
2123
<PackageVersion Include="Microsoft.CodeAnalysis.BuildClient" Version="$(MicrosoftCodeAnalysisBuildClientVersion)" />
24+
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
2225
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
2326
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
2427
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
2528
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
2629
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
27-
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersVersion)" />
2830
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)" />
2931
<PackageVersion Include="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="$(MicrosoftCodeAnalysisRazorToolingInternalVersion)" />
3032
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
3133
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
3234
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
3335
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
36+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
3437
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)" />
38+
39+
<!-- roslyn-sdk dependencies-->
40+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
41+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" Version="1.1.2" />
42+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing" Version="1.1.2" />
43+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing" Version="1.1.2" />
44+
3545
<PackageVersion Include="Microsoft.Css.Parser" Version="$(MicrosoftCssParserVersion)" />
3646
<PackageVersion Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
3747
<PackageVersion Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
@@ -107,6 +117,7 @@
107117
<PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
108118
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
109119
<PackageVersion Include="System.CommandLine.NamingConventionBinder" Version="$(SystemCommandLineNamingConventionBinderVersion)" />
120+
<PackageVersion Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionPackageVersion)" />
110121
<PackageVersion Include="System.Composition.AttributedModel" Version="$(SystemCompositionAttributedModelPackageVersion)" />
111122
<PackageVersion Include="System.Composition.Convention" Version="$(SystemCompositionConventionPackageVersion)" />
112123
<PackageVersion Include="System.Composition.Hosting" Version="$(SystemCompositionHostingPackageVersion)" />
@@ -130,6 +141,7 @@
130141
<PackageVersion Include="Valleysoft.DockerCredsProvider" Version="2.2.4" />
131142
<PackageVersion Include="xunit" Version="$(XUnitVersion)" />
132143
<PackageVersion Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
144+
<PackageVersion Include="xunit.assert" Version="$(XUnitVersion)" Condition="'$(IsTestProject)' != 'true'" />
133145
<PackageVersion Include="xunit.console" Version="$(XUnitVersion)" />
134146
</ItemGroup>
135147

eng/Version.Details.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ This file should be imported by eng/Versions.props
118118
<NuGetVersioningPackageVersion>7.0.0-preview.1.609</NuGetVersioningPackageVersion>
119119
<SystemCodeDomPackageVersion>10.0.0-rc.1.25411.109</SystemCodeDomPackageVersion>
120120
<SystemCommandLinePackageVersion>2.0.0-rc.1.25411.109</SystemCommandLinePackageVersion>
121+
<SystemComponentModelCompositionPackageVersion>10.0.0-preview.7.25377.103</SystemComponentModelCompositionPackageVersion>
121122
<SystemCompositionAttributedModelPackageVersion>10.0.0-rc.1.25411.109</SystemCompositionAttributedModelPackageVersion>
122123
<SystemCompositionConventionPackageVersion>10.0.0-rc.1.25411.109</SystemCompositionConventionPackageVersion>
123124
<SystemCompositionHostingPackageVersion>10.0.0-rc.1.25411.109</SystemCompositionHostingPackageVersion>
@@ -259,6 +260,8 @@ This file should be imported by eng/Versions.props
259260
<NuGetVersioningVersion>$(NuGetVersioningPackageVersion)</NuGetVersioningVersion>
260261
<SystemCodeDomVersion>$(SystemCodeDomPackageVersion)</SystemCodeDomVersion>
261262
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
263+
<SystemComponentModelCompositionVersion>$(SystemComponentModelCompositionPackageVersion)</SystemComponentModelCompositionVersion>
264+
<SystemComponentModelCompositionVersion>$(SystemComponentModelCompositionPackageVersion)</SystemComponentModelCompositionVersion>
262265
<SystemCompositionAttributedModelVersion>$(SystemCompositionAttributedModelPackageVersion)</SystemCompositionAttributedModelVersion>
263266
<SystemCompositionConventionVersion>$(SystemCompositionConventionPackageVersion)</SystemCompositionConventionVersion>
264267
<SystemCompositionHostingVersion>$(SystemCompositionHostingPackageVersion)</SystemCompositionHostingVersion>

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,10 @@
213213
<Uri>https://github.com/dotnet/dotnet</Uri>
214214
<Sha>520c71b5277fc1f72dbec14da03ca55205d6c8e5</Sha>
215215
</Dependency>
216+
<Dependency Name="System.ComponentModel.Composition" Version="10.0.0-preview.7.25377.103">
217+
<Uri>https://github.com/dotnet/dotnet</Uri>
218+
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
219+
</Dependency>
216220
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25411.109">
217221
<Uri>https://github.com/dotnet/dotnet</Uri>
218222
<Sha>520c71b5277fc1f72dbec14da03ca55205d6c8e5</Sha>
@@ -383,10 +387,6 @@
383387
<Uri>https://github.com/dotnet/dotnet</Uri>
384388
<Sha>520c71b5277fc1f72dbec14da03ca55205d6c8e5</Sha>
385389
</Dependency>
386-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25411.109">
387-
<Uri>https://github.com/dotnet/dotnet</Uri>
388-
<Sha>520c71b5277fc1f72dbec14da03ca55205d6c8e5</Sha>
389-
</Dependency>
390390
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.0.0-2.25411.109">
391391
<Uri>https://github.com/dotnet/dotnet</Uri>
392392
<Sha>520c71b5277fc1f72dbec14da03ca55205d6c8e5</Sha>

eng/Versions.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@
6464
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
6565
<SystemCommandLineVersion>2.0.0-rc.1.25377.103</SystemCommandLineVersion>
6666
<SystemCommandLineNamingConventionBinderVersion>2.0.0-beta5.25279.2</SystemCommandLineNamingConventionBinderVersion>
67-
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
67+
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2</MicrosoftCodeAnalysisAnalyzerTestingVersion>
68+
<MicrosoftCodeAnalysisVersionForNetAnalyzers Condition="'$(DotNetBuildSourceOnly)' != 'true'">3.11.0</MicrosoftCodeAnalysisVersionForNetAnalyzers>
69+
<MicrosoftCodeAnalysisVersionForNetAnalyzers Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisVersionForNetAnalyzers>
6870
<MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
6971
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
7072
<MicrosoftWindowsCsWin32PackageVersion>0.3.49-beta</MicrosoftWindowsCsWin32PackageVersion>

sdk.slnx

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,26 @@
100100
<Project Path="src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj" Type="C#" />
101101
<Project Path="src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj" Type="C#" />
102102
</Folder>
103+
<Folder Name="/src/NetAnalyzers/" />
104+
<Folder Name="/src/NetAnalyzers/src/">
105+
<Project Path="src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.CSharp.NetAnalyzers/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.csproj" />
106+
<Project Path="src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj" />
107+
<Project Path="src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Setup/Microsoft.CodeAnalysis.NetAnalyzers.Setup.csproj" />
108+
<Project Path="src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers/Microsoft.CodeAnalysis.NetAnalyzers.csproj" />
109+
<Project Path="src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers.vbproj" />
110+
<Project Path="src/Microsoft.CodeAnalysis.NetAnalyzers/src/Utilities/Compiler.CSharp/Analyzer.CSharp.Utilities.shproj" Id="be5fe32c-da73-4ec5-809e-e11b05aca398" />
111+
<Project Path="src/Microsoft.CodeAnalysis.NetAnalyzers/src/Utilities/Compiler/Analyzer.Utilities.shproj" Id="ec946164-1e17-410b-b7d9-7de7e6268d63" />
112+
<Project Path="src/Microsoft.CodeAnalysis.NetAnalyzers/src/Utilities/FlowAnalysis/FlowAnalysis.Utilities.shproj" Id="fcb56cba-fa35-46a8-86b7-bae5433197d9" />
113+
<Project Path="src/Microsoft.CodeAnalysis.NetAnalyzers/src/Utilities/Workspaces/Workspaces.Utilities.shproj" Id="99f594b1-3916-471d-a761-a6731fc50e9a" />
114+
</Folder>
115+
<Folder Name="/src/NetAnalyzers/tests/">
116+
<Project Path="src/Microsoft.CodeAnalysis.NetAnalyzers/tests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests.csproj" />
117+
<Project Path="src/Microsoft.CodeAnalysis.NetAnalyzers/tests/Test.Utilities/Test.Utilities.csproj" />
118+
<Project Path="src/Microsoft.CodeAnalysis.NetAnalyzers/tests/TestReferenceAssembly/TestReferenceAssembly.csproj" />
119+
</Folder>
120+
<Folder Name="/src/NetAnalyzers/tools/">
121+
<Project Path="src/Microsoft.CodeAnalysis.NetAnalyzers/tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj" />
122+
</Folder>
103123
<Folder Name="/src/RazorSdk/" />
104124
<Folder Name="/src/RazorSdk/Sdk/">
105125
<File Path="src/RazorSdk/Sdk/Sdk.props" />

source-build.slnf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
"src\\Layout\\redist\\tools\\tool_msbuild.csproj",
2727
"src\\Layout\\redist\\tools\\tool_nuget.csproj",
2828
"src\\Microsoft.DotNet.TemplateLocator\\Microsoft.DotNet.TemplateLocator.csproj",
29+
"src\\Microsoft.CodeAnalysis.NetAnalyzers\\src\\Microsoft.CodeAnalysis.CSharp.NetAnalyzers\\Microsoft.CodeAnalysis.CSharp.NetAnalyzers.csproj",
30+
"src\\Microsoft.CodeAnalysis.NetAnalyzers\\src\\Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers\\Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers.vbproj",
31+
"src\\Microsoft.CodeAnalysis.NetAnalyzers\\src\\Microsoft.CodeAnalysis.NetAnalyzers\\Microsoft.CodeAnalysis.NetAnalyzers.csproj",
32+
"src\\Microsoft.CodeAnalysis.NetAnalyzers\\src\\Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj",
2933
"src\\Microsoft.Win32.Msi\\Microsoft.Win32.Msi.csproj",
3034
"src\\RazorSdk\\Tasks\\Microsoft.NET.Sdk.Razor.Tasks.csproj",
3135
"src\\RazorSdk\\Tool\\Microsoft.NET.Sdk.Razor.Tool.csproj",

src/Compatibility/Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<!-- We pin the code analysis version when not in source build as we need to support running on older
77
SDKs when the OOB package is used. -->
88
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
9+
<PackageVersion Update="Microsoft.CodeAnalysis.Common" Version="4.4.0" />
910
</ItemGroup>
1011

1112
</Project>

src/Layout/redist/redist.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
<PackageReference Include="Microsoft.TestPlatform.Build" />
3232
<PackageReference Condition=" '$(DotNetBuildSourceOnly)' != 'true' " Include="NuGet.Localization" />
3333
<PackageReference Include="NuGet.ProjectModel" />
34-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" ExcludeAssets="All" GeneratePathProperty="true" />
3534
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" ExcludeAssets="All" GeneratePathProperty="true" />
3635
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" ExcludeAssets="All" GeneratePathProperty="true" />
3736
<PackageReference Include="Microsoft.FSharp.Compiler" ExcludeAssets="All" GeneratePathProperty="true" />
@@ -71,6 +70,8 @@
7170
<ProjectReference Include="$(RepoRoot)src\BuiltInTools\dotnet-format\dotnet-format.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
7271

7372
<ProjectReference Include="$(RepoRoot)template_feed\*\*.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
73+
74+
<ProjectReference Include="$(RepoRoot)src\Microsoft.CodeAnalysis.NetAnalyzers\src\Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
7475
</ItemGroup>
7576

7677
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">

0 commit comments

Comments
 (0)