Merge pull request #3444 from dotnet/merges/2.9.x-to-master

Merge 2.9.x to master
dotnet · Mar 28, 2020 · 185625a · 185625a
2 parents a27a031 + 07110fc
commit 185625a
Show file tree

Hide file tree

Showing 52 changed files with 417 additions and 9 deletions.
diff --git a/FxCopAnalyzers.sln b/FxCopAnalyzers.sln
@@ -67,8 +67,16 @@ EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Utilities\Workspaces\Workspaces.Utilities.projitems*{99f594b1-3916-471d-a761-a6731fc50e9a}*SharedItemsImports = 13
+		src\Utilities\Compiler\Analyzer.Utilities.projitems*{db2a3703-0149-46d4-b575-018346b2f406}*SharedItemsImports = 5
+		src\Utilities\FlowAnalysis\FlowAnalysis.Utilities.projitems*{db2a3703-0149-46d4-b575-018346b2f406}*SharedItemsImports = 5
+		src\Utilities\Workspaces\Workspaces.Utilities.projitems*{db2a3703-0149-46d4-b575-018346b2f406}*SharedItemsImports = 5
+		src\Utilities\Compiler\Analyzer.Utilities.projitems*{e038e362-efbe-4a81-a93f-cfa5d779fd2e}*SharedItemsImports = 5
+		src\Utilities\Workspaces\Workspaces.Utilities.projitems*{e038e362-efbe-4a81-a93f-cfa5d779fd2e}*SharedItemsImports = 5
 		src\Utilities\Compiler\Analyzer.Utilities.projitems*{ec946164-1e17-410b-b7d9-7de7e6268d63}*SharedItemsImports = 13
 		src\Utilities\FlowAnalysis\FlowAnalysis.Utilities.projitems*{fcb56cba-fa35-46a8-86b7-bae5433197d9}*SharedItemsImports = 13
+		src\Utilities\Compiler\Analyzer.Utilities.projitems*{fee46b63-96ac-476e-80c3-4ca964e748e9}*SharedItemsImports = 5
+		src\Utilities\FlowAnalysis\FlowAnalysis.Utilities.projitems*{fee46b63-96ac-476e-80c3-4ca964e748e9}*SharedItemsImports = 5
+		src\Utilities\Workspaces\Workspaces.Utilities.projitems*{fee46b63-96ac-476e-80c3-4ca964e748e9}*SharedItemsImports = 5
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -23,9 +23,9 @@
     <MicrosoftCodeAnalysisVersion>3.0.0</MicrosoftCodeAnalysisVersion>
     <MicrosoftCodeAnalysisForShippedApisVersion>3.5.0-beta2-20056-01</MicrosoftCodeAnalysisForShippedApisVersion>
     <MicrosoftNetCompilersVersion>3.6.0-1.final</MicrosoftNetCompilersVersion>
-    <DogfoodAnalyzersVersion>3.0.0-beta2.final</DogfoodAnalyzersVersion>
+    <DogfoodAnalyzersVersion>3.0.0-beta4.20177.1</DogfoodAnalyzersVersion>
     <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>$(DogfoodAnalyzersVersion)</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
-    <MicrosoftCodeAnalysisFXCopAnalyersVersion>3.0.0-beta3.final</MicrosoftCodeAnalysisFXCopAnalyersVersion>
+    <MicrosoftCodeAnalysisFXCopAnalyersVersion>$(DogfoodAnalyzersVersion)</MicrosoftCodeAnalysisFXCopAnalyersVersion>
     <MicrosoftCodeAnalysisAnalyersVersion>$(DogfoodAnalyzersVersion)</MicrosoftCodeAnalysisAnalyersVersion>
     <CodeStyleAnalyersVersion>3.6.0-2.20157.5</CodeStyleAnalyersVersion>
     <MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.0-pre-20160714</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -20,11 +20,22 @@
     <UpToDateCheckInput Include="$(MSBuildThisFileDirectory)..\eng\Analyzers_ShippingRules.ruleset" Condition="'$(CodeAnalysisRuleSet)' == '$(MSBuildThisFileDirectory)..\build\Analyzers_NonShippingRules.ruleset'" />
   </ItemGroup>
 
+  <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(NonShipping)' == 'true' or '$(IsVsixProject)' == 'true' or '$(FxCopAnalyzersProject)' == 'true'">
+    <ReleaseTrackingOptOut>true</ReleaseTrackingOptOut>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)\BannedSymbols.txt" Condition="'$(BannedSymbolsOptOut)' != 'true'" />
+	  <AdditionalFiles Include="$(MSBuildProjectDirectory)\AnalyzerReleases.Shipped.md" Condition="'$(ReleaseTrackingOptOut)' != 'true' AND Exists('$(MSBuildProjectDirectory)\AnalyzerReleases.Shipped.md')" />
+    <AdditionalFiles Include="$(MSBuildProjectDirectory)\AnalyzerReleases.Unshipped.md" Condition="'$(ReleaseTrackingOptOut)' != 'true' AND Exists('$(MSBuildProjectDirectory)\AnalyzerReleases.Unshipped.md')" />
   </ItemGroup>
 
+  <Target Name="BeforeBuild" Condition="'$(ReleaseTrackingOptOut)' != 'true'" >
+    <Error Condition="!Exists('$(MSBuildProjectDirectory)\AnalyzerReleases.Shipped.md')" Text="Create a new empty file named 'AnalyzerReleases.Shipped.md' in the project directory" />
+    <Error Condition="!Exists('$(MSBuildProjectDirectory)\AnalyzerReleases.Unshipped.md')" Text="Create a new empty file named 'AnalyzerReleases.Unshipped.md' in the project directory" />
+  </Target>
+
   <PropertyGroup>
     <!-- Workaround for https://github.com/dotnet/roslyn/issues/25041 -->
     <MSBuildAllProjects Condition="'$(CodeAnalysisRuleSet)' == '$(MSBuildThisFileDirectory)..\eng\Analyzers_NonShippingRules.ruleset'">$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\build\Analyzers_ShippingRules.ruleset</MSBuildAllProjects>
@@ -93,4 +104,5 @@
     <Error Text="$(_TestResultsDisplayPath) [$(_TestEnvironment)]" Condition="'$(_TestErrorCode)' != '0' and '$(TargetFrameworks)' == ''" File="XUnit" />
   </Target>
 
+
 </Project>
diff --git a/src/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.csproj b/src/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.csproj
@@ -9,6 +9,7 @@
     <PackageId>*$(MSBuildProjectFullPath)*</PackageId>
     <ExcludeInternalFlowAnalyses>true</ExcludeInternalFlowAnalyses>
     <ExcludeCodeMetricsUtilities>true</ExcludeCodeMetricsUtilities>
+    <ReleaseTrackingOptOut>true</ReleaseTrackingOptOut>
 
     <!-- RS0026: Avoid public API overloads with differences in optional parameters -->
     <NoWarn>$(NoWarn);RS0026</NoWarn>

diff --git a/src/Microsoft.CodeAnalysis.Analyzers/CSharp/AnalyzerReleases.Shipped.md b/src/Microsoft.CodeAnalysis.Analyzers/CSharp/AnalyzerReleases.Shipped.md
@@ -0,0 +1,6 @@
+## Release 2.9.8
+
+### New Rules
+Rule ID | Category | Severity | Notes
+--------|----------|----------|-------
+RS1014 | MicrosoftCodeAnalysisCorrectness | Warning | CSharpImmutableObjectMethodAnalyzer
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/CSharp/AnalyzerReleases.Unshipped.md b/src/Microsoft.CodeAnalysis.Analyzers/CSharp/AnalyzerReleases.Unshipped.md
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/AnalyzerReleases.Shipped.md b/src/Microsoft.CodeAnalysis.Analyzers/Core/AnalyzerReleases.Shipped.md
@@ -0,0 +1,27 @@
+## Release 2.9.8
+
+### New Rules
+Rule ID | Category | Severity | Notes
+--------|----------|----------|-------
+RS1001 | MicrosoftCodeAnalysisCorrectness | Warning | DiagnosticAnalyzerAttributeAnalyzer
+RS1002 | MicrosoftCodeAnalysisCorrectness | Warning | RegisterActionAnalyzer
+RS1003 | MicrosoftCodeAnalysisCorrectness | Warning | RegisterActionAnalyzer
+RS1004 | MicrosoftCodeAnalysisCorrectness | Warning | DiagnosticAnalyzerAttributeAnalyzer
+RS1005 | MicrosoftCodeAnalysisCorrectness | Warning | ReportDiagnosticAnalyzer
+RS1006 | MicrosoftCodeAnalysisCorrectness | Warning | RegisterActionAnalyzer
+RS1007 | MicrosoftCodeAnalysisLocalization | Disabled | DiagnosticDescriptorCreationAnalyzer
+RS1008 | MicrosoftCodeAnalysisPerformance | Warning | DiagnosticAnalyzerFieldsAnalyzer
+RS1009 | MicrosoftCodeAnalysisCompatibility | Error | InternalImplementationOnlyAnalyzer
+RS1010 | Correctness | Warning | FixerWithFixAllAnalyzer
+RS1011 | Correctness | Warning | FixerWithFixAllAnalyzer
+RS1012 | MicrosoftCodeAnalysisPerformance | Warning | RegisterActionAnalyzer
+RS1013 | MicrosoftCodeAnalysisPerformance | Warning | RegisterActionAnalyzer
+RS1015 | MicrosoftCodeAnalysisDocumentation | Disabled | DiagnosticDescriptorCreationAnalyzer
+RS1016 | Correctness | Warning | FixerWithFixAllAnalyzer
+RS1017 | MicrosoftCodeAnalysisDesign | Warning | DiagnosticDescriptorCreationAnalyzer
+RS1018 | MicrosoftCodeAnalysisDesign | Warning | DiagnosticDescriptorCreationAnalyzer
+RS1019 | MicrosoftCodeAnalysisDesign | Warning | DiagnosticDescriptorCreationAnalyzer
+RS1020 | MicrosoftCodeAnalysisDesign | Disabled | DiagnosticDescriptorCreationAnalyzer
+RS1021 | MicrosoftCodeAnalysisDesign | Warning | DiagnosticDescriptorCreationAnalyzer
+RS1022 | MicrosoftCodeAnalysisCorrectness | Warning | DiagnosticAnalyzerApiUsageAnalyzer
+RS1023 | Library | Warning | UpgradeMSBuildWorkspaceAnalyzer
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/AnalyzerReleases.Unshipped.md b/src/Microsoft.CodeAnalysis.Analyzers/Core/AnalyzerReleases.Unshipped.md
@@ -0,0 +1,18 @@
+### New Rules
+Rule ID | Category | Severity | Notes
+--------|----------|----------|-------
+RS1024 | MicrosoftCodeAnalysisCorrectness | Warning | CompareSymbolsCorrectlyAnalyzer
+RS1025 | MicrosoftCodeAnalysisCorrectness | Warning | ConfigureGeneratedCodeAnalysisAnalyzer
+RS1026 | MicrosoftCodeAnalysisCorrectness | Warning | EnableConcurrentExecutionAnalyzer
+RS1027 | MicrosoftCodeAnalysisCorrectness | Warning | ClassIsNotDiagnosticAnalyzer
+RS1028 | MicrosoftCodeAnalysisDocumentation | Disabled | DiagnosticDescriptorCreationAnalyzer
+RS1029 | MicrosoftCodeAnalysisDesign | Warning | DiagnosticDescriptorCreationAnalyzer
+RS1030 | MicrosoftCodeAnalysisCorrectness | Warning | DoNotUseCompilationGetSemanticModelAnalyzer
+RS2000 | MicrosoftCodeAnalysisReleaseTracking | Warning | DiagnosticDescriptorCreationAnalyzer, [Documentation](https://github.com/dotnet/roslyn-analyzers/blob/master/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)
+RS2001 | MicrosoftCodeAnalysisReleaseTracking | Warning | DiagnosticDescriptorCreationAnalyzer, [Documentation](https://github.com/dotnet/roslyn-analyzers/blob/master/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)
+RS2002 | MicrosoftCodeAnalysisReleaseTracking | Warning | DiagnosticDescriptorCreationAnalyzer, [Documentation](https://github.com/dotnet/roslyn-analyzers/blob/master/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)
+RS2003 | MicrosoftCodeAnalysisReleaseTracking | Warning | DiagnosticDescriptorCreationAnalyzer, [Documentation](https://github.com/dotnet/roslyn-analyzers/blob/master/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)
+RS2004 | MicrosoftCodeAnalysisReleaseTracking | Warning | DiagnosticDescriptorCreationAnalyzer, [Documentation](https://github.com/dotnet/roslyn-analyzers/blob/master/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)
+RS2005 | MicrosoftCodeAnalysisReleaseTracking | Warning | DiagnosticDescriptorCreationAnalyzer, [Documentation](https://github.com/dotnet/roslyn-analyzers/blob/master/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)
+RS2006 | MicrosoftCodeAnalysisReleaseTracking | Warning | DiagnosticDescriptorCreationAnalyzer, [Documentation](https://github.com/dotnet/roslyn-analyzers/blob/master/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)
+RS2007 | MicrosoftCodeAnalysisReleaseTracking | Warning | DiagnosticDescriptorCreationAnalyzer, [Documentation](https://github.com/dotnet/roslyn-analyzers/blob/master/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/VisualBasic/AnalyzerReleases.Shipped.md b/src/Microsoft.CodeAnalysis.Analyzers/VisualBasic/AnalyzerReleases.Shipped.md
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/VisualBasic/AnalyzerReleases.Unshipped.md b/src/Microsoft.CodeAnalysis.Analyzers/VisualBasic/AnalyzerReleases.Unshipped.md
diff --git a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/CSharp/AnalyzerReleases.Shipped.md b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/CSharp/AnalyzerReleases.Shipped.md
diff --git a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/CSharp/AnalyzerReleases.Unshipped.md b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/CSharp/AnalyzerReleases.Unshipped.md
diff --git a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Core/AnalyzerReleases.Shipped.md b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Core/AnalyzerReleases.Shipped.md
@@ -0,0 +1,8 @@
+## Release 2.9.8
+
+### New Rules
+Rule ID | Category | Severity | Notes
+--------|----------|----------|-------
+RS0030 | ApiDesign | Warning | SymbolIsBannedAnalyzer, [Documentation](https://github.com/dotnet/roslyn-analyzers/blob/master/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/BannedApiAnalyzers.Help.md)
+RS0031 | ApiDesign | Warning | SymbolIsBannedAnalyzer, [Documentation](https://github.com/dotnet/roslyn-analyzers/blob/master/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/BannedApiAnalyzers.Help.md)
+RS0035 | ApiDesign | Error | RestrictedInternalsVisibleToAnalyzer
diff --git a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Core/AnalyzerReleases.Unshipped.md b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Core/AnalyzerReleases.Unshipped.md
diff --git a/...crosoft.CodeAnalysis.BannedApiAnalyzers/VisualBasic/AnalyzerReleases.Shipped.md b/...crosoft.CodeAnalysis.BannedApiAnalyzers/VisualBasic/AnalyzerReleases.Shipped.md
diff --git a/...osoft.CodeAnalysis.BannedApiAnalyzers/VisualBasic/AnalyzerReleases.Unshipped.md b/...osoft.CodeAnalysis.BannedApiAnalyzers/VisualBasic/AnalyzerReleases.Unshipped.md
diff --git a/...soft.CodeAnalysis.VersionCheckAnalyzer/Microsoft.CodeAnalysis.VersionCheckAnalyzer.csproj b/...soft.CodeAnalysis.VersionCheckAnalyzer/Microsoft.CodeAnalysis.VersionCheckAnalyzer.csproj
@@ -8,6 +8,7 @@
     -->
     <PackageId>*$(MSBuildProjectFullPath)*</PackageId>
     <MicrosoftCodeAnalysisVersion>2.0.0</MicrosoftCodeAnalysisVersion>
+    <ReleaseTrackingOptOut>true</ReleaseTrackingOptOut>
   </PropertyGroup>
 
   <Choose>

diff --git a/src/NetAnalyzers/CSharp/AnalyzerReleases.Shipped.md b/src/NetAnalyzers/CSharp/AnalyzerReleases.Shipped.md
diff --git a/src/NetAnalyzers/CSharp/AnalyzerReleases.Unshipped.md b/src/NetAnalyzers/CSharp/AnalyzerReleases.Unshipped.md