From 8af967b17b1154e6adab2b34e4054efd64dd5c82 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 10 Oct 2024 03:14:48 +0000
Subject: [PATCH] [release/9.0.1xx] Update dependencies from
 dotnet/roslyn-analyzers (#44001)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
---
 eng/Version.Details.xml                       | 12 ++++-----
 eng/Versions.props                            |  4 +--
 .../0001-Update-field-references.patch        | 25 -------------------
 3 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 src/SourceBuild/patches/roslyn-analyzers/0001-Update-field-references.patch

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ec2af93597a5..20c00fc799c4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -404,18 +404,18 @@
       <Sha>4ddd8113a29852380b7b929117bfe67f401ac320</Sha>
       <SourceBuild RepoName="xdt" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24479.1">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24508.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>2595aeb5e9a506f3f845c01be18d70ded045e33a</Sha>
+      <Sha>3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.11.0-beta1.24479.1">
+    <Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.11.0-beta1.24508.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>2595aeb5e9a506f3f845c01be18d70ded045e33a</Sha>
+      <Sha>3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.11.0-beta1.24479.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.11.0-beta1.24508.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>2595aeb5e9a506f3f845c01be18d70ded045e33a</Sha>
+      <Sha>3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2</Sha>
       <SourceBuild RepoName="roslyn-analyzers" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="System.CommandLine" Version="2.0.0-beta4.24324.3">
diff --git a/eng/Versions.props b/eng/Versions.props
index f10b3521f391..adc157e2ec69 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -175,8 +175,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24479.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
-    <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.24479.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24508.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.24508.2</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
diff --git a/src/SourceBuild/patches/roslyn-analyzers/0001-Update-field-references.patch b/src/SourceBuild/patches/roslyn-analyzers/0001-Update-field-references.patch
deleted file mode 100644
index 747894bfb574..000000000000
--- a/src/SourceBuild/patches/roslyn-analyzers/0001-Update-field-references.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nikola Milosavljevic <nikolam@microsoft.com>
-Date: Thu, 3 Oct 2024 19:06:30 +0000
-Subject: [PATCH] Update field references
-
-Backport: https://github.com/dotnet/roslyn-analyzers/pull/7430
----
- .../FlowAnalysis/Framework/DataFlow/AnalysisEntity.cs         | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntity.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntity.cs
-index 5a69abfa0..20553be25 100644
---- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntity.cs
-+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntity.cs
-@@ -186,8 +186,8 @@ internal bool ShouldBeTrackedForAnalysis(bool hasCompletePointsToAnalysisResult)
- 
-         public bool HasConstantValue => Symbol switch
-         {
--            IFieldSymbol field => field.HasConstantValue,
--            ILocalSymbol local => local.HasConstantValue,
-+            IFieldSymbol fieldSymbol => fieldSymbol.HasConstantValue,
-+            ILocalSymbol localSymbol => localSymbol.HasConstantValue,
-             _ => false,
-         };
-