From c81ceff2c3da4b0fc97670ea9be50f3c33314497 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 10:56:23 +0000
Subject: [PATCH 1/2] Bump MicrosoftDiagnosticsRuntimeVersion from 2.4.416101
 to 3.1.456501

Bumps `MicrosoftDiagnosticsRuntimeVersion` from 2.4.416101 to 3.1.456501.

Updates `Microsoft.Diagnostics.Runtime.Utilities` from 2.4.416101 to 3.1.456501

Updates `Microsoft.Diagnostics.Runtime` from 2.4.416101 to 3.1.456501

---
updated-dependencies:
- dependency-name: Microsoft.Diagnostics.Runtime.Utilities
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: Microsoft.Diagnostics.Runtime
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4749e3b87..a3bfa007d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -7,7 +7,7 @@
     <CodeAnalysisVersion>3.11.0</CodeAnalysisVersion>
     <CodeAnalysisVersion Condition="'$(IsTestProject)'=='true'">4.4.0</CodeAnalysisVersion>
     <CodefixTestingVersion>1.1.1</CodefixTestingVersion>
-    <MicrosoftDiagnosticsRuntimeVersion>2.4.416101</MicrosoftDiagnosticsRuntimeVersion>
+    <MicrosoftDiagnosticsRuntimeVersion>3.1.456501</MicrosoftDiagnosticsRuntimeVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="DNNE" Version="2.0.6" />

From efdee0b1349ce980deedd8d7ca130e8258d1486d Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrew.arnott@microsoft.com>
Date: Fri, 5 Jan 2024 11:02:23 -0700
Subject: [PATCH 2/2] Fix up build breaks after dependency upgrade

---
 src/SosThreadingTools/DumpAsyncCommand.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SosThreadingTools/DumpAsyncCommand.cs b/src/SosThreadingTools/DumpAsyncCommand.cs
index e4c2531e8..9aedaf999 100644
--- a/src/SosThreadingTools/DumpAsyncCommand.cs
+++ b/src/SosThreadingTools/DumpAsyncCommand.cs
@@ -362,7 +362,7 @@ private void MarkThreadingBlockTasks(List<AsyncStateMachine> allStateMachines)
                 if (stackFrame is object)
                 {
                     var visitedObjects = new HashSet<ulong>();
-                    foreach (IClrStackRoot stackRoot in thread.EnumerateStackRoots())
+                    foreach (ClrStackRoot stackRoot in thread.EnumerateStackRoots())
                     {
                         ClrObject stackObject = stackRoot.Object;
                         if (string.Equals(stackObject.Type?.Name, "Microsoft.VisualStudio.Threading.JoinableTask", StringComparison.Ordinal) ||
@@ -370,7 +370,7 @@ private void MarkThreadingBlockTasks(List<AsyncStateMachine> allStateMachines)
                         {
                             if (visitedObjects.Add(stackObject.Address))
                             {
-                                var joinableTaskObject = new ClrObject(stackObject.Address, stackObject.Type);
+                                ClrObject joinableTaskObject = stackObject.Type is null ? runtime.Heap.GetObject(stackObject.Address) : runtime.Heap.GetObject(stackObject.Address, stackObject.Type);
                                 int state = joinableTaskObject.ReadField<int>("state");
                                 if ((state & 0x10) == 0x10)
                                 {