From 4a2a44a6179576ce7d033cd43626843b39a84ec9 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Fri, 23 Apr 2021 17:20:21 -0400
Subject: [PATCH] Update analyzer versions (#51696)

---
 eng/CodeAnalysis.ruleset      | 8 ++++++++
 eng/CodeAnalysis.test.ruleset | 7 +++++++
 eng/Versions.props            | 6 +++---
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/eng/CodeAnalysis.ruleset b/eng/CodeAnalysis.ruleset
index 16f5ecb..e3626e2 100644
--- a/eng/CodeAnalysis.ruleset
+++ b/eng/CodeAnalysis.ruleset
@@ -66,6 +66,7 @@
     <Rule Id="CA1401" Action="Warning" />       <!-- P/Invokes should not be visible -->
     <Rule Id="CA1416" Action="Warning" />       <!-- Validate platform compatibility -->
     <Rule Id="CA1417" Action="Warning" />       <!-- Do not use 'OutAttribute' on string parameters for P/Invokes -->
+    <Rule Id="CA1418" Action="Warning" />       <!-- Use valid platform string -->
     <Rule Id="CA1501" Action="None" />          <!-- Avoid excessive inheritance -->
     <Rule Id="CA1502" Action="None" />          <!-- Avoid excessive complexity -->
     <Rule Id="CA1505" Action="None" />          <!-- Avoid unmaintainable code -->
@@ -489,6 +490,8 @@
     <Rule Id="IDE0090" Action="Hidden" />       <!-- UseNew -->
     <Rule Id="IDE0100" Action="Hidden" />       <!-- RemoveRedundantEquality -->
     <Rule Id="IDE0110" Action="Hidden" />       <!-- RemoveUnnecessaryDiscard -->
+    <Rule Id="IDE0120" Action="Hidden" />       <!-- SimplifyLINQExpression -->
+    <Rule Id="IDE0130" Action="Hidden" />       <!-- NamespaceDoesNotMatchFolderStructure -->
     <Rule Id="IDE1001" Action="Hidden" />       <!-- AnalyzerChanged -->
     <Rule Id="IDE1002" Action="Hidden" />       <!-- AnalyzerDependencyConflict -->
     <Rule Id="IDE1003" Action="Hidden" />       <!-- MissingAnalyzerReference -->
@@ -497,5 +500,10 @@
     <Rule Id="IDE1006" Action="Hidden" />       <!-- NamingRule -->
     <Rule Id="IDE1007" Action="Hidden" />       <!-- UnboundIdentifier -->
     <Rule Id="IDE1008" Action="Hidden" />       <!-- UnboundConstructor -->
+    <Rule Id="IDE2000" Action="Hidden" />       <!-- MultipleBlankLines -->
+    <Rule Id="IDE2001" Action="Hidden" />       <!-- EmbeddedStatementsMustBeOnTheirOwnLine -->
+    <Rule Id="IDE2002" Action="Hidden" />       <!-- ConsecutiveBracesMustNotHaveBlankLinesBetweenThem -->
+    <Rule Id="IDE2003" Action="Hidden" />       <!-- ConsecutiveStatementPlacement -->
+    <Rule Id="IDE2004" Action="Hidden" />       <!-- BlankLineNotAllowedAfterConstructorInitializerColon -->
   </Rules>
 </RuleSet>
diff --git a/eng/CodeAnalysis.test.ruleset b/eng/CodeAnalysis.test.ruleset
index 06aeb3c..f1f75fb 100644
--- a/eng/CodeAnalysis.test.ruleset
+++ b/eng/CodeAnalysis.test.ruleset
@@ -489,6 +489,8 @@
     <Rule Id="IDE0090" Action="Hidden" />       <!-- UseNew -->
     <Rule Id="IDE0100" Action="Hidden" />       <!-- RemoveRedundantEquality -->
     <Rule Id="IDE0110" Action="Hidden" />       <!-- RemoveUnnecessaryDiscard -->
+    <Rule Id="IDE0120" Action="Hidden" />      <!-- SimplifyLINQExpression -->
+    <Rule Id="IDE0130" Action="Hidden" />       <!-- NamespaceDoesNotMatchFolderStructure -->
     <Rule Id="IDE1001" Action="Hidden" />       <!-- AnalyzerChanged -->
     <Rule Id="IDE1002" Action="Hidden" />       <!-- AnalyzerDependencyConflict -->
     <Rule Id="IDE1003" Action="Hidden" />       <!-- MissingAnalyzerReference -->
@@ -497,6 +499,11 @@
     <Rule Id="IDE1006" Action="Hidden" />       <!-- NamingRule -->
     <Rule Id="IDE1007" Action="Hidden" />       <!-- UnboundIdentifier -->
     <Rule Id="IDE1008" Action="Hidden" />       <!-- UnboundConstructor -->
+    <Rule Id="IDE2000" Action="Hidden" />       <!-- MultipleBlankLines -->
+    <Rule Id="IDE2001" Action="Hidden" />       <!-- EmbeddedStatementsMustBeOnTheirOwnLine -->
+    <Rule Id="IDE2002" Action="Hidden" />       <!-- ConsecutiveBracesMustNotHaveBlankLinesBetweenThem -->
+    <Rule Id="IDE2003" Action="Hidden" />       <!-- ConsecutiveStatementPlacement -->
+    <Rule Id="IDE2004" Action="Hidden" />       <!-- BlankLineNotAllowedAfterConstructorInitializerColon -->
   </Rules>
   <Rules AnalyzerId="xunit.analyzers" RuleNamespace="xunit.analyzers">
     <Rule Id="xUnit1000" Action="Warning" />    <!-- Test classes must be public -->
diff --git a/eng/Versions.props b/eng/Versions.props
index 7910720..a6086ee 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -50,9 +50,9 @@
     <MicrosoftCodeAnalysisVersion>3.8.0</MicrosoftCodeAnalysisVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-preview3.21168.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
-    <MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.9.0-5.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
-    <MicrosoftCodeAnalysisCSharpVersion>3.9.0-5.final</MicrosoftCodeAnalysisCSharpVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-preview5.21219.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
+    <MicrosoftCodeAnalysisCSharpVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpVersion>
     <!-- Arcade dependencies -->
     <MicrosoftDotNetApiCompatVersion>6.0.0-beta.21221.1</MicrosoftDotNetApiCompatVersion>
     <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21221.1</MicrosoftDotNetBuildTasksFeedVersion>
-- 
2.7.4