[main] Update dependencies from dotnet/roslyn-analyzers

eng/Version.Details.xml

@@ -374,13 +374,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>ebb588725e707db23d8723b633258e7eb918277b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24052.1">
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24067.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>8a92037d28baf58560622cb4685ecefdc828c2c8</Sha>
+      <Sha>23ec029b47d68b1a80348c0dabc3bccf013c1fe6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24052.1">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24067.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>8a92037d28baf58560622cb4685ecefdc828c2c8</Sha>
+      <Sha>23ec029b47d68b1a80348c0dabc3bccf013c1fe6</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.100-alpha.1.23551.3">
       <Uri>https://github.com/dotnet/sdk</Uri>

eng/Versions.props

@@ -31,8 +31,8 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- dotnet/roslyn-analyzers dependencies -->
-    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.24052.1</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24052.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.24067.1</MicrosoftCodeAnalysisAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24067.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.

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeCustomAttributeData.cs

@@ -522,7 +522,9 @@ private static Type CustomAttributeEncodingToType(CustomAttributeEncoding encode
             };
         }
 
+#pragma warning disable CA1859
         private static object EncodedValueToRawValue(long val, CustomAttributeEncoding encodedType)
+#pragma warning restore
         {
             switch (encodedType)
             {

src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/TypeSystem/RuntimeMethodDesc.cs

@@ -63,7 +63,7 @@ public override Instantiation Instantiation
             }
         }
 
-        private TypeDesc _owningType;
+        private DefType _owningType;
         public override TypeDesc OwningType
         {
             get

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/MethodBodyScanner.cs

@@ -123,8 +123,8 @@ private static Stack<StackSlot> MergeStack(Stack<StackSlot> a, Stack<StackSlot>
             }
 
             Stack<StackSlot> newStack = new Stack<StackSlot>(a.Count);
-            IEnumerator<StackSlot> aEnum = a.GetEnumerator();
-            IEnumerator<StackSlot> bEnum = b.GetEnumerator();
+            Stack<StackSlot>.Enumerator aEnum = a.GetEnumerator();
+            Stack<StackSlot>.Enumerator bEnum = b.GetEnumerator();
             while (aEnum.MoveNext() && bEnum.MoveNext())
             {
                 newStack.Push(MergeStackElement(aEnum.Current, bEnum.Current));

src/coreclr/tools/aot/ILCompiler.Compiler/ILCompiler.Compiler.csproj

@@ -16,6 +16,7 @@
     <Configurations>Debug;Release;Checked</Configurations>
 
     <NoWarn Condition="'$(DotNetBuildFromSource)' == 'true'">$(NoWarn);CS8524</NoWarn>
+    <NoWarn>$(NoWarn);CA1859</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

src/coreclr/tools/aot/ILCompiler.RyuJit/JitInterface/CorInfoImpl.RyuJit.cs

@@ -823,7 +823,7 @@ private InfoAccessType constructStringLiteral(CORINFO_MODULE_STRUCT_* module, md
         {
             MethodIL methodIL = (MethodIL)HandleToObject((void*)module);
 
-            ISymbolNode stringObject;
+            FrozenStringNode stringObject;
             if (metaTok == (mdToken)CorConstants.CorTokenType.mdtString)
             {
                 stringObject = _compilation.NodeFactory.SerializedStringObject("");
@@ -1776,7 +1776,7 @@ private void embedGenericHandle(ref CORINFO_RESOLVED_TOKEN pResolvedToken, bool
         private CORINFO_METHOD_STRUCT_* embedMethodHandle(CORINFO_METHOD_STRUCT_* handle, ref void* ppIndirection)
         {
             MethodDesc method = HandleToObject(handle);
-            ISymbolNode methodHandleSymbol = _compilation.NodeFactory.RuntimeMethodHandle(method);
+            RuntimeMethodHandleNode methodHandleSymbol = _compilation.NodeFactory.RuntimeMethodHandle(method);
             CORINFO_METHOD_STRUCT_* result = (CORINFO_METHOD_STRUCT_*)ObjectToHandle(methodHandleSymbol);
 
             if (methodHandleSymbol.RepresentsIndirectionCell)

src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj

@@ -18,6 +18,7 @@
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <Configurations>Debug;Release;Checked</Configurations>
     <IsTrimmable>true</IsTrimmable>
+    <NoWarn>$(NoWarn);CA1859</NoWarn>
   </PropertyGroup>
 
   <ItemGroup Label="Embedded Resources">

src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs

@@ -91,7 +91,7 @@ private bool ShouldCompress(FileType type)
         /// startOffset: offset of the start 'file' within 'bundle'
         /// compressedSize: size of the compressed data, if entry was compressed, otherwise 0
         /// </returns>
-        private (long startOffset, long compressedSize) AddToBundle(Stream bundle, Stream file, FileType type)
+        private (long startOffset, long compressedSize) AddToBundle(Stream bundle, FileStream file, FileType type)
         {
             long startOffset = bundle.Position;
             if (ShouldCompress(type))

src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Parser.cs

@@ -654,7 +654,7 @@ private bool IsBaseOrIdentity(ITypeSymbol source, ITypeSymbol dest)
             /// Finds the template arguments contained in the message string.
             /// </summary>
             /// <returns>A value indicating whether the extraction was successful.</returns>
-            private static bool ExtractTemplates(string? message, IDictionary<string, string> templateMap, List<string> templateList)
+            private static bool ExtractTemplates(string? message, Dictionary<string, string> templateMap, List<string> templateList)
             {
                 if (string.IsNullOrEmpty(message))
                 {

src/libraries/Microsoft.Extensions.Options/gen/Generator.cs

@@ -12,7 +12,9 @@
 
 namespace Microsoft.Extensions.Options.Generators
 {
+#pragma warning disable RS1041 // we're multi-targeting so this is fine
     [Generator]
+#pragma warning restore
     public class OptionsValidatorGenerator : IIncrementalGenerator
     {
         public void Initialize(IncrementalGeneratorInitializationContext context)

src/libraries/System.CodeDom/src/System/CodeDom/Compiler/CodeGeneratorOptions.cs

@@ -8,7 +8,7 @@ namespace System.CodeDom.Compiler
 {
     public class CodeGeneratorOptions
     {
-        private readonly IDictionary _options = new ListDictionary();
+        private readonly ListDictionary _options = new ListDictionary();
 
         public CodeGeneratorOptions() { }
 

src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableExtensions.cs

@@ -175,7 +175,9 @@ private sealed class FallbackWrapper<T> : IOrderedCollection<T>
             /// <summary>
             /// The list-ified sequence.
             /// </summary>
+#pragma warning disable CA1859
             private IList<T>? _collection;
+#pragma warning restore
 
             /// <summary>
             /// Initializes a new instance of the <see cref="FallbackWrapper{T}"/> class.

src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/PropertyDescriptorCollection.cs

@@ -18,7 +18,7 @@ public class PropertyDescriptorCollection : ICollection, IList, IDictionary
         /// </summary>
         public static readonly PropertyDescriptorCollection Empty = new PropertyDescriptorCollection(null, true);
 
-        private IDictionary? _cachedFoundProperties;
+        private Hashtable? _cachedFoundProperties;
         private bool _cachedIgnoreCase;
         private PropertyDescriptor[] _properties;
         private readonly string[]? _namedSort;

src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ClientSettingsStore.cs

@@ -84,7 +84,7 @@ private static void DeclareSection(Configuration config, string sectionName)
 
         internal static IDictionary ReadSettings(string sectionName, bool isUserScoped)
         {
-            IDictionary settings = new Hashtable();
+            Hashtable settings = new Hashtable();
 
             if (isUserScoped && !ConfigurationManagerInternalFactory.Instance.SupportsUserConfig)
             {
@@ -108,7 +108,7 @@ internal static IDictionary ReadSettings(string sectionName, bool isUserScoped)
 
         internal static IDictionary ReadSettingsFromFile(string configFileName, string sectionName, bool isUserScoped)
         {
-            IDictionary settings = new Hashtable();
+            Hashtable settings = new Hashtable();
 
             if (isUserScoped && !ConfigurationManagerInternalFactory.Instance.SupportsUserConfig)
             {

src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationElement.cs

@@ -1725,7 +1725,7 @@ private static object DeserializePropertyValue(ConfigurationProperty prop, XmlRe
                 // Validate the loaded and converted value
                 prop.Validate(propertyValue);
             }
-            catch (ConfigurationException ce)
+            catch (ConfigurationErrorsException ce)
             {
                 // If the error is incomplete - complete it :)
                 if (string.IsNullOrEmpty(ce.Filename)) ce = new ConfigurationErrorsException(ce.Message, reader);

src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/LocalFileSettingsProvider.cs

@@ -149,8 +149,8 @@ public override SettingsPropertyValueCollection GetPropertyValues(SettingsContex
         public override void SetPropertyValues(SettingsContext context, SettingsPropertyValueCollection values)
         {
             string sectionName = GetSectionName(context);
-            IDictionary roamingUserSettings = new Hashtable();
-            IDictionary localUserSettings = new Hashtable();
+            Hashtable roamingUserSettings = new Hashtable();
+            Hashtable localUserSettings = new Hashtable();
 
             foreach (SettingsPropertyValue value in values)
             {

src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcMetaDataFactory.cs

@@ -134,7 +134,6 @@ internal OdbcMetaDataFactory(Stream XMLStream,
             }
         }
 
-#pragma warning disable CA1859 // https://github.com/dotnet/roslyn-analyzers/issues/6440
         private static object BooleanFromODBC(object odbcSource)
         {
             if (odbcSource != DBNull.Value)
@@ -154,7 +153,6 @@ private static object BooleanFromODBC(object odbcSource)
 
             return DBNull.Value;
         }
-#pragma warning disable CA1859
 
         private static OdbcCommand GetCommand(OdbcConnection connection)
         {

src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Windows.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -857,7 +858,7 @@ private static void CreatePipe(out SafeFileHandle parentHandle, out SafeFileHand
             }
         }
 
-        private static string GetEnvironmentVariablesBlock(IDictionary<string, string> sd)
+        private static string GetEnvironmentVariablesBlock(DictionaryWrapper sd)
         {
             // https://docs.microsoft.com/en-us/windows/win32/procthread/changing-environment-variables
             // "All strings in the environment block must be sorted alphabetically by name. The sort is

src/libraries/System.DirectoryServices/src/System/DirectoryServices/ActiveDirectory/ActiveDirectorySchemaClass.cs

@@ -1268,7 +1268,7 @@ private void SetProperty(string propertyName, object? value)
         // This method searches in the schema container for all non-defunct classes of the
         // specified name (ldapDisplayName).
         //
-        private ArrayList GetClasses(ICollection ldapDisplayNames)
+        private ArrayList GetClasses(ArrayList ldapDisplayNames)
         {
             ArrayList classes = new ArrayList();
             SearchResultCollection? resCol = null;
@@ -1340,7 +1340,7 @@ private ArrayList GetClasses(ICollection ldapDisplayNames)
         // This method searches in the schema container for all non-defunct properties of the
         // specified name (ldapDisplayName).
         //
-        private ArrayList GetProperties(ICollection ldapDisplayNames)
+        private ArrayList GetProperties(ArrayList ldapDisplayNames)
         {
             ArrayList properties = new ArrayList();
             SearchResultCollection? resCol = null;

src/libraries/System.Linq.Parallel/src/System/Linq/Parallel/QueryOperators/Binary/ExceptQueryOperator.cs

@@ -230,7 +230,9 @@ private sealed class OrderedExceptQueryOperatorEnumerator<TLeftKey> : QueryOpera
             private readonly QueryOperatorEnumerator<Pair<TInputOutput, NoKeyMemoizationRequired>, int> _rightSource; // Right data source.
             private readonly IEqualityComparer<TInputOutput>? _comparer; // A comparer used for equality checks/hash-coding.
             private readonly IComparer<TLeftKey> _leftKeyComparer; // A comparer for order keys.
+#pragma warning disable CA1859
             private IEnumerator<KeyValuePair<Wrapper<TInputOutput>, Pair<TInputOutput, TLeftKey>>>? _outputEnumerator; // The enumerator output elements + order keys.
+#pragma warning restore
             private readonly CancellationToken _cancellationToken;
 
             //---------------------------------------------------------------------------------------

src/libraries/System.Linq.Parallel/src/System/Linq/Parallel/QueryOperators/Binary/UnionQueryOperator.cs

@@ -294,7 +294,9 @@ private sealed class OrderedUnionQueryOperatorEnumerator<TLeftKey, TRightKey> :
             private readonly QueryOperatorEnumerator<Pair<TInputOutput, NoKeyMemoizationRequired>, TLeftKey> _leftSource; // Left data source.
             private readonly QueryOperatorEnumerator<Pair<TInputOutput, NoKeyMemoizationRequired>, TRightKey> _rightSource; // Right data source.
             private readonly IComparer<ConcatKey<TLeftKey, TRightKey>> _keyComparer; // Comparer for compound order keys.
+#pragma warning disable CA1859
             private IEnumerator<KeyValuePair<Wrapper<TInputOutput>, Pair<TInputOutput, ConcatKey<TLeftKey, TRightKey>>>>? _outputEnumerator; // Enumerator over the output of the union.
+#pragma warning restore
             private readonly bool _leftOrdered; // Whether the left data source is ordered.
             private readonly bool _rightOrdered; // Whether the right data source is ordered.
             private readonly IEqualityComparer<TInputOutput>? _comparer; // Comparer for the elements.

src/libraries/System.Linq.Parallel/src/System/Linq/Parallel/QueryOperators/Unary/DistinctQueryOperator.cs

@@ -193,7 +193,9 @@ private sealed class OrderedDistinctQueryOperatorEnumerator<TKey> : QueryOperato
             private readonly QueryOperatorEnumerator<Pair<TInputOutput, NoKeyMemoizationRequired>, TKey> _source; // The data source.
             private readonly Dictionary<Wrapper<TInputOutput>, TKey> _hashLookup; // The hash lookup, used to produce the distinct set.
             private readonly IComparer<TKey> _keyComparer; // Comparer to decide the key order.
+#pragma warning disable CA1859
             private IEnumerator<KeyValuePair<Wrapper<TInputOutput>, TKey>>? _hashLookupEnumerator; // Enumerates over _hashLookup.
+#pragma warning restore
             private readonly CancellationToken _cancellationToken;
 
             //---------------------------------------------------------------------------------------

src/libraries/System.Net.Http/src/System/Net/Http/Metrics/MetricsHandler.cs

@@ -212,6 +212,7 @@ private static TagList InitializeCommonTags(HttpRequestMessage request)
         private static object[]? s_boxedStatusCodes;
         private static string[]? s_statusCodeStrings;
 
+#pragma warning disable CA1859 // we explictly box here
         private static object GetBoxedStatusCode(int statusCode)
         {
             object[] boxes = LazyInitializer.EnsureInitialized(ref s_boxedStatusCodes, static () => new object[512]);
@@ -220,6 +221,7 @@ private static object GetBoxedStatusCode(int statusCode)
                 ? boxes[statusCode] ??= statusCode
                 : statusCode;
         }
+#pragma warning restore
 
         private static string GetErrorStatusCodeString(int statusCode)
         {

src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventProvider.cs

@@ -1346,7 +1346,7 @@ private static int FindNull(byte[] buffer, int idx)
 
         protected static unsafe IDictionary<string, string?>? ParseFilterData(byte[]? data)
         {
-            IDictionary<string, string?>? args = null;
+            Dictionary<string, string?>? args = null;
 
             // data can be null if the filterArgs had a very large size which failed our sanity check
             if (data != null)

src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContract.cs

@@ -1482,7 +1482,7 @@ private static string GetDefaultXmlLocalName(Type type)
                 int iParam = typeName.IndexOf('[');
                 if (iParam >= 0)
                     typeName = typeName.Substring(0, iParam);
-                IList<int> nestedParamCounts = GetDataContractNameForGenericName(typeName, localName);
+                List<int> nestedParamCounts = GetDataContractNameForGenericName(typeName, localName);
                 bool isTypeOpenGeneric = type.IsGenericTypeDefinition;
                 Type[] genParams = type.GetGenericArguments();
                 for (int i = 0; i < genParams.Length; i++)

src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/SchemaExporter.cs

@@ -263,7 +263,7 @@ private XmlElement ExportGenericInfo(Type clrType, string elementName, string el
             }
 
             Type[]? genericArguments = null;
-            IList<int>? genericArgumentCounts = null;
+            List<int>? genericArgumentCounts = null;
             if (clrType.IsGenericType)
             {
                 genericArguments = clrType.GetGenericArguments();

src/libraries/System.Private.Xml/src/System/Xml/Serialization/Compilation.cs

@@ -21,8 +21,8 @@ internal sealed class TempAssembly
         internal const string GeneratedAssemblyNamespace = "Microsoft.Xml.Serialization.GeneratedAssembly";
         private readonly Assembly? _assembly;
         private XmlSerializerImplementation? _contract;
-        private IDictionary? _writerMethods;
-        private IDictionary? _readerMethods;
+        private Hashtable? _writerMethods;
+        private Hashtable? _readerMethods;
         private TempMethodDictionary? _methods;
 
         internal sealed class TempMethod

src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGenerator.cs

@@ -2563,7 +2563,7 @@ private static void SetArg(IList<XslNode> args, int pos, QilName name, QilNode v
         // Returns true if formalArgs maps 1:1 with actual args.
         // Formally this is n*n algorithm. We can optimize it by calculationg "signature"
         // of the function as sum of all hashes of its args names.
-        private static bool FillupInvokeArgs(IList<QilNode> formalArgs, IList<XslNode> actualArgs, QilList invokeArgs)
+        private static bool FillupInvokeArgs(QilList formalArgs, IList<XslNode> actualArgs, QilList invokeArgs)
         {
             if (actualArgs.Count != formalArgs.Count)
             {

src/libraries/System.Runtime.Serialization.Schema/src/System/Runtime/Serialization/Schema/CodeExporter.cs

@@ -899,7 +899,7 @@ private static bool NeedsExplicitNamespace(string dataContractNamespace, string
             if (knownTypeDictionary == null)
                 return null;
 
-            ICollection<DataContract>? knownTypeContracts = knownTypeDictionary.Values;
+            DataContractDictionary.ValueCollection? knownTypeContracts = knownTypeDictionary.Values;
             if (knownTypeContracts == null || knownTypeContracts.Count == 0)
                 return null;
 

src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/Windows/DecryptorPalWindows.DecodeRecipients.cs

@@ -33,9 +33,7 @@ private static RecipientInfoCollection CreateRecipientInfos(SafeCryptMsgHandle h
             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);

src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/ChainPal.Apple.cs

@@ -190,7 +190,7 @@ private SafeCreateHandle PrepareCustomCertsArray(X509Certificate2Collection cust
             return GetCertsArray(rootCertificates);
         }
 
-        private SafeCreateHandle GetCertsArray(IList<SafeHandle> safeHandles)
+        private SafeCreateHandle GetCertsArray(List<SafeHandle> safeHandles)
         {
             int idx = 0;
 

src/libraries/System.Speech/src/Internal/SrgsCompiler/BackEnd.cs

@@ -819,7 +819,7 @@ internal void InitFromBinaryGrammar(StreamMarshaler streamHelper)
             bool fLastArcNull = true;
             CfgArc pLastArc = new();
             State currentState = null;
-            IEnumerator<KeyValuePair<int, Rule>> ieFirstArcs = ruleFirstArcs.GetEnumerator();
+            SortedDictionary<int, Rule>.Enumerator ieFirstArcs = ruleFirstArcs.GetEnumerator();
 
             // If no rules, then we have no arcs
             if (ieFirstArcs.MoveNext())

src/libraries/System.Speech/src/Recognition/SrgsGrammar/SrgsGrammarCompiler.cs

@@ -115,7 +115,7 @@ public static void CompileClassLibrary(XmlReader reader, string outputPath, stri
         // Decide if the input stream is a cfg.
         // If not assume it's an xml grammar.
         // The stream parameter points to the start of the data on entry and is reset to that point on exit.
-        private static bool CheckIfCfg(Stream stream, out int cfgLength)
+        private static bool CheckIfCfg(SeekableReadStream stream, out int cfgLength)
         {
             long initialPosition = stream.Position;