From 43d658aa5fd7bc29742c01afb0199c10649ed72d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 20 Mar 2024 12:41:44 +0000
Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/roslyn
 build

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset
 From Version 4.10.0-2.24114.13 -> To Version 4.10.0-3.24169.7
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 163f1a9ddcc1f..42d4ff219bb1d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -360,17 +360,17 @@
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
       <Sha>fe7f6de587d1867b71a8e846ffee3b2035afbfe5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-2.24114.13">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.24169.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77372c66fd54927312b5b0a2e399e192f74445c9</Sha>
+      <Sha>98cd097bf122677378692ebe952b71ab6e5bb013</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-2.24114.13">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-3.24169.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77372c66fd54927312b5b0a2e399e192f74445c9</Sha>
+      <Sha>98cd097bf122677378692ebe952b71ab6e5bb013</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-2.24114.13">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-3.24169.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77372c66fd54927312b5b0a2e399e192f74445c9</Sha>
+      <Sha>98cd097bf122677378692ebe952b71ab6e5bb013</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24158.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
@@ -381,9 +381,9 @@
       <Sha>94749ce487be31b74bae5629b5af5d2392377f6d</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.10.0-2.24114.13">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.10.0-3.24169.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77372c66fd54927312b5b0a2e399e192f74445c9</Sha>
+      <Sha>98cd097bf122677378692ebe952b71ab6e5bb013</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.100-preview.3.24161.5">
diff --git a/eng/Versions.props b/eng/Versions.props
index 8511bb41a1241..c95b336d4da23 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -42,9 +42,9 @@
       Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
       they do not break the local dev experience.
     -->
-    <MicrosoftCodeAnalysisCSharpVersion>4.10.0-2.24114.13</MicrosoftCodeAnalysisCSharpVersion>
-    <MicrosoftCodeAnalysisVersion>4.10.0-2.24114.13</MicrosoftCodeAnalysisVersion>
-    <MicrosoftNetCompilersToolsetVersion>4.10.0-2.24114.13</MicrosoftNetCompilersToolsetVersion>
+    <MicrosoftCodeAnalysisCSharpVersion>4.10.0-3.24169.7</MicrosoftCodeAnalysisCSharpVersion>
+    <MicrosoftCodeAnalysisVersion>4.10.0-3.24169.7</MicrosoftCodeAnalysisVersion>
+    <MicrosoftNetCompilersToolsetVersion>4.10.0-3.24169.7</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>
   <!--
     For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.

From cb6d72815f38bb66d1eaf20a9cc2b91610b6fd3a Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Wed, 13 Mar 2024 11:05:39 -0400
Subject: [PATCH 2/2] Suppress System.Threading.Lock cast to object errors

---
 .../System.Private.CoreLib/src/System/Threading/Condition.cs    | 2 ++
 .../System.Private.CoreLib/src/System/Threading/SyncTable.cs    | 2 +-
 .../Tracing/NativeRuntimeEventSource.Threading.NativeSinks.cs   | 2 ++
 .../Diagnostics/Tracing/NativeRuntimeEventSource.Threading.cs   | 2 ++
 .../System.Private.CoreLib/src/System/Threading/Lock.cs         | 2 +-
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Threading/Condition.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Threading/Condition.cs
index 1c6cdadaf0227..9aa83a10d6ca4 100644
--- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Threading/Condition.cs
+++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Threading/Condition.cs
@@ -89,7 +89,9 @@ private unsafe void RemoveWaiter(Waiter waiter)
 
         public Condition(Lock @lock)
         {
+#pragma warning disable CS9216 // casting Lock to object
             ArgumentNullException.ThrowIfNull(@lock);
+#pragma warning restore CS9215
             _lock = @lock;
         }
 
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Threading/SyncTable.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Threading/SyncTable.cs
index c75a5fe9de40d..c9ec4990f5907 100644
--- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Threading/SyncTable.cs
+++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Threading/SyncTable.cs
@@ -140,7 +140,7 @@ public static unsafe int AssignEntry(object obj, int* pHeader)
 
                     // Found a free entry to assign
                     Debug.Assert(!entry.Owner.IsAllocated);
-                    Debug.Assert(entry.Lock == null);
+                    Debug.Assert(entry.Lock is null);
                     Debug.Assert(entry.HashCode == 0);
 
                     // Set up the new entry.  We should not fail after this point.
diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.Threading.NativeSinks.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.Threading.NativeSinks.cs
index 432540c79ff15..69f873288e798 100644
--- a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.Threading.NativeSinks.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.Threading.NativeSinks.cs
@@ -5,6 +5,8 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 
+#pragma warning disable CS9216 // System.Threading.Lock cast to object for object identity
+
 namespace System.Diagnostics.Tracing
 {
     // This is part of the NativeRuntimeEventsource, which is the managed version of the Microsoft-Windows-DotNETRuntime provider.
diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.Threading.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.Threading.cs
index 8c85770e1f0aa..3b9cd5c468349 100644
--- a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.Threading.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.Threading.cs
@@ -5,6 +5,8 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 
+#pragma warning disable CS9216 // System.Threading.Lock cast to object for object identity
+
 namespace System.Diagnostics.Tracing
 {
     // This is part of the NativeRuntimeEventsource, which is the managed version of the Microsoft-Windows-DotNETRuntime provider.
diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Lock.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/Lock.cs
index f9f34ecb19cf0..b7961869eac5d 100644
--- a/src/libraries/System.Private.CoreLib/src/System/Threading/Lock.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Lock.cs
@@ -130,7 +130,7 @@ internal Scope(Lock lockObj, ThreadId currentThreadId)
             public void Dispose()
             {
                 Lock? lockObj = _lockObj;
-                if (lockObj != null)
+                if (lockObj is not null)
                 {
                     _lockObj = null;
                     lockObj.Exit(_currentThreadId);