From c12dc2dd80ea3d8a0b50d1f552a5486c89535f65 Mon Sep 17 00:00:00 2001 From: James Croft Date: Fri, 17 Apr 2026 11:52:43 +0100 Subject: [PATCH 1/5] Add ARM64 msdia140.dll support to test platform packages - Bump Microsoft.Internal.Dia to 18.7.0-preview-1-11715-406 (includes ARM64) - Add ARM64 DIA file copy in TestHost.csproj CopyDiaFiles target - Add ARM64 msdia140.dll to TestHost.nuspec package layout - Add ARM64 msdia140.dll and manifest to CLI.nuspec TestHostNetFramework The ARM64 msdia140.dll was added to the Microsoft.Internal.Dia package via VS PR #720616. Symbol resolution verified for all architectures (x86, x64, arm64) via dotnet-symbol against the Microsoft symbol server. --- eng/Versions.props | 2 +- .../Microsoft.TestPlatform.CLI.nuspec | 2 ++ .../Microsoft.TestPlatform.TestHost.csproj | 2 ++ .../Microsoft.TestPlatform.TestHost.nuspec | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) 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 @@ 8.0.0 18.2.0-preview-1-11429-120 18.3.11611.365 - 18.0.11024.295 + 18.7.0-preview-1-11715-406 8.0.1 5.0.0 6.1.0 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 @@ + + 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 @@ + + 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 @@ + From 924f8d435fd9f13c1501db5e6a0a0b2743bb8a4d Mon Sep 17 00:00:00 2001 From: Jakub Jares Date: Fri, 17 Apr 2026 17:18:12 +0200 Subject: [PATCH 3/5] Add ARM64 msdia140.dll to Microsoft.TestPlatform.nuspec Add arm64 msdia140.dll and manifest entries to all three locations in Microsoft.TestPlatform.nuspec (TestImpact/ComComponents, V1/TestImpact/ComComponents, and TestPlatform root). Update verify-nupkgs.ps1 count from 545 to 551 (+6 files). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/verify-nupkgs.ps1 | 2 +- .../Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1 index 2800db09da..22eff31eca 100644 --- a/eng/verify-nupkgs.ps1 +++ b/eng/verify-nupkgs.ps1 @@ -22,7 +22,7 @@ function Verify-Nuget-Packages { $expectedNumOfFiles = @{ "Microsoft.CodeCoverage" = 76 "Microsoft.NET.Test.Sdk" = 26 - "Microsoft.TestPlatform" = 543 + "Microsoft.TestPlatform" = 549 "Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI" = 389 "Microsoft.TestPlatform.Build" = 21 "Microsoft.TestPlatform.CLI" = 483 diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec index 66df043240..7efcf7fe9d 100644 --- a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec +++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec @@ -229,10 +229,14 @@ + + + + @@ -341,6 +345,8 @@ + + From 85ea5d6f1afe2b58f0c56055e8e15cd9678860d4 Mon Sep 17 00:00:00 2001 From: Jakub Jares Date: Fri, 17 Apr 2026 17:53:50 +0200 Subject: [PATCH 4/5] Fix NU5050: remove duplicate arm64 msdia140.dll entry The Microsoft.Internal.CodeCoverage package already includes arm64\msdia140.dll in its TestPlatform folder, and the wildcard on line 378 of the nuspec picks it up. The explicit entry conflicts with that wildcard. Remove just the dll entry (keep the manifest which CodeCoverage doesn't include). Count: 551 -> 550. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/verify-nupkgs.ps1 | 2 +- .../Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1 index 22eff31eca..b9e3ed9e88 100644 --- a/eng/verify-nupkgs.ps1 +++ b/eng/verify-nupkgs.ps1 @@ -22,7 +22,7 @@ function Verify-Nuget-Packages { $expectedNumOfFiles = @{ "Microsoft.CodeCoverage" = 76 "Microsoft.NET.Test.Sdk" = 26 - "Microsoft.TestPlatform" = 549 + "Microsoft.TestPlatform" = 548 "Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI" = 389 "Microsoft.TestPlatform.Build" = 21 "Microsoft.TestPlatform.CLI" = 483 diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec index 7efcf7fe9d..bacb71848d 100644 --- a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec +++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec @@ -345,7 +345,7 @@ - + From 3e21f898c5d2d9e8ce11fcfb420520c4c448d652 Mon Sep 17 00:00:00 2001 From: nohwnd Date: Mon, 20 Apr 2026 12:55:22 +0200 Subject: [PATCH 5/5] Update expected nupkg file counts after ARM64 msdia merge Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/expected-nupkg-file-counts.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 }