Repository navigation
Avoid duplicate runtime DLLs in the MSTest UWP adapter by @Evangelink in #12238 (backport to rel/4.5) - #12248
Merged
Amaury Levé (Evangelink) merged 2 commits intoNov 6, 2026
Conversation
Remove duplicate runtime DLLs from the adapter package while preserving AppX deployment of resolved dependencies. Add UAP payload and dependency regression coverage. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Amaury Levé (Evangelink)
enabled auto-merge (squash)
November 6, 2026 13:38
Amaury Levé (Evangelink)
approved these changes
Nov 6, 2026
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #12238 to rel/4.5
/cc Amaury Levé (@Evangelink)
Pull request
Summary
Backport the classic UWP adapter packaging correction from #12238. The UAP payload contains only the adapter and platform-services DLLs; required runtime assemblies are restored from their owning NuGet packages and included in AppX deployment.
The backport preserves the release branch's .NET 8/.NET 9 framework policy and modern UWP .NET 9 support. The README conflict is resolved without bringing over main-only F# documentation or .NET 10 platform requirements.
Design and decision record
The design and original red/green evidence are recorded in #12238. This is a servicing backport, not a new feature or architecture change.
Classic UWP still needs explicit AppX deployment because SDK Extras disables automatic copying of NuGet runtime assets. Keep the resolved-asset deployment target and UAP-only TRX/Retry dependencies; do not restore the duplicated package payload.
Demonstration
Verified UAP DLL entries in the freshly packed
MSTest.TestAdapter 4.5.3-dev:The UAP dependency group declares
Microsoft.Testing.Extensions.TrxReportandMicrosoft.Testing.Extensions.Retryat2.5.3-dev. The packaged README is free of conflict markers, retains modern UWP .NET 9 support, and does not include main-only F# documentation.No UI or report layout changes are involved; package contents and real packaged-host execution are the relevant evidence.
Validation and regression proof
Validated the release branch's own packages and toolchain, not the originating main-branch artifacts:
12.0.100-alpha.1.26480.103, Release, Windows x64; outer acceptance hostnet11.0.MSTest 4.5.3-devandMicrosoft.Testing.Platform 2.5.3-dev.2342499bd649e43dcb24059ab656c20863e12639plus the README-only conflict correction, committed unchanged as98cff9529422963e52a6319bc3de6815b2e4b76a.Pack:
Result: exit 0, 0 warnings, 0 errors.
The execution command below preserves the executed options, with only the run-owned artifact directory represented by
$results. A temporary short checkout alias let the unchanged release acceptance fixture create fresh short NuGet caches; no release test-infrastructure change was needed.Independent release-source discovery and execution selected the same 18 cases: 18 passed, 0 failed, 0 skipped, exit 0. TRX, JUnit, and CTRF agree.
WindowsApplicationModelPackageTests, includingPackedMSTestTestAdapter_ClassicUwpDoesNotDuplicateRuntimeDependenciesand both rows ofPackedMSTestTestAdapter_ClassicUwpDeclaresBootstrapDependenciesClassicUwp_ConsumesUapAssets_AndRunsPlainAndUiTestsThroughMtpwithMSTest.Sdk,MSTest, and direct adapter/framework referencesModernUwp_ConsumesUwpAssets_AndRunsPlainAndUiTestsThroughMtponnet9.0-windows10.0.26100.0andnet10.0-windows10.0.26100.0consumersEach of the five real applications returned zero and produced a final TRX containing exactly the expected plain/UI test names, both passed: ten passing product results in total. Retry-attempt reports were not double-counted.
Provenance reconciliation matched 13 distinct local shipping-package hashes against 53 restored consumer-package entries and verified all thirty curated classic-UWP runtime dependencies. The registration leak check passed.
Logs, binlogs, result reports, and provenance are retained locally; no diagnostic artifacts have been uploaded. Separate legacy non-SDK UWP/VSTest execution and modern x86/ARM64 builds were not run. No new launcher/protocol/cancellation behavior was introduced. These are local results, not a claim that backport CI has passed.
Test-value evidence
The originating fix in #12238 has executed paired evidence: the same three new package cases failed on the original layout (12 instead of 2 DLLs, missing TRX/Retry dependencies) and passed with the correction.
On this release backport, all three package regressions and the real packaged-host consumers executed and passed using newly packed
4.5.3-dev/2.5.3-devartifacts. The old-layout counterfactual was not rerun onrel/4.5; main's paired run is not presented as a release-branch execution result. The additional conflict correction is documentation-only, and the actual packed README was checked for release-correct platform text and absence of conflict markers/main-only F# content.