Merge pull request #1259 from microsoft/dependabot/nuget/MicrosoftDia…

…gnosticsRuntimeVersion-3.1.456501 Bump MicrosoftDiagnosticsRuntimeVersion from 2.4.416101 to 3.1.456501
microsoft · Jan 5, 2024 · baa194e · baa194e
2 parents 440e84e + efdee0b
commit baa194e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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" />

diff --git a/src/SosThreadingTools/DumpAsyncCommand.cs b/src/SosThreadingTools/DumpAsyncCommand.cs
@@ -362,15 +362,15 @@ 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) ||
                             string.Equals(stackObject.Type?.BaseType?.Name, "Microsoft.VisualStudio.Threading.JoinableTask", StringComparison.Ordinal))
                         {
                             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)
                                 {