diff --git a/eng/Versions.props b/eng/Versions.props
index 031ed3d7bf..5f6674ddb5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -74,7 +74,7 @@
     <SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
     <TestPlatformExternalsVersion>18.2.0-preview-1-11429-120</TestPlatformExternalsVersion>
     <MicrosoftInternalTestPlatformExtensions>18.3.11611.365</MicrosoftInternalTestPlatformExtensions>
-    <TestPlatformMSDiaVersion>18.0.11024.295</TestPlatformMSDiaVersion>
+    <TestPlatformMSDiaVersion>18.7.0-preview-1-11715-406</TestPlatformMSDiaVersion>
     <SystemDiagnosticsDiagnosticSourceVersion>8.0.1</SystemDiagnosticsDiagnosticSourceVersion>
     <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
     <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
diff --git a/eng/expected-nupkg-file-counts.json b/eng/expected-nupkg-file-counts.json
index 4e1b2c95f1..f39ca1ea27 100644
--- a/eng/expected-nupkg-file-counts.json
+++ b/eng/expected-nupkg-file-counts.json
@@ -1,16 +1,16 @@
 {
   "Microsoft.CodeCoverage": 76,
   "Microsoft.NET.Test.Sdk": 26,
-  "Microsoft.TestPlatform": 543,
+  "Microsoft.TestPlatform": 548,
   "Microsoft.TestPlatform.AdapterUtilities": 62,
   "Microsoft.TestPlatform.Build": 21,
-  "Microsoft.TestPlatform.CLI": 481,
+  "Microsoft.TestPlatform.CLI": 483,
   "Microsoft.TestPlatform.Extensions.TrxLogger": 35,
   "Microsoft.TestPlatform.Filter.Source": 13,
   "Microsoft.TestPlatform.Internal.Uwp": 39,
   "Microsoft.TestPlatform.ObjectModel": 93,
-  "Microsoft.TestPlatform.Portable": 606,
-  "Microsoft.TestPlatform.TestHost": 64,
+  "Microsoft.TestPlatform.Portable": 608,
+  "Microsoft.TestPlatform.TestHost": 65,
   "Microsoft.TestPlatform.TranslationLayer": 175,
-  "Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI": 387
+  "Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI": 389
 }
diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
index c22338717f..53616ed4db 100644
--- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
@@ -75,6 +75,8 @@
     <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="contentFiles\any\net10.0\TestHostNetFramework\x64" />
     <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll"          target="contentFiles\any\net10.0\TestHostNetFramework\x86" />
     <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="contentFiles\any\net10.0\TestHostNetFramework\x86" />
+    <file src="net48\Microsoft.Internal.Dia\arm64\msdia140.dll"          target="contentFiles\any\net10.0\TestHostNetFramework\arm64" />
+    <file src="net48\Microsoft.Internal.Dia\arm64\msdia140.dll.manifest" target="contentFiles\any\net10.0\TestHostNetFramework\arm64" />
 
     <file src="net48\datacollector.exe" target="contentFiles\any\net10.0\TestHostNetFramework" />
     <file src="net48\datacollector.exe.config" target="contentFiles\any\net10.0\TestHostNetFramework" />
diff --git a/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.nuspec b/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.nuspec
index 1c542d83a5..e190a7efa0 100644
--- a/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.nuspec
+++ b/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.nuspec
@@ -602,6 +602,8 @@
     <file src="net8.0\Microsoft.Internal.Dia\x64\msdia140.dll.manifest"	target="tools\net8.0\TestHostNetFramework\x64\msdia140.dll.manifest" />
     <file src="net8.0\Microsoft.Internal.Dia\x86\msdia140.dll"	target="tools\net8.0\TestHostNetFramework\x86\msdia140.dll" />
     <file src="net8.0\Microsoft.Internal.Dia\x86\msdia140.dll.manifest"	target="tools\net8.0\TestHostNetFramework\x86\msdia140.dll.manifest" />
+    <file src="net8.0\Microsoft.Internal.Dia\arm64\msdia140.dll"	target="tools\net8.0\TestHostNetFramework\arm64\msdia140.dll" />
+    <file src="net8.0\Microsoft.Internal.Dia\arm64\msdia140.dll.manifest"	target="tools\net8.0\TestHostNetFramework\arm64\msdia140.dll.manifest" />
 
     <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
     <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
diff --git a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj
index 085d532b35..bc2d8dab7b 100644
--- a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj
+++ b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj
@@ -42,9 +42,11 @@
     <ItemGroup>
       <DiaFilesX86 Include="$(PkgMicrosoft_Internal_Dia)\tools\net451\x86\*"></DiaFilesX86>
       <DiaFilesX64 Include="$(PkgMicrosoft_Internal_Dia)\tools\net451\x64\*"></DiaFilesX64>
+      <DiaFilesArm64 Include="$(PkgMicrosoft_Internal_Dia)\tools\net451\arm64\*"></DiaFilesArm64>
     </ItemGroup>
     <Copy SourceFiles="@(DiaFilesX86)" DestinationFolder="$(OutDir)\x86" />
     <Copy SourceFiles="@(DiaFilesX64)" DestinationFolder="$(OutDir)\x64" />
+    <Copy SourceFiles="@(DiaFilesArm64)" DestinationFolder="$(OutDir)\arm64" />
   </Target>
 
   <ItemGroup>
diff --git a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec
index a559c573ff..d3285af362 100644
--- a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec
+++ b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec
@@ -32,6 +32,7 @@
 
     <file src="net8.0\x86\msdia140.dll" target="lib\net8.0\x86\" />
     <file src="net8.0\x64\msdia140.dll" target="lib\net8.0\x64\" />
+    <file src="net8.0\arm64\msdia140.dll" target="lib\net8.0\arm64\" />
 
     <!--
           We move AnyCPU version of testhost.dll, at the moment we don't have native code that needs particular architecture inside testhost.dll.
diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
index 66df043240..bacb71848d 100644
--- a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
+++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
@@ -229,10 +229,14 @@
     <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x64\msdia140.dll.manifest" />
     <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x86\msdia140.dll" />
     <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x86\msdia140.dll.manifest" />
+    <file src="net48\Microsoft.Internal.Dia\arm64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\arm64\msdia140.dll" />
+    <file src="net48\Microsoft.Internal.Dia\arm64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\arm64\msdia140.dll.manifest" />
     <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x64\msdia140.dll" />
     <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x64\msdia140.dll.manifest" />
     <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x86\msdia140.dll" />
     <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x86\msdia140.dll.manifest" />
+    <file src="net48\Microsoft.Internal.Dia\arm64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\arm64\msdia140.dll" />
+    <file src="net48\Microsoft.Internal.Dia\arm64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\arm64\msdia140.dll.manifest" />
     <file src="net48\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
     <file src="net48\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
     <file src="net48\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
@@ -341,6 +345,8 @@
     <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x64\msdia140.dll.manifest" />
     <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x86\msdia140.dll" />
     <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x86\msdia140.dll.manifest" />
+    <!-- arm64\msdia140.dll is already included via the Microsoft.Internal.CodeCoverage wildcard above -->
+    <file src="net48\Microsoft.Internal.Dia\arm64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\arm64\msdia140.dll.manifest" />
     <file src="net48\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
     <file src="net48\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
     <file src="net48\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
diff --git a/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
index d6488a1b3f..e4cb42e234 100644
--- a/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
+++ b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
@@ -205,6 +205,9 @@
       <VsixSourceItem Include="$(MsDiaFolder)x86\*">
         <VSIXSubPath>x86</VSIXSubPath>
       </VsixSourceItem>
+      <VsixSourceItem Include="$(MsDiaFolder)arm64\*">
+        <VSIXSubPath>arm64</VSIXSubPath>
+      </VsixSourceItem>
     </ItemGroup>
 
     <!-- Code Coverage -->