From 54cb57399dabbfdcc1f7621b81c0420863a8f39c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 10 Jul 2023 13:38:41 -0700
Subject: [PATCH] [main] Update dependencies from dotnet/roslyn-analyzers
 (#87768)

* Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20230618.1

* Suppress RS1038 analyzer

* Fix new failures found with CA1859 analyzer updates

* Disable CA2261 on test projects, fix more CA1859 findings

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Buyaa Namnan <bunamnan@microsoft.com>
---
 eng/CodeAnalysis.src.globalconfig                                 | 3 +++
 eng/CodeAnalysis.test.globalconfig                                | 3 +++
 eng/Version.Details.xml                                           | 8 ++++----
 eng/Versions.props                                                | 4 ++--
 .../System/Reflection/Runtime/MethodInfos/RuntimeMethodInfo.cs    | 2 ++
 .../tools/Common/Compiler/GenericCycleDetection/Graph.Cycles.cs   | 2 +-
 .../Compiler/DependencyAnalysis/VTableSliceNode.cs                | 2 +-
 .../src/EventSourceLogger.cs                                      | 2 +-
 src/libraries/System.Linq/src/System/Linq/Enumerable.SizeOpt.cs   | 2 +-
 .../System/Xml/Serialization/ReflectionXmlSerializationReader.cs  | 6 +++---
 .../gen/JSImportGenerator/JSImportGenerator.csproj                | 2 +-
 .../gen/ComInterfaceGenerator/ComInterfaceGenerator.csproj        | 2 +-
 .../gen/LibraryImportGenerator/LibraryImportGenerator.csproj      | 2 +-
 .../Pal/Windows/DecryptorPalWindows.DecodeRecipients.cs           | 2 ++
 14 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/eng/CodeAnalysis.src.globalconfig b/eng/CodeAnalysis.src.globalconfig
index 0fdc741..f7b055d 100644
--- a/eng/CodeAnalysis.src.globalconfig
+++ b/eng/CodeAnalysis.src.globalconfig
@@ -658,6 +658,9 @@ dotnet_diagnostic.CA2259.severity = warning
 # CA2260: Use correct type parameter
 dotnet_diagnostic.CA2260.severity = warning
 
+# CA2261: Do not use ConfigureAwaitOptions.SuppressThrowing with Task<TResult>
+dotnet_diagnostic.CA2261.severity = warning
+
 # CA2300: Do not use insecure deserializer BinaryFormatter
 dotnet_diagnostic.CA2300.severity = none
 
diff --git a/eng/CodeAnalysis.test.globalconfig b/eng/CodeAnalysis.test.globalconfig
index ae1dc7e..fa3d259 100644
--- a/eng/CodeAnalysis.test.globalconfig
+++ b/eng/CodeAnalysis.test.globalconfig
@@ -654,6 +654,9 @@ dotnet_diagnostic.CA2259.severity = none
 # CA2260: Use correct type parameter
 dotnet_diagnostic.CA2260.severity = none
 
+# CA2261: Do not use ConfigureAwaitOptions.SuppressThrowing with Task<TResult>
+dotnet_diagnostic.CA2261.severity = none
+
 # CA2300: Do not use insecure deserializer BinaryFormatter
 dotnet_diagnostic.CA2300.severity = none
 
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0ca799c..5e032c4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -372,13 +372,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>7787409c6b529c021d4f8b5fbe3d620094953be9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.3.5-beta1.23308.2">
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23357.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>2f0301ef59624a72fb00f7fd92caa50be03f277d</Sha>
+      <Sha>82603c16509d7383cd1922680773a79b839b1705</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23308.2">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23357.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>2f0301ef59624a72fb00f7fd92caa50be03f277d</Sha>
+      <Sha>82603c16509d7383cd1922680773a79b839b1705</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="8.0.100-preview.7.23329.3">
       <Uri>https://github.com/dotnet/sdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 0217d8e..e9dba7b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,8 +32,8 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- dotnet/roslyn-analyzers dependencies -->
-    <MicrosoftCodeAnalysisAnalyzersVersion>3.3.5-beta1.23308.2</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23308.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23357.1</MicrosoftCodeAnalysisAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23357.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <!-- dotnet/roslyn dependencies -->
     <!--
       These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/MethodInfos/RuntimeMethodInfo.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/MethodInfos/RuntimeMethodInfo.cs
index 8b5ff9b..4aea720 100644
--- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/MethodInfos/RuntimeMethodInfo.cs
+++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/MethodInfos/RuntimeMethodInfo.cs
@@ -325,8 +325,10 @@ namespace System.Reflection.Runtime.MethodInfos
                 return null;
             }
 
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance https://github.com/dotnet/roslyn-analyzers/issues/6751
             IList<ParameterInfo> delegateParameters = invokeMethod.GetParametersNoCopy();
             IList<ParameterInfo> targetParameters = this.GetParametersNoCopy();
+#pragma warning restore CA1859
             IEnumerator<ParameterInfo> delegateParameterEnumerator = delegateParameters.GetEnumerator();
             IEnumerator<ParameterInfo> targetParameterEnumerator = targetParameters.GetEnumerator();
 
diff --git a/src/coreclr/tools/Common/Compiler/GenericCycleDetection/Graph.Cycles.cs b/src/coreclr/tools/Common/Compiler/GenericCycleDetection/Graph.Cycles.cs
index 544fceb..db9071a 100644
--- a/src/coreclr/tools/Common/Compiler/GenericCycleDetection/Graph.Cycles.cs
+++ b/src/coreclr/tools/Common/Compiler/GenericCycleDetection/Graph.Cycles.cs
@@ -311,7 +311,7 @@ ReturnFromEndOfRecursiveFunction:
                 }
 #endif
 
-                return verticesInAFlaggedCycleTarjanStyle.Select(v => v.Payload).ToArray();
+                return verticesInAFlaggedCycleTarjanStyle.Select(v => v.Payload);
             }
 
             /// <summary>
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/VTableSliceNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/VTableSliceNode.cs
index d33a12e..8a398b7 100644
--- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/VTableSliceNode.cs
+++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/VTableSliceNode.cs
@@ -102,7 +102,7 @@ namespace ILCompiler.DependencyAnalysis
         {
         }
 
-        private static IReadOnlyList<MethodDesc> ComputeSlots(TypeDesc type)
+        private static MethodDesc[] ComputeSlots(TypeDesc type)
         {
             var slots = default(ArrayBuilder<MethodDesc>);
 
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/EventSourceLogger.cs b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/EventSourceLogger.cs
index b0e405e..b2ad023 100644
--- a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/EventSourceLogger.cs
+++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/EventSourceLogger.cs
@@ -194,7 +194,7 @@ namespace Microsoft.Extensions.Logging.EventSource
         /// <summary>
         /// Converts an ILogger state object into a set of key-value pairs (That can be send to a EventSource)
         /// </summary>
-        private static IReadOnlyList<KeyValuePair<string, string?>> GetProperties(object? state)
+        private static KeyValuePair<string, string?>[] GetProperties(object? state)
         {
             if (state is IReadOnlyList<KeyValuePair<string, object?>> keyValuePairs)
             {
diff --git a/src/libraries/System.Linq/src/System/Linq/Enumerable.SizeOpt.cs b/src/libraries/System.Linq/src/System/Linq/Enumerable.SizeOpt.cs
index bbedf34..493e938 100644
--- a/src/libraries/System.Linq/src/System/Linq/Enumerable.SizeOpt.cs
+++ b/src/libraries/System.Linq/src/System/Linq/Enumerable.SizeOpt.cs
@@ -9,7 +9,7 @@ namespace System.Linq
     {
         public static IEnumerable<TResult> Empty<TResult>() => Array.Empty<TResult>();
 
-        private static IEnumerable<TResult>? GetEmptyIfEmpty<TSource, TResult>(IEnumerable<TSource> source) =>
+        private static TResult[]? GetEmptyIfEmpty<TSource, TResult>(IEnumerable<TSource> source) =>
             source is TSource[] { Length: 0 } ?
                 Array.Empty<TResult>() :
                 null;
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Serialization/ReflectionXmlSerializationReader.cs b/src/libraries/System.Private.Xml/src/System/Xml/Serialization/ReflectionXmlSerializationReader.cs
index 8355612..56ea3f5 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Serialization/ReflectionXmlSerializationReader.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Serialization/ReflectionXmlSerializationReader.cs
@@ -89,7 +89,7 @@ namespace System.Xml.Serialization
         }
 
         [RequiresUnreferencedCode(XmlSerializer.TrimSerializationWarning)]
-        private object GenerateMembersElement(XmlMembersMapping xmlMembersMapping)
+        private object?[] GenerateMembersElement(XmlMembersMapping xmlMembersMapping)
         {
             if (xmlMembersMapping.Accessor.IsSoap)
             {
@@ -102,7 +102,7 @@ namespace System.Xml.Serialization
         }
 
         [RequiresUnreferencedCode(XmlSerializer.TrimSerializationWarning)]
-        private object GenerateLiteralMembersElement(XmlMembersMapping xmlMembersMapping)
+        private object[] GenerateLiteralMembersElement(XmlMembersMapping xmlMembersMapping)
         {
             ElementAccessor element = xmlMembersMapping.Accessor;
             MemberMapping[] mappings = ((MembersMapping)element.Mapping!).Members!;
@@ -322,7 +322,7 @@ namespace System.Xml.Serialization
         }
 
         [RequiresUnreferencedCode(XmlSerializer.TrimSerializationWarning)]
-        private object GenerateEncodedMembersElement(XmlMembersMapping xmlMembersMapping)
+        private object?[] GenerateEncodedMembersElement(XmlMembersMapping xmlMembersMapping)
         {
             ElementAccessor element = xmlMembersMapping.Accessor;
             var membersMapping = (MembersMapping)element.Mapping!;
diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.csproj b/src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.csproj
index 2b9b5ea..60e4210 100644
--- a/src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.csproj
+++ b/src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.csproj
@@ -8,7 +8,7 @@
     <IsRoslynComponent>true</IsRoslynComponent>
     <!-- Disable RS2008: Enable analyzer release tracking
          Diagnostics in runtime use a different mechanism (docs/project/list-of-diagnostics.md) -->
-    <NoWarn>RS2008;$(NoWarn)</NoWarn>
+    <NoWarn>RS2008;RS1038;$(NoWarn)</NoWarn>
     <DefineConstants>$(DefineConstants);JSIMPORTGENERATOR</DefineConstants>
     <AnalyzerLanguage>cs</AnalyzerLanguage>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.csproj b/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.csproj
index a8fb656..a4251a4 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.csproj
+++ b/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.csproj
@@ -8,7 +8,7 @@
     <IsRoslynComponent>true</IsRoslynComponent>
     <!-- Disable RS2008: Enable analyzer release tracking
          Diagnostics in runtime use a different mechanism (docs/project/list-of-diagnostics.md) -->
-    <NoWarn>RS2008;$(NoWarn)</NoWarn>
+    <NoWarn>RS2008;RS1038;$(NoWarn)</NoWarn>
     <AnalyzerLanguage>cs</AnalyzerLanguage>
     <DefineConstants>$(DefineConstants);MICROSOFT_INTEROP_COMINTERFACEGENERATOR</DefineConstants>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj
index 621caea..bb29734 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj
@@ -8,7 +8,7 @@
     <IsRoslynComponent>true</IsRoslynComponent>
     <!-- Disable RS2008: Enable analyzer release tracking
          Diagnostics in runtime use a different mechanism (docs/project/list-of-diagnostics.md) -->
-    <NoWarn>RS2008;$(NoWarn)</NoWarn>
+    <NoWarn>RS2008;RS1038;$(NoWarn)</NoWarn>
     <AnalyzerLanguage>cs</AnalyzerLanguage>
   </PropertyGroup>
 
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/Windows/DecryptorPalWindows.DecodeRecipients.cs b/src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/Windows/DecryptorPalWindows.DecodeRecipients.cs
index a9233e6..27a4848 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/Windows/DecryptorPalWindows.DecodeRecipients.cs
+++ b/src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/Windows/DecryptorPalWindows.DecodeRecipients.cs
@@ -33,7 +33,9 @@ namespace Internal.Cryptography.Pal.Windows
             return new RecipientInfoCollection(recipientInfos);
         }
 
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance https://github.com/dotnet/roslyn-analyzers/issues/6751
         private static IEnumerable<RecipientInfo> ToRecipientInfosForThisIndex(SafeHandle pCmsgCmsRecipientInfoMemory, int index)
+#pragma warning restore CA1859
         {
             bool mustRelease = false;
             pCmsgCmsRecipientInfoMemory.DangerousAddRef(ref mustRelease);
-- 
2.7.4