Fix package restore failure and remove use of obsolete API

Author: AArnott

Directory.Packages.props

@@ -8,7 +8,6 @@
     <CodeAnalysisVersion>3.11.0</CodeAnalysisVersion>
     <CodeAnalysisVersionForTests>4.12.0</CodeAnalysisVersionForTests>
     <CodefixTestingVersion>1.1.2</CodefixTestingVersion>
-    <MicrosoftDiagnosticsRuntimeVersion>3.1.512801</MicrosoftDiagnosticsRuntimeVersion>
     <CodeAnalysisAnalyzerVersion>3.11.0-beta1.24527.2</CodeAnalysisAnalyzerVersion>
   </PropertyGroup>
   <ItemGroup>
@@ -24,8 +23,8 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(CodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing" Version="$(CodefixTestingVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(CodefixTestingVersion)" />
-    <PackageVersion Include="Microsoft.Diagnostics.Runtime.Utilities" Version="$(MicrosoftDiagnosticsRuntimeVersion)" />
-    <PackageVersion Include="Microsoft.Diagnostics.Runtime" Version="$(MicrosoftDiagnosticsRuntimeVersion)" />
+    <PackageVersion Include="Microsoft.Diagnostics.Runtime.Utilities" Version="3.0.442202" />
+    <PackageVersion Include="Microsoft.Diagnostics.Runtime" Version="3.1.512801" />
     <PackageVersion Include="Microsoft.VisualStudio.Interop" Version="17.12.40391" />
     <PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.12.40392" />
     <PackageVersion Include="Microsoft.VisualStudio.Shell.Framework" Version="17.12.40391" />

src/SosThreadingTools/DumpAsyncCommand.cs

@@ -35,7 +35,7 @@ public void Execute(string args)
 
             ChainStateMachinesBasedOnTaskContinuations(knownStateMachines);
             ChainStateMachinesBasedOnJointableTasks(allStateMachines);
-            this.MarkThreadingBlockTasks(allStateMachines);
+            this.MarkThreadingBlockTasks(heap, allStateMachines);
             MarkUIThreadDependingTasks(allStateMachines);
             FixBrokenDependencies(allStateMachines);
 
@@ -348,7 +348,7 @@ private static void FixBrokenDependencies(List<AsyncStateMachine> allStateMachin
         }
     }
 
-    private void MarkThreadingBlockTasks(List<AsyncStateMachine> allStateMachines)
+    private void MarkThreadingBlockTasks(ClrHeap heap, List<AsyncStateMachine> allStateMachines)
     {
         foreach (ClrRuntime runtime in this.Runtimes)
         {
@@ -365,12 +365,13 @@ private void MarkThreadingBlockTasks(List<AsyncStateMachine> allStateMachines)
                     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 (stackObject.Type is not null &&
+                            (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 = heap.GetObject(stackObject.Address, stackObject.Type);
                                 int state = joinableTaskObject.ReadField<int>("state");
                                 if ((state & 0x10) == 0x10)
                                 {