Skip to content

Commit baa194e

Browse files
authored
Merge pull request #1259 from microsoft/dependabot/nuget/MicrosoftDiagnosticsRuntimeVersion-3.1.456501
Bump MicrosoftDiagnosticsRuntimeVersion from 2.4.416101 to 3.1.456501
2 parents 440e84e + efdee0b commit baa194e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<CodeAnalysisVersion>3.11.0</CodeAnalysisVersion>
88
<CodeAnalysisVersion Condition="'$(IsTestProject)'=='true'">4.4.0</CodeAnalysisVersion>
99
<CodefixTestingVersion>1.1.1</CodefixTestingVersion>
10-
<MicrosoftDiagnosticsRuntimeVersion>2.4.416101</MicrosoftDiagnosticsRuntimeVersion>
10+
<MicrosoftDiagnosticsRuntimeVersion>3.1.456501</MicrosoftDiagnosticsRuntimeVersion>
1111
</PropertyGroup>
1212
<ItemGroup>
1313
<PackageVersion Include="DNNE" Version="2.0.6" />

src/SosThreadingTools/DumpAsyncCommand.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,15 +362,15 @@ private void MarkThreadingBlockTasks(List<AsyncStateMachine> allStateMachines)
362362
if (stackFrame is object)
363363
{
364364
var visitedObjects = new HashSet<ulong>();
365-
foreach (IClrStackRoot stackRoot in thread.EnumerateStackRoots())
365+
foreach (ClrStackRoot stackRoot in thread.EnumerateStackRoots())
366366
{
367367
ClrObject stackObject = stackRoot.Object;
368368
if (string.Equals(stackObject.Type?.Name, "Microsoft.VisualStudio.Threading.JoinableTask", StringComparison.Ordinal) ||
369369
string.Equals(stackObject.Type?.BaseType?.Name, "Microsoft.VisualStudio.Threading.JoinableTask", StringComparison.Ordinal))
370370
{
371371
if (visitedObjects.Add(stackObject.Address))
372372
{
373-
var joinableTaskObject = new ClrObject(stackObject.Address, stackObject.Type);
373+
ClrObject joinableTaskObject = stackObject.Type is null ? runtime.Heap.GetObject(stackObject.Address) : runtime.Heap.GetObject(stackObject.Address, stackObject.Type);
374374
int state = joinableTaskObject.ReadField<int>("state");
375375
if ((state & 0x10) == 0x10)
376376
{

0 commit comments

Comments
 (0)