Update analyzer versions (#42249)

* Update analyzer packages to latest NuGet versions * Fix new warnings
dotnet · Oct 31, 2019 · 51686cb · 51686cb
1 parent 54efc11
commit 51686cb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/eng/analyzers.props b/eng/analyzers.props
@@ -1,8 +1,8 @@
 <Project>
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.CodeAnalysis" Version="$(MicrosoftDotNetCodeAnalysisPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.3.0-beta2-final" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.4.0-beta2-final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.6" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.66" />
   </ItemGroup>
 </Project>
diff --git a/src/Common/src/CoreLib/CodeAnalysis.ruleset b/src/Common/src/CoreLib/CodeAnalysis.ruleset
@@ -71,6 +71,7 @@
     <Rule Id="CA5369" Action="None" /> <!-- Use XmlReader For Deserialize -->
     <Rule Id="CA5371" Action="None" /> <!-- Use XmlReader For Schema Read -->
     <Rule Id="CA5372" Action="None" /> <!-- Use XmlReader For XPathDocument -->
+    <Rule Id="CA5397" Action="None" /> <!-- Security protocol version is deprecated -->
   </Rules>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
     <Rule Id="AD0001" Action="None" /> <!-- Analyzer threw an exception -->

diff --git a/src/Common/src/System/Reflection/Emit/IgnoreAccessChecksToAttributeBuilder.cs b/src/Common/src/System/Reflection/Emit/IgnoreAccessChecksToAttributeBuilder.cs
@@ -76,7 +76,7 @@ public static ConstructorInfo AddToModule(ModuleBuilder mb)
             // Find the ctor that takes only AttributeTargets
             ConstructorInfo attributeUsageConstructorInfo =
                 attributeUsageTypeInfo.DeclaredConstructors
-                    .Single(c => c.GetParameters().Count() == 1 &&
+                    .Single(c => c.GetParameters().Length == 1 &&
                                  c.GetParameters()[0].ParameterType == typeof(AttributeTargets));
 
             // Find the property to set AllowMultiple

diff --git a/...osition.Registration/src/System/ComponentModel/Composition/Registration/PartBuilderOfT.cs b/...osition.Registration/src/System/ComponentModel/Composition/Registration/PartBuilderOfT.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 
@@ -116,7 +115,7 @@ private void ParseSelectConstructor(Expression<Func<ParameterImportBuilder, T>>
                     if (argument.NodeType == ExpressionType.Call)
                     {
                         var methodCallExpression = (MethodCallExpression)argument;
-                        if (methodCallExpression.Arguments.Count() == 1)
+                        if (methodCallExpression.Arguments.Count == 1)
                         {
                             Expression parameter = methodCallExpression.Arguments[0];
                             if (parameter.NodeType == ExpressionType.Lambda)

diff --git a/...stem.Composition.Convention/src/System/Composition/Convention/PartConventionBuilderOfT.cs b/...stem.Composition.Convention/src/System/Composition/Convention/PartConventionBuilderOfT.cs
@@ -3,9 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
 using System.Linq.Expressions;
+using System.Reflection;
 
 namespace System.Composition.Convention
 {
@@ -182,7 +181,7 @@ private void ParseSelectConstructor(Expression<Func<ParameterImportConventionBui
                     if (argument.NodeType == ExpressionType.Call)
                     {
                         var methodCallExpression = (MethodCallExpression)argument;
-                        if (methodCallExpression.Arguments.Count() == 1)
+                        if (methodCallExpression.Arguments.Count == 1)
                         {
                             Expression parameter = methodCallExpression.Arguments[0];
                             if (parameter.NodeType == ExpressionType.Lambda)