Skip to content

Cherry-pick: Add ARM64 msdia140.dll support to test platform packages #15692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nohwnd merged 6 commits into from
Apr 20, 2026
Merged

Cherry-pick: Add ARM64 msdia140.dll support to test platform packages #15692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c12dc2d
Add ARM64 msdia140.dll support to test platform packages
jamesmcroft Apr 17, 2026
9f81dd5
Update ARM64 msdia140.dll support to test platform packages
jamesmcroft Apr 17, 2026
924f8d4
Add ARM64 msdia140.dll to Microsoft.TestPlatform.nuspec
nohwnd Apr 17, 2026
85ea5d6
Fix NU5050: remove duplicate arm64 msdia140.dll entry
nohwnd Apr 17, 2026
76846f3
Merge remote-tracking branch 'upstream/main' into cherry-msdia-arm64
nohwnd Apr 20, 2026
3e21f89
Update expected nupkg file counts after ARM64 msdia merge
nohwnd Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions eng/expected-nupkg-file-counts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
2 changes: 2 additions & 0 deletions src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 2 additions & 0 deletions src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 2 additions & 0 deletions src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 6 additions & 0 deletions src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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 -->
Comment thread
nohwnd marked this conversation as resolved.
<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" />
Expand Down
3 changes: 3 additions & 0 deletions ...TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@
<VsixSourceItem Include="$(MsDiaFolder)x86\*">
<VSIXSubPath>x86</VSIXSubPath>
</VsixSourceItem>
<VsixSourceItem Include="$(MsDiaFolder)arm64\*">
<VSIXSubPath>arm64</VSIXSubPath>
</VsixSourceItem>
</ItemGroup>

<!-- Code Coverage -->
Expand Down