From 81a6878cdf6548bd354a5fd35916412fc8025c9d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 28 Jul 2023 12:20:26 +0000
Subject: [PATCH 01/19] Update dependencies from
 https://github.com/dotnet/roslyn-analyzers build 20230727.4

Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.11.0-beta1.23364.2 -> To Version 3.11.0-beta1.23377.4
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 06d9e1d4f9757b..51477087258ce3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -367,13 +367,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>7829f6b85177e96de89bc67f32b61d74ac590f5a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23364.2">
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23377.4">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>45879f0b46557886b8d553d121a81866f67ce08a</Sha>
+      <Sha>1479680b268001455648d371204392a6bc9b4d42</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23364.2">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23377.4">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>45879f0b46557886b8d553d121a81866f67ce08a</Sha>
+      <Sha>1479680b268001455648d371204392a6bc9b4d42</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 bc9bfb96e1f388..a6fccf04283de3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,8 +32,8 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- dotnet/roslyn-analyzers dependencies -->
-    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23364.2</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23364.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23377.4</MicrosoftCodeAnalysisAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23377.4</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.

From 99a22294accb10e29ab6871be10cfab72678d5ae Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@microsoft.com>
Date: Fri, 28 Jul 2023 12:14:19 -0500
Subject: [PATCH 02/19] Fix new analyzer errors

---
 src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs            | 2 +-
 src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs b/src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs
index 38ca23fedee837..ebd5b17ee8c922 100644
--- a/src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs
+++ b/src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs
@@ -397,7 +397,7 @@ protected override int ExecuteTool(string pathToTool, string responseFileCommand
 
         protected override void LogEventsFromTextOutput(string singleLine, MessageImportance messageImportance)
         {
-            if (!ShowCompilerWarnings && singleLine.IndexOf("warning:", StringComparison.OrdinalIgnoreCase) != -1)
+            if (!ShowCompilerWarnings && singleLine.Contains("warning:", StringComparison.OrdinalIgnoreCase))
             {
                 Log.LogMessage(MessageImportance.Normal, singleLine);
                 WarningsDetected = true;
diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
index 423aa4a5561f6a..e520057d5b3bdf 100644
--- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
+++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
@@ -274,7 +274,7 @@ private void UpdateAppRef(string sdkPath, string version)
         private string GetNuGetConfig()
         {
             string contents = File.ReadAllText(TemplateNuGetConfigPath);
-            if (contents.IndexOf(s_nugetInsertionTag, StringComparison.InvariantCultureIgnoreCase) < 0)
+            if (!contents.Contains(s_nugetInsertionTag, StringComparison.InvariantCultureIgnoreCase))
                 throw new LogAsErrorException($"Could not find {s_nugetInsertionTag} in {TemplateNuGetConfigPath}");
 
             return contents.Replace(s_nugetInsertionTag, $@"<add key=""nuget-local"" value=""{LocalNuGetsPath}"" />");
@@ -423,7 +423,7 @@ internal sealed record InstallWorkloadRequest(
             public string Version => Workload.GetMetadata("Version");
             public string TargetPath => Target.GetMetadata("InstallPath");
             public string StampPath => Target.GetMetadata("StampPath");
-            public bool IgnoreErrors => Workload.GetMetadata("IgnoreErrors").ToLowerInvariant() == "true";
+            public bool IgnoreErrors => Workload.GetMetadata("IgnoreErrors").Equals("true", StringComparison.InvariantCultureIgnoreCase);
             public string WorkloadId => Workload.ItemSpec;
 
             public bool Validate(TaskLoggingHelper log)

From 7db61f35bf179a3c763e6bc841ced2ace3a59275 Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@microsoft.com>
Date: Fri, 28 Jul 2023 12:36:30 -0500
Subject: [PATCH 03/19] Fix another IndexOf usage

---
 .../illink/src/linker/Linker.Steps/ProcessLinkerXmlBase.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/illink/src/linker/Linker.Steps/ProcessLinkerXmlBase.cs b/src/tools/illink/src/linker/Linker.Steps/ProcessLinkerXmlBase.cs
index 12aff7c133ec15..d1710a12db0800 100644
--- a/src/tools/illink/src/linker/Linker.Steps/ProcessLinkerXmlBase.cs
+++ b/src/tools/illink/src/linker/Linker.Steps/ProcessLinkerXmlBase.cs
@@ -162,7 +162,7 @@ protected virtual void ProcessTypes (AssemblyDefinition assembly, XPathNavigator
 
 				string fullname = GetFullName (typeNav);
 
-				if (fullname.IndexOf ("*") != -1) {
+				if (fullname.Contains ("*")) {
 					if (ProcessTypePattern (fullname, assembly, typeNav))
 						continue;
 				}

From bb4c767682af0e2bde77d7aafd40bc8692e81499 Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@microsoft.com>
Date: Fri, 28 Jul 2023 13:02:07 -0500
Subject: [PATCH 04/19] Fix another warning

---
 src/coreclr/tools/Common/Compiler/ProcessLinkerXmlBase.cs    | 5 ++---
 .../illink/src/linker/Linker.Steps/ProcessLinkerXmlBase.cs   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/coreclr/tools/Common/Compiler/ProcessLinkerXmlBase.cs b/src/coreclr/tools/Common/Compiler/ProcessLinkerXmlBase.cs
index abf7ac860c4d60..e7a7976258d29b 100644
--- a/src/coreclr/tools/Common/Compiler/ProcessLinkerXmlBase.cs
+++ b/src/coreclr/tools/Common/Compiler/ProcessLinkerXmlBase.cs
@@ -211,7 +211,7 @@ protected virtual void ProcessTypes(ModuleDesc assembly, XPathNavigator nav, boo
 
                 string fullname = GetFullName(typeNav);
 
-                if (fullname.IndexOf("*") != -1)
+                if (fullname.Contains('*'))
                 {
                     if (ProcessTypePattern(fullname, assembly, typeNav))
                         continue;
@@ -762,8 +762,7 @@ public class CecilCompatibleTypeParser
         public static TypeDesc? GetType(ModuleDesc assembly, string fullName)
         {
             Debug.Assert(!string.IsNullOrEmpty(fullName));
-            var position = fullName.IndexOf('/');
-            if (position > 0)
+            if (fullName.Contains('/'))
                 return GetNestedType(assembly, fullName);
             string @namespace, name;
             SplitFullName(fullName, out @namespace, out name);
diff --git a/src/tools/illink/src/linker/Linker.Steps/ProcessLinkerXmlBase.cs b/src/tools/illink/src/linker/Linker.Steps/ProcessLinkerXmlBase.cs
index d1710a12db0800..e96ce5a22f5250 100644
--- a/src/tools/illink/src/linker/Linker.Steps/ProcessLinkerXmlBase.cs
+++ b/src/tools/illink/src/linker/Linker.Steps/ProcessLinkerXmlBase.cs
@@ -162,7 +162,7 @@ protected virtual void ProcessTypes (AssemblyDefinition assembly, XPathNavigator
 
 				string fullname = GetFullName (typeNav);
 
-				if (fullname.Contains ("*")) {
+				if (fullname.Contains ('*')) {
 					if (ProcessTypePattern (fullname, assembly, typeNav))
 						continue;
 				}

From 8ed82ef18314a6b9299256ff7afc2b6bcebe352a Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@microsoft.com>
Date: Fri, 28 Jul 2023 13:58:09 -0500
Subject: [PATCH 05/19] More analyzer fixes

---
 .../src/System/Reflection/TypeNameParser.NativeAot.cs       | 3 +--
 .../Common/src/System/CodeDom/CodeTypeReference.cs          | 4 ++++
 .../src/Microsoft/VisualBasic/FileIO/FileSystem.vb          | 2 +-
 .../src/Microsoft/VisualBasic/FileSystem.vb                 | 6 +++---
 .../System/ComponentModel/DataAnnotations/PhoneAttribute.cs | 2 +-
 .../System.Private.CoreLib/src/System/String.Searching.cs   | 2 ++
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/TypeNameParser.NativeAot.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/TypeNameParser.NativeAot.cs
index e370cb4eed0a83..5cc994bda9211e 100644
--- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/TypeNameParser.NativeAot.cs
+++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/TypeNameParser.NativeAot.cs
@@ -214,10 +214,9 @@ private bool CheckTopLevelAssemblyQualifiedName()
                 if (type is null && _ignoreCase && !_extensibleParser)
                 {
                     // Return the first name that matches. Which one gets returned on a multiple match is an implementation detail.
-                    string lowerName = nestedTypeNames[i].ToLowerInvariant();
                     foreach (Type nt in declaringType.GetNestedTypes(BindingFlags.NonPublic | BindingFlags.Public))
                     {
-                        if (nt.Name.ToLowerInvariant() == lowerName)
+                        if (nt.Name.Equals(nestedTypeNames[i], StringComparison.InvariantCultureIgnoreCase))
                         {
                             type = nt;
                             break;
diff --git a/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs b/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs
index 30342613be9acc..615d6017e37e37 100644
--- a/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs
+++ b/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs
@@ -271,7 +271,11 @@ private void Initialize(string? typeName, CodeTypeReferenceOptions options)
             }
 
             // Now see if we have some arity.  baseType could be null if this is an array type.
+#if NET5_0_OR_GREATER
+            if (_baseType != null && _baseType.Contains('`')) // string.Contains(char) is .NetCore2.1+ specific
+#else
             if (_baseType != null && _baseType.IndexOf('`') != -1) // string.Contains(char) is .NetCore2.1+ specific
+#endif
             {
                 _needsFixup = false;
             }
diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.vb
index 9a2a6ae31c2842..ad431329884eed 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.vb
@@ -2223,7 +2223,7 @@ Namespace Microsoft.VisualBasic.FileIO
 
                 ' If user wants to ignore case, convert new string to lower case. m_SearchText was converted in constructor.
                 If m_IgnoreCase Then
-                    Return New String(CharBuffer).ToUpper(CultureInfo.CurrentCulture).Contains(m_SearchText)
+                    Return New String(CharBuffer).Contains(m_SearchText, StringComparison.CurrentCultureIgnoreCase)
                 Else
                     Return New String(CharBuffer).Contains(m_SearchText)
                 End If
diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileSystem.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileSystem.vb
index 6cfdf1cb099447..39ef345c88c618 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileSystem.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileSystem.vb
@@ -241,11 +241,11 @@ Namespace Microsoft.VisualBasic
                 Return False
             End If
 
-            If (Path.IndexOf("*"c) <> -1) Then
+            If (Path.Contains("*"c)) Then
                 Return True
             End If
 
-            If (Path.IndexOf("?"c) <> -1) Then
+            If (Path.Contains("?"c)) Then
                 Return True
             End If
 
@@ -1315,7 +1315,7 @@ Namespace Microsoft.VisualBasic
         Friend Function VB6CheckPathname(ByVal oAssemblyData As AssemblyData, ByVal sPath As String, ByVal mode As OpenMode) As String
             Dim Result As String
             '  Error if wildcard characters in pathname
-            If (sPath.IndexOf("?"c) <> -1 OrElse sPath.IndexOf("*"c) <> -1) Then
+            If (sPath.Contains("?"c) OrElse sPath.Contains("*"c)) Then
                 Throw New ArgumentException(SR.Format(SR.Argument_InvalidPathChars1, sPath))
             End If
 
diff --git a/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/PhoneAttribute.cs b/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/PhoneAttribute.cs
index 849eb26c8d2649..3ac7d71b3d4beb 100644
--- a/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/PhoneAttribute.cs
+++ b/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/PhoneAttribute.cs
@@ -54,7 +54,7 @@ public override bool IsValid(object? value)
             {
                 if (!(char.IsDigit(c)
                     || char.IsWhiteSpace(c)
-                    || AdditionalPhoneNumberCharacters.IndexOf(c) != -1))
+                    || AdditionalPhoneNumberCharacters.Contains(c)))
                 {
                     return false;
                 }
diff --git a/src/libraries/System.Private.CoreLib/src/System/String.Searching.cs b/src/libraries/System.Private.CoreLib/src/System/String.Searching.cs
index c9ec02441a2284..9c8487c77c8999 100644
--- a/src/libraries/System.Private.CoreLib/src/System/String.Searching.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/String.Searching.cs
@@ -32,7 +32,9 @@ public bool Contains(char value)
 
         public bool Contains(char value, StringComparison comparisonType)
         {
+#pragma warning disable CA2249 // Consider using 'string.Contains' instead of 'string.IndexOf'... this is the implementation of Contains!
             return IndexOf(value, comparisonType) != -1;
+#pragma warning restore CA2249
         }
 
         // Returns the index of the first occurrence of a specified character in the current instance.

From 3b1c2c06bee9d5f5d7d6ac46b17a29c3bb28f28c Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Fri, 28 Jul 2023 20:46:07 -0400
Subject: [PATCH 06/19] Fix roslyn analyzer issues

```
/__w/1/s/src/libraries/Common/src/System/Data/Common/MultipartIdentifier.cs(71,17): error CA2249: Use 'string.Contains' instead of 'string.IndexOf' to improve readability (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2249) [/__w/1/s/src/libraries/System.Data.Common/src/System.Data.Common.csproj]
/__w/1/s/src/libraries/Common/src/System/Data/Common/MultipartIdentifier.cs(71,55): error CA2249: Use 'string.Contains' instead of 'string.IndexOf' to improve readability (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2249) [/__w/1/s/src/libraries/System.Data.Common/src/System.Data.Common.csproj]
/__w/1/s/src/libraries/Common/src/System/Data/Common/MultipartIdentifier.cs(114,33): error CA2249: Use 'string.Contains' instead of 'string.IndexOf' to improve readability (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2249) [/__w/1/s/src/libraries/System.Data.Common/src/System.Data.Common.csproj]
/__w/1/s/src/libraries/Common/src/System/Data/Common/MultipartIdentifier.cs(136,33): error CA2249: Use 'string.Contains' instead of 'string.IndexOf' to improve readability (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2249) [/__w/1/s/src/libraries/System.Data.Common/src/System.Data.Common.csproj]
/__w/1/s/src/libraries/Common/src/System/Data/Common/MultipartIdentifier.cs(141,33): error CA2249: Use 'string.Contains' instead of 'string.IndexOf' to improve readability (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2249) [/__w/1/s/src/libraries/System.Data.Common/src/System.Data.Common.csproj]
/__w/1/s/src/libraries/System.Data.Common/src/System/Data/Common/DBCommandBuilder.cs(736,56): error CA2249: Use 'string.Contains' instead of 'string.IndexOf' to improve readability (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2249) [/__w/1/s/src/libraries/System.Data.Common/src/System.Data.Common.csproj]
/__w/1/s/src/libraries/System.Data.Common/src/System/Data/Common/DBCommandBuilder.cs(740,56): error CA2249: Use 'string.Contains' instead of 'string.IndexOf' to improve readability (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2249) [/__w/1/s/src/libraries/System.Data.Common/src/System.Data.Common.csproj]
```

Remaining:
`/__w/1/s/src/libraries/System.Data.Common/src/System/Data/Common/DbConnectionOptions.cs(168,26): error CA1862: Prefer using 'string.Equals(string, StringComparison)' to perform a case-insensitive comparison (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1862) [/__w/1/s/src/libraries/System.Data.Common/src/System.Data.Common.csproj]`
---
 .../Common/src/System/Data/Common/MultipartIdentifier.cs  | 8 ++++----
 .../src/System/Data/Common/DBCommandBuilder.cs            | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libraries/Common/src/System/Data/Common/MultipartIdentifier.cs b/src/libraries/Common/src/System/Data/Common/MultipartIdentifier.cs
index bca263e6eb0dad..0a116992976671 100644
--- a/src/libraries/Common/src/System/Data/Common/MultipartIdentifier.cs
+++ b/src/libraries/Common/src/System/Data/Common/MultipartIdentifier.cs
@@ -68,7 +68,7 @@ private static bool IsWhitespace(char ch)
                 throw ADP.InvalidMultipartNameToManyParts(property, name, limit);
             }
 
-            if (-1 != leftQuote.IndexOf(separator) || -1 != rightQuote.IndexOf(separator) || leftQuote.Length != rightQuote.Length)
+            if (leftQuote.Contains(separator) || rightQuote.Contains(separator) || leftQuote.Length != rightQuote.Length)
             {
                 throw ADP.InvalidMultipartNameIncorrectUsageOfQuotes(property, name);
             }
@@ -111,7 +111,7 @@ private static bool IsWhitespace(char ch)
                                 state = MPIState.MPI_ParseQuote;
                             }
                             else
-                            if (-1 != rightQuote.IndexOf(testchar))
+                            if (rightQuote.Contains(testchar))
                             { // If we shouldn't see a right quote
                                 throw ADP.InvalidMultipartNameIncorrectUsageOfQuotes(property, name);
                             }
@@ -133,12 +133,12 @@ private static bool IsWhitespace(char ch)
                                 state = MPIState.MPI_Value;
                             }
                             else // Quotes are not valid inside a non-quoted name
-                            if (-1 != rightQuote.IndexOf(testchar))
+                            if (rightQuote.Contains(testchar))
                             {
                                 throw ADP.InvalidMultipartNameIncorrectUsageOfQuotes(property, name);
                             }
                             else
-                            if (-1 != leftQuote.IndexOf(testchar))
+                            if (leftQuote.Contains(testchar))
                             {
                                 throw ADP.InvalidMultipartNameIncorrectUsageOfQuotes(property, name);
                             }
diff --git a/src/libraries/System.Data.Common/src/System/Data/Common/DBCommandBuilder.cs b/src/libraries/System.Data.Common/src/System/Data/Common/DBCommandBuilder.cs
index 5b744965e9eb65..387752c8e424b6 100644
--- a/src/libraries/System.Data.Common/src/System/Data/Common/DBCommandBuilder.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/Common/DBCommandBuilder.cs
@@ -733,11 +733,11 @@ private void BuildInformation(DataTable schemaTable)
             string quotePrefix = QuotePrefix;
             string quoteSuffix = QuoteSuffix;
 
-            if (!string.IsNullOrEmpty(quotePrefix) && (-1 != baseTableName.IndexOf(quotePrefix, StringComparison.Ordinal)))
+            if (!string.IsNullOrEmpty(quotePrefix) && baseTableName.Contains(quotePrefix, StringComparison.Ordinal))
             {
                 throw ADP.DynamicSQLNestedQuote(baseTableName, quotePrefix);
             }
-            if (!string.IsNullOrEmpty(quoteSuffix) && (-1 != baseTableName.IndexOf(quoteSuffix, StringComparison.Ordinal)))
+            if (!string.IsNullOrEmpty(quoteSuffix) && baseTableName.Contains(quoteSuffix, StringComparison.Ordinal))
             {
                 throw ADP.DynamicSQLNestedQuote(baseTableName, quoteSuffix);
             }

From dbb6a5454facf99bbe00bcac7a2d206f633d173a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 29 Jul 2023 12:18:41 +0000
Subject: [PATCH 07/19] Update dependencies from
 https://github.com/dotnet/roslyn-analyzers build 20230728.1

Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.11.0-beta1.23364.2 -> To Version 3.11.0-beta1.23378.1
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 51477087258ce3..863a6a830506db 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -367,13 +367,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>7829f6b85177e96de89bc67f32b61d74ac590f5a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23377.4">
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23378.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>1479680b268001455648d371204392a6bc9b4d42</Sha>
+      <Sha>e4e56687ee402ae3c1ecf4b6d7db65dcdfc427bb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23377.4">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23378.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>1479680b268001455648d371204392a6bc9b4d42</Sha>
+      <Sha>e4e56687ee402ae3c1ecf4b6d7db65dcdfc427bb</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 a6fccf04283de3..402d992951a54e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,8 +32,8 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- dotnet/roslyn-analyzers dependencies -->
-    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23377.4</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23377.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23378.1</MicrosoftCodeAnalysisAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23378.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.

From ffd93190c90cb69d9ae63a2262d13157d866ed60 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 12:14:25 +0000
Subject: [PATCH 08/19] Update dependencies from
 https://github.com/dotnet/roslyn-analyzers build 20230730.2

Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.11.0-beta1.23364.2 -> To Version 3.11.0-beta1.23380.2
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 863a6a830506db..109c7f68205e0f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -367,13 +367,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>7829f6b85177e96de89bc67f32b61d74ac590f5a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23378.1">
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23380.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>e4e56687ee402ae3c1ecf4b6d7db65dcdfc427bb</Sha>
+      <Sha>366736f79ace382243ae02e9fd13b5362df40281</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23378.1">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23380.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>e4e56687ee402ae3c1ecf4b6d7db65dcdfc427bb</Sha>
+      <Sha>366736f79ace382243ae02e9fd13b5362df40281</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 402d992951a54e..713ec0b4dd157b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,8 +32,8 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- dotnet/roslyn-analyzers dependencies -->
-    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23378.1</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23378.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23380.2</MicrosoftCodeAnalysisAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23380.2</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.

From 91aea075f2ecb23e3964c3cb5626662e211ddc50 Mon Sep 17 00:00:00 2001
From: Buyaa Namnan <bunamnan@microsoft.com>
Date: Mon, 31 Jul 2023 20:25:47 -0700
Subject: [PATCH 09/19] Fix more warnings, degrade severity of CA1862

---
 eng/CodeAnalysis.src.globalconfig                          | 2 +-
 .../src/System/Reflection/TypeNameParser.NativeAot.cs      | 3 ++-
 .../src/PhysicalFilesWatcher.cs                            | 4 ++++
 .../src/Microsoft/CSharp/CSharpCodeGenerator.cs            | 2 ++
 .../src/System.Configuration.ConfigurationManager.csproj   | 2 +-
 .../src/System/IO/Packaging/PackUriHelper.PackUriScheme.cs | 4 ++++
 .../src/System/IO/Packaging/ZipPackage.cs                  | 2 +-
 .../src/System/Net/Managed/HttpEndPointManager.cs          | 4 ++--
 .../src/System/Reflection/TypeLoading/General/Helpers.cs   | 4 ++++
 .../System/ServiceModel/Syndication/Rss20FeedFormatter.cs  | 7 ++++++-
 .../System.Speech/src/Internal/SrgsParser/XmlParser.cs     | 2 +-
 11 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/eng/CodeAnalysis.src.globalconfig b/eng/CodeAnalysis.src.globalconfig
index de0d6e8137e0b8..b4bf73bbcb23fe 100644
--- a/eng/CodeAnalysis.src.globalconfig
+++ b/eng/CodeAnalysis.src.globalconfig
@@ -475,7 +475,7 @@ dotnet_diagnostic.CA1860.severity = warning
 dotnet_diagnostic.CA1861.severity = warning
 
 # CA1862: Prefer using 'StringComparer'/'StringComparison' to perform case-insensitive string comparisons
-dotnet_diagnostic.CA1862.severity = warning
+dotnet_diagnostic.CA1862.severity = info
 
 # CA1863: Use 'CompositeFormat'
 dotnet_diagnostic.CA1863.severity = suggestion
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/TypeNameParser.NativeAot.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/TypeNameParser.NativeAot.cs
index 5cc994bda9211e..e370cb4eed0a83 100644
--- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/TypeNameParser.NativeAot.cs
+++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/TypeNameParser.NativeAot.cs
@@ -214,9 +214,10 @@ private bool CheckTopLevelAssemblyQualifiedName()
                 if (type is null && _ignoreCase && !_extensibleParser)
                 {
                     // Return the first name that matches. Which one gets returned on a multiple match is an implementation detail.
+                    string lowerName = nestedTypeNames[i].ToLowerInvariant();
                     foreach (Type nt in declaringType.GetNestedTypes(BindingFlags.NonPublic | BindingFlags.Public))
                     {
-                        if (nt.Name.Equals(nestedTypeNames[i], StringComparison.InvariantCultureIgnoreCase))
+                        if (nt.Name.ToLowerInvariant() == lowerName)
                         {
                             type = nt;
                             break;
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs
index 905dd855cd016a..db0a767573a1e8 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs
@@ -160,7 +160,11 @@ private IChangeToken GetOrAddChangeToken(string pattern)
             }
 
             IChangeToken changeToken;
+#if NET5_0_OR_GREATER
+            bool isWildCard = pattern.Contains('*');
+#else
             bool isWildCard = pattern.IndexOf('*') != -1;
+#endif
             if (isWildCard || IsDirectoryPath(pattern))
             {
                 changeToken = GetOrAddWildcardChangeToken(pattern);
diff --git a/src/libraries/System.CodeDom/src/Microsoft/CSharp/CSharpCodeGenerator.cs b/src/libraries/System.CodeDom/src/Microsoft/CSharp/CSharpCodeGenerator.cs
index 0e1ec989371662..095b76eb7deb53 100644
--- a/src/libraries/System.CodeDom/src/Microsoft/CSharp/CSharpCodeGenerator.cs
+++ b/src/libraries/System.CodeDom/src/Microsoft/CSharp/CSharpCodeGenerator.cs
@@ -181,8 +181,10 @@ private string QuoteSnippetString(string value)
             // If the string is short, use C style quoting (e.g "\r\n")
             // Also do it if it is too long to fit in one line
             // If the string contains '\0', verbatim style won't work.
+#pragma warning disable CA2249 // Consider using 'string.Contains' instead of 'string.IndexOf'
             if (value.Length < 256 || value.Length > 1500 || (value.IndexOf('\0') != -1)) // string.Contains(char) is .NetCore2.1+ specific
                 return QuoteSnippetStringCStyle(value);
+#pragma warning restore CA2249
 
             // Otherwise, use 'verbatim' style quoting (e.g. @"foo")
             return QuoteSnippetStringVerbatimStyle(value);
diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
index 7463343674be06..436c9ed08b465f 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
+++ b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
     <Nullable>disable</Nullable>
-    <NoWarn>$(NoWarn);nullable</NoWarn>
+    <NoWarn>$(NoWarn);CA2249;nullable</NoWarn>
     <!-- opt-out of trimming until it works https://github.com/dotnet/runtime/issues/49062 -->
     <IsTrimmable>false</IsTrimmable>
     <EnableAOTAnalyzer>false</EnableAOTAnalyzer>
diff --git a/src/libraries/System.IO.Packaging/src/System/IO/Packaging/PackUriHelper.PackUriScheme.cs b/src/libraries/System.IO.Packaging/src/System/IO/Packaging/PackUriHelper.PackUriScheme.cs
index 9912f15555ad9b..2707afbf4b5391 100644
--- a/src/libraries/System.IO.Packaging/src/System/IO/Packaging/PackUriHelper.PackUriScheme.cs
+++ b/src/libraries/System.IO.Packaging/src/System/IO/Packaging/PackUriHelper.PackUriScheme.cs
@@ -285,7 +285,11 @@ private static string EscapeSpecialCharacters(string path)
             // This is currently enforced by the order of characters in the s_specialCharacterChars array
             foreach (char c in s_specialCharacterChars)
             {
+#if NET5_0_OR_GREATER
+                if (path.Contains(c))
+#else
                 if (path.IndexOf(c) != -1)
+#endif
                 {
                     path = path.Replace(c.ToString(), Uri.HexEscape(c));
                 }
diff --git a/src/libraries/System.IO.Packaging/src/System/IO/Packaging/ZipPackage.cs b/src/libraries/System.IO.Packaging/src/System/IO/Packaging/ZipPackage.cs
index d604e8a766c4be..d142afc3e0b577 100644
--- a/src/libraries/System.IO.Packaging/src/System/IO/Packaging/ZipPackage.cs
+++ b/src/libraries/System.IO.Packaging/src/System/IO/Packaging/ZipPackage.cs
@@ -501,7 +501,7 @@ bool IEqualityComparer<string>.Equals(string? extensionA, string? extensionB)
                 //with the rules for comparing/normalizing partnames.
                 //Refer to PackUriHelper.ValidatedPartUri.GetNormalizedPartUri method.
                 //Currently normalization just involves upper-casing ASCII and hence the simplification.
-                return extensionA.ToUpperInvariant() == extensionB.ToUpperInvariant();
+                return extensionA.Equals(extensionB, StringComparison.InvariantCultureIgnoreCase);
             }
 
             int IEqualityComparer<string>.GetHashCode(string extension)
diff --git a/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpEndPointManager.cs b/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpEndPointManager.cs
index e6be7fd6a0689e..5077554178e92b 100644
--- a/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpEndPointManager.cs
+++ b/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpEndPointManager.cs
@@ -99,7 +99,7 @@ private static void AddPrefixInternal(string p, HttpListener listener)
             if (lp.Path!.Contains('%'))
                 throw new HttpListenerException((int)HttpStatusCode.BadRequest, SR.net_invalid_path);
 
-            if (lp.Path.IndexOf("//", StringComparison.Ordinal) != -1)
+            if (lp.Path.Contains("//"))
                 throw new HttpListenerException((int)HttpStatusCode.BadRequest, SR.net_invalid_path);
 
             // listens on all the interfaces if host name cannot be parsed by IPAddress.
@@ -206,7 +206,7 @@ private static void RemovePrefixInternal(string prefix, HttpListener listener)
             if (lp.Path!.Contains('%'))
                 return;
 
-            if (lp.Path.IndexOf("//", StringComparison.Ordinal) != -1)
+            if (lp.Path.Contains("//"))
                 return;
 
             HttpEndPointListener epl = GetEPListener(lp.Host!, lp.Port, listener, lp.Secure);
diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/General/Helpers.cs b/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/General/Helpers.cs
index 9de7d560950f40..147259b5cde42b 100644
--- a/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/General/Helpers.cs
+++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/General/Helpers.cs
@@ -123,7 +123,11 @@ public static bool NeedsEscapingInTypeName(this char c)
 
         public static string UnescapeTypeNameIdentifier(this string identifier)
         {
+#if NET5_0_OR_GREATER
+            if (identifier.Contains('\\'))
+#else
             if (identifier.IndexOf('\\') != -1)
+#endif
             {
                 StringBuilder sbUnescapedName = new StringBuilder(identifier.Length);
                 for (int i = 0; i < identifier.Length; i++)
diff --git a/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs b/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs
index 6514dcb5f576a5..efba341decb936 100644
--- a/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs
+++ b/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs
@@ -378,7 +378,12 @@ private void ReadItemFrom(XmlReader reader, SyndicationItem result, Uri feedBase
                             {
                                 bool isPermalink = true;
                                 string permalinkString = reader.GetAttribute(Rss20Constants.IsPermaLinkTag, Rss20Constants.Rss20Namespace);
-                                if ((permalinkString != null) && (permalinkString.ToUpperInvariant() == "FALSE"))
+                                if (permalinkString != null &&
+#if NET5_0_OR_GREATER
+                                    permalinkString.Equals("FALSE", StringComparison.InvariantCultureIgnoreCase))
+#else
+                                    permalinkString.ToUpperInvariant() == "FALSE")
+#endif
                                 {
                                     isPermalink = false;
                                 }
diff --git a/src/libraries/System.Speech/src/Internal/SrgsParser/XmlParser.cs b/src/libraries/System.Speech/src/Internal/SrgsParser/XmlParser.cs
index 79c87dfa6d34b0..7acbf9c03bdf15 100644
--- a/src/libraries/System.Speech/src/Internal/SrgsParser/XmlParser.cs
+++ b/src/libraries/System.Speech/src/Internal/SrgsParser/XmlParser.cs
@@ -168,7 +168,7 @@ internal static void ParseText(IElement parent, string sChars, string pronunciat
                 }
 
                 string sToken = sChars.Substring(i, iTokenEnd - i);
-                if (sToken.IndexOf('"') != -1)
+                if (sToken.Contains('"'))
                 {
                     // "The token string is not allowed to contain double quote character."
                     XmlParser.ThrowSrgsException(SRID.InvalidTokenString);

From 5dbae013304e7af3af5779e699ad0850d6ee378c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 12:19:41 +0000
Subject: [PATCH 10/19] Update dependencies from
 https://github.com/dotnet/roslyn-analyzers build 20230731.2

Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.11.0-beta1.23364.2 -> To Version 3.11.0-beta1.23381.2
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 109c7f68205e0f..f2668564d22561 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -367,13 +367,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>7829f6b85177e96de89bc67f32b61d74ac590f5a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23380.2">
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23381.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>366736f79ace382243ae02e9fd13b5362df40281</Sha>
+      <Sha>48e7c8f02b8e38e3bba0411923a904f25e9bf1a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23380.2">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23381.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>366736f79ace382243ae02e9fd13b5362df40281</Sha>
+      <Sha>48e7c8f02b8e38e3bba0411923a904f25e9bf1a0</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 713ec0b4dd157b..d5a6b965e14415 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,8 +32,8 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- dotnet/roslyn-analyzers dependencies -->
-    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23380.2</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23380.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23381.2</MicrosoftCodeAnalysisAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23381.2</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.

From a6c5ed8090add7642b7a7d91e3fe91b3b55bc7a7 Mon Sep 17 00:00:00 2001
From: Buyaa Namnan <bunamnan@microsoft.com>
Date: Tue, 1 Aug 2023 08:19:59 -0700
Subject: [PATCH 11/19] Revert unwanted change

---
 src/coreclr/tools/Common/Compiler/ProcessLinkerXmlBase.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/coreclr/tools/Common/Compiler/ProcessLinkerXmlBase.cs b/src/coreclr/tools/Common/Compiler/ProcessLinkerXmlBase.cs
index e7a7976258d29b..ba6b1f0694d048 100644
--- a/src/coreclr/tools/Common/Compiler/ProcessLinkerXmlBase.cs
+++ b/src/coreclr/tools/Common/Compiler/ProcessLinkerXmlBase.cs
@@ -762,7 +762,8 @@ public class CecilCompatibleTypeParser
         public static TypeDesc? GetType(ModuleDesc assembly, string fullName)
         {
             Debug.Assert(!string.IsNullOrEmpty(fullName));
-            if (fullName.Contains('/'))
+            var position = fullName.IndexOf('/');
+            if (position > 0)
                 return GetNestedType(assembly, fullName);
             string @namespace, name;
             SplitFullName(fullName, out @namespace, out name);

From 58614b07ac1c8726de6e08c5fea26692a59cbf2d Mon Sep 17 00:00:00 2001
From: Buyaa Namnan <bunamnan@microsoft.com>
Date: Tue, 1 Aug 2023 08:32:28 -0700
Subject: [PATCH 12/19] Small update

---
 .../System/ServiceModel/Syndication/Rss20FeedFormatter.cs  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs b/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs
index efba341decb936..b71004972ad700 100644
--- a/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs
+++ b/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs
@@ -378,12 +378,7 @@ private void ReadItemFrom(XmlReader reader, SyndicationItem result, Uri feedBase
                             {
                                 bool isPermalink = true;
                                 string permalinkString = reader.GetAttribute(Rss20Constants.IsPermaLinkTag, Rss20Constants.Rss20Namespace);
-                                if (permalinkString != null &&
-#if NET5_0_OR_GREATER
-                                    permalinkString.Equals("FALSE", StringComparison.InvariantCultureIgnoreCase))
-#else
-                                    permalinkString.ToUpperInvariant() == "FALSE")
-#endif
+                                if (permalinkString != null && permalinkString.Equals("FALSE", StringComparison.InvariantCultureIgnoreCase))
                                 {
                                     isPermalink = false;
                                 }

From e8618438be2386a2f39782a0f36224929e00544c Mon Sep 17 00:00:00 2001
From: Buyaa Namnan <bunamnan@microsoft.com>
Date: Tue, 1 Aug 2023 11:15:24 -0700
Subject: [PATCH 13/19] Use OrdinalIgnoreCase

---
 .../src/Microsoft/VisualBasic/FileIO/FileSystem.vb              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.vb
index ad431329884eed..45fe6e29b9a1ea 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.vb
@@ -2223,7 +2223,7 @@ Namespace Microsoft.VisualBasic.FileIO
 
                 ' If user wants to ignore case, convert new string to lower case. m_SearchText was converted in constructor.
                 If m_IgnoreCase Then
-                    Return New String(CharBuffer).Contains(m_SearchText, StringComparison.CurrentCultureIgnoreCase)
+                    Return New String(CharBuffer).Contains(m_SearchText, StringComparison.OrdinalIgnoreCase)
                 Else
                     Return New String(CharBuffer).Contains(m_SearchText)
                 End If

From dc9519264db223c784d29f45e3ed7b0697bbcf8c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 2 Aug 2023 12:21:02 +0000
Subject: [PATCH 14/19] Update dependencies from
 https://github.com/dotnet/roslyn-analyzers build 20230801.2

Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.11.0-beta1.23364.2 -> To Version 3.11.0-beta1.23401.2
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f2668564d22561..2fbf11dbcc359e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -367,13 +367,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>7829f6b85177e96de89bc67f32b61d74ac590f5a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23381.2">
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23401.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>48e7c8f02b8e38e3bba0411923a904f25e9bf1a0</Sha>
+      <Sha>35e2379b54b6b11c3e5dedbce050702bddd3bc8b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23381.2">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23401.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>48e7c8f02b8e38e3bba0411923a904f25e9bf1a0</Sha>
+      <Sha>35e2379b54b6b11c3e5dedbce050702bddd3bc8b</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 d5a6b965e14415..bf2f5b181bf22a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,8 +32,8 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- dotnet/roslyn-analyzers dependencies -->
-    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23381.2</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23381.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23401.2</MicrosoftCodeAnalysisAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23401.2</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.

From ce2d0615034eaf6d3c3a68f6ab4115f79ecdf165 Mon Sep 17 00:00:00 2001
From: Buyaa Namnan <bunamnan@microsoft.com>
Date: Wed, 2 Aug 2023 21:33:09 -0700
Subject: [PATCH 15/19] Fix more warnings caused by bugfix in CA1864

---
 .../AccountManagement/AD/ADStoreCtx_Query.cs             | 5 +----
 .../System/IO/Packaging/PartBasedPackageProperties.cs    | 2 ++
 .../src/System/Diagnostics/Tracing/EventSource.cs        | 3 +--
 .../src/System/Xml/Resolvers/XmlPreloadedResolver.cs     | 9 +--------
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADStoreCtx_Query.cs b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADStoreCtx_Query.cs
index ec744f624af6ae..b009b3ed540917 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADStoreCtx_Query.cs
+++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADStoreCtx_Query.cs
@@ -1013,10 +1013,7 @@ private void AddPropertySetToTypePropListMap(Type principalType, StringCollectio
         {
             lock (TypeToLdapPropListMap)
             {
-                if (!TypeToLdapPropListMap[this.MappingTableIndex].ContainsKey(principalType))
-                {
-                    TypeToLdapPropListMap[this.MappingTableIndex].Add(principalType, propertySet);
-                }
+                TypeToLdapPropListMap[MappingTableIndex].TryAdd(principalType, propertySet);
             }
         }
     }
diff --git a/src/libraries/System.IO.Packaging/src/System/IO/Packaging/PartBasedPackageProperties.cs b/src/libraries/System.IO.Packaging/src/System/IO/Packaging/PartBasedPackageProperties.cs
index 526a2bf676d9b5..a5035967e174e9 100644
--- a/src/libraries/System.IO.Packaging/src/System/IO/Packaging/PartBasedPackageProperties.cs
+++ b/src/libraries/System.IO.Packaging/src/System/IO/Packaging/PartBasedPackageProperties.cs
@@ -379,7 +379,9 @@ private void RecordNewBinding(PackageXmlEnum propertyenum, object? value, bool i
                 _package.ThrowIfReadOnly();
 
             // Case of an existing property.
+#pragma warning disable CA1864 // Prefer the 'IDictionary.TryAdd(TKey, TValue)' method
             if (_propertyDictionary.ContainsKey(propertyenum))
+#pragma warning restore CA1864 // Cannot use TryAdd because if the value is null it is not added if
             {
                 // Parsing should detect redundant entries.
                 if (initializing)
diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs
index d9fa4d943bf2aa..cf84520b8549d8 100644
--- a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs
@@ -5505,8 +5505,7 @@ public void AddEventParameter(Type type, string name)
             {
                 templates?.Append(" map=\"").Append(type.Name).Append('"');
                 mapsTab ??= new Dictionary<string, Type>();
-                if (!mapsTab.ContainsKey(type.Name))
-                    mapsTab.Add(type.Name, type);        // Remember that we need to dump the type enumeration
+                mapsTab.TryAdd(type.Name, type);        // Remember that we need to dump the type enumeration
             }
 
             templates?.AppendLine("/>");
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Resolvers/XmlPreloadedResolver.cs b/src/libraries/System.Private.Xml/src/System/Xml/Resolvers/XmlPreloadedResolver.cs
index 98a4e76ca380ec..a746ab4e52b55f 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Resolvers/XmlPreloadedResolver.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Resolvers/XmlPreloadedResolver.cs
@@ -352,14 +352,7 @@ private void Add(Uri uri, PreloadedData data)
             Debug.Assert(uri != null);
 
             // override if exists
-            if (_mappings.ContainsKey(uri))
-            {
-                _mappings[uri] = data;
-            }
-            else
-            {
-                _mappings.Add(uri, data);
-            }
+            _mappings[uri] = data;
         }
 
         private void AddKnownDtd(XmlKnownDtdData[] dtdSet)

From 16aaa1d5221be419273a90fdaf342b2521dafbdc Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 3 Aug 2023 12:19:20 +0000
Subject: [PATCH 16/19] Update dependencies from
 https://github.com/dotnet/roslyn-analyzers build 20230802.3

Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.11.0-beta1.23364.2 -> To Version 3.11.0-beta1.23402.3
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2fbf11dbcc359e..87981bcee941ae 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -367,13 +367,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>7829f6b85177e96de89bc67f32b61d74ac590f5a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23401.2">
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23402.3">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>35e2379b54b6b11c3e5dedbce050702bddd3bc8b</Sha>
+      <Sha>95ab6bb1b33a5ff965ebbebb5da1cf77385f8a1c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23401.2">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23402.3">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>35e2379b54b6b11c3e5dedbce050702bddd3bc8b</Sha>
+      <Sha>95ab6bb1b33a5ff965ebbebb5da1cf77385f8a1c</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 bf2f5b181bf22a..87477888a13526 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,8 +32,8 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- dotnet/roslyn-analyzers dependencies -->
-    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23401.2</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23401.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23402.3</MicrosoftCodeAnalysisAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23402.3</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.

From e9db46b9da7d813d192bb51d5696665e5b1fa182 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 4 Aug 2023 12:19:48 +0000
Subject: [PATCH 17/19] Update dependencies from
 https://github.com/dotnet/roslyn-analyzers build 20230803.2

Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.11.0-beta1.23364.2 -> To Version 3.11.0-beta1.23403.2
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 87981bcee941ae..8ffe4a810cc639 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -367,13 +367,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>7829f6b85177e96de89bc67f32b61d74ac590f5a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23402.3">
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23403.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>95ab6bb1b33a5ff965ebbebb5da1cf77385f8a1c</Sha>
+      <Sha>7957ef8b5a284b56c40ccc10cb32f251a98dc800</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23402.3">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23403.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>95ab6bb1b33a5ff965ebbebb5da1cf77385f8a1c</Sha>
+      <Sha>7957ef8b5a284b56c40ccc10cb32f251a98dc800</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 87477888a13526..ec5e5487c9c18d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,8 +32,8 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- dotnet/roslyn-analyzers dependencies -->
-    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23402.3</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23402.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23403.2</MicrosoftCodeAnalysisAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23403.2</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.

From a2f16c3d511bdf8155c3965f867286e3e6aeb71b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 5 Aug 2023 12:17:54 +0000
Subject: [PATCH 18/19] Update dependencies from
 https://github.com/dotnet/roslyn-analyzers build 20230804.2

Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.11.0-beta1.23364.2 -> To Version 3.11.0-beta1.23404.2
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8ffe4a810cc639..38213c8c6d7618 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -367,13 +367,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>7829f6b85177e96de89bc67f32b61d74ac590f5a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23403.2">
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23404.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>7957ef8b5a284b56c40ccc10cb32f251a98dc800</Sha>
+      <Sha>196b36c28bc0dc23a76c0a2902a6b4d5faf0bc2b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23403.2">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23404.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>7957ef8b5a284b56c40ccc10cb32f251a98dc800</Sha>
+      <Sha>196b36c28bc0dc23a76c0a2902a6b4d5faf0bc2b</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 ec5e5487c9c18d..a35e89b09c8fbd 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,8 +32,8 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- dotnet/roslyn-analyzers dependencies -->
-    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23403.2</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23403.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23404.2</MicrosoftCodeAnalysisAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23404.2</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.

From ca00a3e5ddf9056efdc9dac595a60e8bba9afde1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sun, 6 Aug 2023 12:15:47 +0000
Subject: [PATCH 19/19] Update dependencies from
 https://github.com/dotnet/roslyn-analyzers build 20230805.1

Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.11.0-beta1.23364.2 -> To Version 3.11.0-beta1.23405.1
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 38213c8c6d7618..00812b136ab3dc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -367,13 +367,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>7829f6b85177e96de89bc67f32b61d74ac590f5a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23404.2">
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23405.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>196b36c28bc0dc23a76c0a2902a6b4d5faf0bc2b</Sha>
+      <Sha>633ade7a83c2b6918c10035247d93fbe1520463d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23404.2">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23405.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>196b36c28bc0dc23a76c0a2902a6b4d5faf0bc2b</Sha>
+      <Sha>633ade7a83c2b6918c10035247d93fbe1520463d</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 a35e89b09c8fbd..0786f2ee5bec7a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,8 +32,8 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- dotnet/roslyn-analyzers dependencies -->
-    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23404.2</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23404.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23405.1</MicrosoftCodeAnalysisAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23405.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.
