From 4c866766d704534493fdc0bad86501048105a7e4 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Mon, 19 Jul 2021 11:30:51 -0400
Subject: [PATCH] Update analyzer rulesets

---
 eng/CodeAnalysis.ruleset      |  3 +++
 eng/CodeAnalysis.test.ruleset | 20 +++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/eng/CodeAnalysis.ruleset b/eng/CodeAnalysis.ruleset
index 0be33b74564982..37968bf0bcad76 100644
--- a/eng/CodeAnalysis.ruleset
+++ b/eng/CodeAnalysis.ruleset
@@ -176,6 +176,7 @@
     <Rule Id="CA2249" Action="Warning" />       <!-- Consider using 'string.Contains' instead of 'string.IndexOf' -->
     <Rule Id="CA2250" Action="Warning" />       <!-- Use 'ThrowIfCancellationRequested' -->
     <Rule Id="CA2251" Action="Warning" />       <!-- Use 'string.Equals' -->
+    <Rule Id="CA2252" Action="None" />          <!-- This API requires opting into preview features -->
     <Rule Id="CA2300" Action="None" />          <!-- Do not use insecure deserializer BinaryFormatter -->
     <Rule Id="CA2301" Action="None" />          <!-- Do not call BinaryFormatter.Deserialize without first setting BinaryFormatter.Binder -->
     <Rule Id="CA2302" Action="None" />          <!-- Ensure BinaryFormatter.Binder is set before calling BinaryFormatter.Deserialize -->
@@ -498,6 +499,8 @@
     <Rule Id="IDE0110" Action="Hidden" />       <!-- RemoveUnnecessaryDiscard -->
     <Rule Id="IDE0120" Action="Hidden" />       <!-- SimplifyLINQExpression -->
     <Rule Id="IDE0130" Action="Hidden" />       <!-- NamespaceDoesNotMatchFolderStructure -->
+    <Rule Id="IDE0140" Action="Hidden" />       <!-- SimplifyObjectCreationDiagnosticId -->
+    <Rule Id="IDE0150" Action="Hidden" />       <!-- UseNullCheckOverTypeCheckDiagnosticId -->
     <Rule Id="IDE1001" Action="Hidden" />       <!-- AnalyzerChanged -->
     <Rule Id="IDE1002" Action="Hidden" />       <!-- AnalyzerDependencyConflict -->
     <Rule Id="IDE1003" Action="Hidden" />       <!-- MissingAnalyzerReference -->
diff --git a/eng/CodeAnalysis.test.ruleset b/eng/CodeAnalysis.test.ruleset
index 285b9ff6bbfa1e..40bb66f202c775 100644
--- a/eng/CodeAnalysis.test.ruleset
+++ b/eng/CodeAnalysis.test.ruleset
@@ -67,6 +67,8 @@
     <Rule Id="CA1401" Action="None" />          <!-- P/Invokes should not be visible -->
     <Rule Id="CA1416" Action="None" />          <!-- Validate platform compatibility -->
     <Rule Id="CA1417" Action="None" />          <!-- Do not use 'OutAttribute' on string parameters for P/Invokes -->
+    <Rule Id="CA1418" Action="None" />          <!-- Use valid platform string -->
+    <Rule Id="CA1419" Action="None" />          <!-- Provide a public parameterless constructor for concrete types derived from 'System.Runtime.InteropServices.SafeHandle' -->
     <Rule Id="CA1501" Action="None" />          <!-- Avoid excessive inheritance -->
     <Rule Id="CA1502" Action="None" />          <!-- Avoid excessive complexity -->
     <Rule Id="CA1505" Action="None" />          <!-- Avoid unmaintainable code -->
@@ -120,11 +122,12 @@
     <Rule Id="CA1839" Action="None" />          <!-- Use 'Environment.ProcessPath' -->
     <Rule Id="CA1840" Action="None" />          <!-- Use 'Environment.CurrentManagedThreadId' -->
     <Rule Id="CA1841" Action="None" />          <!-- Prefer Dictionary.Contains methods -->
-	  <Rule Id="CA1842" Action="None" />          <!-- Do not use 'WhenAll' with a single task -->
-	  <Rule Id="CA1843" Action="None" />          <!-- Do not use 'WaitAll' with a single task -->
-	  <Rule Id="CA1844" Action="None" />          <!-- Provide memory-based overrides of async methods when subclassing 'Stream' -->
-	  <Rule Id="CA1845" Action="None" />          <!-- Use span-based 'string.Concat' -->
-	  <Rule Id="CA1846" Action="None" />          <!-- Prefer 'AsSpan' over 'Substring' -->
+    <Rule Id="CA1842" Action="None" />          <!-- Do not use 'WhenAll' with a single task -->
+    <Rule Id="CA1843" Action="None" />          <!-- Do not use 'WaitAll' with a single task -->
+    <Rule Id="CA1844" Action="None" />          <!-- Provide memory-based overrides of async methods when subclassing 'Stream' -->
+    <Rule Id="CA1845" Action="None" />          <!-- Use span-based 'string.Concat' -->
+    <Rule Id="CA1846" Action="None" />          <!-- Prefer 'AsSpan' over 'Substring' -->
+    <Rule Id="CA1847" Action="None" />          <!-- Use char literal for a single character lookup -->
     <Rule Id="CA2000" Action="None" />          <!-- Dispose objects before losing scope -->
     <Rule Id="CA2002" Action="None" />          <!-- Do not lock on objects with weak identity -->
     <Rule Id="CA2007" Action="None" />          <!-- Consider calling ConfigureAwait on the awaited task -->
@@ -172,7 +175,8 @@
     <Rule Id="CA2248" Action="None" />          <!-- Provide correct 'enum' argument to 'Enum.HasFlag' -->
     <Rule Id="CA2249" Action="None" />          <!-- Consider using 'string.Contains' instead of 'string.IndexOf' -->
     <Rule Id="CA2250" Action="None" />          <!-- Use 'ThrowIfCancellationRequested' -->
-	  <Rule Id="CA2251" Action="None" />          <!-- Use 'string.Equals' -->
+    <Rule Id="CA2251" Action="None" />          <!-- Use 'string.Equals' -->
+    <Rule Id="CA2252" Action="None" />          <!-- This API requires opting into preview features -->
     <Rule Id="CA2300" Action="None" />          <!-- Do not use insecure deserializer BinaryFormatter -->
     <Rule Id="CA2301" Action="None" />          <!-- Do not call BinaryFormatter.Deserialize without first setting BinaryFormatter.Binder -->
     <Rule Id="CA2302" Action="None" />          <!-- Ensure BinaryFormatter.Binder is set before calling BinaryFormatter.Deserialize -->
@@ -496,8 +500,10 @@
     <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="IDE0120" Action="Hidden" />       <!-- SimplifyLINQExpression -->
     <Rule Id="IDE0130" Action="Hidden" />       <!-- NamespaceDoesNotMatchFolderStructure -->
+    <Rule Id="IDE0140" Action="Hidden" />       <!-- SimplifyObjectCreationDiagnosticId -->
+    <Rule Id="IDE0150" Action="Hidden" />       <!-- UseNullCheckOverTypeCheckDiagnosticId -->
     <Rule Id="IDE1001" Action="Hidden" />       <!-- AnalyzerChanged -->
     <Rule Id="IDE1002" Action="Hidden" />       <!-- AnalyzerDependencyConflict -->
     <Rule Id="IDE1003" Action="Hidden" />       <!-- MissingAnalyzerReference -->