diff --git a/Directory.Packages.props b/Directory.Packages.props
index b789106d5..5a869eb8b 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -22,8 +22,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="3.0.442202" />
-    <PackageVersion Include="Microsoft.Diagnostics.Runtime" Version="3.1.512801" />
+    <PackageVersion Include="Microsoft.Diagnostics.Runtime.Utilities" Version="4.0.722401" />
+    <PackageVersion Include="Microsoft.Diagnostics.Runtime" Version="4.0.722401" />
     <PackageVersion Include="Microsoft.VisualStudio.Interop" Version="17.14.40260" />
     <PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.14.40264" />
     <PackageVersion Include="Microsoft.VisualStudio.Shell.Framework" Version="17.14.40264" />
@@ -31,7 +31,7 @@
     <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.275" />
     <PackageVersion Include="Nullable" Version="1.3.1" />
-    <PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
+    <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageVersion Include="System.Memory" Version="4.6.3" />
     <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
diff --git a/global.json b/global.json
index 26ea1f754..1ebb0a7a5 100644
--- a/global.json
+++ b/global.json
@@ -8,7 +8,6 @@
     "runner": "Microsoft.Testing.Platform"
   },
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "3.0.44",
     "Microsoft.Build.NoTargets": "3.7.134",
 		"Microsoft.Build.Traversal": "4.1.82"
   }
diff --git a/src/SosThreadingTools/SosThreadingTools.csproj b/src/SosThreadingTools/SosThreadingTools.csproj
index 8fb9ffbe4..0881f882c 100644
--- a/src/SosThreadingTools/SosThreadingTools.csproj
+++ b/src/SosThreadingTools/SosThreadingTools.csproj
@@ -1,8 +1,7 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.SDK">
   <PropertyGroup>
-    <TargetFrameworks>net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net10.0-windows</TargetFrameworks>
     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
-    <ExtrasBuildEachRuntimeIdentifier>true</ExtrasBuildEachRuntimeIdentifier>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <HasLceComments>false</HasLceComments>
diff --git a/src/SosThreadingTools/SosThreadingTools.targets b/src/SosThreadingTools/SosThreadingTools.targets
index d53fcec4a..166bb82e5 100644
--- a/src/SosThreadingTools/SosThreadingTools.targets
+++ b/src/SosThreadingTools/SosThreadingTools.targets
@@ -26,7 +26,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <GalleryManifest Include="$(IntermediateOutputPath)GalleryManifest.xml" Condition="'$(RuntimeIdentifier)'=='win-x64'" />
+    <GalleryManifest Include="$(IntermediateOutputPath)GalleryManifest.xml" Condition="'$(RuntimeIdentifier)'=='win-x64' OR '$(RuntimeIdentifier)'==''" />
   </ItemGroup>
   <ItemGroup>
     <FilesToSign Include="$(TargetDir)$(DnneNativeBinaryName).dll">
@@ -41,12 +41,23 @@
     <SignFilesDependsOn Include="StampAndIncludeGalleryManifest" />
   </ItemGroup>
 
-  <Target Name="PackBuildOutputs" DependsOnTargets="DebugSymbolsProjectOutputGroup;StampAndIncludeGalleryManifest">
+  <Target Name="_BuildForEachRuntimeIdentifier"
+          AfterTargets="Build"
+          Condition="'$(RuntimeIdentifier)' == '' AND '$(RuntimeIdentifiers)' != ''">
     <ItemGroup>
-      <TfmSpecificPackageFile Include="$(TargetPath)" PackagePath="tools\$(RuntimeIdentifier)\" />
-      <TfmSpecificPackageFile Include="$(TargetDir)$(TargetName).runtimeconfig.json" PackagePath="tools\$(RuntimeIdentifier)\" />
-      <TfmSpecificPackageFile Include="@(DebugSymbolsProjectOutputGroupOutput->'%(FinalOutputPath)')" PackagePath="symbols\$(RuntimeIdentifier)\" />
-      <TfmSpecificPackageFile Include="$(TargetDir)*.dll" PackagePath="tools\$(RuntimeIdentifier)\" />
+      <_InnerBuildRid Include="$(RuntimeIdentifiers)" />
+    </ItemGroup>
+    <MSBuild Projects="$(MSBuildProjectFullPath)"
+             Targets="Build"
+             Properties="RuntimeIdentifier=%(_InnerBuildRid.Identity)" />
+  </Target>
+
+  <Target Name="PackBuildOutputs" DependsOnTargets="StampAndIncludeGalleryManifest">
+    <ItemGroup>
+      <_PackRid Include="$(RuntimeIdentifiers)" />
+      <TfmSpecificPackageFile Include="$(TargetDir)%(_PackRid.Identity)\$(TargetName).runtimeconfig.json" PackagePath="tools\%(_PackRid.Identity)\" />
+      <TfmSpecificPackageFile Include="$(TargetDir)%(_PackRid.Identity)\$(TargetName).pdb" PackagePath="symbols\%(_PackRid.Identity)\" />
+      <TfmSpecificPackageFile Include="$(TargetDir)%(_PackRid.Identity)\*.dll" PackagePath="tools\%(_PackRid.Identity)\" />
     </ItemGroup>
   </Target>
   <Target Name="StampAndIncludeGalleryManifest" DependsOnTargets="GetBuildVersion" Condition="'@(GalleryManifest)'!=''">