diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c57d36105c..6dcf5377e2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,5 +7,5 @@
 # have proper ownership.
 /src/                       @dotnet/dotnet-diag
 /documentation/             @dotnet/dotnet-diag
-/eng/SourceBuild.props      @dotnet/source-build-internal
-/eng/SourceBuildPrebuiltBaseline.xml  @dotnet/source-build-internal
+/eng/DotNetBuild.props      @dotnet/product-construction
+/eng/SourceBuildPrebuiltBaseline.xml  @dotnet/source-build
diff --git a/NuGet.config b/NuGet.config
index 4b675ebca4..53688d72fe 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,6 +5,14 @@
   </solution>
   <packageSources>
     <clear />
+    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-pub-dotnet-aspnetcore-6d58cd8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-6d58cd8f/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-aspnetcore -->
+    <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-pub-dotnet-runtime-7dab903" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-7dab903b/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-runtime -->
+    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
     <add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
     <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
diff --git a/documentation/FAQ.md b/documentation/FAQ.md
index 467672c824..be5a0127a0 100644
--- a/documentation/FAQ.md
+++ b/documentation/FAQ.md
@@ -1,6 +1,22 @@
 Frequently Asked Questions
 ==========================
 
+* For more information on any of the following errors, enabling logging will help diagnose the problem.
+
+    Under windbg/cdb execute the following commands:
+    ```
+    !sosflush
+    !logging enable
+    ```
+
+    Under dotnet-dump/lldb:
+    ```
+    sosflush
+    logging enable
+    ```
+
+    and then re-run command with the issue.
+
 * On MacOS if you see any of the following errors:
     ```
     (lldb) plugin load libsosplugin.so
@@ -25,7 +41,7 @@ Frequently Asked Questions
     $ sudo codesign --force --sign - /usr/local/bin/lldb
     ```
 
-This will make a copy of Xcode lldb and adhoc sign it. Note that this workaround is only applicable to Xcode lldb, not the System lldb (`/usr/bin/lldb`), which may still fail to load. You may need to delete or rename `~/.lldbinit` to use `/usr/bin/lldb`.
+    This will make a copy of Xcode lldb and adhoc sign it. Note that this workaround is only applicable to Xcode lldb, not the System lldb (`/usr/bin/lldb`), which may still fail to load. You may need to delete or rename `~/.lldbinit` to use `/usr/bin/lldb`.
 
 * `dotnet-dump analyze` running on Windows doesn't support MacOS .NET 5.0 and 6.0 core dumps. `dotnet-dump` running on MacOS does support .NET 5.0 but not 6.0 core dumps (which will be fixed in a future dotnet-dump release). MacOS .NET 6.0 core dumps generated by the runtime via [createdump](https://github.com/dotnet/runtime/blob/main/docs/design/coreclr/botr/xplat-minidump-generation.md#os-x) are supported by lldb/SOS running on MacOS.
 
diff --git a/eng/SourceBuild.props b/eng/DotNetBuild.props
similarity index 73%
rename from eng/SourceBuild.props
rename to eng/DotNetBuild.props
index cd81671885..bf6e4287ba 100644
--- a/eng/SourceBuild.props
+++ b/eng/DotNetBuild.props
@@ -1,4 +1,4 @@
-<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
+<!-- When altering this file, include @dotnet/product-construction as a reviewer. -->
 
 <Project>
 
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 854ceff458..a26a34d85e 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -1,4 +1,4 @@
-<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
+<!-- When altering this file or making other Source Build related changes, include @dotnet/source-build as a reviewer. -->
 <!-- See aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them. -->
 
 <UsageData>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b756a6c5e5..f66e3d113f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,57 +1,57 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Diagnostics.Runtime" Version="4.0.0-beta.24480.1">
+    <Dependency Name="Microsoft.Diagnostics.Runtime" Version="4.0.0-beta.24528.1">
       <Uri>https://github.com/microsoft/clrmd</Uri>
-      <Sha>898339503a4f9d877be46826b5814c1813808ac5</Sha>
+      <Sha>7616daa712ada6cc6c70d793fd5ed062c17fe2c0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="4.0.0-beta.24480.1">
+    <Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="4.0.0-beta.24528.1">
       <Uri>https://github.com/microsoft/clrmd</Uri>
-      <Sha>898339503a4f9d877be46826b5814c1813808ac5</Sha>
+      <Sha>7616daa712ada6cc6c70d793fd5ed062c17fe2c0</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24504.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24527.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
+      <Sha>bee0a0f7b1e68e88c63261e127beee2ed06c6d13</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24504.4">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24527.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
+      <Sha>bee0a0f7b1e68e88c63261e127beee2ed06c6d13</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24504.4">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24527.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
+      <Sha>bee0a0f7b1e68e88c63261e127beee2ed06c6d13</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rtm.24504.15">
+    <Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rtm.24527.3">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>6a7f86a90566a15439ae0332f17e50cf34c21c3a</Sha>
+      <Sha>50e04b8d1d8ff413de90383aa799e4189612f685</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-rtm.24508.22">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-rtm.24522.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>9f57b1ed7a4adab022ec5d227723f23862aad0e3</Sha>
+      <Sha>6d58cd8ffa1b8f00a04238f16c58248d38c90776</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rtm.24508.22">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>9f57b1ed7a4adab022ec5d227723f23862aad0e3</Sha>
+      <Sha>6d58cd8ffa1b8f00a04238f16c58248d38c90776</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rtm.24508.17">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f</Sha>
+      <Sha>7dab903b20269d78c6bc08d5269947db7d35c22b</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-rtm.24508.17">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-rtm.24528.8">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f</Sha>
+      <Sha>7dab903b20269d78c6bc08d5269947db7d35c22b</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.0-alpha.1.24507.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.0-alpha.1.24528.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>fd609e3b427601180d23633e2f1a4cdac6c42c20</Sha>
+      <Sha>ed0d2d18003162e01c244e5b7f97a3f8fd695d5f</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis" Version="4.11.0-2.24271.11">
diff --git a/eng/Versions.props b/eng/Versions.props
index 5da621e5b9..bbfe8459c8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RepositoryUrl>https://github.com/dotnet/diagnostics</RepositoryUrl>
     <PreReleaseVersionLabel></PreReleaseVersionLabel>
-    <VersionPrefix>8.0.0</VersionPrefix>
+    <VersionPrefix>9.0.0</VersionPrefix>
     <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
     <AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
     <!--
@@ -16,11 +16,11 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Latest shared runtime version updated by darc -->
-    <VSRedistCommonNetCoreSharedFrameworkx6490Version>9.0.0-rtm.24508.17</VSRedistCommonNetCoreSharedFrameworkx6490Version>
-    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rtm.24508.17</MicrosoftNETCoreAppRuntimewinx64Version>
+    <VSRedistCommonNetCoreSharedFrameworkx6490Version>9.0.0-rtm.24528.8</VSRedistCommonNetCoreSharedFrameworkx6490Version>
+    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
     <!-- Latest shared aspnetcore version updated by darc -->
-    <MicrosoftAspNetCoreAppRefInternalVersion>9.0.0-rtm.24508.22</MicrosoftAspNetCoreAppRefInternalVersion>
-    <MicrosoftAspNetCoreAppRefVersion>9.0.0-rtm.24508.22</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRefInternalVersion>9.0.0-rtm.24522.5</MicrosoftAspNetCoreAppRefInternalVersion>
+    <MicrosoftAspNetCoreAppRefVersion>9.0.0</MicrosoftAspNetCoreAppRefVersion>
     <!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
     <MicrosoftDotnetSdkVersion>9.0.100-rc.1.24409.1</MicrosoftDotnetSdkVersion>
   </PropertyGroup>
@@ -37,7 +37,7 @@
     <SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
     <!-- Other libs -->
     <MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
-    <MicrosoftDiagnosticsRuntimeVersion>4.0.0-beta.24480.1</MicrosoftDiagnosticsRuntimeVersion>
+    <MicrosoftDiagnosticsRuntimeVersion>4.0.0-beta.24528.1</MicrosoftDiagnosticsRuntimeVersion>
     <MicrosoftDiaSymReaderNativeVersion>17.10.0-beta1.24272.1</MicrosoftDiaSymReaderNativeVersion>
     <MicrosoftDiagnosticsTracingTraceEventVersion>3.0.7</MicrosoftDiagnosticsTracingTraceEventVersion>
     <MicrosoftExtensionsLoggingVersion>6.0.0</MicrosoftExtensionsLoggingVersion>
@@ -55,12 +55,12 @@
     <SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
     <SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
     <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24504.4</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24527.1</MicrosoftDotNetCodeAnalysisVersion>
     <StyleCopAnalyzersVersion>1.2.0-beta.406</StyleCopAnalyzersVersion>
     <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorVersion>
     <cdbsosversion>10.0.26100.1</cdbsosversion>
     <NewtonSoftJsonVersion>13.0.1</NewtonSoftJsonVersion>
-    <MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>10.0.0-alpha.1.24507.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
+    <MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>10.0.0-alpha.1.24528.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
     <!-- Roslyn and analyzers -->
     <!-- dotnet/roslyn dependencies -->
     <!--
diff --git a/eng/common/build.sh b/eng/common/build.sh
index ac1ee8620c..483647daf1 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -231,7 +231,6 @@ function Build {
     /p:Restore=$restore \
     /p:Build=$build \
     /p:DotNetBuildRepo=$product_build \
-    /p:ArcadeBuildFromSource=$source_build \
     /p:DotNetBuildSourceOnly=$source_build \
     /p:Rebuild=$rebuild \
     /p:Test=$test \
diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml
index c37d16634d..295c9a2317 100644
--- a/eng/common/core-templates/job/job.yml
+++ b/eng/common/core-templates/job/job.yml
@@ -128,33 +128,11 @@ jobs:
       - ${{ preStep }}
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
-      - task: MicroBuildSigningPlugin@4
-        displayName: Install MicroBuild plugin
-        inputs:
-          signType: $(_SignType)
-          zipSources: false
-          feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
-          ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
-            azureSubscription: 'MicroBuild Signing Task (DevDiv)'
-        env:
-          TeamName: $(_TeamName)
-          MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
-          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+    - template: /eng/common/core-templates/steps/install-microbuild.yml
+      parameters:
+        enableMicrobuild: ${{ parameters.enableMicrobuild }}
+        enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
         continueOnError: ${{ parameters.continueOnError }}
-        condition: and(
-          succeeded(),
-          or(
-            and(
-              eq(variables['Agent.Os'], 'Windows_NT'),
-              in(variables['_SignType'], 'real', 'test')
-            ),
-            and(
-              ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
-              ne(variables['Agent.Os'], 'Windows_NT'),
-              eq(variables['_SignType'], 'real')
-            )
-          ))
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
     - task: NuGetAuthenticate@1
@@ -183,26 +161,12 @@ jobs:
   - ${{ each step in parameters.componentGovernanceSteps }}:
     - ${{ step }}
 
-  - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
-    - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-      - task: MicroBuildCleanup@1
-        displayName: Execute Microbuild cleanup tasks
-        condition: and(
-          always(),
-          or(
-            and(
-              eq(variables['Agent.Os'], 'Windows_NT'),
-              in(variables['_SignType'], 'real', 'test')
-            ),
-            and(
-              ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
-              ne(variables['Agent.Os'], 'Windows_NT'),
-              eq(variables['_SignType'], 'real')
-            )
-          ))
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - template: /eng/common/core-templates/steps/cleanup-microbuild.yml
+      parameters:
+        enableMicrobuild: ${{ parameters.enableMicrobuild }}
+        enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
         continueOnError: ${{ parameters.continueOnError }}
-        env:
-          TeamName: $(_TeamName)
 
   # Publish test results
   - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
diff --git a/eng/common/core-templates/steps/cleanup-microbuild.yml b/eng/common/core-templates/steps/cleanup-microbuild.yml
new file mode 100644
index 0000000000..c0fdcd3379
--- /dev/null
+++ b/eng/common/core-templates/steps/cleanup-microbuild.yml
@@ -0,0 +1,28 @@
+parameters:
+  # Enable cleanup tasks for MicroBuild
+  enableMicrobuild: false
+  # Enable cleanup tasks for MicroBuild on Mac and Linux
+  # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
+  enableMicrobuildForMacAndLinux: false
+  continueOnError: false
+
+steps:
+  - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
+    - task: MicroBuildCleanup@1
+      displayName: Execute Microbuild cleanup tasks
+      condition: and(
+        always(),
+        or(
+          and(
+            eq(variables['Agent.Os'], 'Windows_NT'),
+            in(variables['_SignType'], 'real', 'test')
+          ),
+          and(
+            ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
+            ne(variables['Agent.Os'], 'Windows_NT'),
+            eq(variables['_SignType'], 'real')
+          )
+        ))
+      continueOnError: ${{ parameters.continueOnError }}
+      env:
+        TeamName: $(_TeamName)
diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml
new file mode 100644
index 0000000000..9abe726e54
--- /dev/null
+++ b/eng/common/core-templates/steps/install-microbuild.yml
@@ -0,0 +1,43 @@
+parameters:
+  # Enable cleanup tasks for MicroBuild
+  enableMicrobuild: false
+  # Enable cleanup tasks for MicroBuild on Mac and Linux
+  # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
+  enableMicrobuildForMacAndLinux: false
+  continueOnError: false
+
+steps:
+  - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
+    # Remove Python downgrade with https://github.com/dotnet/arcade/issues/15151
+    - ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
+      - task: UsePythonVersion@0
+        displayName: 'Use Python 3.11.x'
+        inputs:
+          versionSpec: '3.11.x'
+
+    - task: MicroBuildSigningPlugin@4
+      displayName: Install MicroBuild plugin
+      inputs:
+        signType: $(_SignType)
+        zipSources: false
+        feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
+        ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
+          azureSubscription: 'MicroBuild Signing Task (DevDiv)'
+      env:
+        TeamName: $(_TeamName)
+        MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      continueOnError: ${{ parameters.continueOnError }}
+      condition: and(
+        succeeded(),
+        or(
+          and(
+            eq(variables['Agent.Os'], 'Windows_NT'),
+            in(variables['_SignType'], 'real', 'test')
+          ),
+          and(
+            ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
+            ne(variables['Agent.Os'], 'Windows_NT'),
+            eq(variables['_SignType'], 'real')
+          )
+        ))
diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml
index 2915d29bb7..c9271c0115 100644
--- a/eng/common/core-templates/steps/source-build.yml
+++ b/eng/common/core-templates/steps/source-build.yml
@@ -86,7 +86,6 @@ steps:
       $runtimeOsArgs \
       $baseOsArgs \
       /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
-      /p:ArcadeBuildFromSource=true \
       /p:DotNetBuildSourceOnly=true \
       /p:DotNetBuildRepo=true \
       /p:AssetManifestFileName=$assetManifestFileName
diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh
new file mode 100644
index 0000000000..03e47c48ac
--- /dev/null
+++ b/eng/common/native/install-dependencies.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+set -e
+
+# This is a simple script primarily used for CI to install necessary dependencies
+#
+# Usage:
+#
+# ./install-dependencies.sh <OS>
+
+os="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
+
+if [ -z "$os" ]; then
+    . "$(dirname "$0")"/init-os-and-arch.sh
+fi
+
+case "$os" in
+    linux)
+        if [ -e /etc/os-release ]; then
+            . /etc/os-release
+        fi
+
+        if [ "$ID" = "debian" ] || [ "$ID_LIKE" = "debian" ]; then
+            apt update
+
+            apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
+                libssl-dev libkrb5-dev zlib1g-dev pigz
+
+            localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+        elif [ "$ID" = "fedora" ]; then
+            dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz
+        elif [ "$ID" = "alpine" ]; then
+            apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz
+        else
+            echo "Unsupported distro. distro: $ID"
+            exit 1
+        fi
+        ;;
+
+    osx|maccatalyst|ios|iossimulator|tvos|tvossimulator)
+        echo "Installed xcode version: $(xcode-select -p)"
+
+        export HOMEBREW_NO_INSTALL_CLEANUP=1
+        export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
+        # Skip brew update for now, see https://github.com/actions/setup-python/issues/577
+        # brew update --preinstall
+        brew bundle --no-upgrade --no-lock --file=- <<EOF
+brew "cmake"
+brew "icu4c"
+brew "openssl@3"
+brew "pkg-config"
+brew "python3"
+brew "pigz"
+EOF
+        ;;
+
+    *)
+        echo "Unsupported platform. OS: $os"
+        exit 1
+        ;;
+esac
diff --git a/global.json b/global.json
index c1f99d9127..575efe913b 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "9.0.100-rc.1.24452.12",
+    "dotnet": "9.0.100-rc.2.24474.11",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCoreApp60Version)",
@@ -14,6 +14,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.5.0",
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24504.4"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24527.1"
   }
 }
diff --git a/src/Microsoft.Diagnostics.DebugServices.Implementation/DataReader.cs b/src/Microsoft.Diagnostics.DebugServices.Implementation/DataReader.cs
index 826eaecdf1..01f46135fa 100644
--- a/src/Microsoft.Diagnostics.DebugServices.Implementation/DataReader.cs
+++ b/src/Microsoft.Diagnostics.DebugServices.Implementation/DataReader.cs
@@ -54,11 +54,10 @@ bool IDataReader.GetThreadContext(uint threadId, uint contextFlags, Span<byte> c
         {
             try
             {
-                byte[] registerContext = ThreadService.GetThreadFromId(threadId).GetThreadContext();
-                registerContext.AsSpan().Slice(0, context.Length).CopyTo(context);
+                ThreadService.GetThreadFromId(threadId).GetThreadContext(context);
                 return true;
             }
-            catch (Exception ex) when (ex is DiagnosticsException or ArgumentException)
+            catch (Exception ex) when (ex is DiagnosticsException or ArgumentOutOfRangeException)
             {
                 Trace.TraceError($"GetThreadContext: {threadId} exception {ex.Message}");
             }
diff --git a/src/Microsoft.Diagnostics.DebugServices.Implementation/ServiceManager.cs b/src/Microsoft.Diagnostics.DebugServices.Implementation/ServiceManager.cs
index 19904d2f10..ae69ea69ef 100644
--- a/src/Microsoft.Diagnostics.DebugServices.Implementation/ServiceManager.cs
+++ b/src/Microsoft.Diagnostics.DebugServices.Implementation/ServiceManager.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Runtime.Loader;
@@ -20,7 +21,7 @@ public class ServiceManager : IServiceManager
     {
         private readonly Dictionary<Type, ServiceFactory>[] _factories;
         private readonly Dictionary<Type, List<ServiceFactory>> _providerFactories;
-        private readonly List<object> _extensions;
+        private readonly List<(Assembly assembly, object extension)> _extensions;
         private bool _finalized;
 
         /// <summary>
@@ -51,7 +52,7 @@ public ServiceManager()
         {
             _factories = new Dictionary<Type, ServiceFactory>[(int)ServiceScope.Max];
             _providerFactories = new Dictionary<Type, List<ServiceFactory>>();
-            _extensions = new List<object>();
+            _extensions = new List<(Assembly assembly, object extension)>();
             NotifyExtensionLoad = new ServiceEvent<Assembly>();
             NotifyExtensionLoadFailure = new ServiceEvent<Exception>();
             for (int i = 0; i < (int)ServiceScope.Max; i++)
@@ -299,6 +300,7 @@ public void LoadExtension(string extensionPath)
                 if (RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework"))
                 {
                     assembly = Assembly.LoadFile(extensionPath);
+                    _extensions.Add((assembly, null));
                 }
                 else
                 {
@@ -308,6 +310,7 @@ public void LoadExtension(string extensionPath)
             catch (Exception ex) when
                 (ex is IOException
                  or ArgumentException
+                 or NotSupportedException
                  or InvalidOperationException
                  or BadImageFormatException
                  or System.Security.SecurityException)
@@ -321,6 +324,11 @@ or BadImageFormatException
             }
         }
 
+        /// <summary>
+        /// Returns the extensions loaded
+        /// </summary>
+        public IEnumerable<Assembly> ExtensionsLoaded => _extensions.Select(static ((Assembly assembly, object extension) entry) => entry.assembly);
+
         /// <summary>
         /// Load the extension using an assembly load context. This needs to be in
         /// a separate method so ExtensionLoadContext class doesn't get referenced
@@ -334,8 +342,8 @@ private Assembly UseAssemblyLoadContext(string extensionPath)
             Assembly assembly = extension.LoadFromAssemblyPath(extensionPath);
             if (assembly is not null)
             {
-                // This list is just to keep the load context alive
-                _extensions.Add(extension);
+                // This list to track the assemblies loaded and to keep the load context alive (ExtensionLoadContext)
+                _extensions.Add((assembly, extension));
             }
             return assembly;
         }
diff --git a/src/Microsoft.Diagnostics.DebugServices.Implementation/Thread.cs b/src/Microsoft.Diagnostics.DebugServices.Implementation/Thread.cs
index 5a4fc38934..96804254d7 100644
--- a/src/Microsoft.Diagnostics.DebugServices.Implementation/Thread.cs
+++ b/src/Microsoft.Diagnostics.DebugServices.Implementation/Thread.cs
@@ -3,14 +3,13 @@
 
 using System;
 using System.Diagnostics;
-using System.Runtime.InteropServices;
 
 namespace Microsoft.Diagnostics.DebugServices.Implementation
 {
     public class Thread : IThread, IDisposable
     {
         private readonly ThreadService _threadService;
-        private byte[] _threadContext;
+        private ReadOnlyMemory<byte> _threadContext;
         private ulong? _teb;
 
         protected readonly ServiceContainer _serviceContainer;
@@ -40,46 +39,28 @@ void IDisposable.Dispose()
 
         public IServiceProvider Services => _serviceContainer;
 
-        public bool TryGetRegisterValue(int index, out ulong value)
+        public bool TryGetRegisterValue(int registerIndex, out ulong value)
         {
-            value = 0;
-
-            if (_threadService.TryGetRegisterInfo(index, out RegisterInfo info))
+            try
+            {
+                ReadOnlySpan<byte> context = GetThreadContext();
+                return _threadService.TryGetRegisterValue(context, registerIndex, out value);
+            }
+            catch (DiagnosticsException ex)
             {
-                try
-                {
-                    Span<byte> threadContext = new(GetThreadContext(), info.RegisterOffset, info.RegisterSize);
-                    switch (info.RegisterSize)
-                    {
-                        case 1:
-                            value = MemoryMarshal.Read<byte>(threadContext);
-                            return true;
-                        case 2:
-                            value = MemoryMarshal.Read<ushort>(threadContext);
-                            return true;
-                        case 4:
-                            value = MemoryMarshal.Read<uint>(threadContext);
-                            return true;
-                        case 8:
-                            value = MemoryMarshal.Read<ulong>(threadContext);
-                            return true;
-                        default:
-                            Trace.TraceError($"GetRegisterValue: 0x{ThreadId:X4} {info.RegisterName} invalid size {info.RegisterSize}");
-                            break;
-                    }
-                }
-                catch (DiagnosticsException ex)
-                {
-                    Trace.TraceError($"GetRegisterValue: 0x{ThreadId:X4} {info.RegisterName} {ex}");
-                }
+                Trace.TraceError($"GetRegisterValue: 0x{ThreadId:X4} {ex}");
             }
+            value = 0;
             return false;
         }
 
-        public byte[] GetThreadContext()
+        public ReadOnlySpan<byte> GetThreadContext()
         {
-            _threadContext ??= _threadService.GetThreadContext(this);
-            return _threadContext;
+            if (_threadContext.IsEmpty)
+            {
+                _threadContext = _threadService.GetThreadContext(this);
+            }
+            return _threadContext.Span;
         }
 
         public ulong GetThreadTeb()
diff --git a/src/Microsoft.Diagnostics.DebugServices.Implementation/ThreadService.cs b/src/Microsoft.Diagnostics.DebugServices.Implementation/ThreadService.cs
index 2d0a95cbee..668d17e127 100644
--- a/src/Microsoft.Diagnostics.DebugServices.Implementation/ThreadService.cs
+++ b/src/Microsoft.Diagnostics.DebugServices.Implementation/ThreadService.cs
@@ -3,14 +3,14 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using Microsoft.Diagnostics.Runtime;
 using Architecture = System.Runtime.InteropServices.Architecture;
 
-namespace Microsoft.Diagnostics.DebugServices.Implementation
-{
+namespace Microsoft.Diagnostics.DebugServices.Implementation {
     /// <summary>
     /// Provides thread and register info and values for the clrmd IDataReader
     /// </summary>
@@ -187,6 +187,43 @@ public bool TryGetRegisterInfo(int registerIndex, out RegisterInfo info)
             return _lookupByIndex.TryGetValue(registerIndex, out info);
         }
 
+        /// <summary>
+        /// Returns the register value for the thread context and register index. This function
+        /// can only return register values that are 64 bits or less and currently the clrmd data
+        /// targets don't return any floating point or larger registers.
+        /// </summary>
+        /// <param name="context">thread context</param>
+        /// <param name="registerIndex">register index</param>
+        /// <param name="value">value returned</param>
+        /// <returns>true if value found</returns>
+        public bool TryGetRegisterValue(ReadOnlySpan<byte> context, int registerIndex, out ulong value)
+        {
+            if (TryGetRegisterInfo(registerIndex, out RegisterInfo info))
+            {
+                ReadOnlySpan<byte> threadSpan = context.Slice(info.RegisterOffset, info.RegisterSize);
+                switch (info.RegisterSize)
+                {
+                    case 1:
+                        value = MemoryMarshal.Read<byte>(threadSpan);
+                        return true;
+                    case 2:
+                        value = MemoryMarshal.Read<ushort>(threadSpan);
+                        return true;
+                    case 4:
+                        value = MemoryMarshal.Read<uint>(threadSpan);
+                        return true;
+                    case 8:
+                        value = MemoryMarshal.Read<ulong>(threadSpan);
+                        return true;
+                    default:
+                        Trace.TraceError($"GetRegisterValue: {info.RegisterName} invalid size {info.RegisterSize}");
+                        break;
+                }
+            }
+            value = 0;
+            return false;
+        }
+
         /// <summary>
         /// Enumerate all the native threads
         /// </summary>
@@ -236,6 +273,7 @@ public IThread GetThreadFromId(uint threadId)
         /// </summary>
         /// <param name="thread">thread instance</param>
         /// <returns>context array</returns>
+        /// <exception cref="DiagnosticsException">invalid thread id</exception>
         internal byte[] GetThreadContext(Thread thread)
         {
             byte[] threadContext = new byte[_contextSize];
diff --git a/src/Microsoft.Diagnostics.DebugServices/IServiceManager.cs b/src/Microsoft.Diagnostics.DebugServices/IServiceManager.cs
index 44bfd087bc..e52fd777b4 100644
--- a/src/Microsoft.Diagnostics.DebugServices/IServiceManager.cs
+++ b/src/Microsoft.Diagnostics.DebugServices/IServiceManager.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 
 namespace Microsoft.Diagnostics.DebugServices
 {
@@ -22,5 +23,10 @@ public interface IServiceManager
         /// <param name="providerType">type or interface</param>
         /// <returns>the provider factories for the type</returns>
         IEnumerable<ServiceFactory> EnumerateProviderFactories(Type providerType);
+
+        /// <summary>
+        /// Returns the extensions loaded
+        /// </summary>
+        public IEnumerable<Assembly> ExtensionsLoaded { get; }
     }
 }
diff --git a/src/Microsoft.Diagnostics.DebugServices/IThread.cs b/src/Microsoft.Diagnostics.DebugServices/IThread.cs
index 207ca62c0a..e78515e369 100644
--- a/src/Microsoft.Diagnostics.DebugServices/IThread.cs
+++ b/src/Microsoft.Diagnostics.DebugServices/IThread.cs
@@ -3,8 +3,7 @@
 
 using System;
 
-namespace Microsoft.Diagnostics.DebugServices
-{
+namespace Microsoft.Diagnostics.DebugServices {
     /// <summary>
     /// Details about a thread
     /// </summary>
@@ -45,7 +44,7 @@ public interface IThread
         /// </summary>
         /// <returns>register context</returns>
         /// <exception cref="DiagnosticsException">invalid thread</exception>
-        byte[] GetThreadContext();
+        ReadOnlySpan<byte> GetThreadContext();
 
         /// <summary>
         /// Returns the address of the Windows TEB or 0.
diff --git a/src/Microsoft.Diagnostics.DebugServices/IThreadService.cs b/src/Microsoft.Diagnostics.DebugServices/IThreadService.cs
index 7518d53028..922ecdac0f 100644
--- a/src/Microsoft.Diagnostics.DebugServices/IThreadService.cs
+++ b/src/Microsoft.Diagnostics.DebugServices/IThreadService.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using System.Collections.Generic;
 
 namespace Microsoft.Diagnostics.DebugServices
@@ -46,6 +47,17 @@ public interface IThreadService
         /// <returns>true if index found</returns>
         bool TryGetRegisterInfo(int registerIndex, out RegisterInfo info);
 
+        /// <summary>
+        /// Returns the register value for the thread context and register index. This function
+        /// can only return register values that are 64 bits or less and currently the clrmd data
+        /// targets don't return any floating point or larger registers.
+        /// </summary>
+        /// <param name="context">thread context</param>
+        /// <param name="registerIndex">register index</param>
+        /// <param name="value">value returned</param>
+        /// <returns>true if value found</returns>
+        bool TryGetRegisterValue(ReadOnlySpan<byte> context, int registerIndex, out ulong value);
+
         /// <summary>
         /// Enumerate all the native threads
         /// </summary>
diff --git a/src/Microsoft.Diagnostics.DebugServices/IThreadUnwindService.cs b/src/Microsoft.Diagnostics.DebugServices/IThreadUnwindService.cs
index cb8a4b7d81..9e3b032040 100644
--- a/src/Microsoft.Diagnostics.DebugServices/IThreadUnwindService.cs
+++ b/src/Microsoft.Diagnostics.DebugServices/IThreadUnwindService.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
+
 namespace Microsoft.Diagnostics.DebugServices
 {
     /// <summary>
@@ -14,9 +16,8 @@ public interface IThreadUnwindService
         /// return the context will be modified to reflect the parent frame's context.
         /// </summary>
         /// <param name="threadId">thread id to unwind</param>
-        /// <param name="contextSize">register context size</param>
         /// <param name="context">On input, the frame to unwind. On return, the context of the next frame</param>
         /// <returns>HRESULT</returns>
-        int Unwind(uint threadId, uint contextSize, byte[] context);
+        int Unwind(uint threadId, Span<byte> context);
     }
 }
diff --git a/src/Microsoft.Diagnostics.DebugServices/ThreadExtensions.cs b/src/Microsoft.Diagnostics.DebugServices/ThreadExtensions.cs
new file mode 100644
index 0000000000..e4e4be22a0
--- /dev/null
+++ b/src/Microsoft.Diagnostics.DebugServices/ThreadExtensions.cs
@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Diagnostics.DebugServices
+{
+    public static class ThreadExtensions
+    {
+        public static unsafe void GetThreadContext(this IThread thread, IntPtr context, int contextSize)
+        {
+            GetThreadContext(thread, new(context.ToPointer(), contextSize));
+        }
+
+        public static void GetThreadContext(this IThread thread, Span<byte> context)
+        {
+            ReadOnlySpan<byte> registerContext = thread.GetThreadContext();
+            context.Clear();
+            registerContext.Slice(0, Math.Min(registerContext.Length, context.Length)).CopyTo(context);
+        }
+    }
+}
diff --git a/src/Microsoft.Diagnostics.ExtensionCommands/DumpRequestsCommand.cs b/src/Microsoft.Diagnostics.ExtensionCommands/DumpRequestsCommand.cs
index 660a619a91..b1e684fc03 100644
--- a/src/Microsoft.Diagnostics.ExtensionCommands/DumpRequestsCommand.cs
+++ b/src/Microsoft.Diagnostics.ExtensionCommands/DumpRequestsCommand.cs
@@ -30,9 +30,13 @@ public override void Invoke()
                     if (obj.Type?.Name?.Equals("Microsoft.AspNetCore.Http.DefaultHttpContext") ?? false)
                     {
                         ClrObject collection = obj.ReadValueTypeField("_features").ReadObjectField("<Collection>k__BackingField");
-                        if (!collection.IsNull)
+                        if (!collection.IsNull && collection.IsValid)
                         {
-                            string method = collection.ReadStringField("<Method>k__BackingField") ?? "";
+                            if (!collection.TryReadStringField("<Method>k__BackingField", default, out string method))
+                            {
+                                method = collection.ReadStringField("_methodText") ?? "";
+                            }
+
                             string scheme = collection.ReadStringField("<Scheme>k__BackingField") ?? "";
                             string path = collection.ReadStringField("<Path>k__BackingField") ?? "";
                             string query = collection.ReadStringField("<QueryString>k__BackingField") ?? "";
@@ -59,10 +63,11 @@ public override void Invoke()
 
         public void PrintRequests(List<(ulong Address, string Method, string scheme, string Url)> requests)
         {
-            Column methodColumn = Text.GetAppropriateWidth(requests.Select(r => r.Method)).WithAlignment(Align.Left);
-            Column schemeColumn = Text.GetAppropriateWidth(requests.Select(r => r.scheme)).WithAlignment(Align.Left);
-            Column urlColumn = Text.GetAppropriateWidth(requests.Select(r => r.Url)).WithAlignment(Align.Left);
-            Table output = new(Console, DumpObj.WithAlignment(Align.Left), methodColumn, schemeColumn, urlColumn); ;
+            Column addressColumn = DumpObj.GetAppropriateWidth(requests.Select(r => r.Address), 7).WithAlignment(Align.Left);
+            Column methodColumn = Text.GetAppropriateWidth(requests.Select(r => r.Method), 6).WithAlignment(Align.Left);
+            Column schemeColumn = Text.GetAppropriateWidth(requests.Select(r => r.scheme), 6).WithAlignment(Align.Left);
+            Column urlColumn = Text.GetAppropriateWidth(requests.Select(r => r.Url), 3).WithAlignment(Align.Left);
+            Table output = new(Console, addressColumn, methodColumn, schemeColumn, urlColumn); ;
             output.WriteHeader("Address", "Method", "Scheme", "Url");
 
             foreach ((ulong address, string method, string scheme, string url) in requests)
diff --git a/src/Microsoft.Diagnostics.ExtensionCommands/Host/StatusCommand.cs b/src/Microsoft.Diagnostics.ExtensionCommands/Host/StatusCommand.cs
index 36cda4e670..91c44223fb 100644
--- a/src/Microsoft.Diagnostics.ExtensionCommands/Host/StatusCommand.cs
+++ b/src/Microsoft.Diagnostics.ExtensionCommands/Host/StatusCommand.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
 using Microsoft.Diagnostics.DebugServices;
 
 namespace Microsoft.Diagnostics.ExtensionCommands
@@ -14,6 +17,9 @@ public class StatusCommand : CommandBase
         [ServiceImport]
         public IHost Host { get; set; }
 
+        [ServiceImport]
+        public IServiceManager ServiceManager { get; set; }
+
         [ServiceImport]
         public ISymbolService SymbolService { get; set; }
 
@@ -57,6 +63,18 @@ public override void Invoke()
                 }
                 this.DisplaySpecialInfo();
                 Write(SymbolService.ToString());
+
+                List<Assembly> extensions = new(ServiceManager.ExtensionsLoaded);
+                extensions.Insert(0, Assembly.GetExecutingAssembly());
+
+                WriteLine("Extensions loaded:");
+                foreach (Assembly extension in extensions)
+                {
+                    string path = extension.Location;
+                    FileVersionInfo versionInfo = FileVersionInfo.GetVersionInfo(path);
+                    WriteLine($"-> {versionInfo.ProductVersion} {path}");
+                }
+
                 long memoryUsage = GC.GetTotalMemory(forceFullCollection: true);
                 WriteLine($"GC memory usage for managed SOS components: {memoryUsage:##,#} bytes");
             }
diff --git a/src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClient/EventPipeSession.cs b/src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClient/EventPipeSession.cs
index 4de76a9896..fd7508c24a 100644
--- a/src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClient/EventPipeSession.cs
+++ b/src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClient/EventPipeSession.cs
@@ -164,15 +164,8 @@ private bool TryCreateStopMessage(out IpcMessage stopMessage)
 
         protected virtual void Dispose(bool disposing)
         {
-            // If session being disposed hasn't been stopped, attempt to stop it first
-            if (!_stopped)
-            {
-                try
-                {
-                    Stop();
-                }
-                catch { } // swallow any exceptions that may be thrown from Stop.
-            }
+            // Do not call Stop() here. Trying to do so now might block indefinitely if the runtime is unresponsive and we don't want blocking behavior in Dispose().
+            // If the caller wants to ensure that all rundown events are captured they should call Stop() first, then process the EventStream until it is complete, then call Dispose().
 
             if (!_disposedValue)
             {
diff --git a/src/SOS/SOS.Extensions/DebuggerServices.cs b/src/SOS/SOS.Extensions/DebuggerServices.cs
index 82cb8872dd..a1888f0af4 100644
--- a/src/SOS/SOS.Extensions/DebuggerServices.cs
+++ b/src/SOS/SOS.Extensions/DebuggerServices.cs
@@ -284,15 +284,18 @@ public HResult SetCurrentThreadId(uint threadId)
 
         public HResult GetThreadTeb(uint threadId, out ulong teb)
         {
-            // The native code may zero out this return pointer
+            // The native code may not zero out this return pointer
+#pragma warning disable IDE0059 // Unnecessary assignment of a value
+            teb = 0;
+#pragma warning restore IDE0059 // Unnecessary assignment of a value
             return VTable.GetThreadTeb(Self, threadId, out teb);
         }
 
-        public HResult VirtualUnwind(uint threadId, uint contextSize, byte[] context)
+        public HResult VirtualUnwind(uint threadId, Span<byte> context)
         {
             fixed (byte* contextPtr = context)
             {
-                return VTable.VirtualUnwind(Self, threadId, contextSize, contextPtr);
+                return VTable.VirtualUnwind(Self, threadId, context.Length, contextPtr);
             }
         }
 
@@ -537,7 +540,7 @@ private readonly unsafe struct IDebuggerServicesVTable
             public readonly delegate* unmanaged[Stdcall]<IntPtr, out uint, int> GetCurrentThreadSystemId;
             public readonly delegate* unmanaged[Stdcall]<IntPtr, uint, int> SetCurrentThreadSystemId;
             public readonly delegate* unmanaged[Stdcall]<IntPtr, uint, out ulong, int> GetThreadTeb;
-            public readonly delegate* unmanaged[Stdcall]<IntPtr, uint, uint, byte*, int> VirtualUnwind;
+            public readonly delegate* unmanaged[Stdcall]<IntPtr, uint, int, byte*, int> VirtualUnwind;
             public readonly delegate* unmanaged[Stdcall]<IntPtr, byte*, uint, out uint, int> GetSymbolPath;
             public readonly delegate* unmanaged[Stdcall]<IntPtr, int, ulong, byte*, int, out uint, out ulong, int> GetSymbolByOffset;
             public readonly delegate* unmanaged[Stdcall]<IntPtr, int, byte*, out ulong, int> GetOffsetBySymbol;
diff --git a/src/SOS/SOS.Extensions/ThreadUnwindServiceFromDebuggerServices.cs b/src/SOS/SOS.Extensions/ThreadUnwindServiceFromDebuggerServices.cs
index b3a5f683a6..5d42737f50 100644
--- a/src/SOS/SOS.Extensions/ThreadUnwindServiceFromDebuggerServices.cs
+++ b/src/SOS/SOS.Extensions/ThreadUnwindServiceFromDebuggerServices.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using Microsoft.Diagnostics.DebugServices;
 
 namespace SOS.Extensions
@@ -14,9 +15,9 @@ public ThreadUnwindServiceFromDebuggerServices(DebuggerServices debuggerServices
             _debuggerServices = debuggerServices;
         }
 
-        public int Unwind(uint threadId, uint contextSize, byte[] context)
+        public int Unwind(uint threadId, Span<byte> context)
         {
-            return _debuggerServices.VirtualUnwind(threadId, contextSize, context);
+            return _debuggerServices.VirtualUnwind(threadId, context);
         }
     }
 }
diff --git a/src/SOS/SOS.Hosting/CorDebugDataTargetWrapper.cs b/src/SOS/SOS.Hosting/CorDebugDataTargetWrapper.cs
index a58f59211f..7ecd6c98a7 100644
--- a/src/SOS/SOS.Hosting/CorDebugDataTargetWrapper.cs
+++ b/src/SOS/SOS.Hosting/CorDebugDataTargetWrapper.cs
@@ -7,8 +7,7 @@
 using Microsoft.Diagnostics.DebugServices;
 using Microsoft.Diagnostics.Runtime.Utilities;
 
-namespace SOS.Hosting
-{
+namespace SOS.Hosting {
     public sealed unsafe class CorDebugDataTargetWrapper : COMCallableIUnknown
     {
         private static readonly Guid IID_ICorDebugDataTarget = new("FE06DC28-49FB-4636-A4A3-E80DB4AE116C");
@@ -137,7 +136,7 @@ private unsafe int ReadVirtual(
                 address &= _ignoreAddressBitsMask;
                 if (!_memoryService.ReadMemory(address, buffer, unchecked((int)bytesRequested), out read))
                 {
-                    Trace.TraceError("CorDebugDataTargetWrappter.ReadVirtual FAILED address {0:X16} size {1:X8}", address, bytesRequested);
+                    Trace.TraceError("CorDebugDataTargetWrapper.ReadVirtual FAILED address {0:X16} size {1:X8}", address, bytesRequested);
                     return HResult.E_FAIL;
                 }
             }
@@ -152,21 +151,13 @@ private int GetThreadContext(
             int contextSize,
             IntPtr context)
         {
-            byte[] registerContext;
             try
             {
-                registerContext = _threadService.GetThreadFromId(threadId).GetThreadContext();
+                _threadService.GetThreadFromId(threadId).GetThreadContext(context, contextSize);
             }
-            catch (DiagnosticsException)
-            {
-                return HResult.E_FAIL;
-            }
-            try
-            {
-                Marshal.Copy(registerContext, 0, context, Math.Min(registerContext.Length, contextSize));
-            }
-            catch (Exception ex) when (ex is ArgumentOutOfRangeException or ArgumentNullException)
+            catch (Exception ex) when (ex is DiagnosticsException or ArgumentOutOfRangeException)
             {
+                Trace.TraceError($"CorDebugDataTargetWrapper.GetThreadContext({threadId:X8}) FAILED");
                 return HResult.E_INVALIDARG;
             }
             return HResult.S_OK;
@@ -179,7 +170,7 @@ private int GetThreadContext(
         private int VirtualUnwind(
             IntPtr self,
             uint threadId,
-            uint contextSize,
+            int contextSize,
             byte[] context)
         {
             try
@@ -188,7 +179,7 @@ private int VirtualUnwind(
                 {
                     return HResult.E_NOTIMPL;
                 }
-                return _threadUnwindService.Unwind(threadId, contextSize, context);
+                return _threadUnwindService.Unwind(threadId, context.AsSpan(0, contextSize));
             }
             catch (DiagnosticsException)
             {
@@ -263,7 +254,7 @@ private delegate int GetThreadContextDelegate(
         private delegate int VirtualUnwindDelegate(
             [In] IntPtr self,
             [In] uint threadId,
-            [In] uint contextSize,
+            [In] int contextSize,
             [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 2)] byte[] context);
 
         #endregion
diff --git a/src/SOS/SOS.Hosting/DataTargetWrapper.cs b/src/SOS/SOS.Hosting/DataTargetWrapper.cs
index 659835540f..3feade5d10 100644
--- a/src/SOS/SOS.Hosting/DataTargetWrapper.cs
+++ b/src/SOS/SOS.Hosting/DataTargetWrapper.cs
@@ -9,8 +9,7 @@
 using Microsoft.Diagnostics.Runtime.Utilities;
 using SOS.Hosting.DbgEng.Interop;
 
-namespace SOS.Hosting
-{
+namespace SOS.Hosting {
     internal sealed unsafe class DataTargetWrapper : COMCallableIUnknown
     {
         private static readonly Guid IID_ICLRDataTarget = new("3E11CCEE-D08B-43e5-AF01-32717A64DA03");
@@ -221,23 +220,13 @@ private int GetThreadContext(
             int contextSize,
             IntPtr context)
         {
-            byte[] registerContext;
             try
             {
-                registerContext = _threadService.GetThreadFromId(threadId).GetThreadContext();
+                _threadService.GetThreadFromId(threadId).GetThreadContext(context, contextSize);
             }
-            catch (DiagnosticsException)
+            catch (Exception ex) when (ex is DiagnosticsException or ArgumentOutOfRangeException)
             {
                 Trace.TraceError($"DataTargetWrapper.GetThreadContext({threadId:X8}) FAILED");
-                return HResult.E_FAIL;
-            }
-            try
-            {
-                Marshal.Copy(registerContext, 0, context, Math.Min(registerContext.Length, contextSize));
-            }
-            catch (Exception ex) when (ex is ArgumentOutOfRangeException or ArgumentNullException)
-            {
-                Trace.TraceError($"DataTargetWrapper.GetThreadContext Marshal.Copy FAILED {ex}");
                 return HResult.E_INVALIDARG;
             }
             return HResult.S_OK;
@@ -311,7 +300,7 @@ private int FreeVirtual(
         private int VirtualUnwind(
             IntPtr self,
             uint threadId,
-            uint contextSize,
+            int contextSize,
             byte[] context)
         {
             try
@@ -320,7 +309,7 @@ private int VirtualUnwind(
                 {
                     return HResult.E_NOTIMPL;
                 }
-                return _threadUnwindService.Unwind(threadId, contextSize, context);
+                return _threadUnwindService.Unwind(threadId, context.AsSpan(0, contextSize));
             }
             catch (DiagnosticsException)
             {
@@ -466,7 +455,7 @@ private delegate int FreeVirtualDelegate(
         private delegate int VirtualUnwindDelegate(
             [In] IntPtr self,
             [In] uint threadId,
-            [In] uint contextSize,
+            [In] int contextSize,
             [In, Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 2)] byte[] context);
 
         #endregion
diff --git a/src/SOS/SOS.Hosting/LLDBServices.cs b/src/SOS/SOS.Hosting/LLDBServices.cs
index 1e6b127090..3c6d1a4552 100644
--- a/src/SOS/SOS.Hosting/LLDBServices.cs
+++ b/src/SOS/SOS.Hosting/LLDBServices.cs
@@ -107,7 +107,7 @@ private string GetCoreClrDirectory(
         private int VirtualUnwind(
             IntPtr self,
             uint threadId,
-            uint contextSize,
+            int contextSize,
             byte[] context)
         {
             return HResult.E_NOTIMPL;
@@ -226,7 +226,7 @@ private delegate ulong GetExpressionDelegate(
         private delegate int VirtualUnwindDelegate(
             IntPtr self,
             uint threadId,
-            uint contextSize,
+            int contextSize,
             byte[] context);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
diff --git a/src/SOS/SOS.Hosting/SOSHost.cs b/src/SOS/SOS.Hosting/SOSHost.cs
index 5a8cfb48b4..68e737c8d4 100644
--- a/src/SOS/SOS.Hosting/SOSHost.cs
+++ b/src/SOS/SOS.Hosting/SOSHost.cs
@@ -13,8 +13,7 @@
 using SOS.Hosting.DbgEng.Interop;
 using Architecture = System.Runtime.InteropServices.Architecture;
 
-namespace SOS.Hosting
-{
+namespace SOS.Hosting {
     /// <summary>
     /// Helper code to hosting the native SOS code
     /// </summary>
@@ -581,21 +580,13 @@ internal int GetThreadContextBySystemId(
             int contextSize,
             IntPtr context)
         {
-            byte[] registerContext;
             try
             {
-                registerContext = ThreadService.GetThreadFromId(threadId).GetThreadContext();
+                ThreadService.GetThreadFromId(threadId).GetThreadContext(context, contextSize);
             }
-            catch (DiagnosticsException)
-            {
-                return HResult.E_FAIL;
-            }
-            try
-            {
-                Marshal.Copy(registerContext, 0, context, Math.Min(registerContext.Length, contextSize));
-            }
-            catch (Exception ex) when (ex is ArgumentOutOfRangeException or ArgumentNullException)
+            catch (Exception ex) when (ex is DiagnosticsException or ArgumentOutOfRangeException)
             {
+                Trace.TraceError($"SOSHost.GetThreadContext({threadId:X8}) FAILED");
                 return HResult.E_INVALIDARG;
             }
             return HResult.S_OK;
diff --git a/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
index fd034675a5..c1ea95337d 100644
--- a/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
+++ b/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
@@ -35,11 +35,6 @@
 
   <CliPath>$(DotNetRoot)/dotnet</CliPath>
 
-  <NuGetPackageFeeds>
-      dotnet9=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json;
-      dotnet-public=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json
-  </NuGetPackageFeeds>
-
   <Options>
     <!--
         Single file (debuggees cli built)
diff --git a/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
index 7e0e353cc8..04bc6ac553 100644
--- a/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
+++ b/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
@@ -46,11 +46,6 @@
 
   <CliPath>$(DotNetRoot)\dotnet.exe</CliPath>
 
-  <NuGetPackageFeeds>
-      dotnet9=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json;
-      dotnet-public=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json
-  </NuGetPackageFeeds>
-
   <Options>
     <!--
         .NET Core Runtime
diff --git a/src/SOS/Strike/crosscontext.h b/src/SOS/Strike/crosscontext.h
index 47937e3761..336d63f054 100644
--- a/src/SOS/Strike/crosscontext.h
+++ b/src/SOS/Strike/crosscontext.h
@@ -379,6 +379,7 @@ typedef struct {
     ULONGLONG F[4*32];
     DWORD64 Fcc;
     DWORD   Fcsr;
+    DWORD Padding[1];
 
 } LOONGARCH64_CONTEXT;
 
diff --git a/src/SOS/Strike/disasmLOONGARCH64.cpp b/src/SOS/Strike/disasmLOONGARCH64.cpp
index d9f509500e..c0378b97d1 100644
--- a/src/SOS/Strike/disasmLOONGARCH64.cpp
+++ b/src/SOS/Strike/disasmLOONGARCH64.cpp
@@ -127,7 +127,192 @@ void LOONGARCH64Machine::Unassembly (
     BOOL bDisplayOffsets,
     std::function<void(ULONG*, UINT*, BYTE*)> displayIL) const
 {
-    _ASSERTE("LOONGARCH64:NYI");
+    ULONG_PTR PC = PCBegin;
+    char line[1024];
+    ULONG lineNum;
+    ULONG curLine = -1;
+    WCHAR fileName[MAX_LONGPATH];
+    char *ptr;
+    ULONG ilPosition = 0;
+    UINT ilIndentCount = 0;
+
+    while(PC < PCEnd)
+    {
+        ULONG_PTR currentPC = PC;
+        DisasmAndClean (PC, line, ARRAY_SIZE(line));
+
+        if (currentPC != PCBegin)
+        {
+            ExtOut ("\n");
+        }
+
+        // This is the new instruction
+
+        if (IsInterrupt())
+            return;
+        //
+        // Print out line numbers if needed
+        //
+        if (!bSuppressLines &&
+            SUCCEEDED(GetLineByOffset(TO_CDADDR(currentPC), &lineNum, fileName, MAX_LONGPATH)))
+        {
+            if (lineNum != curLine)
+            {
+                curLine = lineNum;
+                ExtOut("\n%S @ %d:\n", fileName, lineNum);
+            }
+        }
+        displayIL(&ilPosition, &ilIndentCount, (BYTE*)PC);
+
+        //
+        // Print out any GC information corresponding to the current instruction offset.
+        //
+        if (pGCEncodingInfo)
+        {
+            SIZE_T curOffset = (currentPC - PCBegin) + pGCEncodingInfo->hotSizeToAdd;
+            pGCEncodingInfo->DumpGCInfoThrough(curOffset);
+        }
+
+        //
+        // Print out any EH info corresponding to the current offset
+        //
+        if (pEHInfo)
+        {
+            pEHInfo->FormatForDisassembly(currentPC - PCBegin);
+        }
+
+        if (currentPC == PCAskedFor)
+        {
+            ExtOut (">>> ");
+        }
+
+        //
+        // Print offsets, in addition to actual address.
+        //
+        if (bDisplayOffsets)
+        {
+            ExtOut("%04x ", currentPC - PCBegin);
+        }
+
+        // look at the disassembled bytes
+        ptr = line;
+        NextTerm (ptr);
+
+        //
+        // If there is gcstress info for this method, and this is a 'hlt'
+        // instruction, then gcstress probably put the 'hlt' there.  Look
+        // up the original instruction and print it instead.
+        //
+
+        if (   GCStressCodeCopy
+            && (   !strncmp (ptr, "ffffff0f", 8)
+                || !strncmp (ptr, "ffffff0e", 8)
+                || !strncmp (ptr, "ffffff0d", 8)
+                ))
+        {
+            ULONG_PTR InstrAddr = currentPC;
+
+            //
+            // Compute address into saved copy of the code, and
+            // disassemble the original instruction
+            //
+
+            ULONG_PTR OrigInstrAddr = GCStressCodeCopy + (InstrAddr - PCBegin);
+            ULONG_PTR OrigPC = OrigInstrAddr;
+
+            DisasmAndClean(OrigPC, line, ARRAY_SIZE(line));
+
+            //
+            // Increment the real PC based on the size of the unmodifed
+            // instruction
+            //
+
+            PC = InstrAddr + (OrigPC - OrigInstrAddr);
+
+            //
+            // Print out real code address in place of the copy address
+            //
+
+            ExtOut("%08x`%08x ", (ULONG)(InstrAddr >> 32), (ULONG)InstrAddr);
+
+            ptr = line;
+            NextTerm (ptr);
+
+            //
+            // Print out everything after the code address, and skip the
+            // instruction bytes
+            //
+
+            ExtOut(ptr);
+
+            //
+            // Add an indicator that this address has not executed yet
+            //
+
+            ExtOut(" (gcstress)");
+        }
+        else
+        {
+            ExtOut (line);
+        }
+
+        // Now advance to the opcode
+        NextTerm (ptr);
+
+        if (!strncmp(ptr, "beq ", 4)
+            || !strncmp(ptr, "bne ", 4)
+            || !strncmp(ptr, "blt ", 4)
+            || !strncmp(ptr, "bge ", 4)
+            || !strncmp(ptr, "bltu ", 5)
+            || !strncmp(ptr, "bgeu ", 5)
+            )
+        {
+            char *endptr;
+            NextTerm (ptr);
+            NextTerm (ptr);
+            NextTerm (ptr);
+            ULONG_PTR value = strtoul(ptr, &endptr, 10);
+            ExtOut("(0x%llx)", (value + currentPC));
+        }
+        else if (!strncmp(ptr, "beqz ", 5)
+                || !strncmp(ptr, "bnez ", 5)
+                || !strncmp(ptr, "bceqz ", 6)
+                || !strncmp(ptr, "bcnez ", 6)
+                )
+        {
+            char *endptr;
+            NextTerm (ptr);
+            NextTerm (ptr);
+            ULONG_PTR value = strtoul(ptr, &endptr, 10);
+            ExtOut("(0x%llx)", (value + currentPC));
+        }
+        else if (!strncmp(ptr, "b ", 2) || !strncmp(ptr, "bl ", 3))
+        {
+            char *endptr;
+            NextTerm (ptr);
+            ULONG_PTR value = strtoul(ptr, &endptr, 10);
+            ExtOut("(0x%llx)", (value + currentPC));
+            HandleValue(value + currentPC);
+        }
+
+    }
+    ExtOut ("\n");
+
+    //
+    // Print out any "end" GC info
+    //
+    if (pGCEncodingInfo)
+    {
+        pGCEncodingInfo->DumpGCInfoThrough(PC - PCBegin);
+    }
+
+    //
+    // Print out any "end" EH info (where the end address is the byte immediately following the last instruction)
+    //
+    if (pEHInfo)
+    {
+        pEHInfo->FormatForDisassembly(PC - PCBegin);
+    }
 }
 
 BOOL LOONGARCH64Machine::GetExceptionContext (TADDR stack, TADDR PC, TADDR *cxrAddr, CROSS_PLATFORM_CONTEXT * cxr,
diff --git a/src/Tools/dotnet-stack/ReportCommand.cs b/src/Tools/dotnet-stack/ReportCommand.cs
index 4684d58d0b..645de24def 100644
--- a/src/Tools/dotnet-stack/ReportCommand.cs
+++ b/src/Tools/dotnet-stack/ReportCommand.cs
@@ -78,12 +78,13 @@ private static async Task<int> Report(CancellationToken ct, IConsole console, in
                 // is too short in a given environment, e.g., resource constrained systems
                 // N.B. - This trace INCLUDES rundown.  For sufficiently large applications, it may take non-trivial time to collect
                 //        the symbol data in rundown.
-                using (EventPipeSession session = client.StartEventPipeSession(providers))
+                EventPipeSession session = await client.StartEventPipeSessionAsync(providers, requestRundown:true, token:ct).ConfigureAwait(false);
+                using (session)
                 using (FileStream fs = File.OpenWrite(tempNetTraceFilename))
                 {
-                    Task copyTask = session.EventStream.CopyToAsync(fs);
-                    await Task.Delay(duration).ConfigureAwait(false);
-                    session.Stop();
+                    Task copyTask = session.EventStream.CopyToAsync(fs, ct);
+                    await Task.Delay(duration, ct).ConfigureAwait(false);
+                    await session.StopAsync(ct).ConfigureAwait(false);
 
                     // check if rundown is taking more than 5 seconds and add comment to report
                     Task timeoutTask = Task.Delay(TimeSpan.FromSeconds(5));
@@ -147,6 +148,10 @@ private static async Task<int> Report(CancellationToken ct, IConsole console, in
                     }
                 }
             }
+            catch (OperationCanceledException)
+            {
+                return -1;
+            }
             catch (Exception ex)
             {
                 Console.Error.WriteLine($"[ERROR] {ex}");
diff --git a/src/shared/debug/dbgutil/dbgutil.cpp b/src/shared/debug/dbgutil/dbgutil.cpp
index 91235f40e7..e9b6f6300a 100644
--- a/src/shared/debug/dbgutil/dbgutil.cpp
+++ b/src/shared/debug/dbgutil/dbgutil.cpp
@@ -271,18 +271,14 @@ HRESULT GetNextLevelResourceEntryRVA(ICorDebugDataTarget* pDataTarget,
     IMAGE_RESOURCE_DIRECTORY resourceDirectory;
     hr = ReadFromDataTarget(pDataTarget, moduleBaseAddress + resourceDirectoryRVA, (BYTE*)&resourceDirectory, sizeof(resourceDirectory));
 
-
-
-    // The ith resource directory entry is at offset 16 + 8i from the beginning of the resource
-    // directory table
-    WORD numNameEntries;
-    WORD numIDEntries;
     if (SUCCEEDED(hr))
     {
-        numNameEntries = resourceDirectory.NumberOfNamedEntries;
-        numIDEntries = resourceDirectory.NumberOfIdEntries;
+        // The ith resource directory entry is at offset 16 + 8i from the beginning of the resource
+        // directory table. First come named entries, followed by ID entries. We skip the former.
+        WORD beginIdEntries = resourceDirectory.NumberOfNamedEntries;
+        WORD endIdEntries = (WORD)(beginIdEntries + resourceDirectory.NumberOfIdEntries);
 
-        for (WORD i = numNameEntries; i < numNameEntries + numIDEntries; i++)
+        for (WORD i = beginIdEntries; i < endIdEntries; i++)
         {
             IMAGE_RESOURCE_DIRECTORY_ENTRY entry;
             hr = ReadFromDataTarget(pDataTarget, moduleBaseAddress + resourceDirectoryRVA + sizeof(resourceDirectory) + sizeof(entry)*i,
diff --git a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt
index 35c0da8c61..3eba797e4a 100644
--- a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt
+++ b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt
@@ -16,11 +16,6 @@
 
   <CliPath>$(DotNetRoot)/dotnet</CliPath>
 
-  <NuGetPackageFeeds>
-      dotnet9=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json;
-      dotnet-public=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json
-  </NuGetPackageFeeds>
-
   <Options>
     <!--
         Default (prebuilt)
diff --git a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt
index 4077d745d4..9dc0909183 100644
--- a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt
+++ b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt
@@ -15,11 +15,6 @@
   <DebuggeeBuildRoot>$(RootBinDir)</DebuggeeBuildRoot>
   <CliPath>$(DotNetRoot)\dotnet.exe</CliPath>
 
-  <NuGetPackageFeeds>
-      dotnet9=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json;
-      dotnet-public=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json
-  </NuGetPackageFeeds>
-
   <Options>
     <!--
         Default (prebuilt)
diff --git a/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
index d6bf7af01d..49ee3e7b9b 100644
--- a/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
+++ b/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
@@ -16,11 +16,6 @@
   !-- Use the global.json SDK to build and the test SDK/runtime to run -->
   <CliPath>$(DotNetRoot)/dotnet</CliPath>
 
-  <NuGetPackageFeeds>
-      dotnet9=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json;
-      dotnet-public=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json
-  </NuGetPackageFeeds>
-
   <!-- Run OpenVirtualProcess tests on Linux -->
   <RunTestsLinux_x64>false</RunTestsLinux_x64>
   <RunTestsLinux_x64 Condition="'$(OS)' == 'linux'">true</RunTestsLinux_x64>
diff --git a/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
index b280bd5904..3fc9b1d4d2 100644
--- a/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
+++ b/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
@@ -16,11 +16,6 @@
 
   <CliPath>$(DotNetRoot)\dotnet.exe</CliPath>
 
-  <NuGetPackageFeeds>
-      dotnet9=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json;
-      dotnet-public=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json
-  </NuGetPackageFeeds>
-
   <RunTestsWindows_x64>true</RunTestsWindows_x64>
   <RunTestsWindows_x64 Condition="'$(TargetArchitecture)' != 'x64'">false</RunTestsWindows_x64>
   
diff --git a/src/tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs b/src/tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs
index b44fba2a5d..ae557118d2 100644
--- a/src/tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs
+++ b/src/tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs
@@ -84,7 +84,7 @@ public void CheckModuleNames()
 
         private void CheckModuleNamesInternal(Minidump minidump)
         {
-            Assert.Single(minidump.LoadedImages.Where(i => i.ModuleName.EndsWith(@"\clr.dll")));
+            Assert.Single(minidump.LoadedImages, i => i.ModuleName.EndsWith(@"\clr.dll"));
 
             foreach (var module in minidump.LoadedImages)
                 Assert.NotNull(module.ModuleName);