diff --git a/BUILD.bazel b/BUILD.bazel
index 4251bd8993..a50da5aac1 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -82,7 +82,7 @@ filegroup(
":crashdump",
":ctrf",
":framework",
- ":framework_extensions",
+ ":framework_compatibility",
":github_report",
":globalconfigs_generator",
":hangdump",
@@ -179,7 +179,6 @@ testfx_binary(
":adapter",
":ctrf",
":framework",
- ":framework_extensions",
":html",
":junit",
":trx",
@@ -210,7 +209,6 @@ testfx_binary(
deps = [
":assert_generator",
":framework",
- ":framework_extensions",
":internal_test_framework",
":trx",
"@paket.source//awesomeassertions",
diff --git a/MSTest.slnf b/MSTest.slnf
index 382d2ad51a..d87f1d3cf1 100644
--- a/MSTest.slnf
+++ b/MSTest.slnf
@@ -18,7 +18,9 @@
"src\\Package\\MSTest\\MSTest.csproj",
"src\\Platform\\Microsoft.Testing.Extensions.PackagedApp.Controller\\Microsoft.Testing.Extensions.PackagedApp.Controller.csproj",
"src\\Platform\\Microsoft.Testing.Extensions.PackagedApp.MSBuild\\Microsoft.Testing.Extensions.PackagedApp.MSBuild.csproj",
- "src\\TestFramework\\TestFramework.Extensions\\TestFramework.Extensions.csproj",
+ "src\\TestFramework\\MSTest.Uwp\\MSTest.Uwp.csproj",
+ "src\\TestFramework\\MSTest.WinUI\\MSTest.WinUI.csproj",
+ "src\\TestFramework\\TestFramework.Compatibility\\TestFramework.Compatibility.csproj",
"src\\TestFramework\\TestFramework.Windows.UIAutomation\\TestFramework.Windows.UIAutomation.csproj",
"src\\TestFramework\\TestFramework.SourceGeneration\\TestFramework.SourceGeneration.csproj",
"src\\TestFramework\\TestFramework\\TestFramework.csproj",
diff --git a/NonWindowsTests.slnf b/NonWindowsTests.slnf
index f500564cf9..0de72be46c 100644
--- a/NonWindowsTests.slnf
+++ b/NonWindowsTests.slnf
@@ -39,7 +39,7 @@
"src\\Platform\\Microsoft.Testing.Platform.MSBuild\\Microsoft.Testing.Platform.MSBuild.csproj",
"src\\Platform\\Microsoft.Testing.Platform.ServerMode.Client.Sources\\Microsoft.Testing.Platform.ServerMode.Client.Sources.csproj",
"src\\Platform\\Microsoft.Testing.Platform\\Microsoft.Testing.Platform.csproj",
- "src\\TestFramework\\TestFramework.Extensions\\TestFramework.Extensions.csproj",
+ "src\\TestFramework\\TestFramework.Compatibility\\TestFramework.Compatibility.csproj",
"src\\TestFramework\\TestFramework.Windows.UIAutomation\\TestFramework.Windows.UIAutomation.csproj",
"src\\TestFramework\\TestFramework.SourceGeneration\\TestFramework.SourceGeneration.csproj",
"src\\TestFramework\\TestFramework\\TestFramework.csproj",
diff --git a/TestFx.slnx b/TestFx.slnx
index 9611938f6c..0ba94150ec 100644
--- a/TestFx.slnx
+++ b/TestFx.slnx
@@ -72,7 +72,9 @@
-
+
+
+
diff --git a/docs/decisions/explicit-mstest-packages.md b/docs/decisions/explicit-mstest-packages.md
new file mode 100644
index 0000000000..266b21a9f7
--- /dev/null
+++ b/docs/decisions/explicit-mstest-packages.md
@@ -0,0 +1,380 @@
+# Explicit MSTest packages: layer 2
+
+## Problem and contract
+
+This is the package-extraction layer replacing
+[#12435](https://github.com/microsoft/testfx/pull/12435), following
+[#7225](https://github.com/microsoft/testfx/issues/7225),
+[#12412](https://github.com/microsoft/testfx/pull/12412) and
+[#12428](https://github.com/microsoft/testfx/pull/12428). The
+[shared-core prerequisite](shared-core-ui-contract.md), delivered separately in
+[#12446](https://github.com/microsoft/testfx/pull/12446), owns the runtime changes;
+this layer does not repeat or extend them.
+
+`TestFramework.csproj` becomes the `MSTest.TestFramework` package owner.
+`MSTest.Uwp` owns the existing classic/modern UWP UI attribute and matching
+adapter/services; `MSTest.WinUI` owns the existing WinUI attributes and matching
+adapter/services. Each UI package pins core to its exact package version, uses
+ordinary `lib/` assets, and carries its own build assets and satellites.
+Modern net10.0 Windows assets also support compatible net11.0 consumers. Neither
+UI package depends on the ordinary adapter or the other UI flavor.
+
+The old Extensions implementation and package-owner project are retired. Its
+existing API records are byte-preserving `.txt.history` moves, outside release
+promotion. A forwarding-only compatibility assembly preserves the non-UI types
+already moved to core, including the upstream Playwright binary-compatibility
+repair. It contains no UI definitions, resources, or selection logic. Consumers
+must still update UI package/assembly references and recompile: one facade cannot
+forward the same UI identity to both new packages. Ordinary and net462
+resolver/configuration behavior remain unchanged. `AppModel` moves unchanged
+into PlatformServices, where its actual callers already live.
+
+The SDK automatically selects the existing application model using `UseWinUI`,
+`UseUwpTools`, early `UseUwp`, and classic `uap` inference. An explicit
+`UseUwpTools=false` remains an opt-out from early modern UWP inference.
+Selection is shared by ClassicEngine, NativeAOT, VSTest, existing generated-code
+helper injections, and central package management. This layer introduces no
+public override, new diagnostics, helper privacy/copy-local policy or builder-hook
+policy. Existing launch, activation, cancellation, handshake, exit aggregation
+and cleanup ownership are unchanged.
+
+Native/Bazel edits are limited to live source/type-owner references made invalid
+by deleting Extensions. New native UI archives, exact-range machinery and
+expanded validation belong to layer 4. SDK policy/composition coverage belongs
+to layer 3. No release-branch enablement or backport is made here; the series
+coordinator owns dependency flow, rollout and servicing decisions.
+
+## Research and decision
+
+2026-11-13: the initial clean parent and remote ref both identify
+`e22e899febaeee44ea3af385403e1c65c18164bb`. The frozen source ref and live
+[#12435](https://github.com/microsoft/testfx/pull/12435) head both identify
+`00428d48c212cf3630dcf6fa31d131c5ae745c98`.
+The carving input is
+`8dd78e1347417e400c3ef8d786059a8bb346162f...refs/pr-stack/source/12435`.
+Parent changes must be reconciled, not replaced with old snapshots.
+
+Keeping the original Extensions project would preserve the hidden UI
+asset-swapping package design.
+Copying the full source SDK/native policy would defeat the smaller review.
+The chosen boundary extracts the source's package owners and small exact-version
+packing hook, retaining existing runtime and helper policy. Ordinary adapter
+restore/build still expose UI variants; pack must narrow both NuGet's public
+framework list and Sdk.Extras' cached flavor matrix so UI payloads and dependency
+groups cannot leak.
+
+### 2026-11-16 maintenance and compatibility follow-through
+
+The maintenance rebase uses verified parent
+`984c2c635742d3d9699f488af36d25dff48e0f85`, which includes main
+`ddb33a558d5200030053e571dba7a65de476f317`. Main now requires the existing
+`MSTest.TestFramework.Extensions` non-UI type forwarders: removing that assembly
+would regress already-compiled `Microsoft.Playwright.MSTest.v4` consumers.
+This supersedes the earlier blanket clean-break decision for non-UI types only.
+
+The compatibility project has one dependency, on core. Core packing collects its
+same-TFM DLL and XML after the repository solution's complete Build phase, with
+an explicit missing-output error. The compatibility project is non-packable and
+is included in the actual solution/filter inputs. There is no reverse project
+reference, nested restore/build, new package, or UI asset selection in the facade.
+The existing exact package-shape verifier is retained and its affected baselines
+will be regenerated from the repacked products, not replaced with file counts.
+
+| Preserved contract | Focused evidence planned for this revision |
+| --- | --- |
+| Forwarded non-UI identity, no duplicate implementation | Existing `PackedExtensionsForwardMovedTypesToCore` rows, adapted to ordinary core assets and checking facade type definitions |
+| Already-compiled external consumers | Existing `PlaywrightSdkTests` under MTP and VSTest |
+| Exact core pin, UI isolation and consumed binaries | Existing package-content and `PackedConsumersUseSharedCoreAndSelectedUiPackage` cases, plus representative real UI consumers |
+| WinUI startup guard tests remain executable | Existing four `UITestMethodStartupWaitTests` cases; conditional new-owner reference and friend access only |
+
+The original Linux pack binlog records `NU5129` with the core entry item's
+`PackagePath=buildTransitive\`. The item now specifies its complete package
+filename, avoiding platform-dependent trailing-directory path handling.
+The original Windows unit build was reproduced: only the WinUI TFM failed with
+`CS0234` for `AppContainer`. The conditional new-owner reference and matching
+friend grant then built all five declared unit-test TFMs with zero warnings or
+errors. Markdown `MD018` was reproduced and corrected with an explicit PR link.
+These build/lint observations are not behavioral red-phase test evidence.
+
+Azure build 1683532 at `852e5580048a8f5aa0e74c1bd362bc3de76b2265`
+also exposed nine SDK evaluation rows restoring `MSTest.WinUI` on Linux, where
+`NonWindowsTests.slnf` intentionally does not produce that package. Only the six
+package-consuming test methods now require Windows-produced packed assets.
+All nine rows and assertions remain, including the explicit Unix MSBuild
+OS-property simulation executed on Windows. The console control stays
+cross-platform; no synthetic UI package or SDK selection policy is introduced.
+The acceptance-owner-only rebuild used `/p:BuildProjectReferences=false`, without
+rebuilding or repacking product code. Independent discovery and fresh TRX
+validation confirmed all nine guarded rows plus the console control executed and
+passed on Windows (10/10, zero skips), including the Unix/empty-controller row.
+Consumed SDK, core and WinUI package hashes match the preserved shipping packages.
+
+The dedicated facade builds all four declared TFMs. Its binaries contain only
+the `` type definition and respectively 5, 12, 6, and 6 forwarders for
+netstandard2.0, net462, net10.0, and net11.0. Eight ordinary public API baseline
+files were retained byte-for-byte, as were all 28 inert historical records from
+the released parent. No UI definition or resource is compiled into the facade.
+
+The 43-project actual-source solution filter passed the pinned Release repack,
+including strict metadata and updated exact package-shape validation. The first
+repack failed only because the old shapes still described the retired UI layout;
+regenerating those intentional shapes and repacking passed without suppressions.
+The four existing startup-guard tests were independently discovered and all four
+executed and passed, with no skips. These commands exited zero:
+
+```powershell
+.\build.cmd -c Release -msbuildEngine vs -projects src\TestFramework\TestFramework.Compatibility\TestFramework.Compatibility.csproj -bl
+.\build.cmd -c Release -msbuildEngine vs -projects test\UnitTests\MSTestAdapter.PlatformServices.UnitTests\MSTestAdapter.PlatformServices.UnitTests.csproj -bl
+.\eng\verify-nupkgs.ps1 -configuration Release -updateBaselines
+.\build.cmd -pack -c Release -msbuildEngine vs -projects artifacts\validation\layer2-maintenance-pack.slnf -bl
+.\build.cmd -c Release -msbuildEngine vs -projects artifacts\validation\layer2-maintenance-tests.slnf -bl
+```
+
+Final-head package consumption, execution counts, provenance, and remote CI will
+be recorded once performed. The older evidence in the next section remains
+historical; it does not prove the rebased facade layout.
+
+The first committed maintenance head,
+`a9406f988adb7cab787bddda02431ddfc232f948`, passed all 57 independently discovered
+package/consumer/Playwright cases, including all six precompiled Playwright rows
+and seven hashed ordinary/UI core consumers. Both packaged WinUI activation cases
+also passed, as did real modern UWP net10/net11, unsupported deployment, and
+unpackaged WinUI.
+
+Real classic UWP exposed a distinct facade-deployment defect: all three unchanged
+SDK/metapackage/direct-package cases executed and failed their layout assertion
+because `MSTest.TestFramework.Extensions.dll` was missing. The classic test source
+blob was `6dcd56b32e0b6b39715f13058ec669ce30878cc1`. Its binlog confirms that
+`ResolvePackageAssets` supplied the netstandard facade as `RuntimeCopyLocalItems`,
+but SDK-style UWP disables their default copying and the adapter's existing
+explicit runtime allowlist omitted it. The initial hypothesis that the old layout
+assertion should be renamed was rejected after this trace. The correction retains
+the assertion and adds only the facade to that existing UWP copy list; no new
+application-model or helper-copy policy is introduced.
+
+The same three retained tests then executed and passed after the pinned Release
+repack, with no skips and outer exit zero. The test blob stayed unchanged.
+Production patch SHA-256:
+`F68B4DAB401172220AEF0FDC59C2A328B83C5295CD15C3E365CEF26DA86B71D4`.
+The pre-fix outer run exited 2 with exactly the three missing-facade layout
+assertions; the fixed run exited 0 and also verified all six associated child
+results in each classic app. Both variants used separate fresh marked consumer
+caches and SDK `12.0.100-alpha.1.26562.108`.
+
+Before publication, main advanced once through the Arcade update
+[#12480](https://github.com/microsoft/testfx/pull/12480). The coordinator froze the
+maintenance wave on main `c094c9cfc610ed31cdb4d22877ad7ce26cd881a5` and released
+new shared-core parent `3af2ff923500f02dba67400a5a52f6d995d32097`. Its delta from
+the first parent contains only the four Arcade metadata/script files and no
+product/test source drift. The layer is replayed from the exact previous parent,
+not from an inferred fork. The results above remain earlier-wave evidence;
+final-new-pin pack and consumer results must be recorded separately.
+
+Corrected-head Linux shipping/attachment CI passed. Azure build 1683240 then
+exposed a separate sample-version regression: the three public UWP/WinUI samples
+still pin published MSTest/SDK 4.5.3, where the extracted package IDs do not exist.
+Unconditional new package references failed restore (`NU1101`), and the classic
+sample's explicit new Uwp DLL path failed copy (`MSB3030`). The samples now retain
+their original package references/UAP payload below major 5 and select the new
+owners for 5+, including prereleases. The actual MSBuild version intrinsic was
+checked with 4.5.3, 5.0.0-dev, and 5.0.0.
+
+All three actual public samples then restored/built with their published 4.5.3
+pins, warnings as errors, and binary logs (exit zero). Isolated short-path copies
+of the same source also restored/built against locally packed MSTest/SDK
+5.0.0-dev and aligned MTP 3.0.0-dev (exit zero). The VSTest host/object model was
+aligned with the producer's `MicrosoftNETTestSdkVersion`, 18.12.0. An initial
+attempt retaining the older public VSTest pin correctly failed restore with
+`NU1605`; it was a mixed-version setup failure, not a product red phase.
+The restored core/Uwp/WinUI/SDK package archives in the isolated cache match the
+shipping producer SHA-256 values. The correction changes neither SDK
+application-model policy nor package binaries.
+
+The same Azure build's Debug incrementality step found five exact coverage-XML
+assertions still referring to the retired project filename. The coverage emitter
+had lost the old assembly-name mapping, so the fixture produced
+`TestFramework.Extensions.dll` instead of `MSTest.TestFramework.Extensions.dll`.
+The fixture now uses the real replacement `TestFramework.Compatibility.csproj`,
+and its existing mapping names the facade assembly. No expected XML bytes, BOM,
+line endings, regex semantics, or timestamp assertions were weakened.
+With that retained migrated fixture (blob
+`c070441e074aefb7aa6add325ffee8583b8f6c43`), the focused
+`CoverageSettingsPreserveExactBytesAndTimestamp` case first executed and failed
+on the missing assembly-name mapping. Adding the one production metadata mapping
+then passed the existing complete harness: 12 executed, 12 passed, 0 failed,
+0 skipped. The harness stages isolated snapshots and preserves the actual task
+host/incrementality scenarios; it does not rebuild product assemblies.
+
+CI subsequently composed the stack with main
+`94711f3b4db336920e628039fdd54437458ae441` (#12490 and #12489). The coordinator
+explicitly advanced the bottom to that revision rather than discarding its
+restore/coverage and net462-timeout changes. The layer replay onto verified
+`500f4f0c50401dd1e1945a846b3d183a379d5ddf` preserved the upstream deterministic
+mapped-NuGet exclusion `^[\\/]_\d+[\\/].*` in both the production output and
+exact expected XML, alongside the facade assembly-name correction. The actual
+merged twelve-case incrementality harness passed all twelve cases with no
+skips. All six-build-validated sample project blobs and the existing managed
+product package hashes remained unchanged by that replay. These are explicit
+revision/source-equivalence checks, not a claim that older CI runs tested a
+later Git head.
+
+## Historical validation and demonstration
+
+| Requirement | Existing automated evidence | Surface / limitation |
+| --- | --- | --- |
+| Core/UI archive ownership, exact core dependency, no flavor leaks | `WindowsApplicationModelPackageTests` and physical package inspection | Physical nupkg entries and nuspec groups, not inferred project metadata |
+| Ordinary/direct/metapackage consumers use the shared core | `CoreFrameworkAssemblyTests`, `FrameworkTargetingTests` | Packed/cached/resolved/copied hashes and loaded identities |
+| Automatic SDK selection preserves existing applications | Existing UI and helper cases in `SdkTests` | Real packed SDK; expanded policy matrix deferred |
+| Classic/modern UWP and packaged/unpackaged WinUI still execute | Existing `ClassicUwpTests`, `ModernUwpTests`, `WinUITests`, `UnpackagedWinUITests`, `PackagedWinUITests` | Existing environment gates and owned activation lifecycle retained |
+| AppModel relocation and ordinary net462 behavior are preserved | `WinUIExtensionTests.UnpackagedProcessHasNoPackageIdentityOrPath`, existing net462 consumer | Reflection owner follows the actual assembly; no native baseline repair |
+
+Validation used Release outputs at shipping revision
+`f9708f5edbd37215b7e53cef840ef1e29ddf3f93`, SDK
+`12.0.100-alpha.1.26556.115` and desktop MSBuild `18.13.0`. The later evidence
+commit changes this record only. The populated producer cache was input, never
+cleared or copied; same-version consumers used fresh task-owned caches. Pack
+preceded consumers. Historical results from the unsplit source are not credited.
+
+The acceptance assemblies retain method-level, CPU-count parallelization.
+Generated consumers use per-invocation assets and isolated cache state; existing
+class exclusions for shared mutable app assets remain unchanged. The internal
+TestContainer engine is sequential. No scheduling declarations change.
+
+Package ownership is nonvisual; the archive/consumer transcript below is more
+useful than a staged screenshot. Real UI activation was exercised separately.
+
+The first pinned-script invocation did not start because the bounded PATH omitted
+Windows PowerShell; correcting that command-local path fixed setup. The clean
+baseline build then passed all four declared framework-test TFMs, and
+`WinUIExtensionTests.UnpackagedProcessHasNoPackageIdentityOrPath` executed
+**1 passed, 0 failed, 0 skipped** before relocation.
+
+The 36-project actual-source pack filter contained the ten MSTest package owners,
+their reference closure, the pack-time global-config generator, and packages
+unconditionally required by the existing acceptance fixture. The command
+`.\build.cmd -pack -c Release -msbuildEngine vs -projects artifacts\validation\layer2-pack.slnf -bl`
+exited **0**, with **0 warnings and 0 errors**, including the package content and
+metadata verifier. Core built four TFMs, each adapter/service still built all six
+Windows variants, and both classic/modern UWP plus WinUI package owners built.
+
+The native adaptation is separate from the substantive package extraction:
+15 existing source/layout/probe files and one matching unit-test fixture lose or
+replace obsolete owner references. Existing labels, target matrices, rule
+machinery, Hosting behavior and append-only app-model artifacts are retained.
+No native UI package production, range machinery or expanded validation is added.
+
+### Executed requirements
+
+Independent discovery and the strict TRX execution gate reconciled every primary
+selection: **71 executed, 71 passed, 0 failed, 0 skipped** (70 acceptance cases
+and one TestContainer case). These are not added to historical counts.
+
+| Requirement | Exact cases / observed result |
+| --- | --- |
+| Shared core and selected UI package, including net11 and explicit modern UWP opt-out | Six `CoreFrameworkAssemblyTests.PackedConsumersUseSharedCoreAndSelectedUiPackage` rows; packed/cached/resolved/copied hashes and loaded core/UI/resource paths matched. |
+| Ordinary net10/net11 runtime selection | Two `FrameworkTargetingTests.PackedPackages_UseMatchingFrameworkAssetsAndRuntime` rows passed. |
+| Physical archives, API availability, exact pin and flavor isolation | 21 selected `WindowsApplicationModelPackageTests` rows passed, including all three `PackedUIFramework_OwnsItsPayloadWithoutAnotherAdapter` rows. |
+| Unchanged runtime guards from layer 1 | `WinUITests.SimpleWinUITestCase` and `Deployment_Reflection`, `Deployment_Rooting`, `Deployment_ReflectionFree` passed. Each negative child produced its four associated deployment failures and one metadata-provider pass. |
+| Existing SDK selection, satellites, helper default and net462/configuration behavior | 25 selected SDK/net462 cases passed, including `MSTestSdk_UwpXamlReferencesWithoutUwpTools_BuildsAndRunsDirectMtpRunner`, `NetFrameworkCleanupFailureMessagesRetainBothMethodIdentities` and `TestDataSourceFromAppConfig`. The latter two intentionally assert failing children; their outer cases passed. |
+| Real classic UWP via SDK, metapackage and direct Uwp package | Three `ClassicUwp_ConsumesUapAssets_AndRunsPlainAndUiTestsThroughMtp` rows passed. Each recovered TRX had the exact plain/UI identities, 2 executed and 2 passed. |
+| Real modern UWP net10/net11 and unsupported deployment | `ModernUwp_Net10`, `ModernUwp_Net11`, `ModernUwp_UnsupportedDeployment` passed. Normal children had 2/2 passes; the negative child had 2 passes and the 2 expected inherited-deployment failures, with no body execution. |
+| Real unpackaged WinUI | `SelfHostedUnpackagedWinUI_RunsTests_AndProcessExits` passed. |
+| Real packaged SDK/direct WinUI | `PackagedFullTrustWinUI_RegistersActivatesConnectsBackRunsUiTestsAndCleansUp` and `PackagedAppContainerWinUI_ExplicitIntegrationPublishesTrx` passed. The direct AppContainer TRX associated all five expected identities with Passed. |
+| Existing generated-code helper flow and CPM | `MSTestSdk_SourceGenerationOptIn_DoesNotFlowTransitively` and both `JUnitReport_UsesPlatformVersion_WhenOptedIn` rows passed. The helper retains its existing adapter dependency; no layer-3 privacy policy is introduced. |
+| Unchanged AppModel implementation, new reflection owner | `UnpackagedProcessHasNoPackageIdentityOrPath`: 1/1 green before and after relocation. The source blob remains `9efd65874c58227c59de033a4568f7501aa085cf`. |
+
+Real consumer manifests selected classic `lib/netstandard2.0` core and
+`MSTest.Uwp/lib/uap10.0.16299`; modern net10/net11 core came from the corresponding
+ordinary lib folder with Uwp's net10 Windows assets; WinUI used its own normalized
+net10 Windows folder. Cached core/Uwp/WinUI/SDK/metapackage archive hashes matched
+the current producer. All 28 archived API files were byte-identical moves.
+
+The initial real-app attempt used an unnecessarily long task cache: XAML
+references reached 277 characters and the controller loader also failed to open
+present files. Fresh short caches reduced the longest inspected WinUI reference
+to 240 characters. The same real-app selections then passed without any product
+or test-source change. These setup failures are not behavioral red proof.
+Preflight and the final registration leak check both exited 0; no reserved test
+package registration remained. Owned diagnostics and caches are retained.
+
+### Commands and retained inputs
+
+All commands ran from their owning worktree with a bounded command-local PATH.
+The exact generated filters, independent discovery, run manifests, binlogs and
+TRX are retained under `artifacts/validation` and `artifacts/TestResults/Release`.
+The generated pack filter enumerates actual `TestFx.slnx` projects, not source
+globs or globally overridden target frameworks. The test filter names the three
+actual framework/MSTest/MTP acceptance owners.
+
+```powershell
+.\build.cmd -pack -c Release -msbuildEngine vs -projects artifacts\validation\layer2-pack.slnf -bl
+.\build.cmd -c Release -msbuildEngine vs -projects artifacts\validation\layer2-tests.slnf -bl
+.\build.cmd -c Release -msbuildEngine vs -projects test\UnitTests\TestFramework.UnitTests\TestFramework.UnitTests.csproj -bl
+```
+
+Each exited 0 with no warnings/errors. The first command was repeated after the
+shipping checkpoint was pushed. Each acceptance selection used this command,
+with its independently discovered filter and its own result/binlog path:
+
+```powershell
+.\.dotnet\dotnet.exe test --project $project -c Release --no-build --filter $filter -p:UsingDotNetTest=true "-p:ArtifactsTestResultsDir=$results" "-bl:$binlog" --show-test-results all
+```
+
+The MSTest acceptance selections were contract (33), SDK/net462 (25), real UWP
+and unpackaged WinUI (7), generated-code helper (1), and CPM/non-CPM (2). The MTP
+acceptance selection was packaged SDK/direct WinUI (2). All exited 0. The direct
+framework host used
+`--filter-uid Microsoft.VisualStudio.TestPlatform.TestFramework.UnitTests.Extensions.WinUIExtensionTests.UnpackagedProcessHasNoPackageIdentityOrPath --report-trx`
+before and after; both exited 0. Packed SDK XML inspection also verified that
+ClassicEngine, NativeAOT, VSTest and existing helper injections use the same
+private package-id property for both PackageReference and CPM PackageVersion.
+This static check is not a new NativeAOT/composition execution matrix.
+
+### Test-value evidence
+
+The outside-repository comparison retained the same test source blob
+`68740964bb4d22979e5a197dc9b46dffd4e55a35` and source revision
+`f9708f5edbd37215b7e53cef840ef1e29ddf3f93`. Its only mutation removed the eight-line
+`_AlignMSTestPlatformPackageCoreVersion` packing target; patch SHA-256:
+`782C978E864EE5D000D0C9EF4645FFCB16BD7F4F033057747872C89934910676`.
+The primary worktree was never mutated for this experiment.
+
+Both counterfactual and restored states rebuilt/repacked with the same 36-project
+pack command above (exit 0). The unchanged acceptance owner also rebuilt (exit 0).
+The same selector was used in both states:
+
+```powershell
+$filter = 'FullyQualifiedName~WindowsApplicationModelPackageTests.PackedUIFramework_OwnsItsPayloadWithoutAnotherAdapter'
+```
+
+| Contract | Without behavior | Correct implementation |
+| --- | --- | --- |
+| Exact core pin, classic/modern Uwp and WinUI | Executed: detected. 3 selected/executed/failed, 0 skipped, outer exit 2. Every failure was the exact-range assertion: expected `[5.0.0-dev]`, actual `5.0.0-dev`. | Executed: 3 selected/executed/passed, 0 skipped, outer exit 0, after restoration and repack. |
+| AppModel relocation | Preservation baseline: 1 passed. | 1 passed with the reflection owner changed to PlatformServices. |
+| Other archive/routing/runtime contracts | Separate behavior-removal mutations were not executed. | The named real consumers and archive checks above passed; no broader mutation claim is made. |
+
+Red archives, both paired reports, fresh run-owned caches, the exact mutation,
+commands and package hashes are retained. The comparison source was restored
+cleanly. The negative run did not rely on compilation/setup failures or skips.
+
+### Primary package identity
+
+All four packages are `5.0.0-dev`; the aligned MTP runtime family is `3.0.0-dev`.
+
+| Package | Physical files | SHA-256 |
+| --- | ---: | --- |
+| MSTest.TestFramework | 67 | `D2EE5D08A2CBB07F1B121BF45638D91B379A9786DF97600BFEDB35683E6AF6EF` |
+| MSTest.TestAdapter | 54 | `D92345C1F377777D90211009BEAD6F2357DC0A22C1BA3AAF0EABF7542CED416C` |
+| MSTest.Uwp | 73 | `CACA4C1F125823A65098CAE676F154529BD945B358400E6A7D4B3C6D990B0EC2` |
+| MSTest.WinUI | 53 | `71499BFDCF652259B4A09CFA9CCAA7E1E80CB5DA743FF0F1CECBC713127A484C` |
+
+## Open questions and deferred proof
+
+The historical checkpoint below was followed by the maintenance fixes and
+compatibility follow-through above. Its old results do not prove live CI execution,
+full native Bazel execution, x86/ARM64 activation, native shipping .NET 10 SDK
+runner interoperability and release-branch/backport validation are not claimed.
+The known native net462 PlatformServices System.Reflection.Metadata failure has
+only static baseline attribution and was not repaired or experimentally chased.
+The coordinator retains downstream rollout/servicing ownership; layers 3 and 4
+retain their explicitly deferred policy/native-package responsibilities.
diff --git a/docs/winui-testing.md b/docs/winui-testing.md
index ef58543f3e..985fe68baf 100644
--- a/docs/winui-testing.md
+++ b/docs/winui-testing.md
@@ -23,7 +23,7 @@ A packaged WinUI 3 desktop app is full trust by default. Packaging gives it iden
`Microsoft.Testing.Extensions.PackagedApp` supports both full-trust and AppContainer hosts end to end. `Microsoft.Testing.Extensions.PackagedApp.MSBuild` supplies the full-trust sidecar controller, selects the packaged test executable explicitly, and ships the UAP-compatible bootstrap. `MSTest.Sdk` references that integration package automatically; the adapter supplies classic UWP's runtime assets.
-### Explicit metapackage or adapter integration
+### Explicit UI-package integration
Projects using `Microsoft.NET.Sdk` or `MSBuild.Sdk.Extras` instead of `MSTest.Sdk`
can reference the same integration package explicitly:
@@ -35,13 +35,16 @@ can reference the same integration package explicitly:
true
-
-
+
+
```
-The `MSTest` reference can be replaced with explicit `MSTest.TestAdapter` and
-`MSTest.TestFramework` references. Preserve the application's WinUI/UWP build
+For UWP, replace `MSTest.WinUI` with `MSTest.Uwp`. These MSTest 5 packages own the
+UI attributes and matching adapter/services and depend on the exact matching
+`MSTest.TestFramework` version. Do not combine them with `MSTest.TestAdapter`
+or the modern `MSTest` metapackage; classic UAP metapackage consumers select
+`MSTest.Uwp` through their UAP dependency group. Preserve the application's WinUI/UWP build
settings and `OnLaunched` bootstrap, then execute
`msbuild MyTests.csproj -t:InvokeTestingPlatform`. Desktop MSBuild and
`dotnet msbuild` both reuse `InvokeTestingPlatformTask` to launch the controller
diff --git a/eng/bazel/SdkPackageTool.cs b/eng/bazel/SdkPackageTool.cs
index 5167a24eb9..cf7cbc037d 100644
--- a/eng/bazel/SdkPackageTool.cs
+++ b/eng/bazel/SdkPackageTool.cs
@@ -193,8 +193,9 @@ static Dependency[] MetaPackageDependencies(XElement project, Dictionary(StringComparer.Ordinal)
{
- ["$(RepoRoot)src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj"] = ("MSTest.TestAdapter", versions["MSTestVersion"], ""),
- ["$(RepoRoot)src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj"] = ("MSTest.TestFramework", versions["MSTestVersion"], ""),
+ ["$(RepoRoot)src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj"] = ("MSTest.TestAdapter", versions["MSTestVersion"], "'$(TargetFramework)'!='$(UwpMinimum)'"),
+ ["$(RepoRoot)src/TestFramework/MSTest.Uwp/MSTest.Uwp.csproj"] = ("MSTest.Uwp", versions["MSTestVersion"], "'$(TargetFramework)'=='$(UwpMinimum)'"),
+ ["$(RepoRoot)src/TestFramework/TestFramework/TestFramework.csproj"] = ("MSTest.TestFramework", versions["MSTestVersion"], ""),
["$(RepoRoot)src/Platform/Microsoft.Testing.Extensions.TrxReport/Microsoft.Testing.Extensions.TrxReport.csproj"] = ("Microsoft.Testing.Extensions.TrxReport", versions["MicrosoftTestingPlatformVersion"], "'$(TargetFramework)'!='$(UwpMinimum)'"),
};
var dependencies = new List();
@@ -207,7 +208,10 @@ static Dependency[] MetaPackageDependencies(XElement project, Dictionary -updateBaselines
+Icon.png
+MSTest.Uwp.nuspec
+PACKAGE.md
+[Content_Types].xml
+_rels/.rels
+buildTransitive/net10.0-windows10.0.17763/MSTest.TestAdapter.dll
+buildTransitive/net10.0-windows10.0.17763/MSTest.Uwp.props
+buildTransitive/net10.0-windows10.0.17763/MSTest.Uwp.targets
+buildTransitive/net10.0-windows10.0.17763/MSTestAdapter.PlatformServices.dll
+buildTransitive/net10.0-windows10.0.17763/Parallelize.targets
+buildTransitive/net10.0-windows10.0.17763/_localization/cs/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/cs/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/de/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/de/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/es/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/es/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/fr/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/fr/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/it/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/it/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/ja/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/ja/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/ko/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/ko/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/pl/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/pl/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/pt-BR/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/pt-BR/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/ru/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/ru/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/tr/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/tr/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/zh-Hans/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/zh-Hans/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/zh-Hant/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.17763/_localization/zh-Hant/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/uap10.0.16299/MSTest.TestAdapter.dll
+buildTransitive/uap10.0.16299/MSTest.Uwp.props
+buildTransitive/uap10.0.16299/MSTest.Uwp.targets
+buildTransitive/uap10.0.16299/MSTestAdapter.PlatformServices.dll
+buildTransitive/uap10.0.16299/Parallelize.targets
+buildTransitive/uap10.0.16299/_localization/cs/MSTest.TestAdapter.resources.dll
+buildTransitive/uap10.0.16299/_localization/cs/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/uap10.0.16299/_localization/de/MSTest.TestAdapter.resources.dll
+buildTransitive/uap10.0.16299/_localization/de/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/uap10.0.16299/_localization/es/MSTest.TestAdapter.resources.dll
+buildTransitive/uap10.0.16299/_localization/es/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/uap10.0.16299/_localization/fr/MSTest.TestAdapter.resources.dll
+buildTransitive/uap10.0.16299/_localization/fr/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/uap10.0.16299/_localization/it/MSTest.TestAdapter.resources.dll
+buildTransitive/uap10.0.16299/_localization/it/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/uap10.0.16299/_localization/ja/MSTest.TestAdapter.resources.dll
+buildTransitive/uap10.0.16299/_localization/ja/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/uap10.0.16299/_localization/ko/MSTest.TestAdapter.resources.dll
+buildTransitive/uap10.0.16299/_localization/ko/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/uap10.0.16299/_localization/pl/MSTest.TestAdapter.resources.dll
+buildTransitive/uap10.0.16299/_localization/pl/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/uap10.0.16299/_localization/pt-BR/MSTest.TestAdapter.resources.dll
+buildTransitive/uap10.0.16299/_localization/pt-BR/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/uap10.0.16299/_localization/ru/MSTest.TestAdapter.resources.dll
+buildTransitive/uap10.0.16299/_localization/ru/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/uap10.0.16299/_localization/tr/MSTest.TestAdapter.resources.dll
+buildTransitive/uap10.0.16299/_localization/tr/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/uap10.0.16299/_localization/zh-Hans/MSTest.TestAdapter.resources.dll
+buildTransitive/uap10.0.16299/_localization/zh-Hans/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/uap10.0.16299/_localization/zh-Hant/MSTest.TestAdapter.resources.dll
+buildTransitive/uap10.0.16299/_localization/zh-Hant/MSTestAdapter.PlatformServices.resources.dll
+lib/net10.0-windows10.0.17763/MSTest.Uwp.dll
+lib/net10.0-windows10.0.17763/MSTest.Uwp.xml
+lib/uap10.0.16299/MSTest.Uwp.dll
+lib/uap10.0.16299/MSTest.Uwp.pri
+lib/uap10.0.16299/MSTest.Uwp.xml
+package/services/metadata/core-properties/{guid}.psmdcp
diff --git a/eng/package-shapes/MSTest.WinUI.txt b/eng/package-shapes/MSTest.WinUI.txt
new file mode 100644
index 0000000000..a863b0e1e9
--- /dev/null
+++ b/eng/package-shapes/MSTest.WinUI.txt
@@ -0,0 +1,55 @@
+# Expected files of the MSTest.WinUI NuGet package, validated by eng/verify-nupkgs.ps1 after pack.
+# After an intentional package layout change, regenerate with: .\eng\verify-nupkgs.ps1 -configuration -updateBaselines
+Icon.png
+MSTest.WinUI.nuspec
+PACKAGE.md
+[Content_Types].xml
+_rels/.rels
+buildTransitive/net10.0-windows10.0.18362/MSTest.TestAdapter.dll
+buildTransitive/net10.0-windows10.0.18362/MSTest.WinUI.props
+buildTransitive/net10.0-windows10.0.18362/MSTest.WinUI.targets
+buildTransitive/net10.0-windows10.0.18362/MSTestAdapter.PlatformServices.dll
+buildTransitive/net10.0-windows10.0.18362/Parallelize.targets
+buildTransitive/net10.0-windows10.0.18362/_localization/cs/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/cs/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/de/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/de/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/es/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/es/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/fr/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/fr/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/it/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/it/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/ja/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/ja/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/ko/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/ko/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/pl/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/pl/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/pt-BR/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/pt-BR/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/ru/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/ru/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/tr/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/tr/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/zh-Hans/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/zh-Hans/MSTestAdapter.PlatformServices.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/zh-Hant/MSTest.TestAdapter.resources.dll
+buildTransitive/net10.0-windows10.0.18362/_localization/zh-Hant/MSTestAdapter.PlatformServices.resources.dll
+lib/net10.0-windows10.0.18362/MSTest.WinUI.dll
+lib/net10.0-windows10.0.18362/MSTest.WinUI.pri
+lib/net10.0-windows10.0.18362/MSTest.WinUI.xml
+lib/net10.0-windows10.0.18362/cs/MSTest.WinUI.resources.dll
+lib/net10.0-windows10.0.18362/de/MSTest.WinUI.resources.dll
+lib/net10.0-windows10.0.18362/es/MSTest.WinUI.resources.dll
+lib/net10.0-windows10.0.18362/fr/MSTest.WinUI.resources.dll
+lib/net10.0-windows10.0.18362/it/MSTest.WinUI.resources.dll
+lib/net10.0-windows10.0.18362/ja/MSTest.WinUI.resources.dll
+lib/net10.0-windows10.0.18362/ko/MSTest.WinUI.resources.dll
+lib/net10.0-windows10.0.18362/pl/MSTest.WinUI.resources.dll
+lib/net10.0-windows10.0.18362/pt-BR/MSTest.WinUI.resources.dll
+lib/net10.0-windows10.0.18362/ru/MSTest.WinUI.resources.dll
+lib/net10.0-windows10.0.18362/tr/MSTest.WinUI.resources.dll
+lib/net10.0-windows10.0.18362/zh-Hans/MSTest.WinUI.resources.dll
+lib/net10.0-windows10.0.18362/zh-Hant/MSTest.WinUI.resources.dll
+package/services/metadata/core-properties/{guid}.psmdcp
diff --git a/eng/test-build-incrementality.ps1 b/eng/test-build-incrementality.ps1
index e9745a961e..0baebd461a 100644
--- a/eng/test-build-incrementality.ps1
+++ b/eng/test-build-incrementality.ps1
@@ -263,7 +263,7 @@ function New-CoverageFixture {
-
+
diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1
index 0bb53914d0..d9ff4ecc7b 100644
--- a/eng/verify-nupkgs.ps1
+++ b/eng/verify-nupkgs.ps1
@@ -125,6 +125,8 @@ function Confirm-NugetPackages {
"MSTest.SourceGeneration"
"MSTest.TestAdapter"
"MSTest.TestFramework"
+ "MSTest.Uwp"
+ "MSTest.WinUI"
"MSTest.Windows.UIAutomation"
)
# These packages include PDBs only in some build modes; validate their stable non-symbol payload.
diff --git a/samples/public/ClassicUwpMtpApp/ClassicUwpMtpApp.csproj b/samples/public/ClassicUwpMtpApp/ClassicUwpMtpApp.csproj
index dea6638629..c4ab03d575 100644
--- a/samples/public/ClassicUwpMtpApp/ClassicUwpMtpApp.csproj
+++ b/samples/public/ClassicUwpMtpApp/ClassicUwpMtpApp.csproj
@@ -43,7 +43,7 @@
-
+
@@ -52,6 +52,15 @@
CopyToOutputDirectory="PreserveNewest" />
+
+
+
+
+
+
+
+
+
diff --git a/samples/public/WinUIVSTestApp/WinUIVSTestApp.csproj b/samples/public/WinUIVSTestApp/WinUIVSTestApp.csproj
index 4751fd830c..7775d8a652 100644
--- a/samples/public/WinUIVSTestApp/WinUIVSTestApp.csproj
+++ b/samples/public/WinUIVSTestApp/WinUIVSTestApp.csproj
@@ -50,6 +50,11 @@
+
+
+
+
diff --git a/src/Adapter/MSTest.Extensions.Hosting/MSTest.Extensions.Hosting.csproj b/src/Adapter/MSTest.Extensions.Hosting/MSTest.Extensions.Hosting.csproj
index 6714e32a51..2889d081c7 100644
--- a/src/Adapter/MSTest.Extensions.Hosting/MSTest.Extensions.Hosting.csproj
+++ b/src/Adapter/MSTest.Extensions.Hosting/MSTest.Extensions.Hosting.csproj
@@ -36,9 +36,7 @@ $(CommonProductDescription)]]>
-
-
-
+
diff --git a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj
index 4c32f71781..11012f8c26 100644
--- a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj
+++ b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj
@@ -28,14 +28,11 @@
false
MSTest.TestAdapter
$(CommonPackageTags) MSTest TestFramework TestAdapter VisualStudio MSTestV2
-
@@ -70,46 +67,21 @@ $(CommonProductDescription)]]>
dependency: PrivateAssets="all" suppresses the dependency (and its transitive package dependencies). -->
-
-
-
-
- none
-
-
-
-
- none
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
@@ -169,15 +141,10 @@ $(CommonProductDescription)]]>
-
-
-
-
-
@@ -211,7 +176,6 @@ $(CommonProductDescription)]]>
-
@@ -219,6 +183,42 @@ $(CommonProductDescription)]]>
+
+
+
+ <_MSTestAdapterBuildFlavor Include="@(_SdkProjectFlavorMatrixItem)" />
+ <_SdkProjectFlavorMatrixItem Remove="@(_SdkProjectFlavorMatrixItem)"
+ Condition=" '%(_SdkProjectFlavorMatrixItem.TargetFramework)' == '$(UwpMinimum)'
+ OR '%(_SdkProjectFlavorMatrixItem.TargetFramework)' == '$(ModernUwpMinimum)'
+ OR '%(_SdkProjectFlavorMatrixItem.TargetFramework)' == '$(WinUiMinimum)' " />
+ <_FrameworksWithSuppressedDependencies Include="$(UwpMinimum);$(ModernUwpMinimum);$(WinUiMinimum)" />
+
+
+
+
+
+
+ <_MSTestAdapterBuildFrameworks>$(TargetFrameworks)
+ $(SupportedNetFrameworks)
+ $(NetFrameworkMinimum);$(TargetFrameworks)
+
+
+
+
+
+ $(_MSTestAdapterBuildFrameworks)
+
+
+ <_SdkProjectFlavorMatrixItem Remove="@(_SdkProjectFlavorMatrixItem)" />
+ <_SdkProjectFlavorMatrixItem Include="@(_MSTestAdapterBuildFlavor)" />
+
+
+
PreserveNewest
diff --git a/src/Adapter/MSTest.TestAdapter/PACKAGE.md b/src/Adapter/MSTest.TestAdapter/PACKAGE.md
index 6bafa986c6..7e9a28aaed 100644
--- a/src/Adapter/MSTest.TestAdapter/PACKAGE.md
+++ b/src/Adapter/MSTest.TestAdapter/PACKAGE.md
@@ -24,17 +24,12 @@ Supported platforms:
- .NET 4.6.2+
- .NET 10.0+
-- .NET 10.0 Windows.18362+ (WinUI)
-- UWP 10.0.16299
-- UWP 10.0.17763 with .NET 10+
-## Classic UWP dependencies
-
-The classic UWP adapter payload contains the adapter and its platform-services
-assembly. Microsoft.Testing.Platform and its extensions are restored from their
-own NuGet packages rather than duplicated inside this package. The classic UWP
-bootstrap also depends on the TRX reporting and Retry packages. The adapter's
-build targets include the resolved runtime assemblies in the AppX deployment.
+Use `MSTest.Uwp` for classic or modern UWP applications and `MSTest.WinUI` for
+packaged or unpackaged WinUI applications. Those packages own their matching
+UI attributes, adapters, platform services and satellites. This ordinary adapter
+no longer switches assemblies based on `UseWinUI` or `UseUwpTools`; do not
+combine it with either UI package.
## F# modules
diff --git a/src/Adapter/MSTest.TestAdapter/PackageDependencies.props b/src/Adapter/MSTest.TestAdapter/PackageDependencies.props
new file mode 100644
index 0000000000..ff3e824f6e
--- /dev/null
+++ b/src/Adapter/MSTest.TestAdapter/PackageDependencies.props
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+ none
+
+
+ none
+
+
+
+
+
+
+
diff --git a/src/Adapter/MSTest.TestAdapter/build/uap10.0/MSTest.TestAdapter.props b/src/Adapter/MSTest.TestAdapter/build/uap10.0/MSTest.TestAdapter.props
deleted file mode 100644
index f15322b9ac..0000000000
--- a/src/Adapter/MSTest.TestAdapter/build/uap10.0/MSTest.TestAdapter.props
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/Adapter/MSTest.TestAdapter/build/uap10.0/MSTest.TestAdapter.targets b/src/Adapter/MSTest.TestAdapter/build/uap10.0/MSTest.TestAdapter.targets
deleted file mode 100644
index 699a1cdcd9..0000000000
--- a/src/Adapter/MSTest.TestAdapter/build/uap10.0/MSTest.TestAdapter.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/Adapter/MSTest.TestAdapter/buildTransitive/common/MSTest.TestAdapter.targets b/src/Adapter/MSTest.TestAdapter/buildTransitive/common/MSTest.TestAdapter.targets
index 300f3a050a..58e56aa7f3 100644
--- a/src/Adapter/MSTest.TestAdapter/buildTransitive/common/MSTest.TestAdapter.targets
+++ b/src/Adapter/MSTest.TestAdapter/buildTransitive/common/MSTest.TestAdapter.targets
@@ -14,26 +14,17 @@
false
-
- <_TestAdapterPlatformServicesRoot>$(MSBuildThisFileDirectory)../net10.0/winui/
-
-
-
- <_TestAdapterPlatformServicesRoot>$(MSBuildThisFileDirectory)../net10.0/uwp/
-
-
- <_TestAdapterPlatformServicesRoot>$(MSBuildThisFileDirectory)
+
+ <_MSTestAdapterPayloadRoot Condition=" '$(_MSTestAdapterPayloadRoot)' == '' ">$(MSBuildThisFileDirectory)
+ <_MSTestAdapterLocalizationRoot Condition=" '$(_MSTestAdapterLocalizationRoot)' == '' ">$(MSBuildThisFileDirectory)..\_localization\
- $(_TestAdapterPlatformServicesRoot)MSTest.TestAdapter.dll
+ $(_MSTestAdapterPayloadRoot)MSTest.TestAdapter.dll
- $(_TestAdapterPlatformServicesRoot)MSTestAdapter.PlatformServices.dll
+ $(_MSTestAdapterPayloadRoot)MSTestAdapter.PlatformServices.dll
@@ -73,7 +64,7 @@
-->
<_MSTestSatelliteResourceLanguages Include="$(SatelliteResourceLanguages)" />
- <_MSTestV2Files Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\_localization'))\**\*.dll" />
+ <_MSTestV2Files Include="$(_MSTestAdapterLocalizationRoot)**\*.dll" />
<_MSTestV2Files Update="@(_MSTestV2Files)">
@@ -105,7 +96,7 @@
Inputs/Outputs of CopyMSTestV2Resources are evaluated for incremental build.
-->
- <_MSTestV2Files Include="$(MSBuildThisFileDirectory)..\_localization\%(CurrentUICultureHierarchy.Identity)\*.dll">
+ <_MSTestV2Files Include="$(_MSTestAdapterLocalizationRoot)%(CurrentUICultureHierarchy.Identity)\*.dll">
%(CurrentUICultureHierarchy.Identity)\
$([System.String]::Copy('%(CurrentUICultureHierarchy.Identity)').ToLowerInvariant())
diff --git a/src/Adapter/MSTest.TestAdapter/buildTransitive/uwp/MSTest.TestAdapter.targets b/src/Adapter/MSTest.TestAdapter/buildTransitive/uwp/MSTest.TestAdapter.targets
index 5c96cf2b87..a36ad463b8 100644
--- a/src/Adapter/MSTest.TestAdapter/buildTransitive/uwp/MSTest.TestAdapter.targets
+++ b/src/Adapter/MSTest.TestAdapter/buildTransitive/uwp/MSTest.TestAdapter.targets
@@ -10,10 +10,10 @@
- $(MSBuildThisFileDirectory)MSTest.TestAdapter.dll
+ $(_MSTestAdapterPayloadRoot)MSTest.TestAdapter.dll
- $(MSBuildThisFileDirectory)MSTestAdapter.PlatformServices.dll
+ $(_MSTestAdapterPayloadRoot)MSTestAdapter.PlatformServices.dll
@@ -32,6 +32,7 @@
OR '%(_MSTestUwpRuntimeDependency.Filename)' == 'Microsoft.Testing.Extensions.TrxReport.Abstractions'
OR '%(_MSTestUwpRuntimeDependency.Filename)' == 'Microsoft.Testing.Extensions.TrxReport'
OR '%(_MSTestUwpRuntimeDependency.Filename)' == 'Microsoft.Testing.Platform'
+ OR '%(_MSTestUwpRuntimeDependency.Filename)' == 'MSTest.TestFramework.Extensions'
OR '%(_MSTestUwpRuntimeDependency.Filename)' == 'Microsoft.TestPlatform.CoreUtilities'
OR '%(_MSTestUwpRuntimeDependency.Filename)' == 'Microsoft.TestPlatform.PlatformAbstractions'
OR '%(_MSTestUwpRuntimeDependency.Filename)' == 'Microsoft.VisualStudio.TestPlatform.ObjectModel' ">
@@ -60,7 +61,7 @@
Every requested localized satellite must be copied to the output directory so any selected culture can be resolved at run time.
-->
- <_MSTestV2Files Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\_localization'))\**\*.dll" />
+ <_MSTestV2Files Include="$(_MSTestAdapterLocalizationRoot)**\*.dll" />
<_MSTestV2Files Update="@(_MSTestV2Files)">
@@ -92,7 +93,7 @@
Inputs/Outputs of CopyMSTestV2Resources are evaluated for incremental build.
-->
- <_MSTestV2Files Include="$(MSBuildThisFileDirectory)..\_localization\%(CurrentUICultureHierarchy.Identity)\*.dll">
+ <_MSTestV2Files Include="$(_MSTestAdapterLocalizationRoot)%(CurrentUICultureHierarchy.Identity)\*.dll">
%(CurrentUICultureHierarchy.Identity)
$([System.String]::Copy('%(CurrentUICultureHierarchy.Identity)').ToLowerInvariant())
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/InternalAPI/InternalAPI.Unshipped.txt b/src/Adapter/MSTestAdapter.PlatformServices/InternalAPI/InternalAPI.Unshipped.txt
index f0b4ea9b4b..f436607902 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/InternalAPI/InternalAPI.Unshipped.txt
+++ b/src/Adapter/MSTestAdapter.PlatformServices/InternalAPI/InternalAPI.Unshipped.txt
@@ -1,4 +1,7 @@
#nullable enable
+Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.AppContainer.AppModel
+static Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.AppContainer.AppModel.GetCurrentPackagePath() -> string?
+static Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.AppContainer.AppModel.IsPackagedProcess() -> bool
override Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.TestContextImplementation.TestRunDirectory.get -> string?
override Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.TestContextImplementation.DeploymentDirectory.get -> string?
override Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.TestContextImplementation.ResultsDirectory.get -> string?
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/MSTestAdapter.PlatformServices.csproj b/src/Adapter/MSTestAdapter.PlatformServices/MSTestAdapter.PlatformServices.csproj
index c985b6d70d..0681bd4344 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/MSTestAdapter.PlatformServices.csproj
+++ b/src/Adapter/MSTestAdapter.PlatformServices/MSTestAdapter.PlatformServices.csproj
@@ -38,7 +38,7 @@
-
+
diff --git a/src/TestFramework/TestFramework.Extensions/AppModel.cs b/src/Adapter/MSTestAdapter.PlatformServices/Services/AppModel.cs
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/AppModel.cs
rename to src/Adapter/MSTestAdapter.PlatformServices/Services/AppModel.cs
diff --git a/src/Package/MSTest.Sdk/PACKAGE.md b/src/Package/MSTest.Sdk/PACKAGE.md
index 0cb0ac57e8..d38fff681e 100644
--- a/src/Package/MSTest.Sdk/PACKAGE.md
+++ b/src/Package/MSTest.Sdk/PACKAGE.md
@@ -28,6 +28,12 @@ For package identity, AUMID activation, unpackaged WinUI, UWP launch activation,
AppContainer security guidance, see
[Testing UWP and WinUI apps with MSTest](https://github.com/microsoft/testfx/blob/main/docs/winui-testing.md).
+The SDK selects `MSTest.WinUI` for `UseWinUI=true`, `MSTest.Uwp` for UWP tooling
+or classic UAP targets, and `MSTest.TestAdapter` otherwise. Early `UseUwp=true`
+also selects UWP unless `UseUwpTools=false` is explicit. All use the same
+`MSTest.TestFramework` core; UI applications no longer swap hidden Extensions
+assemblies. Direct-package consumers should use the matching UI package.
+
For packaged Windows applications, the SDK references
`Microsoft.Testing.Extensions.PackagedApp.MSBuild` from the aligned MTP release.
That separately shipped package owns the full-trust controller, shared launch
diff --git a/src/Package/MSTest.Sdk/README.md b/src/Package/MSTest.Sdk/README.md
index 123133fb84..229737bc88 100644
--- a/src/Package/MSTest.Sdk/README.md
+++ b/src/Package/MSTest.Sdk/README.md
@@ -28,7 +28,12 @@ Specify the SDK version in the `Sdk` attribute (`MSTest.Sdk/x.y.z`) or through t
MSTest.Sdk uses Microsoft.Testing.Platform by default for unpackaged WinUI, packaged full-trust WinUI, AppContainer-configured WinUI, modern UWP (`UseUwpTools=true`), and classic `uap10.0` projects. For packaged applications it references `Microsoft.Testing.Extensions.PackagedApp.MSBuild`, which supplies the full-trust app-model controller and shared launch targets. That controller registers the package and activates the exact manifest application by AUMID while retaining MTP-owned cancellation, reports, retries, and exit-code handling. The SDK itself does not duplicate the tool payload. The integration package ships in the aligned MTP release and can also be referenced explicitly by MSTest metapackage or adapter-only consumers.
-`UseUwp=true` adds UWP XAML references. The desktop Visual Studio UWP targets enable `UseUwpTools` after MSTest.Sdk declares its package references and before the packages select their specialized UWP assemblies. MSTest.Sdk preserves the UWP application model during that earlier evaluation when `UseUwp=true` and `UseUwpTools` is still unset. Set `UseUwpTools=false` explicitly to use the references without UWP package activation; this selects the ordinary MSTest assemblies and direct MTP runner unless another packaged application model is configured.
+The SDK selects `MSTest.WinUI` for `UseWinUI=true`, `MSTest.Uwp` for UWP, and
+`MSTest.TestAdapter` for ordinary applications. Each uses the shared
+`MSTest.TestFramework` core rather than swapping hidden Extensions assemblies.
+Direct-package UI consumers must reference the corresponding UI package.
+
+`UseUwp=true` adds UWP XAML references. The desktop Visual Studio UWP targets enable `UseUwpTools` after MSTest.Sdk declares its package references. MSTest.Sdk selects `MSTest.Uwp` during that earlier evaluation when `UseUwp=true` and `UseUwpTools` is still unset, and for classic UAP targets. Set `UseUwpTools=false` explicitly to use the references without modern UWP package activation; this selects the ordinary adapter and direct MTP runner unless another packaged application model is configured.
Unsigned build-output layouts require Windows Developer Mode or sideloading. UWP builds still require the Visual Studio UWP/MSBuild workload, but they do not require `Microsoft.NET.Test.Sdk`, `vstest.console`, or the Visual Studio UWP test-host runtime provider. See [Testing UWP and WinUI apps with MSTest](../../../docs/winui-testing.md).
diff --git a/src/Package/MSTest.Sdk/Sdk/Runner/ClassicEngine.targets b/src/Package/MSTest.Sdk/Sdk/Runner/ClassicEngine.targets
index 7bcddec8e9..55da144460 100644
--- a/src/Package/MSTest.Sdk/Sdk/Runner/ClassicEngine.targets
+++ b/src/Package/MSTest.Sdk/Sdk/Runner/ClassicEngine.targets
@@ -85,10 +85,10 @@
-
+
$(MSTestVersion)
-
diff --git a/src/Package/MSTest.Sdk/Sdk/Runner/NativeAOT.targets b/src/Package/MSTest.Sdk/Sdk/Runner/NativeAOT.targets
index 004342fad9..493fbce4b6 100644
--- a/src/Package/MSTest.Sdk/Sdk/Runner/NativeAOT.targets
+++ b/src/Package/MSTest.Sdk/Sdk/Runner/NativeAOT.targets
@@ -68,14 +68,14 @@
Condition=" '$(EnableMicrosoftTestingPlatform)' == 'true' and '$(ManagePackageVersionsCentrally)' == 'true' " />
-
+
$(MSTestVersion)
-
diff --git a/src/Package/MSTest.Sdk/Sdk/Sdk.targets b/src/Package/MSTest.Sdk/Sdk/Sdk.targets
index b54c53867e..b9ae53f70e 100644
--- a/src/Package/MSTest.Sdk/Sdk/Sdk.targets
+++ b/src/Package/MSTest.Sdk/Sdk/Sdk.targets
@@ -8,11 +8,14 @@
false
- <_MSTestUwpApplicationModel Condition=" '$(UseUwpTools)' == 'true' OR ('$(UseUwp)' == 'true' AND '$(UseUwpTools)' == '') ">true
+ <_MSTestUwpApplicationModel>false
+ <_MSTestUwpApplicationModel Condition=" '$(UseUwpTools)' == 'true' OR ('$(UseUwp)' == 'true' AND '$(UseUwpTools)' == '') OR $(TargetFramework.StartsWith('uap')) ">true
+ <_MSTestAdapterPackageId>MSTest.TestAdapter
+ <_MSTestAdapterPackageId Condition=" '$(_MSTestUwpApplicationModel)' == 'true' ">MSTest.Uwp
+ <_MSTestAdapterPackageId Condition=" '$(UseWinUI)' == 'true' ">MSTest.WinUI
@@ -51,10 +54,10 @@
and ( '$(EnableMSTestSourceGeneration)' == 'true'
or ( '$(UseVSTest)' == 'false' and '$(PublishAot)' == 'true' ) ) ">
-
+
$(MSTestVersion)
-
diff --git a/src/Package/MSTest.Sdk/Sdk/VSTest/VSTest.targets b/src/Package/MSTest.Sdk/Sdk/VSTest/VSTest.targets
index f5bb75fdfe..28767a1a47 100644
--- a/src/Package/MSTest.Sdk/Sdk/VSTest/VSTest.targets
+++ b/src/Package/MSTest.Sdk/Sdk/VSTest/VSTest.targets
@@ -36,10 +36,10 @@
-
+
$(MSTestVersion)
-
diff --git a/src/Package/MSTest/MSTest.csproj b/src/Package/MSTest/MSTest.csproj
index 4da44ec705..82626a2c20 100644
--- a/src/Package/MSTest/MSTest.csproj
+++ b/src/Package/MSTest/MSTest.csproj
@@ -29,9 +29,7 @@
Supported platforms:
- .NET 4.6.2+
- .NET 10.0+
-- .NET 10.0 Windows.18362+ (WinUI)
- UWP 10.0.16299
-- UWP 10.0.17763 with .NET 10+
$(CommonProductDescription)]]>
@@ -45,8 +43,9 @@ $(CommonProductDescription)]]>
-
-
+
+
+
diff --git a/src/Package/MSTest/PACKAGE.md b/src/Package/MSTest/PACKAGE.md
index 2dd77a1c53..ad1c3068e4 100644
--- a/src/Package/MSTest/PACKAGE.md
+++ b/src/Package/MSTest/PACKAGE.md
@@ -22,9 +22,13 @@ Supported platforms:
- .NET 4.6.2+
- .NET 10.0+
-- .NET 10.0 Windows.18362+ (WinUI)
- UWP 10.0.16299
-- UWP 10.0.17763 with .NET 10+
+
+Classic UWP selects `MSTest.Uwp` through its UAP dependency group. Modern UWP
+and WinUI cannot be distinguished by a Windows TFM alone: reference
+`MSTest.Uwp` or `MSTest.WinUI` directly instead of this metapackage, or use
+`MSTest.Sdk` with the appropriate application model. Do not combine them with
+the ordinary adapter dependency supplied by this metapackage.
## Documentation
diff --git a/src/TestFramework/TestFramework.Extensions/InternalAPI/InternalAPI.Shipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/InternalAPI.Shipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/InternalAPI/InternalAPI.Shipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/InternalAPI.Shipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/InternalAPI/InternalAPI.Unshipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/InternalAPI.Unshipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/InternalAPI/InternalAPI.Unshipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/InternalAPI.Unshipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.17763.0/InternalAPI.Shipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.17763.0/InternalAPI.Shipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.17763.0/InternalAPI.Shipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.17763.0/InternalAPI.Shipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.17763.0/InternalAPI.Unshipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.17763.0/InternalAPI.Unshipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.17763.0/InternalAPI.Unshipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.17763.0/InternalAPI.Unshipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.18362.0/InternalAPI.Shipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.18362.0/InternalAPI.Shipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.18362.0/InternalAPI.Shipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.18362.0/InternalAPI.Shipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.18362.0/InternalAPI.Unshipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.18362.0/InternalAPI.Unshipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.18362.0/InternalAPI.Unshipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net10.0-windows10.0.18362.0/InternalAPI.Unshipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/InternalAPI/net10.0/InternalAPI.Shipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net10.0/InternalAPI.Shipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/InternalAPI/net10.0/InternalAPI.Shipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net10.0/InternalAPI.Shipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/InternalAPI/net10.0/InternalAPI.Unshipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net10.0/InternalAPI.Unshipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/InternalAPI/net10.0/InternalAPI.Unshipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net10.0/InternalAPI.Unshipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/InternalAPI/net462/InternalAPI.Shipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net462/InternalAPI.Shipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/InternalAPI/net462/InternalAPI.Shipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net462/InternalAPI.Shipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/InternalAPI/net462/InternalAPI.Unshipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net462/InternalAPI.Unshipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/InternalAPI/net462/InternalAPI.Unshipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/net462/InternalAPI.Unshipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/InternalAPI/netstandard2.0/InternalAPI.Shipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/netstandard2.0/InternalAPI.Shipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/InternalAPI/netstandard2.0/InternalAPI.Shipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/netstandard2.0/InternalAPI.Shipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/InternalAPI/netstandard2.0/InternalAPI.Unshipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/netstandard2.0/InternalAPI.Unshipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/InternalAPI/netstandard2.0/InternalAPI.Unshipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/netstandard2.0/InternalAPI.Unshipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/InternalAPI/uap10.0.16299/InternalAPI.Shipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/uap10.0.16299/InternalAPI.Shipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/InternalAPI/uap10.0.16299/InternalAPI.Shipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/uap10.0.16299/InternalAPI.Shipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/InternalAPI/uap10.0.16299/InternalAPI.Unshipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/uap10.0.16299/InternalAPI.Unshipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/InternalAPI/uap10.0.16299/InternalAPI.Unshipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/InternalAPI/uap10.0.16299/InternalAPI.Unshipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/PublicAPI.Shipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/PublicAPI.Shipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/PublicAPI/PublicAPI.Shipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/PublicAPI.Shipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/PublicAPI.Unshipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/PublicAPI.Unshipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/PublicAPI/PublicAPI.Unshipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/PublicAPI.Unshipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.17763.0/PublicAPI.Shipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.17763.0/PublicAPI.Shipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.17763.0/PublicAPI.Shipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.17763.0/PublicAPI.Shipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.17763.0/PublicAPI.Unshipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.17763.0/PublicAPI.Unshipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.17763.0/PublicAPI.Unshipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.17763.0/PublicAPI.Unshipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.18362.0/PublicAPI.Shipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.18362.0/PublicAPI.Shipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.18362.0/PublicAPI.Shipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.18362.0/PublicAPI.Shipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.18362.0/PublicAPI.Unshipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.18362.0/PublicAPI.Unshipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.18362.0/PublicAPI.Unshipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net10.0-windows10.0.18362.0/PublicAPI.Unshipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/net10.0/PublicAPI.Shipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net10.0/PublicAPI.Shipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/PublicAPI/net10.0/PublicAPI.Shipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net10.0/PublicAPI.Shipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/net10.0/PublicAPI.Unshipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net10.0/PublicAPI.Unshipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/PublicAPI/net10.0/PublicAPI.Unshipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net10.0/PublicAPI.Unshipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/net462/PublicAPI.Shipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net462/PublicAPI.Shipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/PublicAPI/net462/PublicAPI.Shipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net462/PublicAPI.Shipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net462/PublicAPI.Unshipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/PublicAPI/net462/PublicAPI.Unshipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/net462/PublicAPI.Unshipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/uap10.0.16299/PublicAPI.Shipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/uap10.0.16299/PublicAPI.Shipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/PublicAPI/uap10.0.16299/PublicAPI.Shipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/uap10.0.16299/PublicAPI.Shipped.txt.history
diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/uap10.0.16299/PublicAPI.Unshipped.txt b/src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/uap10.0.16299/PublicAPI.Unshipped.txt.history
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/PublicAPI/uap10.0.16299/PublicAPI.Unshipped.txt
rename to src/TestFramework/APIHistory/TestFramework.Extensions/PublicAPI/uap10.0.16299/PublicAPI.Unshipped.txt.history
diff --git a/src/TestFramework/APIHistory/TestFramework.Extensions/README.md b/src/TestFramework/APIHistory/TestFramework.Extensions/README.md
new file mode 100644
index 0000000000..154add1e09
--- /dev/null
+++ b/src/TestFramework/APIHistory/TestFramework.Extensions/README.md
@@ -0,0 +1,15 @@
+# Retired Extensions API provenance
+
+These are the unchanged shipped and unshipped API records of
+`MSTest.TestFramework.Extensions` at the rebased shared-core prerequisite
+`984c2c635742d3d9699f488af36d25dff48e0f85`. They are historical records, not an
+active build input or an API-compatibility claim for the new assemblies.
+The `.txt.history` suffix deliberately keeps these snapshots out of
+`eng/mark-shipped.ps1`'s recursive `PublicAPI.Shipped.txt` /
+`InternalAPI.Shipped.txt` discovery, so a release cannot promote or rewrite them.
+
+The non-UI APIs moved to core in #12412 and #12428. The dedicated
+`TestFramework.Compatibility` project retains independent live copies of the
+ordinary non-UI API baselines and forwards those types to core. The remaining UI
+APIs now belong to `MSTest.Uwp` and `MSTest.WinUI`. UI consumers must update their
+package references and recompile for this intentional next-major package boundary.
diff --git a/src/TestFramework/TestFramework.Extensions/Attributes/UWP_UITestMethodAttribute.cs b/src/TestFramework/MSTest.Uwp/Attributes/UITestMethodAttribute.cs
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Attributes/UWP_UITestMethodAttribute.cs
rename to src/TestFramework/MSTest.Uwp/Attributes/UITestMethodAttribute.cs
diff --git a/src/TestFramework/MSTest.Uwp/InternalAPI/InternalAPI.Shipped.txt b/src/TestFramework/MSTest.Uwp/InternalAPI/InternalAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/TestFramework/MSTest.Uwp/InternalAPI/InternalAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/TestFramework/MSTest.Uwp/InternalAPI/InternalAPI.Unshipped.txt b/src/TestFramework/MSTest.Uwp/InternalAPI/InternalAPI.Unshipped.txt
new file mode 100644
index 0000000000..115f82fe64
--- /dev/null
+++ b/src/TestFramework/MSTest.Uwp/InternalAPI/InternalAPI.Unshipped.txt
@@ -0,0 +1,3 @@
+#nullable enable
+Microsoft.CodeAnalysis.EmbeddedAttribute
+Microsoft.CodeAnalysis.EmbeddedAttribute.EmbeddedAttribute() -> void
diff --git a/src/TestFramework/MSTest.Uwp/MSTest.Uwp.csproj b/src/TestFramework/MSTest.Uwp/MSTest.Uwp.csproj
new file mode 100644
index 0000000000..881670a0b2
--- /dev/null
+++ b/src/TestFramework/MSTest.Uwp/MSTest.Uwp.csproj
@@ -0,0 +1,30 @@
+
+
+
+ <_UsesMSBuildSdkExtras Condition=" '$(OS)' == 'Windows_NT' ">true
+
+
+
+
+
+ $(ModernUwpMinimum)
+ $(UwpMinimum);$(TargetFrameworks)
+ MSTest.Uwp
+ MSTest.Uwp
+ $(DefineConstants);WINDOWS_UWP
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/TestFramework/MSTest.Uwp/PACKAGE.md b/src/TestFramework/MSTest.Uwp/PACKAGE.md
new file mode 100644
index 0000000000..d60c5ef0d5
--- /dev/null
+++ b/src/TestFramework/MSTest.Uwp/PACKAGE.md
@@ -0,0 +1,26 @@
+# MSTest.Uwp
+
+Write and run UI-thread tests in classic and modern UWP applications. This
+package contains `MSTest.Uwp.dll`, the UWP MSTest adapter and platform services,
+and their localized resources. It depends on the matching `MSTest.TestFramework`
+package, not on `MSTest.TestAdapter` or `MSTest.WinUI`.
+
+Supported targets are classic `uap10.0.16299` and modern
+`net10.0-windows10.0.17763.0`, including compatible .NET 11 UWP consumers.
+The application still owns its UWP tooling, runtime, manifest and activation.
+Modern UWP does not use WinUI assets.
+
+Reference this package instead of the `MSTest` metapackage or ordinary adapter
+for modern UWP. `MSTest.Sdk` selects it from the existing UWP tooling properties,
+including early `UseUwp` when desktop tooling is imported later.
+Ordinary helper libraries need only `MSTest.TestFramework`.
+
+`Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.UITestMethodAttribute`
+keeps its existing API and dispatches through the UWP CoreWindow dispatcher.
+Migrate references to the retired `MSTest.TestFramework.Extensions` assembly and
+recompile. All six `TestContext` directory getters return null in UWP hosts,
+even when the property bag contains same-named values. Deployment items are
+unsupported: modern UWP tests using `[DeploymentItem]` fail before their body;
+classic UWP's netstandard core does not expose that attribute.
+
+MSTest is Microsoft supported Test Framework.
diff --git a/src/TestFramework/TestFramework.Extensions/Properties/AssemblyInfo.cs b/src/TestFramework/MSTest.Uwp/Properties/AssemblyInfo.cs
similarity index 50%
rename from src/TestFramework/TestFramework.Extensions/Properties/AssemblyInfo.cs
rename to src/TestFramework/MSTest.Uwp/Properties/AssemblyInfo.cs
index e79fe7763d..b41b7b5a9a 100644
--- a/src/TestFramework/TestFramework.Extensions/Properties/AssemblyInfo.cs
+++ b/src/TestFramework/MSTest.Uwp/Properties/AssemblyInfo.cs
@@ -1,11 +1,5 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#if !WIN_UI
[assembly: CLSCompliant(true)]
[assembly: ComVisible(false)]
-#else
-// Extra .0 at the end is a workaround for https://github.com/dotnet/roslyn-analyzers/issues/5728
-// Can be removed after the issue is closed.
-[assembly: SupportedOSPlatform("windows10.0.17763.0")]
-#endif
diff --git a/src/TestFramework/TestFramework.Extensions/Properties/Extension.UWP.rd.xml b/src/TestFramework/MSTest.Uwp/Properties/MSTest.Uwp.rd.xml
similarity index 97%
rename from src/TestFramework/TestFramework.Extensions/Properties/Extension.UWP.rd.xml
rename to src/TestFramework/MSTest.Uwp/Properties/MSTest.Uwp.rd.xml
index 4a9d515ef0..a5b06eeeb1 100644
--- a/src/TestFramework/TestFramework.Extensions/Properties/Extension.UWP.rd.xml
+++ b/src/TestFramework/MSTest.Uwp/Properties/MSTest.Uwp.rd.xml
@@ -25,7 +25,7 @@
https://go.microsoft.com/fwlink/?LinkID=391919
-->
-
+
diff --git a/src/TestFramework/MSTest.Uwp/PublicAPI/PublicAPI.Shipped.txt b/src/TestFramework/MSTest.Uwp/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/TestFramework/MSTest.Uwp/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/TestFramework/MSTest.Uwp/PublicAPI/PublicAPI.Unshipped.txt b/src/TestFramework/MSTest.Uwp/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..175a7cf10f
--- /dev/null
+++ b/src/TestFramework/MSTest.Uwp/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1,4 @@
+#nullable enable
+Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.UITestMethodAttribute
+Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.UITestMethodAttribute.UITestMethodAttribute(string! callerFilePath = "", int callerLineNumber = -1) -> void
+override Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.UITestMethodAttribute.ExecuteAsync(Microsoft.VisualStudio.TestTools.UnitTesting.ITestMethod! testMethod) -> System.Threading.Tasks.Task!
diff --git a/src/TestFramework/TestFramework.Extensions/Attributes/WinUI_UITestMethodAttribute.cs b/src/TestFramework/MSTest.WinUI/Attributes/UITestMethodAttribute.cs
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Attributes/WinUI_UITestMethodAttribute.cs
rename to src/TestFramework/MSTest.WinUI/Attributes/UITestMethodAttribute.cs
diff --git a/src/TestFramework/TestFramework.Extensions/Attributes/WinUITestTargetAttribute.cs b/src/TestFramework/MSTest.WinUI/Attributes/WinUITestTargetAttribute.cs
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Attributes/WinUITestTargetAttribute.cs
rename to src/TestFramework/MSTest.WinUI/Attributes/WinUITestTargetAttribute.cs
diff --git a/src/TestFramework/MSTest.WinUI/InternalAPI/InternalAPI.Shipped.txt b/src/TestFramework/MSTest.WinUI/InternalAPI/InternalAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/TestFramework/MSTest.WinUI/InternalAPI/InternalAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/TestFramework/MSTest.WinUI/InternalAPI/InternalAPI.Unshipped.txt b/src/TestFramework/MSTest.WinUI/InternalAPI/InternalAPI.Unshipped.txt
new file mode 100644
index 0000000000..41c5ec0968
--- /dev/null
+++ b/src/TestFramework/MSTest.WinUI/InternalAPI/InternalAPI.Unshipped.txt
@@ -0,0 +1,4 @@
+#nullable enable
+Microsoft.CodeAnalysis.EmbeddedAttribute
+Microsoft.CodeAnalysis.EmbeddedAttribute.EmbeddedAttribute() -> void
+static Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.UITestMethodAttribute.WaitForApplicationStartup(System.Threading.Tasks.TaskCompletionSource! startupCompletion, System.Func! waitForUiThreadExit, System.TimeSpan timeout, System.TimeSpan pollInterval) -> void
diff --git a/src/TestFramework/MSTest.WinUI/MSTest.WinUI.csproj b/src/TestFramework/MSTest.WinUI/MSTest.WinUI.csproj
new file mode 100644
index 0000000000..8521c9e49b
--- /dev/null
+++ b/src/TestFramework/MSTest.WinUI/MSTest.WinUI.csproj
@@ -0,0 +1,26 @@
+
+
+
+ $(WinUiMinimum)
+ MSTest.WinUI
+ MSTest.WinUI
+ $(DefineConstants);WIN_UI
+ 10.0.18362.0
+ 10.0.17763.0
+ 10.0.17763.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/TestFramework/MSTest.WinUI/PACKAGE.md b/src/TestFramework/MSTest.WinUI/PACKAGE.md
new file mode 100644
index 0000000000..e28b21aca0
--- /dev/null
+++ b/src/TestFramework/MSTest.WinUI/PACKAGE.md
@@ -0,0 +1,24 @@
+# MSTest.WinUI
+
+Write and run UI-thread tests in packaged and unpackaged WinUI applications.
+This package contains `MSTest.WinUI.dll`, the WinUI MSTest adapter and platform
+services, and their localized resources. It depends on the matching
+`MSTest.TestFramework` package, not on `MSTest.TestAdapter` or `MSTest.Uwp`.
+
+The package targets `net10.0-windows10.0.18362.0` and compatible .NET 11
+consumers. The application still owns its Windows App SDK version, runtime
+bootstrap, dispatcher, manifest and activation; this package does not install
+or select that runtime.
+
+Reference this package instead of the `MSTest` metapackage or ordinary adapter.
+`MSTest.Sdk` selects it for applications with `UseWinUI=true`.
+Ordinary helper libraries need only `MSTest.TestFramework`.
+
+The existing AppContainer `UITestMethodAttribute` and `WinUITestTargetAttribute`
+APIs are unchanged. Migrate references to the retired
+`MSTest.TestFramework.Extensions` assembly and recompile. All six `TestContext`
+directory getters return null in WinUI hosts, even when the property bag
+contains same-named values. Tests using `[DeploymentItem]` fail before their
+body because UI-host deployment is unsupported.
+
+MSTest is Microsoft supported Test Framework.
diff --git a/src/TestFramework/MSTest.WinUI/Properties/AssemblyInfo.cs b/src/TestFramework/MSTest.WinUI/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..6165e9e158
--- /dev/null
+++ b/src/TestFramework/MSTest.WinUI/Properties/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+[assembly: SupportedOSPlatform("windows10.0.17763.0")]
diff --git a/src/TestFramework/MSTest.WinUI/PublicAPI/PublicAPI.Shipped.txt b/src/TestFramework/MSTest.WinUI/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/TestFramework/MSTest.WinUI/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/TestFramework/MSTest.WinUI/PublicAPI/PublicAPI.Unshipped.txt b/src/TestFramework/MSTest.WinUI/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..e41ff441f9
--- /dev/null
+++ b/src/TestFramework/MSTest.WinUI/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1,9 @@
+#nullable enable
+Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.UITestMethodAttribute
+Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.UITestMethodAttribute.UITestMethodAttribute(string! callerFilePath = "", int callerLineNumber = -1) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.WinUITestTargetAttribute
+Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.WinUITestTargetAttribute.ApplicationType.get -> System.Type!
+Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.WinUITestTargetAttribute.WinUITestTargetAttribute(System.Type! applicationType) -> void
+override Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.UITestMethodAttribute.ExecuteAsync(Microsoft.VisualStudio.TestTools.UnitTesting.ITestMethod! testMethod) -> System.Threading.Tasks.Task!
+static Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.UITestMethodAttribute.DispatcherQueue.get -> Microsoft.UI.Dispatching.DispatcherQueue?
+static Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.UITestMethodAttribute.DispatcherQueue.set -> void
diff --git a/src/TestFramework/TestFramework.Extensions/Resources/FrameworkExtensionsMessages.resx b/src/TestFramework/MSTest.WinUI/Resources/FrameworkExtensionsMessages.resx
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Resources/FrameworkExtensionsMessages.resx
rename to src/TestFramework/MSTest.WinUI/Resources/FrameworkExtensionsMessages.resx
diff --git a/src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.cs.xlf b/src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.cs.xlf
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.cs.xlf
rename to src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.cs.xlf
diff --git a/src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.de.xlf b/src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.de.xlf
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.de.xlf
rename to src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.de.xlf
diff --git a/src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.es.xlf b/src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.es.xlf
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.es.xlf
rename to src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.es.xlf
diff --git a/src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.fr.xlf b/src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.fr.xlf
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.fr.xlf
rename to src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.fr.xlf
diff --git a/src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.it.xlf b/src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.it.xlf
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.it.xlf
rename to src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.it.xlf
diff --git a/src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.ja.xlf b/src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.ja.xlf
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.ja.xlf
rename to src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.ja.xlf
diff --git a/src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.ko.xlf b/src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.ko.xlf
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.ko.xlf
rename to src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.ko.xlf
diff --git a/src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.pl.xlf b/src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.pl.xlf
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.pl.xlf
rename to src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.pl.xlf
diff --git a/src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.pt-BR.xlf b/src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.pt-BR.xlf
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.pt-BR.xlf
rename to src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.pt-BR.xlf
diff --git a/src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.ru.xlf b/src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.ru.xlf
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.ru.xlf
rename to src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.ru.xlf
diff --git a/src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.tr.xlf b/src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.tr.xlf
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.tr.xlf
rename to src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.tr.xlf
diff --git a/src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.zh-Hans.xlf b/src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.zh-Hans.xlf
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.zh-Hans.xlf
rename to src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.zh-Hans.xlf
diff --git a/src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.zh-Hant.xlf b/src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.zh-Hant.xlf
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/Resources/xlf/FrameworkExtensionsMessages.zh-Hant.xlf
rename to src/TestFramework/MSTest.WinUI/Resources/xlf/FrameworkExtensionsMessages.zh-Hant.xlf
diff --git a/src/Adapter/MSTest.TestAdapter/buildTransitive/uwp/MSTest.TestAdapter.props b/src/TestFramework/PlatformPackage/MSTest.Platform.props
similarity index 65%
rename from src/Adapter/MSTest.TestAdapter/buildTransitive/uwp/MSTest.TestAdapter.props
rename to src/TestFramework/PlatformPackage/MSTest.Platform.props
index 1e14ef753e..afa9624c75 100644
--- a/src/Adapter/MSTest.TestAdapter/buildTransitive/uwp/MSTest.TestAdapter.props
+++ b/src/TestFramework/PlatformPackage/MSTest.Platform.props
@@ -1,20 +1,16 @@
-
+ <_MSTestAdapterPayloadRoot>$(MSBuildThisFileDirectory)
+ <_MSTestAdapterLocalizationRoot>$(MSBuildThisFileDirectory)_localization\
true
true
-
+
MSTest
Microsoft.VisualStudio.TestTools.UnitTesting.TestingPlatformBuilderHook
-
diff --git a/src/TestFramework/PlatformPackage/PlatformPackage.props b/src/TestFramework/PlatformPackage/PlatformPackage.props
new file mode 100644
index 0000000000..a49d62a42c
--- /dev/null
+++ b/src/TestFramework/PlatformPackage/PlatformPackage.props
@@ -0,0 +1,25 @@
+
+
+
+ Microsoft.VisualStudio.TestTools.UnitTesting
+ true
+ true
+ $(CommonPackageTags) MSTest UI TestFramework TestAdapter
+ $(DefineConstants);TRACE;EXCLUDE_RANGE_INDEX_POLYFILL;EXCLUDE_OS_POLYFILL
+ $(TargetsForTfmSpecificContentInPackage);_AddMSTestPlatformPackageFiles
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/TestFramework/PlatformPackage/PlatformPackage.targets b/src/TestFramework/PlatformPackage/PlatformPackage.targets
new file mode 100644
index 0000000000..a8d5f3328b
--- /dev/null
+++ b/src/TestFramework/PlatformPackage/PlatformPackage.targets
@@ -0,0 +1,36 @@
+
+
+
+
+ <_ProjectReferencesWithVersions Condition=" '%(Filename)' == 'TestFramework' ">
+ [$(PackageVersion)]
+
+
+
+
+
+
+ <_PlatformPackageTfm Condition=" '$(TargetFramework)' == '$(UwpMinimum)' ">uap10.0.16299
+ <_PlatformPackageTfm Condition=" '$(TargetFramework)' == '$(ModernUwpMinimum)' ">net10.0-windows10.0.17763
+ <_PlatformPackageTfm Condition=" '$(TargetFramework)' == '$(WinUiMinimum)' ">net10.0-windows10.0.18362
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/TestFramework/TestFramework.Compatibility/InternalAPI/InternalAPI.Shipped.txt b/src/TestFramework/TestFramework.Compatibility/InternalAPI/InternalAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/TestFramework/TestFramework.Compatibility/InternalAPI/InternalAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/TestFramework/TestFramework.Compatibility/InternalAPI/InternalAPI.Unshipped.txt b/src/TestFramework/TestFramework.Compatibility/InternalAPI/InternalAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/TestFramework/TestFramework.Compatibility/InternalAPI/InternalAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/TestFramework/TestFramework.Compatibility/PublicAPI/PublicAPI.Shipped.txt b/src/TestFramework/TestFramework.Compatibility/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..951482cb7f
--- /dev/null
+++ b/src/TestFramework/TestFramework.Compatibility/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,44 @@
+#nullable enable
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.ITestRunInfo
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.ITestRunInfo.PlannedTests.get -> System.Collections.Generic.IReadOnlyCollection!
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.AssemblyPath.get -> string!
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.DeclaringFilePath.get -> string?
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.DeclaringLineNumber.get -> int?
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.FullyQualifiedTestClassName.get -> string!
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.ManagedMethodName.get -> string?
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.ManagedTypeName.get -> string?
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.PlannedTest(string! fullyQualifiedTestClassName, string! testName, string? testDisplayName, string! assemblyPath, string? managedTypeName, string? managedMethodName, string? declaringFilePath, int? declaringLineNumber, System.Collections.Generic.IReadOnlyCollection! testCategories, System.Collections.Generic.IReadOnlyCollection>! testProperties) -> void
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.TestCategories.get -> System.Collections.Generic.IReadOnlyCollection!
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.TestDisplayName.get -> string?
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.TestName.get -> string!
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.TestProperties.get -> System.Collections.Generic.IReadOnlyCollection>!
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.TestRun
+[MSTESTEXP]static Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.Current.get -> Microsoft.VisualStudio.TestTools.UnitTesting.TestContext?
+[MSTESTEXP]static Microsoft.VisualStudio.TestTools.UnitTesting.TestRun.Current.get -> Microsoft.VisualStudio.TestTools.UnitTesting.ITestRunInfo!
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.AddResultFile(string! fileName) -> void
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DisplayMessage(Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel messageLevel, string! message) -> void
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.Properties.get -> System.Collections.Generic.IDictionary!
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.Write(string! format, params object?[]! args) -> void
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.Write(string? message) -> void
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.WriteLine(string! format, params object?[]! args) -> void
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.WriteLine(string? message) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel
+Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel.Error = 2 -> Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel
+Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel.Informational = 0 -> Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel
+Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel.Warning = 1 -> Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.CancellationToken.get -> System.Threading.CancellationToken
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestContext() -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestData.get -> object?[]?
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestData.set -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestDisplayName.get -> string?
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestDisplayName.set -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestException.get -> System.Exception?
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestException.set -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunCount.get -> int
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.CancellationTokenSource.get -> System.Threading.CancellationTokenSource!
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.CancellationTokenSource.set -> void
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.CurrentTestOutcome.get -> Microsoft.VisualStudio.TestTools.UnitTesting.UnitTestOutcome
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.FullyQualifiedTestClassName.get -> string!
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestName.get -> string!
diff --git a/src/TestFramework/TestFramework.Compatibility/PublicAPI/PublicAPI.Unshipped.txt b/src/TestFramework/TestFramework.Compatibility/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..21baac0fad
--- /dev/null
+++ b/src/TestFramework/TestFramework.Compatibility/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1,87 @@
+#nullable enable
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.ITestRunInfo
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.ITestRunInfo.PlannedTests.get -> System.Collections.Generic.IReadOnlyCollection!
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.AssemblyPath.get -> string!
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.DeclaringFilePath.get -> string?
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.DeclaringLineNumber.get -> int?
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.FullyQualifiedTestClassName.get -> string!
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.ManagedMethodName.get -> string?
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.ManagedTypeName.get -> string?
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.PlannedTest(string! fullyQualifiedTestClassName, string! testName, string? testDisplayName, string! assemblyPath, string? managedTypeName, string? managedMethodName, string? declaringFilePath, int? declaringLineNumber, System.Collections.Generic.IReadOnlyCollection! testCategories, System.Collections.Generic.IReadOnlyCollection>! testProperties) -> void
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.TestCategories.get -> System.Collections.Generic.IReadOnlyCollection!
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.TestDisplayName.get -> string?
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.TestName.get -> string!
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.TestProperties.get -> System.Collections.Generic.IReadOnlyCollection>!
+*REMOVED*[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.TestRun
+*REMOVED*[MSTESTEXP]static Microsoft.VisualStudio.TestTools.UnitTesting.TestRun.Current.get -> Microsoft.VisualStudio.TestTools.UnitTesting.ITestRunInfo!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel.Error = 2 -> Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel.Informational = 0 -> Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel.Warning = 1 -> Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.TestContext
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.CancellationToken.get -> System.Threading.CancellationToken
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestContext() -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestData.get -> object?[]?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestData.set -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestDisplayName.get -> string?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestDisplayName.set -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestException.get -> System.Exception?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestException.set -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunCount.get -> int
+*REMOVED*[MSTESTEXP]static Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.Current.get -> Microsoft.VisualStudio.TestTools.UnitTesting.TestContext?
+*REMOVED*abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.AddResultFile(string! fileName) -> void
+*REMOVED*abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DisplayMessage(Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel messageLevel, string! message) -> void
+*REMOVED*abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.Properties.get -> System.Collections.Generic.IDictionary!
+*REMOVED*abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.Write(string! format, params object?[]! args) -> void
+*REMOVED*abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.Write(string? message) -> void
+*REMOVED*abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.WriteLine(string! format, params object?[]! args) -> void
+*REMOVED*abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.WriteLine(string? message) -> void
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.CancellationTokenSource.get -> System.Threading.CancellationTokenSource!
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.CancellationTokenSource.set -> void
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.CurrentTestOutcome.get -> Microsoft.VisualStudio.TestTools.UnitTesting.UnitTestOutcome
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.FullyQualifiedTestClassName.get -> string!
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestName.get -> string!
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.ITestRunInfo (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.ITestRunInfo.PlannedTests.get -> System.Collections.Generic.IReadOnlyCollection! (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.AssemblyPath.get -> string! (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.DeclaringFilePath.get -> string? (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.DeclaringLineNumber.get -> int? (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.FullyQualifiedTestClassName.get -> string! (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.ManagedMethodName.get -> string? (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.ManagedTypeName.get -> string? (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.PlannedTest(string! fullyQualifiedTestClassName, string! testName, string? testDisplayName, string! assemblyPath, string? managedTypeName, string? managedMethodName, string? declaringFilePath, int? declaringLineNumber, System.Collections.Generic.IReadOnlyCollection! testCategories, System.Collections.Generic.IReadOnlyCollection>! testProperties) -> void (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.TestCategories.get -> System.Collections.Generic.IReadOnlyCollection! (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.TestDisplayName.get -> string? (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.TestName.get -> string! (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.PlannedTest.TestProperties.get -> System.Collections.Generic.IReadOnlyCollection>! (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.TestRun (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]static Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.Current.get -> Microsoft.VisualStudio.TestTools.UnitTesting.TestContext? (forwarded, contained in MSTest.TestFramework)
+[MSTESTEXP]static Microsoft.VisualStudio.TestTools.UnitTesting.TestRun.Current.get -> Microsoft.VisualStudio.TestTools.UnitTesting.ITestRunInfo! (forwarded, contained in MSTest.TestFramework)
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.AddResultFile(string! fileName) -> void (forwarded, contained in MSTest.TestFramework)
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DisplayMessage(Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel messageLevel, string! message) -> void (forwarded, contained in MSTest.TestFramework)
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.Properties.get -> System.Collections.Generic.IDictionary! (forwarded, contained in MSTest.TestFramework)
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.Write(string! format, params object?[]! args) -> void (forwarded, contained in MSTest.TestFramework)
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.Write(string? message) -> void (forwarded, contained in MSTest.TestFramework)
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.WriteLine(string! format, params object?[]! args) -> void (forwarded, contained in MSTest.TestFramework)
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.WriteLine(string? message) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel.Error = 2 -> Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel.Informational = 0 -> Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel.Warning = 1 -> Microsoft.VisualStudio.TestTools.UnitTesting.MessageLevel (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.CancellationToken.get -> System.Threading.CancellationToken (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestContext() -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestData.get -> object?[]? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestData.set -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestDisplayName.get -> string? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestDisplayName.set -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestException.get -> System.Exception? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestException.set -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunCount.get -> int (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.CancellationTokenSource.get -> System.Threading.CancellationTokenSource! (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.CancellationTokenSource.set -> void (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.CurrentTestOutcome.get -> Microsoft.VisualStudio.TestTools.UnitTesting.UnitTestOutcome (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.FullyQualifiedTestClassName.get -> string! (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestName.get -> string! (forwarded, contained in MSTest.TestFramework)
diff --git a/src/TestFramework/TestFramework.Compatibility/PublicAPI/net10.0/PublicAPI.Shipped.txt b/src/TestFramework/TestFramework.Compatibility/PublicAPI/net10.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..91ebb602b6
--- /dev/null
+++ b/src/TestFramework/TestFramework.Compatibility/PublicAPI/net10.0/PublicAPI.Shipped.txt
@@ -0,0 +1,12 @@
+#nullable enable
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path, string? outputDirectory) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.OutputDirectory.get -> string?
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.Path.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DeploymentDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.ResultsDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestResultsDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunResultsDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestTempDirectory.get -> string?
diff --git a/src/TestFramework/TestFramework.Compatibility/PublicAPI/net10.0/PublicAPI.Unshipped.txt b/src/TestFramework/TestFramework.Compatibility/PublicAPI/net10.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..f366587490
--- /dev/null
+++ b/src/TestFramework/TestFramework.Compatibility/PublicAPI/net10.0/PublicAPI.Unshipped.txt
@@ -0,0 +1,23 @@
+#nullable enable
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path, string? outputDirectory) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.OutputDirectory.get -> string?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.Path.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DeploymentDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.ResultsDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestResultsDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunResultsDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestTempDirectory.get -> string?
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path, string? outputDirectory) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.OutputDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.Path.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DeploymentDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.ResultsDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestResultsDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunResultsDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestTempDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
diff --git a/src/TestFramework/TestFramework.Compatibility/PublicAPI/net462/PublicAPI.Shipped.txt b/src/TestFramework/TestFramework.Compatibility/PublicAPI/net462/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..07d475fcfe
--- /dev/null
+++ b/src/TestFramework/TestFramework.Compatibility/PublicAPI/net462/PublicAPI.Shipped.txt
@@ -0,0 +1,114 @@
+#nullable enable
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DataConnection.get -> System.Data.Common.DbConnection?
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DataRow.get -> System.Data.DataRow?
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.ConnectionString.get -> string!
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.ConnectionString.set -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataAccessMethod.get -> string!
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataAccessMethod.set -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataSourceElement() -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataTableName.get -> string!
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataTableName.set -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.Name.get -> string!
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.Name.set -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.Add(Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement! element) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.Clear() -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.DataSourceElementCollection() -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.Remove(Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement! element) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.Remove(string! name) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.this[int index].get -> Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement!
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.this[int index].set -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.this[string! name].get -> Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement!
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path, string? outputDirectory) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.OutputDirectory.get -> string?
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.Path.get -> string?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetArrayElement(string! name, params int[]! indices) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetArrayElement(string! name, System.Reflection.BindingFlags bindingFlags, params int[]! indices) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetField(string! name, System.Reflection.BindingFlags bindingFlags) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetField(string! name) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetFieldOrProperty(string! name, System.Reflection.BindingFlags bindingFlags) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetFieldOrProperty(string! name) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetProperty(string! name, params object?[]? args) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetProperty(string! name, System.Reflection.BindingFlags bindingFlags, params object?[]? args) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetProperty(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetProperty(string! name, System.Type![]? parameterTypes, object?[]? args) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, object?[]? args, System.Globalization.CultureInfo! culture) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, params object?[]? args) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, object?[]? args, System.Globalization.CultureInfo! culture) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, params object?[]? args) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]! parameterTypes, object?[]? args) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo! culture) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo? culture, System.Type![]? typeArguments) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Type![]! parameterTypes, object?[]? args, System.Type![]! typeArguments) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Type![]! parameterTypes, object?[]? args) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo! culture) -> object?
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(object! obj, Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType! type) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(object! obj, string! memberToAccess) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(object! obj) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(string! assemblyName, string! typeName, params object?[]? args) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(string! assemblyName, string! typeName, System.Type![]? parameterTypes, object?[]? args) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(System.Type! type, params object?[]? args) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(System.Type! type, System.Type![]? parameterTypes, object?[]? args) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.RealType.get -> System.Type!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetArrayElement(string! name, object! value, params int[]! indices) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetArrayElement(string! name, System.Reflection.BindingFlags bindingFlags, object! value, params int[]! indices) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetField(string! name, object! value) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetField(string! name, System.Reflection.BindingFlags bindingFlags, object? value) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetFieldOrProperty(string! name, object! value) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetFieldOrProperty(string! name, System.Reflection.BindingFlags bindingFlags, object? value) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetProperty(string! name, object? value, params object?[]? args) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetProperty(string! name, System.Reflection.BindingFlags bindingFlags, object! value, params object?[]? args) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetProperty(string! name, System.Reflection.BindingFlags bindingFlags, object? value, System.Type![]? parameterTypes, object?[]? args) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetProperty(string! name, System.Type![]? parameterTypes, object? value, object?[]? args) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Target.get -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Target.set -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticArrayElement(string! name, params int[]! indices) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticArrayElement(string! name, System.Reflection.BindingFlags bindingFlags, params int[]! indices) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticField(string! name, System.Reflection.BindingFlags bindingFlags) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticField(string! name) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticFieldOrProperty(string! name, System.Reflection.BindingFlags bindingFlags) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticFieldOrProperty(string! name) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticProperty(string! name, params object?[]? args) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticProperty(string! name, System.Reflection.BindingFlags bindingFlags, params object?[]? args) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticProperty(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, object?[]? args, System.Globalization.CultureInfo? culture) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, params object?[]? args) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, object?[]? args, System.Globalization.CultureInfo? culture) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, params object?[]? args) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo? culture, System.Type![]? typeArguments) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo? culture) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo? culture) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Type![]? parameterTypes, object?[]? args, System.Type![]! typeArguments) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Type![]? parameterTypes, object?[]? args) -> object!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.PrivateType(string! assemblyName, string! typeName) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.PrivateType(System.Type! type) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.ReferencedType.get -> System.Type!
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticArrayElement(string! name, object! value, params int[]! indices) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticArrayElement(string! name, System.Reflection.BindingFlags bindingFlags, object! value, params int[]! indices) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticField(string! name, object! value) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticField(string! name, System.Reflection.BindingFlags bindingFlags, object! value) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticFieldOrProperty(string! name, object! value) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticFieldOrProperty(string! name, System.Reflection.BindingFlags bindingFlags, object! value) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticProperty(string! name, object! value, params object?[]? args) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticProperty(string! name, object! value, System.Type![]? parameterTypes, object?[]? args) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticProperty(string! name, System.Reflection.BindingFlags bindingFlags, object! value, params object?[]? args) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticProperty(string! name, System.Reflection.BindingFlags bindingFlags, object! value, System.Type![]? parameterTypes, object?[]? args) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.TestConfiguration
+Microsoft.VisualStudio.TestTools.UnitTesting.TestConfigurationSection
+Microsoft.VisualStudio.TestTools.UnitTesting.TestConfigurationSection.DataSources.get -> Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection!
+Microsoft.VisualStudio.TestTools.UnitTesting.TestConfigurationSection.TestConfigurationSection() -> void
+override Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Equals(object? obj) -> bool
+override Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetHashCode() -> int
+static Microsoft.VisualStudio.TestTools.UnitTesting.TestConfiguration.ConfigurationSection.get -> Microsoft.VisualStudio.TestTools.UnitTesting.TestConfigurationSection!
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DeploymentDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.ResultsDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestResultsDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunResultsDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestTempDirectory.get -> string?
diff --git a/src/TestFramework/TestFramework.Compatibility/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/TestFramework/TestFramework.Compatibility/PublicAPI/net462/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..98768279f4
--- /dev/null
+++ b/src/TestFramework/TestFramework.Compatibility/PublicAPI/net462/PublicAPI.Unshipped.txt
@@ -0,0 +1,227 @@
+#nullable enable
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.ConnectionString.get -> string!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.ConnectionString.set -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataAccessMethod.get -> string!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataAccessMethod.set -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataSourceElement() -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataTableName.get -> string!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataTableName.set -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.Name.get -> string!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.Name.set -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.Add(Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement! element) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.Clear() -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.DataSourceElementCollection() -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.Remove(Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement! element) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.Remove(string! name) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.this[int index].get -> Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.this[int index].set -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.this[string! name].get -> Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetArrayElement(string! name, params int[]! indices) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetArrayElement(string! name, System.Reflection.BindingFlags bindingFlags, params int[]! indices) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetField(string! name, System.Reflection.BindingFlags bindingFlags) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetField(string! name) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetFieldOrProperty(string! name, System.Reflection.BindingFlags bindingFlags) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetFieldOrProperty(string! name) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetProperty(string! name, params object?[]? args) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetProperty(string! name, System.Reflection.BindingFlags bindingFlags, params object?[]? args) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetProperty(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetProperty(string! name, System.Type![]? parameterTypes, object?[]? args) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, object?[]? args, System.Globalization.CultureInfo! culture) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, params object?[]? args) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, object?[]? args, System.Globalization.CultureInfo! culture) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, params object?[]? args) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]! parameterTypes, object?[]? args) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo! culture) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo? culture, System.Type![]? typeArguments) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Type![]! parameterTypes, object?[]? args, System.Type![]! typeArguments) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Type![]! parameterTypes, object?[]? args) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo! culture) -> object?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(object! obj, Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType! type) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(object! obj, string! memberToAccess) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(object! obj) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(string! assemblyName, string! typeName, params object?[]? args) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(string! assemblyName, string! typeName, System.Type![]? parameterTypes, object?[]? args) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(System.Type! type, params object?[]? args) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(System.Type! type, System.Type![]? parameterTypes, object?[]? args) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.RealType.get -> System.Type!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetArrayElement(string! name, object! value, params int[]! indices) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetArrayElement(string! name, System.Reflection.BindingFlags bindingFlags, object! value, params int[]! indices) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetField(string! name, object! value) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetField(string! name, System.Reflection.BindingFlags bindingFlags, object? value) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetFieldOrProperty(string! name, object! value) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetFieldOrProperty(string! name, System.Reflection.BindingFlags bindingFlags, object? value) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetProperty(string! name, object? value, params object?[]? args) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetProperty(string! name, System.Reflection.BindingFlags bindingFlags, object! value, params object?[]? args) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetProperty(string! name, System.Reflection.BindingFlags bindingFlags, object? value, System.Type![]? parameterTypes, object?[]? args) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetProperty(string! name, System.Type![]? parameterTypes, object? value, object?[]? args) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Target.get -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Target.set -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticArrayElement(string! name, params int[]! indices) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticArrayElement(string! name, System.Reflection.BindingFlags bindingFlags, params int[]! indices) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticField(string! name, System.Reflection.BindingFlags bindingFlags) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticField(string! name) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticFieldOrProperty(string! name, System.Reflection.BindingFlags bindingFlags) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticFieldOrProperty(string! name) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticProperty(string! name, params object?[]? args) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticProperty(string! name, System.Reflection.BindingFlags bindingFlags, params object?[]? args) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticProperty(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, object?[]? args, System.Globalization.CultureInfo? culture) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, params object?[]? args) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, object?[]? args, System.Globalization.CultureInfo? culture) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, params object?[]? args) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo? culture, System.Type![]? typeArguments) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo? culture) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo? culture) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Type![]? parameterTypes, object?[]? args, System.Type![]! typeArguments) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Type![]? parameterTypes, object?[]? args) -> object!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.PrivateType(string! assemblyName, string! typeName) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.PrivateType(System.Type! type) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.ReferencedType.get -> System.Type!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticArrayElement(string! name, object! value, params int[]! indices) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticArrayElement(string! name, System.Reflection.BindingFlags bindingFlags, object! value, params int[]! indices) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticField(string! name, object! value) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticField(string! name, System.Reflection.BindingFlags bindingFlags, object! value) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticFieldOrProperty(string! name, object! value) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticFieldOrProperty(string! name, System.Reflection.BindingFlags bindingFlags, object! value) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticProperty(string! name, object! value, params object?[]? args) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticProperty(string! name, object! value, System.Type![]? parameterTypes, object?[]? args) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticProperty(string! name, System.Reflection.BindingFlags bindingFlags, object! value, params object?[]? args) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticProperty(string! name, System.Reflection.BindingFlags bindingFlags, object! value, System.Type![]? parameterTypes, object?[]? args) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.TestConfiguration
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.TestConfigurationSection
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.TestConfigurationSection.DataSources.get -> Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.TestConfigurationSection.TestConfigurationSection() -> void
+*REMOVED*override Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Equals(object? obj) -> bool
+*REMOVED*override Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetHashCode() -> int
+*REMOVED*static Microsoft.VisualStudio.TestTools.UnitTesting.TestConfiguration.ConfigurationSection.get -> Microsoft.VisualStudio.TestTools.UnitTesting.TestConfigurationSection!
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path, string? outputDirectory) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.OutputDirectory.get -> string?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.Path.get -> string?
+*REMOVED*abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DataConnection.get -> System.Data.Common.DbConnection?
+*REMOVED*abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DataRow.get -> System.Data.DataRow?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DeploymentDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.ResultsDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestResultsDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunResultsDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestTempDirectory.get -> string?
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DataConnection.get -> System.Data.Common.DbConnection? (forwarded, contained in MSTest.TestFramework)
+abstract Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DataRow.get -> System.Data.DataRow? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.ConnectionString.get -> string! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.ConnectionString.set -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataAccessMethod.get -> string! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataAccessMethod.set -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataSourceElement() -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataTableName.get -> string! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.DataTableName.set -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.Name.get -> string! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement.Name.set -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.Add(Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement! element) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.Clear() -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.DataSourceElementCollection() -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.Remove(Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement! element) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.Remove(string! name) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.this[int index].get -> Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.this[int index].set -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection.this[string! name].get -> Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElement! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path, string? outputDirectory) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.OutputDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.Path.get -> string? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetArrayElement(string! name, params int[]! indices) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetArrayElement(string! name, System.Reflection.BindingFlags bindingFlags, params int[]! indices) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetField(string! name, System.Reflection.BindingFlags bindingFlags) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetField(string! name) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetFieldOrProperty(string! name, System.Reflection.BindingFlags bindingFlags) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetFieldOrProperty(string! name) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetProperty(string! name, params object?[]? args) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetProperty(string! name, System.Reflection.BindingFlags bindingFlags, params object?[]? args) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetProperty(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetProperty(string! name, System.Type![]? parameterTypes, object?[]? args) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, object?[]? args, System.Globalization.CultureInfo! culture) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, params object?[]? args) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, object?[]? args, System.Globalization.CultureInfo! culture) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, params object?[]? args) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]! parameterTypes, object?[]? args) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo! culture) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo? culture, System.Type![]? typeArguments) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Type![]! parameterTypes, object?[]? args, System.Type![]! typeArguments) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Type![]! parameterTypes, object?[]? args) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Invoke(string! name, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo! culture) -> object? (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(object! obj, Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType! type) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(object! obj, string! memberToAccess) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(object! obj) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(string! assemblyName, string! typeName, params object?[]? args) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(string! assemblyName, string! typeName, System.Type![]? parameterTypes, object?[]? args) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(System.Type! type, params object?[]? args) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.PrivateObject(System.Type! type, System.Type![]? parameterTypes, object?[]? args) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.RealType.get -> System.Type! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetArrayElement(string! name, object! value, params int[]! indices) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetArrayElement(string! name, System.Reflection.BindingFlags bindingFlags, object! value, params int[]! indices) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetField(string! name, object! value) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetField(string! name, System.Reflection.BindingFlags bindingFlags, object? value) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetFieldOrProperty(string! name, object! value) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetFieldOrProperty(string! name, System.Reflection.BindingFlags bindingFlags, object? value) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetProperty(string! name, object? value, params object?[]? args) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetProperty(string! name, System.Reflection.BindingFlags bindingFlags, object! value, params object?[]? args) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetProperty(string! name, System.Reflection.BindingFlags bindingFlags, object? value, System.Type![]? parameterTypes, object?[]? args) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.SetProperty(string! name, System.Type![]? parameterTypes, object? value, object?[]? args) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Target.get -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Target.set -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticArrayElement(string! name, params int[]! indices) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticArrayElement(string! name, System.Reflection.BindingFlags bindingFlags, params int[]! indices) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticField(string! name, System.Reflection.BindingFlags bindingFlags) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticField(string! name) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticFieldOrProperty(string! name, System.Reflection.BindingFlags bindingFlags) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticFieldOrProperty(string! name) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticProperty(string! name, params object?[]? args) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticProperty(string! name, System.Reflection.BindingFlags bindingFlags, params object?[]? args) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.GetStaticProperty(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, object?[]? args, System.Globalization.CultureInfo? culture) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, params object?[]? args) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, object?[]? args, System.Globalization.CultureInfo? culture) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, params object?[]? args) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo? culture, System.Type![]? typeArguments) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo? culture) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Reflection.BindingFlags bindingFlags, System.Type![]? parameterTypes, object?[]? args) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Type![]? parameterTypes, object?[]? args, System.Globalization.CultureInfo? culture) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Type![]? parameterTypes, object?[]? args, System.Type![]! typeArguments) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.InvokeStatic(string! name, System.Type![]? parameterTypes, object?[]? args) -> object! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.PrivateType(string! assemblyName, string! typeName) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.PrivateType(System.Type! type) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.ReferencedType.get -> System.Type! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticArrayElement(string! name, object! value, params int[]! indices) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticArrayElement(string! name, System.Reflection.BindingFlags bindingFlags, object! value, params int[]! indices) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticField(string! name, object! value) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticField(string! name, System.Reflection.BindingFlags bindingFlags, object! value) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticFieldOrProperty(string! name, object! value) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticFieldOrProperty(string! name, System.Reflection.BindingFlags bindingFlags, object! value) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticProperty(string! name, object! value, params object?[]? args) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticProperty(string! name, object! value, System.Type![]? parameterTypes, object?[]? args) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticProperty(string! name, System.Reflection.BindingFlags bindingFlags, object! value, params object?[]? args) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.PrivateType.SetStaticProperty(string! name, System.Reflection.BindingFlags bindingFlags, object! value, System.Type![]? parameterTypes, object?[]? args) -> void (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.TestConfiguration (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.TestConfigurationSection (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.TestConfigurationSection.DataSources.get -> Microsoft.VisualStudio.TestTools.UnitTesting.DataSourceElementCollection! (forwarded, contained in MSTest.TestFramework)
+Microsoft.VisualStudio.TestTools.UnitTesting.TestConfigurationSection.TestConfigurationSection() -> void (forwarded, contained in MSTest.TestFramework)
+override Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.Equals(object? obj) -> bool (forwarded, contained in MSTest.TestFramework)
+override Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject.GetHashCode() -> int (forwarded, contained in MSTest.TestFramework)
+static Microsoft.VisualStudio.TestTools.UnitTesting.TestConfiguration.ConfigurationSection.get -> Microsoft.VisualStudio.TestTools.UnitTesting.TestConfigurationSection! (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DeploymentDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.ResultsDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestResultsDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunResultsDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestTempDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
diff --git a/src/TestFramework/TestFramework.Compatibility/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/TestFramework/TestFramework.Compatibility/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..91ebb602b6
--- /dev/null
+++ b/src/TestFramework/TestFramework.Compatibility/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -0,0 +1,12 @@
+#nullable enable
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path, string? outputDirectory) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.OutputDirectory.get -> string?
+Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.Path.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DeploymentDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.ResultsDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestResultsDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunResultsDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestTempDirectory.get -> string?
diff --git a/src/TestFramework/TestFramework.Compatibility/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/TestFramework/TestFramework.Compatibility/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..dcad70fcda
--- /dev/null
+++ b/src/TestFramework/TestFramework.Compatibility/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -0,0 +1,18 @@
+#nullable enable
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path, string? outputDirectory) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path) -> void
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.OutputDirectory.get -> string?
+*REMOVED*Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.Path.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DeploymentDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.ResultsDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestResultsDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunResultsDirectory.get -> string?
+*REMOVED*virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestTempDirectory.get -> string?
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DeploymentDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.ResultsDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestResultsDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunResultsDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
+virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestTempDirectory.get -> string? (forwarded, contained in MSTest.TestFramework)
diff --git a/src/TestFramework/TestFramework.Compatibility/TestFramework.Compatibility.csproj b/src/TestFramework/TestFramework.Compatibility/TestFramework.Compatibility.csproj
new file mode 100644
index 0000000000..9ea5628ef4
--- /dev/null
+++ b/src/TestFramework/TestFramework.Compatibility/TestFramework.Compatibility.csproj
@@ -0,0 +1,24 @@
+
+
+
+ netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks)
+ MSTest.TestFramework.Extensions
+ false
+
+
+
+ <_ApiTargetFramework>$(TargetFramework)
+ <_ApiTargetFramework Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">net10.0
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/TestFramework/TestFramework.Extensions/TypeForwarders.cs b/src/TestFramework/TestFramework.Compatibility/TypeForwarders.cs
similarity index 96%
rename from src/TestFramework/TestFramework.Extensions/TypeForwarders.cs
rename to src/TestFramework/TestFramework.Compatibility/TypeForwarders.cs
index 58f28e3103..dab43d5002 100644
--- a/src/TestFramework/TestFramework.Extensions/TypeForwarders.cs
+++ b/src/TestFramework/TestFramework.Compatibility/TypeForwarders.cs
@@ -14,7 +14,7 @@
[assembly: TypeForwardedTo(typeof(PlannedTest))]
#pragma warning restore MSTESTEXP
-#if !NETSTANDARD2_0 && !WINDOWS_UWP && !WIN_UI
+#if !NETSTANDARD2_0
[assembly: TypeForwardedTo(typeof(DeploymentItemAttribute))]
#endif
diff --git a/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj b/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj
deleted file mode 100644
index 64adf54491..0000000000
--- a/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj
+++ /dev/null
@@ -1,257 +0,0 @@
-
-
-
- <_UsesMSBuildSdkExtras Condition=" '$(OS)' == 'Windows_NT' ">true
-
-
-
-
-
-
-
- netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(ModernUwpMinimum);$(WinUiMinimum)
- $(SupportedNetFrameworks);netstandard2.0
-
-
-
- true
-
- false
- MSTest.TestFramework
- $(CommonPackageTags) MSTest TestFramework MSTestV2 Framework
-
- $(NoWarn);NU5100;NU5128
-
-
-
- Microsoft.VisualStudio.TestTools.UnitTesting
- MSTest.TestFramework.Extensions
- $(DefineConstants);TRACE
-
- $(DefineConstants);EXCLUDE_RANGE_INDEX_POLYFILL;EXCLUDE_OS_POLYFILL
-
-
-
-
- $(DefineConstants);WIN_UI
- 10.0.18362.0
- 10.0.17763.0
- 10.0.17763.0
-
-
-
- $(DefineConstants);WINDOWS_UWP
-
-
-
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ApiTargetFramework>$(TargetFramework)
- <_ApiTargetFramework Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0')) AND !$(TargetFramework.Contains('-'))">net10.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_NonPublishableNupkg>$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg
- <_NonPublishableExtractDir>$(BaseIntermediateOutputPath)nupkgfix\
-
-
-
-
-
-
- <_NonPublishableNuspecPath>$(_NonPublishableExtractDir)$(PackageId).nuspec
- <_NonPublishableNuspecContent>$([System.IO.File]::ReadAllText($(_NonPublishableNuspecPath)))
- <_NonPublishableNuspecFixed>$([System.Text.RegularExpressions.Regex]::Replace($(_NonPublishableNuspecContent), '[ \t]*<dependency id="NotPublishable"[^>]*/>[ \t]*\r?\n', ''))
-
- <_NonPublishableDependencyRemoved>false
- <_NonPublishableDependencyRemoved Condition=" '$(_NonPublishableNuspecFixed)' != '$(_NonPublishableNuspecContent)' ">true
-
-
-
-
-
- <_WriteTextFile Condition=" '$(_NonPublishableDependencyRemoved)' == 'true' " Path="$(_NonPublishableNuspecPath)" Content="$(_NonPublishableNuspecFixed)" />
-
-
-
-
-
-
-
-
-
- $(TargetsForTfmSpecificContentInPackage);_AddTestFrameworkPackageFiles
-
-
-
-
-
- <_PackageTfm Condition=" '$(TargetFramework)' == '$(UwpMinimum)' ">uap10.0
- <_PackageTfm Condition=" '$(_PackageTfm)' == '' ">$(TargetFramework)
-
-
- <_ExtensionsPackagePath Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == '$(NetFrameworkMinimum)' OR '$(TargetFramework)' == '$(UwpMinimum)' ">lib\$(_PackageTfm)\
- <_ExtensionsPackagePath Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">buildTransitive\$(TargetFramework)\
- <_ExtensionsPackagePath Condition=" '$(TargetFramework)' == '$(WinUiMinimum)' ">buildTransitive\net10.0\winui\
- <_ExtensionsPackagePath Condition=" '$(TargetFramework)' == '$(ModernUwpMinimum)' ">buildTransitive\net10.0\uwp\
-
- <_CorePackagePath>lib\$(_PackageTfm)\
- <_CorePackagePath Condition=" '$(TargetFramework)' == '$(WinUiMinimum)' OR '$(TargetFramework)' == '$(ModernUwpMinimum)' ">$(_ExtensionsPackagePath)
-
-
-
-
-
-
-
-
- <_CoreResourceFile Include="$(TargetDir)**\MSTest.TestFramework.resources.dll" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/TestFramework/TestFramework.Extensions/build/net10.0/MSTest.TestFramework.targets b/src/TestFramework/TestFramework.Extensions/build/net10.0/MSTest.TestFramework.targets
deleted file mode 100644
index 9d8d32dc68..0000000000
--- a/src/TestFramework/TestFramework.Extensions/build/net10.0/MSTest.TestFramework.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/TestFramework/TestFramework.Extensions/build/net11.0/MSTest.TestFramework.targets b/src/TestFramework/TestFramework.Extensions/build/net11.0/MSTest.TestFramework.targets
deleted file mode 100644
index 1cf2ef5560..0000000000
--- a/src/TestFramework/TestFramework.Extensions/build/net11.0/MSTest.TestFramework.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/TestFramework/TestFramework.Extensions/build/net462/MSTest.TestFramework.targets b/src/TestFramework/TestFramework.Extensions/build/net462/MSTest.TestFramework.targets
deleted file mode 100644
index f80fd5bb22..0000000000
--- a/src/TestFramework/TestFramework.Extensions/build/net462/MSTest.TestFramework.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/TestFramework/TestFramework.Extensions/build/netstandard2.0/MSTest.TestFramework.targets b/src/TestFramework/TestFramework.Extensions/build/netstandard2.0/MSTest.TestFramework.targets
deleted file mode 100644
index d4afeaee4a..0000000000
--- a/src/TestFramework/TestFramework.Extensions/build/netstandard2.0/MSTest.TestFramework.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/TestFramework/TestFramework.Extensions/build/uap10.0/MSTest.TestFramework.targets b/src/TestFramework/TestFramework.Extensions/build/uap10.0/MSTest.TestFramework.targets
deleted file mode 100644
index 9b248fe99e..0000000000
--- a/src/TestFramework/TestFramework.Extensions/build/uap10.0/MSTest.TestFramework.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/TestFramework/TestFramework.Extensions/buildTransitive/net10.0AndLater/MSTest.TestFramework.targets b/src/TestFramework/TestFramework.Extensions/buildTransitive/net10.0AndLater/MSTest.TestFramework.targets
deleted file mode 100644
index 6150e3528e..0000000000
--- a/src/TestFramework/TestFramework.Extensions/buildTransitive/net10.0AndLater/MSTest.TestFramework.targets
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
- <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net10.0/winui/
-
-
-
-
- <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net10.0/uwp/
-
-
-
- <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)
-
-
-
-
- $(_TestFrameworkExtensionsRoot)MSTest.TestFramework.Extensions.dll
- PreserveNewest
- False
-
-
-
-
-
-
- <_MSTestCoreCompileAsset Include="@(ResolvedCompileFileDefinitions)" Condition=" '%(Filename)' == 'MSTest.TestFramework' " />
- <_MSTestCoreRuntimeAsset Include="@(RuntimeCopyLocalItems)" Condition=" '%(Filename)' == 'MSTest.TestFramework' " />
- <_MSTestCoreResourceAsset Include="@(ResourceCopyLocalItems)" Condition=" '%(Filename)' == 'MSTest.TestFramework.resources' " />
-
-
-
-
- $(_TestFrameworkExtensionsRoot)MSTest.TestFramework.dll
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/TestFramework/TestFramework.Windows.UIAutomation/TestFramework.Windows.UIAutomation.csproj b/src/TestFramework/TestFramework.Windows.UIAutomation/TestFramework.Windows.UIAutomation.csproj
index 247ae3097d..e7aa395bcc 100644
--- a/src/TestFramework/TestFramework.Windows.UIAutomation/TestFramework.Windows.UIAutomation.csproj
+++ b/src/TestFramework/TestFramework.Windows.UIAutomation/TestFramework.Windows.UIAutomation.csproj
@@ -24,7 +24,7 @@ $(CommonProductDescription)]]>
-
+
diff --git a/src/TestFramework/TestFramework.Extensions/buildTransitive/others/MSTest.TestFramework.targets b/src/TestFramework/TestFramework/MSTest.TestFramework.targets
similarity index 100%
rename from src/TestFramework/TestFramework.Extensions/buildTransitive/others/MSTest.TestFramework.targets
rename to src/TestFramework/TestFramework/MSTest.TestFramework.targets
diff --git a/src/TestFramework/TestFramework.Extensions/PACKAGE.md b/src/TestFramework/TestFramework/PACKAGE.md
similarity index 84%
rename from src/TestFramework/TestFramework.Extensions/PACKAGE.md
rename to src/TestFramework/TestFramework/PACKAGE.md
index 3d71cac2d8..bda210417a 100644
--- a/src/TestFramework/TestFramework.Extensions/PACKAGE.md
+++ b/src/TestFramework/TestFramework/PACKAGE.md
@@ -2,7 +2,9 @@
MSTest is Microsoft supported Test Framework.
-This package includes the libraries for writing tests with MSTest. To ensure discovery and execution of your tests, install the MSTest.TestAdapter package.
+This package contains the shared non-UI libraries for writing MSTest tests and
+helper libraries. Add `MSTest.TestAdapter` for ordinary test applications,
+`MSTest.Uwp` for UWP, or `MSTest.WinUI` for WinUI.
## Getting started
@@ -22,9 +24,7 @@ Supported platforms:
- .NET 4.6.2+
- .NET 10.0+
-- .NET 10.0 Windows.18362+ (WinUI)
-- UWP 10.0.16299
-- UWP 10.0.17763 with .NET 10+
+- .NET Standard 2.0 (including classic UWP helper libraries)
## Documentation
@@ -34,17 +34,19 @@ Starting with MSTest 5, `TestContext`, `DeploymentItemAttribute`, `MessageLevel`
`TestRun`, `ITestRunInfo` and `PlannedTest`
are defined in `MSTest.TestFramework.dll`. The .NET Framework-only private
reflection and test-configuration helpers are also defined there.
-`MSTest.TestFramework.Extensions.dll` forwards these types to the core assembly,
+The forwarding-only `MSTest.TestFramework.Extensions.dll` preserves these types,
so binaries compiled against MSTest 4 (such as `Microsoft.Playwright.MSTest.v4`)
and assembly-qualified type names that use the former assembly keep resolving to
the core definitions without a rebuild.
-UI APIs remain in Extensions. Package IDs, package ownership and supported targets
-are unchanged. UWP/WinUI select matching core and Extensions assemblies; their
-`TestContext` still excludes desktop directory properties, and
-`DeploymentItemAttribute` remains unavailable there and on .NET Standard 2.0.
-Modern UWP/WinUI core assemblies and their resources ship beside the existing
-UI Extensions assets in `buildTransitive/net10.0/uwp` and
-`buildTransitive/net10.0/winui`; ordinary consumers keep their `lib` assets.
+
+The old Extensions implementation and package-owner project are retired.
+The facade contains no UI APIs or implementation. UI APIs now belong to
+`MSTest.Uwp` and `MSTest.WinUI`; migrate package/assembly references and
+recompile. All applications and ordinary helper libraries use the same non-UI
+core selected through `lib/`. Modern UI consumers therefore see the shared
+directory and deployment APIs, but UI hosts return null for all six directory
+getters, even when same-named property-bag values exist, and reject
+`DeploymentItemAttribute` before the test body executes.
### Predicate-based collection assertions
diff --git a/src/TestFramework/TestFramework/TestFramework.csproj b/src/TestFramework/TestFramework/TestFramework.csproj
index be61f2a583..4a8af3cc03 100644
--- a/src/TestFramework/TestFramework/TestFramework.csproj
+++ b/src/TestFramework/TestFramework/TestFramework.csproj
@@ -9,13 +9,13 @@
MSTest.TestFramework
$(DefineConstants);TRACE
-
- NotPublishable
- false
+ MSTest.TestFramework
+ true
+ $(TargetsForTfmSpecificContentInPackage);_AddMSTestCompatibilityFacade
+ $(CommonPackageTags) MSTest TestFramework Framework
+
$(DefineConstants);EXCLUDE_RANGE_INDEX_POLYFILL;EXCLUDE_OS_POLYFILL
MSTest.TestFramework
- MSTest.TestFramework.Extensions
+ MSTest.TestFramework.Extensions
<_CodeCoverageProjectReference Include="$(MSBuildProjectFullPath)"
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ClassicUwpTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ClassicUwpTests.cs
index 086088d7cd..6dcd56b32e 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ClassicUwpTests.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ClassicUwpTests.cs
@@ -20,7 +20,7 @@ public sealed class ClassicUwpTests : AcceptanceTestBase
[TestMethod]
[DataRow("MSTest.Sdk")]
[DataRow("MSTest")]
- [DataRow("MSTest.TestAdapter")]
+ [DataRow("MSTest.Uwp")]
[OSCondition(OperatingSystems.Windows, IgnoreMessage = "Classic UWP execution is supported only on Windows.")]
public async Task ClassicUwp_ConsumesUapAssets_AndRunsPlainAndUiTestsThroughMtp(string package)
{
@@ -32,7 +32,7 @@ public async Task ClassicUwp_ConsumesUapAssets_AndRunsPlainAndUiTestsThroughMtp(
{
string references = package == "MSTest"
? $""
- : $"";
+ : $"";
source = source
.Replace(" ", string.Empty, StringComparison.Ordinal)
.Replace(" ", string.Empty, StringComparison.Ordinal)
@@ -307,11 +307,11 @@ private static void AssertCounter(XElement counters, string name, int expected,
-
-
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/CoreFrameworkAssemblyTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/CoreFrameworkAssemblyTests.cs
index 10030f36a7..9739a33202 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/CoreFrameworkAssemblyTests.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/CoreFrameworkAssemblyTests.cs
@@ -16,14 +16,10 @@ namespace MSTest.Acceptance.IntegrationTests;
public sealed class CoreFrameworkAssemblyTests : AcceptanceTestBase
{
[TestMethod]
- [OSCondition(OperatingSystems.Windows)]
[DataRow("lib/netstandard2.0", false, false, DisplayName = "NetStandardForwarders")]
[DataRow("lib/net462", true, true, DisplayName = "NetFrameworkForwarders")]
- [DataRow("lib/uap10.0", false, false, DisplayName = "ClassicUwpForwarders")]
- [DataRow("buildTransitive/net10.0", true, false, DisplayName = "Net10Forwarders")]
- [DataRow("buildTransitive/net11.0", true, false, DisplayName = "Net11Forwarders")]
- [DataRow("buildTransitive/net10.0/uwp", false, false, DisplayName = "ModernUwpForwarders")]
- [DataRow("buildTransitive/net10.0/winui", false, false, DisplayName = "WinUIForwarders")]
+ [DataRow("lib/net10.0", true, false, DisplayName = "Net10Forwarders")]
+ [DataRow("lib/net11.0", true, false, DisplayName = "Net11Forwarders")]
public void PackedExtensionsForwardMovedTypesToCore(string assetFolder, bool supportsDeployment, bool supportsPrivateHelpers)
{
string package = Path.Join(Constants.ArtifactsPackagesShipping, $"MSTest.TestFramework.{MSTestVersion}.nupkg");
@@ -36,9 +32,11 @@ public void PackedExtensionsForwardMovedTypesToCore(string assetFolder, bool sup
image.Position = 0;
using var pe = new PEReader(image);
MetadataReader metadata = pe.GetMetadataReader();
+ Assert.AreSequenceEqual(
+ [""],
+ metadata.TypeDefinitions.Select(handle => metadata.GetString(metadata.GetTypeDefinition(handle).Name)));
ExportedType[] forwardedTypes = metadata.ExportedTypes
.Select(metadata.GetExportedType)
- .Where(type => metadata.GetString(type.Namespace) == "Microsoft.VisualStudio.TestTools.UnitTesting")
.ToArray();
List expected = ["ITestRunInfo", "MessageLevel", "PlannedTest", "TestContext", "TestRun"];
if (supportsDeployment)
@@ -56,6 +54,7 @@ public void PackedExtensionsForwardMovedTypesToCore(string assetFolder, bool sup
forwardedTypes.Select(type => metadata.GetString(type.Name)).Order(StringComparer.Ordinal));
foreach (ExportedType type in forwardedTypes)
{
+ Assert.AreEqual("Microsoft.VisualStudio.TestTools.UnitTesting", metadata.GetString(type.Namespace));
Assert.IsTrue(type.IsForwarder);
Assert.AreEqual(HandleKind.AssemblyReference, type.Implementation.Kind);
Assert.AreEqual(
@@ -66,23 +65,26 @@ public void PackedExtensionsForwardMovedTypesToCore(string assetFolder, bool sup
[TestMethod]
[OSCondition(OperatingSystems.Windows)]
- [DataRow("net10.0-windows10.0.26100.0", false, false, false, "lib/net10.0", DisplayName = "OrdinaryWindows")]
- [DataRow("net10.0-windows10.0.26100.0", true, false, false, "buildTransitive/net10.0/winui", DisplayName = "WinUI")]
- [DataRow("net10.0-windows10.0.26100.0", false, true, true, "buildTransitive/net10.0/uwp", DisplayName = "ModernUwp")]
- [DataRow("net10.0-windows10.0.26100.0", false, false, true, "lib/net10.0", DisplayName = "ExplicitUwpToolsOptOut")]
- [DataRow("net11.0-windows10.0.26100.0", false, false, false, "lib/net11.0", DisplayName = "Net11OrdinaryWindows")]
- [DataRow("net11.0-windows10.0.26100.0", true, false, false, "buildTransitive/net10.0/winui", DisplayName = "Net11WinUI")]
- [DataRow("net11.0-windows10.0.26100.0", false, true, true, "buildTransitive/net10.0/uwp", DisplayName = "Net11ModernUwp")]
- public async Task PackedConsumersUseMatchingCoreAndExtensions(
- string targetFramework, bool useWinUI, bool useUwpTools, bool useUwp, string coreAsset)
+ [DataRow("net10.0-windows10.0.26100.0", false, false, false, "", DisplayName = "OrdinaryWindows")]
+ [DataRow("net10.0-windows10.0.26100.0", true, false, false, "MSTest.WinUI", DisplayName = "WinUI")]
+ [DataRow("net10.0-windows10.0.26100.0", false, true, true, "MSTest.Uwp", DisplayName = "ModernUwp")]
+ [DataRow("net10.0-windows10.0.26100.0", false, false, true, "", DisplayName = "ExplicitUwpToolsOptOut")]
+ [DataRow("net11.0-windows10.0.26100.0", false, false, false, "", DisplayName = "Net11OrdinaryWindows")]
+ [DataRow("net11.0-windows10.0.26100.0", true, false, false, "MSTest.WinUI", DisplayName = "Net11WinUI")]
+ [DataRow("net11.0-windows10.0.26100.0", false, true, true, "MSTest.Uwp", DisplayName = "Net11ModernUwp")]
+ public async Task PackedConsumersUseSharedCoreAndSelectedUiPackage(
+ string targetFramework, bool useWinUI, bool useUwpTools, bool useUwp, string uiPackage)
{
- bool desktop = coreAsset.StartsWith("lib/", StringComparison.Ordinal);
+ string coreAsset = $"lib/{targetFramework.Split('-')[0]}";
+ string uiTfm = useWinUI ? "net10.0-windows10.0.18362" : "net10.0-windows10.0.17763";
string source = ConsumerSource
.Replace("$TargetFramework$", targetFramework, StringComparison.Ordinal)
.Replace("$MSTestVersion$", MSTestVersion, StringComparison.Ordinal)
.Replace("$UseWinUI$", useWinUI.ToString(), StringComparison.Ordinal)
.Replace("$UseUwpTools$", useUwpTools.ToString(), StringComparison.Ordinal)
- .Replace("$UseUwp$", useUwp.ToString(), StringComparison.Ordinal);
+ .Replace("$UseUwp$", useUwp.ToString(), StringComparison.Ordinal)
+ .Replace("$UiPackage$", uiPackage, StringComparison.Ordinal)
+ .Replace("$UiReference$", uiPackage.Length == 0 ? string.Empty : $"", StringComparison.Ordinal);
using TestAsset asset = await TestAsset.GenerateAssetAsync("CoreFrameworkConsumer", source);
string cache = Path.Join(asset.TargetAssetPath, ".packages");
var environment = new Dictionary { ["NUGET_PACKAGES"] = cache };
@@ -100,34 +102,33 @@ public async Task PackedConsumersUseMatchingCoreAndExtensions(
Assert.AreEqual(
Path.GetFullPath(cache),
Path.GetFullPath(assets.RootElement.GetProperty("project").GetProperty("restore").GetProperty("packagesPath").GetString()!));
- string package = Path.Join(Constants.ArtifactsPackagesShipping, $"MSTest.TestFramework.{MSTestVersion}.nupkg");
- string restored = Path.Join(cache, "mstest.testframework", MSTestVersion);
- string cachedPackage = Path.Join(restored, $"mstest.testframework.{MSTestVersion}.nupkg");
- Assert.AreEqual(
- Convert.ToHexString(SHA256.HashData(File.ReadAllBytes(package))),
- Convert.ToHexString(SHA256.HashData(File.ReadAllBytes(cachedPackage))));
- string extensionsAsset = desktop ? $"buildTransitive/{targetFramework.Split('-')[0]}" : coreAsset;
- (string Name, string Asset)[] assemblies =
+ List<(string Package, string Name, string Asset)> assemblies =
[
- ("MSTest.TestFramework", coreAsset),
- ("MSTest.TestFramework.Extensions", extensionsAsset),
+ ("MSTest.TestFramework", "MSTest.TestFramework", coreAsset),
+ ("MSTest.TestFramework", "MSTest.TestFramework.Extensions", coreAsset),
];
+ if (uiPackage.Length != 0)
+ {
+ assemblies.Add((uiPackage, uiPackage, $"lib/{uiTfm}"));
+ assemblies.Add((uiPackage, "MSTest.TestAdapter", $"buildTransitive/{uiTfm}"));
+ assemblies.Add((uiPackage, "MSTestAdapter.PlatformServices", $"buildTransitive/{uiTfm}"));
+ }
+
string output = Path.Join(asset.TargetAssetPath, "bin", "Release", targetFramework);
string[] resolved = File.ReadAllLines(Path.Join(asset.TargetAssetPath, "resolved-framework-assets.txt"));
var expectedResolved = new List();
- using ZipArchive archive = ZipFile.OpenRead(package);
- foreach ((string name, string folder) in assemblies)
+ foreach ((string packageId, string name, string folder) in assemblies)
{
+ string package = Path.Join(Constants.ArtifactsPackagesShipping, $"{packageId}.{MSTestVersion}.nupkg");
+ string restored = Path.Join(cache, packageId.ToLowerInvariant(), MSTestVersion);
+ string cachedPackage = Path.Join(restored, $"{packageId.ToLowerInvariant()}.{MSTestVersion}.nupkg");
+ Assert.AreEqual(
+ Convert.ToHexString(SHA256.HashData(File.ReadAllBytes(package))),
+ Convert.ToHexString(SHA256.HashData(File.ReadAllBytes(cachedPackage))));
+ using ZipArchive archive = ZipFile.OpenRead(package);
string relative = $"{folder}/{name}.dll";
using Stream packedAssembly = archive.GetEntry(relative)!.Open();
string hash = Convert.ToHexString(SHA256.HashData(packedAssembly));
- if (name == "MSTest.TestFramework")
- {
- string sharedCoreAsset = desktop ? coreAsset : "lib/net10.0";
- using Stream sharedCore = archive.GetEntry($"{sharedCoreAsset}/{name}.dll")!.Open();
- Assert.AreEqual(Convert.ToHexString(SHA256.HashData(sharedCore)), hash, relative);
- }
-
string cachedAssembly = Path.GetFullPath(Path.Join(restored, relative));
string copiedAssembly = Path.Join(output, name + ".dll");
Assert.AreEqual(hash, Convert.ToHexString(SHA256.HashData(File.ReadAllBytes(cachedAssembly))), relative);
@@ -138,7 +139,8 @@ public async Task PackedConsumersUseMatchingCoreAndExtensions(
}
Assert.AreSequenceEqual(expectedResolved.Order(StringComparer.Ordinal), resolved.Order(StringComparer.Ordinal));
- using Stream packedResource = archive.GetEntry($"{coreAsset}/fr/MSTest.TestFramework.resources.dll")!.Open();
+ using ZipArchive corePackage = ZipFile.OpenRead(Path.Join(Constants.ArtifactsPackagesShipping, $"MSTest.TestFramework.{MSTestVersion}.nupkg"));
+ using Stream packedResource = corePackage.GetEntry($"{coreAsset}/fr/MSTest.TestFramework.resources.dll")!.Open();
string copiedResource = Path.Join(output, "fr", "MSTest.TestFramework.resources.dll");
Assert.AreEqual(
Convert.ToHexString(SHA256.HashData(packedResource)),
@@ -149,15 +151,21 @@ public async Task PackedConsumersUseMatchingCoreAndExtensions(
workingDirectory: asset.TargetAssetPath,
cancellationToken: TestContext.CancellationToken);
Assert.AreEqual(0, exit, $"{muxer.StandardOutput}{muxer.StandardError}");
- Assert.AreEqual(
- $"""
+ string expectedOutput = uiPackage.Length == 0
+ ? $"""
+ {Path.Join(output, "MSTest.TestFramework.dll")}
+ {Path.Join(output, "MSTest.TestFramework.Extensions.dll")}
+ {copiedResource}
+ Packed framework ownership and API shape passed.
+ """
+ : $"""
{Path.Join(output, "MSTest.TestFramework.dll")}
{Path.Join(output, "MSTest.TestFramework.Extensions.dll")}
+ {Path.Join(output, uiPackage + ".dll")}
{copiedResource}
Packed framework ownership and API shape passed.
- """.ReplaceLineEndings(),
- muxer.StandardOutput.ReplaceLineEndings());
- TestContext.WriteLine($"Package: {package}; cache: {restored}");
+ """;
+ Assert.AreEqual(expectedOutput.ReplaceLineEndings(), muxer.StandardOutput.ReplaceLineEndings());
TestContext.WriteLine($"Package folders: {string.Join("; ", packageFolders)}");
TestContext.WriteLine(string.Join(Environment.NewLine, resolved));
TestContext.WriteLine(muxer.StandardOutput);
@@ -182,11 +190,12 @@ Packed framework ownership and API shape passed.
+ $UiReference$
- <_FrameworkCompile Include="@(ReferencePath)" Condition=" ('%(Filename)' == 'MSTest.TestFramework' OR '%(Filename)' == 'MSTest.TestFramework.Extensions') AND '%(Extension)' == '.dll' " />
- <_FrameworkRuntime Include="@(ReferenceCopyLocalPaths)" Condition=" ('%(Filename)' == 'MSTest.TestFramework' OR '%(Filename)' == 'MSTest.TestFramework.Extensions') AND '%(Extension)' == '.dll' " />
+ <_FrameworkCompile Include="@(ReferencePath)" Condition=" ('%(Filename)' == 'MSTest.TestFramework' OR '%(Filename)' == 'MSTest.TestFramework.Extensions' OR '%(Filename)' == '$UiPackage$' OR '%(Filename)' == 'MSTest.TestAdapter' OR '%(Filename)' == 'MSTestAdapter.PlatformServices') AND '%(Extension)' == '.dll' " />
+ <_FrameworkRuntime Include="@(ReferenceCopyLocalPaths)" Condition=" ('%(Filename)' == 'MSTest.TestFramework' OR '%(Filename)' == 'MSTest.TestFramework.Extensions' OR '%(Filename)' == '$UiPackage$' OR '%(Filename)' == 'MSTest.TestAdapter' OR '%(Filename)' == 'MSTestAdapter.PlatformServices') AND '%(Extension)' == '.dll' " />
@@ -221,6 +230,26 @@ Packed framework ownership and API shape passed.
Assert.IsNull(typeof(TestContext).GetProperty("DataConnection"));
Console.WriteLine(core.Location);
Console.WriteLine(extensions.Location);
+ if ("$UiPackage$".Length != 0)
+ {
+ Assembly ui = Assembly.Load("$UiPackage$");
+ Assert.IsNull(ui.GetType(typeof(TestContext).FullName!));
+ Assembly services = Assembly.Load("MSTestAdapter.PlatformServices");
+ Type implementation = services.GetType("Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.TestContextImplementation", true)!;
+ var properties = directories.ToDictionary(name => name, name => (object?)"must-not-be-a-directory");
+ var context = (TestContext)implementation.GetConstructors(BindingFlags.Instance | BindingFlags.NonPublic)
+ .Single(constructor => constructor.GetParameters().Length == 5)
+ .Invoke([null, null, properties, null, null]);
+ foreach (string directory in directories)
+ {
+ Assert.AreEqual("must-not-be-a-directory", context.Properties[directory]);
+ Assert.IsNull(typeof(TestContext).GetProperty(directory)!.GetValue(context), directory);
+ }
+
+ ((IDisposable)context).Dispose();
+ Console.WriteLine(ui.Location);
+ }
+
Console.WriteLine(core.GetSatelliteAssembly(System.Globalization.CultureInfo.GetCultureInfo("fr")).Location);
Console.WriteLine("Packed framework ownership and API shape passed.");
""";
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/CppCliMtpTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/CppCliMtpTests.cs
index 6be46f0ba4..603ab242cd 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/CppCliMtpTests.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/CppCliMtpTests.cs
@@ -209,9 +209,6 @@ public void Placeholder()
$(ClosureDir)\MSTest.TestFramework.dll
-
- $(ClosureDir)\MSTest.TestFramework.Extensions.dll
-
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/CppCliVSTestTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/CppCliVSTestTests.cs
index a3de105dcf..9a1c5cd338 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/CppCliVSTestTests.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/CppCliVSTestTests.cs
@@ -169,9 +169,6 @@ private static string ExtractShippingPackage(TempDirectory destination, string p
$MSTestFrameworkDir$\MSTest.TestFramework.dll
-
- $MSTestFrameworkDir$\MSTest.TestFramework.Extensions.dll
-
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/FrameworkTargetingTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/FrameworkTargetingTests.cs
index 308e12bd1b..1c0be64190 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/FrameworkTargetingTests.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/FrameworkTargetingTests.cs
@@ -97,11 +97,10 @@ await DotnetCli.RunAsync(
string importedTargets = File.ReadAllText(Path.Combine(asset.TargetAssetPath, "obj", $"{assetName}.csproj.nuget.g.targets"))
.Replace('\\', '/');
Assert.Contains($"buildTransitive/{targetFramework}/MSTest.TestAdapter.targets", importedTargets);
- Assert.Contains($"buildTransitive/{targetFramework}/MSTest.TestFramework.targets", importedTargets);
+ Assert.Contains("buildTransitive/MSTest.TestFramework.targets", importedTargets);
var host = TestHost.LocateFrom(asset.TargetAssetPath, assetName, targetFramework);
await AssertMatchingAssemblyAsync("MSTest.TestFramework", MSTestVersion, $"lib/{targetFramework}/MSTest.TestFramework.dll", host.DirectoryName);
- await AssertMatchingAssemblyAsync("MSTest.TestFramework", MSTestVersion, $"buildTransitive/{targetFramework}/MSTest.TestFramework.Extensions.dll", host.DirectoryName);
await AssertMatchingAssemblyAsync("MSTest.TestAdapter", MSTestVersion, $"buildTransitive/{targetFramework}/MSTest.TestAdapter.dll", host.DirectoryName);
await AssertMatchingAssemblyAsync("MSTest.TestAdapter", MSTestVersion, $"buildTransitive/{targetFramework}/MSTestAdapter.PlatformServices.dll", host.DirectoryName);
await AssertMatchingAssemblyAsync("Microsoft.Testing.Platform", MicrosoftTestingPlatformVersion, $"lib/{targetFramework}/Microsoft.Testing.Platform.dll", host.DirectoryName);
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/SdkTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/SdkTests.cs
index 688f5ad7d6..17567de321 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/SdkTests.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/SdkTests.cs
@@ -425,11 +425,13 @@ public async Task SatelliteResourceLanguages_FiltersClassicUwpAdapterResources(s
-
+
-
+
+
@@ -467,11 +469,13 @@ public async Task SatelliteResourceLanguages_FiltersClassicUwpMtpAdapterResource
-
+
-
+
+
@@ -805,11 +809,13 @@ public async Task SettingIsTestApplicationToFalseReducesAddedExtensionsAndMakesP
SL.Task cscTask = binLog.FindChildrenRecursive(task => task.Name == "Csc").Single();
SL.Item[] references = [.. cscTask.FindChildrenRecursive(p => p.Name == "References").Single().Children.OfType()];
- // Ensure that MSTest.Framework is referenced
+ // Ordinary helpers reference shared core and its forwarding-only compatibility facade.
Assert.Contains(r => r.Text.EndsWith("MSTest.TestFramework.dll", StringComparison.OrdinalIgnoreCase), references);
Assert.Contains(r => r.Text.EndsWith("MSTest.TestFramework.Extensions.dll", StringComparison.OrdinalIgnoreCase), references);
+ Assert.DoesNotContain(r => r.Text.EndsWith("MSTest.Uwp.dll", StringComparison.OrdinalIgnoreCase), references);
+ Assert.DoesNotContain(r => r.Text.EndsWith("MSTest.WinUI.dll", StringComparison.OrdinalIgnoreCase), references);
- // No adapter, no extensions, no vstest sdk
+ // No adapter, no MTP extensions, no vstest sdk
Assert.DoesNotContain(r => r.Text.EndsWith("MSTest.TestAdapter.dll", StringComparison.OrdinalIgnoreCase), references);
Assert.DoesNotContain(r => r.Text.Contains("Microsoft.Testing.Extensions.", StringComparison.OrdinalIgnoreCase), references);
@@ -1257,7 +1263,7 @@ public async Task MSTestSdk_ModernUwp_DefaultsToMtpWithAppModelController()
result.AssertOutputContains("Controller=mstest-appmodel-controller.exe");
result.AssertOutputContains("ControllerTfm=net11.0");
result.AssertOutputContains("ControllerExtensions=msbuild;packagedapp;codecoverage;trx;mstest;EndContract");
- result.AssertOutputContains("MSTest.TestAdapter");
+ result.AssertOutputContains("MSTest.Uwp");
result.AssertOutputContains("MSTest.TestFramework");
result.AssertOutputContains("Microsoft.Testing.Extensions.PackagedApp");
result.AssertOutputContains("TestContainer");
@@ -1375,10 +1381,14 @@ public void UseUwpToolsFalse_RunsThroughDirectMtp()
string adapterPath = resolvedAssets.Single(
path => path.EndsWith("MSTest.TestAdapter.dll", StringComparison.OrdinalIgnoreCase));
- string frameworkExtensionsPath = resolvedAssets.Single(
- path => path.EndsWith("MSTest.TestFramework.Extensions.dll", StringComparison.OrdinalIgnoreCase));
+ string frameworkPath = resolvedAssets.Single(
+ path => path.EndsWith("MSTest.TestFramework.dll", StringComparison.OrdinalIgnoreCase));
Assert.DoesNotContain($"{Path.DirectorySeparatorChar}uwp{Path.DirectorySeparatorChar}", adapterPath, adapterPath);
- Assert.DoesNotContain($"{Path.DirectorySeparatorChar}uwp{Path.DirectorySeparatorChar}", frameworkExtensionsPath, frameworkExtensionsPath);
+ Assert.DoesNotContain($"{Path.DirectorySeparatorChar}uwp{Path.DirectorySeparatorChar}", frameworkPath, frameworkPath);
+ Assert.DoesNotContain(
+ path => path.EndsWith("MSTest.Uwp.dll", StringComparison.OrdinalIgnoreCase)
+ || path.EndsWith("MSTest.WinUI.dll", StringComparison.OrdinalIgnoreCase),
+ resolvedAssets);
Assert.DoesNotContain(
path => path.Contains("Microsoft.Testing.Extensions.PackagedApp", StringComparison.OrdinalIgnoreCase),
resolvedAssets);
@@ -1437,6 +1447,7 @@ public async Task MSTestSdk_UnpackagedWinUIWithUwpXamlReferences_DoesNotConflict
}
[TestMethod]
+ [OSCondition(OperatingSystems.Windows, IgnoreMessage = "The packed MSTest.WinUI assets are produced only by Windows builds.")]
public async Task MSTestSdk_UnpackagedWinUI_DefaultsToMtpWithoutPackagedAppLauncher()
{
DotnetMuxerResult result = await EvaluateWindowsApplicationModelAsync(
@@ -1455,6 +1466,7 @@ public async Task MSTestSdk_UnpackagedWinUI_DefaultsToMtpWithoutPackagedAppLaunc
}
[TestMethod]
+ [OSCondition(OperatingSystems.Windows, IgnoreMessage = "The packed MSTest.WinUI assets are produced only by Windows builds.")]
public async Task MSTestSdk_UnpackagedWinUIWithExplicitPackagedAppExtension_KeepsDirectLaunch()
{
DotnetMuxerResult result = await EvaluateWindowsApplicationModelAsync(
@@ -1486,6 +1498,7 @@ public async Task MSTestSdk_ConsoleWithExplicitPackagedAppExtension_KeepsDirectL
}
[TestMethod]
+ [OSCondition(OperatingSystems.Windows, IgnoreMessage = "The packed MSTest.WinUI assets are produced only by Windows builds.")]
public async Task MSTestSdk_UnpackagedWinUI_AllowsVSTest()
{
DotnetMuxerResult result = await EvaluateWindowsApplicationModelAsync(
@@ -1502,11 +1515,12 @@ public async Task MSTestSdk_UnpackagedWinUI_AllowsVSTest()
result.AssertOutputContains("WindowsTestContract:UseVSTest=true;GenerateEntryPoint=false;GenerateHelper=false;PackagedApp=;OutputType=Exe;IsTestProject=true;");
result.AssertOutputContains(";Controller=;ControllerTfm=;ControllerExtensions=;EndContract");
result.AssertOutputContains("Microsoft.NET.Test.Sdk");
- result.AssertOutputContains("MSTest.TestAdapter");
+ result.AssertOutputContains("MSTest.WinUI");
result.AssertOutputDoesNotContain("Microsoft.Testing.Extensions.PackagedApp");
}
[TestMethod]
+ [OSCondition(OperatingSystems.Windows, IgnoreMessage = "The packed MSTest.WinUI assets are produced only by Windows builds.")]
[DataRow(false)]
[DataRow(true)]
public async Task MSTestSdk_WinUIWithUwpTools_RejectsConflictingApplicationModels(bool useVSTest)
@@ -1526,9 +1540,10 @@ public async Task MSTestSdk_WinUIWithUwpTools_RejectsConflictingApplicationModel
}
[TestMethod]
- [DataRow("net10.0", "Windows_NT", "mstest-appmodel-controller.exe", "net10.0", "msbuild;packagedapp;codecoverage;trx;mstest")]
- [DataRow("net11.0", "Windows_NT", "mstest-appmodel-controller.exe", "net11.0", "msbuild;packagedapp;codecoverage;trx;mstest")]
- [DataRow("net11.0", "Unix", "", "", "")]
+ [OSCondition(OperatingSystems.Windows, IgnoreMessage = "The packed MSTest.WinUI assets are produced only by Windows builds.")]
+ [DataRow("net10.0-windows10.0.26100.0", "Windows_NT", "mstest-appmodel-controller.exe", "net10.0", "msbuild;packagedapp;codecoverage;trx;mstest")]
+ [DataRow("net11.0-windows10.0.26100.0", "Windows_NT", "mstest-appmodel-controller.exe", "net11.0", "msbuild;packagedapp;codecoverage;trx;mstest")]
+ [DataRow("net11.0-windows10.0.26100.0", "Unix", "", "", "")]
public async Task MSTestSdk_PackagedWinUI_SelectsLauncherOnlyOnWindows(
string targetFramework, string operatingSystem, string controller, string controllerTfm, string controllerExtensions)
{
@@ -1549,6 +1564,7 @@ public async Task MSTestSdk_PackagedWinUI_SelectsLauncherOnlyOnWindows(
}
[TestMethod]
+ [OSCondition(OperatingSystems.Windows, IgnoreMessage = "The packed MSTest.WinUI assets are produced only by Windows builds.")]
public async Task MSTestSdk_WinUISeparateHost_KeepsGeneratedEntryPoint()
{
DotnetMuxerResult result = await EvaluateWindowsApplicationModelAsync(
@@ -1589,6 +1605,7 @@ private async Task EvaluateWindowsApplicationModelAsync(
$TargetFramework$
Exe
+ true
true
$(NoWarn);NETSDK1201;NU1507
$ApplicationModelProperties$
@@ -1615,7 +1632,7 @@ private async Task EvaluateWindowsApplicationModelAsync(
Source
.PatchCodeWithReplace("$AssetName$", assetName)
.PatchCodeWithReplace("$MSTestVersion$", MSTestVersion)
- .PatchCodeWithReplace("$TargetFramework$", targetFramework ?? TargetFrameworks.NetCurrent)
+ .PatchCodeWithReplace("$TargetFramework$", targetFramework ?? $"{TargetFrameworks.NetCurrent}-windows10.0.26100.0")
.PatchCodeWithReplace("$ApplicationModelProperties$", applicationModelProperties));
string binlogPath = Path.Combine(testAsset.TargetAssetPath, $"{assetName}.binlog");
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/UnpackagedWinUITests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/UnpackagedWinUITests.cs
index 6a5d47c83c..0ce8669fc5 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/UnpackagedWinUITests.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/UnpackagedWinUITests.cs
@@ -276,13 +276,7 @@ anywhere. What is under test here (no package identity, WinUI hosting MTP, [UITe
-
-
-
+
@@ -504,8 +498,7 @@ anywhere. What is under test here (no package identity, WinUI hosting MTP, [UITe
-
-
+
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/WinUITests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/WinUITests.cs
index eb3889a7c3..a944abf244 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/WinUITests.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/WinUITests.cs
@@ -129,8 +129,7 @@ and GetCurrentPackagePath() returning null).
-
-
+
@@ -176,8 +175,7 @@ public void TestMethod1()
$SourceGenMode$
-
-
+
$Generator$
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/WindowsApplicationModelPackageTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/WindowsApplicationModelPackageTests.cs
index 333b4b3cd5..e6d8f40ff4 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/WindowsApplicationModelPackageTests.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/WindowsApplicationModelPackageTests.cs
@@ -25,10 +25,11 @@ public void ModernUwp_ResolvedAssetsRequireMatchingFrameworkAndSpecializedPayloa
string report = $$"""
TargetFramework={{targetFramework}}
UseUwpTools=true
- /buildTransitive/net10.0/uwp/MSTest.TestFramework.dll
- /buildTransitive/net10.0/uwp/MSTest.TestAdapter.dll
- /buildTransitive/net10.0/uwp/MSTestAdapter.PlatformServices.dll
- /buildTransitive/net10.0/uwp/MSTest.TestFramework.Extensions.dll
+ /lib/{{targetFramework.Split('-')[0]}}/MSTest.TestFramework.dll
+ /lib/{{targetFramework.Split('-')[0]}}/MSTest.TestFramework.Extensions.dll
+ /buildTransitive/net10.0-windows10.0.17763/MSTest.TestAdapter.dll
+ /buildTransitive/net10.0-windows10.0.17763/MSTestAdapter.PlatformServices.dll
+ /lib/net10.0-windows10.0.17763/MSTest.Uwp.dll
""";
File.WriteAllText(reportPath, report);
@@ -37,17 +38,17 @@ public void ModernUwp_ResolvedAssetsRequireMatchingFrameworkAndSpecializedPayloa
File.WriteAllText(
reportPath,
- report.Replace("/buildTransitive/net10.0/uwp/MSTest.TestFramework.dll", $"/lib/{targetFramework.Split('-')[0]}/MSTest.TestFramework.dll", StringComparison.Ordinal));
+ report.Replace($"/lib/{targetFramework.Split('-')[0]}/MSTest.TestFramework.dll", "/lib/netstandard2.0/MSTest.TestFramework.dll", StringComparison.Ordinal));
AssertFailedException wrongFramework = Assert.ThrowsExactly(() =>
WindowsApplicationModelTestTools.AssertResolvedMSTestAssets(
reportPath, WindowsApplicationModelAssetKind.ModernUwp, targetFramework));
- Assert.Contains("/buildTransitive/net10.0/uwp/MSTest.TestFramework.dll", wrongFramework.Message);
+ Assert.Contains($"/lib/{targetFramework.Split('-')[0]}/MSTest.TestFramework.dll", wrongFramework.Message);
- File.WriteAllText(reportPath, report.Replace("/uwp/", "/", StringComparison.Ordinal));
+ File.WriteAllText(reportPath, report.Replace("/buildTransitive/net10.0-windows10.0.17763/", "/buildTransitive/net10.0/", StringComparison.Ordinal));
AssertFailedException ordinaryPayload = Assert.ThrowsExactly(() =>
WindowsApplicationModelTestTools.AssertResolvedMSTestAssets(
reportPath, WindowsApplicationModelAssetKind.ModernUwp, targetFramework));
- Assert.Contains("/buildTransitive/net10.0/uwp/MSTest.TestFramework.dll", ordinaryPayload.Message);
+ Assert.Contains("/buildTransitive/net10.0-windows10.0.17763/MSTest.TestAdapter.dll", ordinaryPayload.Message);
}
[TestMethod]
@@ -162,20 +163,20 @@ public void PackedMSTestTestFramework_DeploymentItemAvailabilityMatchesTargetFra
[TestMethod]
[OSCondition(OperatingSystems.Windows, IgnoreMessage = "Windows-specific framework assets are produced only by Windows packs.")]
[DataRow("lib/net462/MSTest.TestFramework.dll", true, true, DisplayName = "DeploymentItem_Net462_IsAvailable")]
- [DataRow("lib/uap10.0/MSTest.TestFramework.dll", false, true, DisplayName = "DeploymentItem_ClassicUwp_IsUnavailable")]
- [DataRow("buildTransitive/net10.0/uwp/MSTest.TestFramework.dll", true, true, DisplayName = "DeploymentItem_ModernUwp_IsAvailable")]
- [DataRow("buildTransitive/net10.0/winui/MSTest.TestFramework.dll", true, true, DisplayName = "DeploymentItem_WinUI_IsAvailable")]
+ [DataRow("lib/netstandard2.0/MSTest.TestFramework.dll", false, true, DisplayName = "DeploymentItem_ClassicUwp_IsUnavailable")]
+ [DataRow("lib/net10.0/MSTest.TestFramework.dll", true, true, DisplayName = "DeploymentItem_ModernUwp_IsAvailable")]
+ [DataRow("lib/net10.0/MSTest.TestFramework.dll", true, true, DisplayName = "DeploymentItem_WinUI_IsAvailable")]
public void PackedMSTestTestFramework_DeploymentItemAvailabilityMatchesWindowsTargetFramework(string assemblyPath, bool expectedAvailable, bool directoriesAvailable)
=> AssertCoreContract(assemblyPath, expectedAvailable, directoriesAvailable);
[TestMethod]
[OSCondition(OperatingSystems.Windows, IgnoreMessage = "Windows application-model package assets are produced only by Windows packs.")]
- [DataRow("lib/uap10.0/MSTest.TestFramework.Extensions.dll", false)]
- [DataRow("buildTransitive/net10.0/uwp/MSTest.TestFramework.Extensions.dll", false)]
- [DataRow("buildTransitive/net10.0/winui/MSTest.TestFramework.Extensions.dll", true)]
- public void PackedMSTestTestFramework_SealsConcreteUIAttributes(string assemblyPath, bool winUI)
+ [DataRow("MSTest.Uwp", "lib/uap10.0.16299/MSTest.Uwp.dll", false)]
+ [DataRow("MSTest.Uwp", "lib/net10.0-windows10.0.17763/MSTest.Uwp.dll", false)]
+ [DataRow("MSTest.WinUI", "lib/net10.0-windows10.0.18362/MSTest.WinUI.dll", true)]
+ public void PackedUIFramework_SealsConcreteUIAttributes(string packageId, string assemblyPath, bool winUI)
{
- using ZipArchive archive = ZipFile.OpenRead(GetExactCurrentPackagePath("MSTest.TestFramework"));
+ using ZipArchive archive = ZipFile.OpenRead(GetExactCurrentPackagePath(packageId));
Dictionary types = ReadTypeAttributes(archive, assemblyPath);
const string prefix = "Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.";
@@ -188,77 +189,108 @@ public void PackedMSTestTestFramework_SealsConcreteUIAttributes(string assemblyP
private static readonly string[] RequiredTestAdapterEntries =
[
- // Classic UWP.
- "build/uap10.0/MSTest.TestAdapter.props",
- "build/uap10.0/MSTest.TestAdapter.targets",
- "buildTransitive/uap10.0/MSTest.TestAdapter.dll",
- "buildTransitive/uap10.0/MSTestAdapter.PlatformServices.dll",
- "buildTransitive/uap10.0/MSTest.TestAdapter.props",
- "buildTransitive/uap10.0/MSTest.TestAdapter.targets",
- "buildTransitive/uap10.0/Parallelize.targets",
-
- // Modern UWP, WinUI, and their normal net10.0 selection targets.
+ "buildTransitive/net462/MSTest.TestFramework.dll",
+ "buildTransitive/net462/MSTest.TestAdapter.dll",
+ "buildTransitive/net462/MSTestAdapter.PlatformServices.dll",
"build/net10.0/MSTest.TestAdapter.props",
"build/net10.0/MSTest.TestAdapter.targets",
"buildTransitive/net10.0/MSTest.TestAdapter.props",
"buildTransitive/net10.0/MSTest.TestAdapter.targets",
"buildTransitive/net10.0/Parallelize.targets",
- "buildTransitive/net10.0/uwp/MSTest.TestAdapter.dll",
- "buildTransitive/net10.0/uwp/MSTestAdapter.PlatformServices.dll",
- "buildTransitive/net10.0/winui/MSTest.TestAdapter.dll",
- "buildTransitive/net10.0/winui/MSTestAdapter.PlatformServices.dll",
+ "buildTransitive/net10.0/MSTest.TestAdapter.dll",
+ "buildTransitive/net10.0/MSTestAdapter.PlatformServices.dll",
+ "buildTransitive/net11.0/MSTest.TestAdapter.dll",
+ "buildTransitive/net11.0/MSTestAdapter.PlatformServices.dll",
];
private static readonly string[] RequiredTestFrameworkEntries =
[
- // Classic UWP.
- "lib/uap10.0/MSTest.TestFramework.dll",
- "lib/uap10.0/MSTest.TestFramework.xml",
- "lib/uap10.0/MSTest.TestFramework.Extensions.dll",
- "lib/uap10.0/MSTest.TestFramework.Extensions.xml",
- "build/uap10.0/MSTest.TestFramework.targets",
- "buildTransitive/uap10.0/MSTest.TestFramework.targets",
-
- // Modern UWP, WinUI, and their normal net10.0 framework assets.
+ "lib/netstandard2.0/MSTest.TestFramework.dll",
+ "lib/net462/MSTest.TestFramework.dll",
"lib/net10.0/MSTest.TestFramework.dll",
"lib/net10.0/MSTest.TestFramework.xml",
- "build/net10.0/MSTest.TestFramework.targets",
- "buildTransitive/net10.0/MSTest.TestFramework.targets",
- "buildTransitive/net10.0/uwp/MSTest.TestFramework.Extensions.dll",
- "buildTransitive/net10.0/uwp/MSTest.TestFramework.Extensions.xml",
- "buildTransitive/net10.0/uwp/MSTest.TestFramework.dll",
- "buildTransitive/net10.0/uwp/MSTest.TestFramework.xml",
- "buildTransitive/net10.0/uwp/fr/MSTest.TestFramework.resources.dll",
- "buildTransitive/net10.0/winui/MSTest.TestFramework.Extensions.dll",
- "buildTransitive/net10.0/winui/MSTest.TestFramework.Extensions.xml",
- "buildTransitive/net10.0/winui/MSTest.TestFramework.dll",
- "buildTransitive/net10.0/winui/MSTest.TestFramework.xml",
- "buildTransitive/net10.0/winui/fr/MSTest.TestFramework.resources.dll",
+ "lib/net11.0/MSTest.TestFramework.dll",
+ "lib/net10.0/fr/MSTest.TestFramework.resources.dll",
+ "lib/net11.0/fr/MSTest.TestFramework.resources.dll",
+ "buildTransitive/MSTest.TestFramework.targets",
];
[TestMethod]
[OSCondition(OperatingSystems.Windows, IgnoreMessage = "Windows application-model package assets are produced only by Windows packs.")]
- public void PackedMSTestTestAdapter_ContainsRequiredWindowsApplicationModelAssets()
- => AssertPackageContainsAllEntries(
- GetExactCurrentPackagePath("MSTest.TestAdapter"),
- RequiredTestAdapterEntries);
+ public void PackedMSTestTestAdapter_ContainsOnlyOrdinaryAssets()
+ {
+ string package = GetExactCurrentPackagePath("MSTest.TestAdapter");
+ AssertPackageContainsAllEntries(package, RequiredTestAdapterEntries);
+ using ZipArchive archive = ZipFile.OpenRead(package);
+ Assert.DoesNotContain(
+ entry => entry.FullName.Contains("uap", StringComparison.OrdinalIgnoreCase)
+ || entry.FullName.Contains("windows", StringComparison.OrdinalIgnoreCase)
+ || entry.FullName.Contains("/winui/", StringComparison.OrdinalIgnoreCase)
+ || entry.FullName.Contains("/uwp/", StringComparison.OrdinalIgnoreCase)
+ || entry.FullName.Contains("TestFramework.Extensions", StringComparison.Ordinal),
+ archive.Entries);
+ using var reader = new StreamReader(archive.GetEntry("MSTest.TestAdapter.nuspec")!.Open());
+ var nuspec = XDocument.Parse(reader.ReadToEnd());
+ Assert.DoesNotContain(
+ group => ((string?)group.Attribute("targetFramework"))?.Contains("UAP", StringComparison.OrdinalIgnoreCase) == true
+ || ((string?)group.Attribute("targetFramework"))?.Contains("windows", StringComparison.OrdinalIgnoreCase) == true,
+ nuspec.Descendants().Where(element => element.Name.LocalName == "group"));
+ }
+
+ [TestMethod]
+ [OSCondition(OperatingSystems.Windows)]
+ [DataRow("MSTest.Uwp", "uap10.0.16299")]
+ [DataRow("MSTest.Uwp", "net10.0-windows10.0.17763")]
+ [DataRow("MSTest.WinUI", "net10.0-windows10.0.18362")]
+ public void PackedUIFramework_OwnsItsPayloadWithoutAnotherAdapter(string packageId, string framework)
+ {
+ string package = GetExactCurrentPackagePath(packageId);
+ AssertPackageContainsAllEntries(
+ package,
+ [
+ $"lib/{framework}/{packageId}.dll",
+ $"lib/{framework}/{packageId}.xml",
+ $"buildTransitive/{framework}/{packageId}.props",
+ $"buildTransitive/{framework}/{packageId}.targets",
+ $"buildTransitive/{framework}/MSTest.TestAdapter.dll",
+ $"buildTransitive/{framework}/MSTestAdapter.PlatformServices.dll",
+ $"buildTransitive/{framework}/_localization/fr/MSTestAdapter.PlatformServices.resources.dll",
+ ]);
+ using ZipArchive archive = ZipFile.OpenRead(package);
+ Assert.DoesNotContain(
+ entry => entry.Name is "MSTest.TestFramework.dll" or "MSTest.TestFramework.Extensions.dll",
+ archive.Entries);
+ using var reader = new StreamReader(archive.GetEntry(packageId + ".nuspec")!.Open());
+ var nuspec = XDocument.Parse(reader.ReadToEnd());
+ XElement[] dependencies = nuspec.Descendants().Where(element => element.Name.LocalName == "dependency").ToArray();
+ Assert.DoesNotContain(
+ dependency => (string?)dependency.Attribute("id") is "MSTest.TestAdapter" or "MSTest.Uwp" or "MSTest.WinUI",
+ dependencies);
+ XElement[] core = dependencies.Where(dependency => (string?)dependency.Attribute("id") == "MSTest.TestFramework").ToArray();
+ Assert.IsNotEmpty(core);
+ foreach (XElement dependency in core)
+ {
+ Assert.AreEqual($"[{AcceptanceTestBase.MSTestVersion}]", (string?)dependency.Attribute("version"));
+ }
+ }
[TestMethod]
[OSCondition(OperatingSystems.Windows, IgnoreMessage = "Classic UWP package assets are produced only by Windows packs.")]
- public void PackedMSTestTestAdapter_ClassicUwpDoesNotDuplicateRuntimeDependencies()
+ public void PackedMSTestUwp_ClassicUwpDoesNotDuplicateRuntimeDependencies()
{
- using ZipArchive archive = ZipFile.OpenRead(GetExactCurrentPackagePath("MSTest.TestAdapter"));
+ using ZipArchive archive = ZipFile.OpenRead(GetExactCurrentPackagePath("MSTest.Uwp"));
string[] assemblies = archive.Entries
.Select(entry => entry.FullName)
- .Where(path => path.StartsWith("buildTransitive/uap10.0/", StringComparison.Ordinal)
+ .Where(path => path.StartsWith("buildTransitive/uap10.0.16299/", StringComparison.Ordinal)
+ && !path["buildTransitive/uap10.0.16299/".Length..].Contains('/')
&& path.EndsWith(".dll", StringComparison.OrdinalIgnoreCase))
.Order(StringComparer.Ordinal)
.ToArray();
Assert.AreSequenceEqual(
[
- "buildTransitive/uap10.0/MSTest.TestAdapter.dll",
- "buildTransitive/uap10.0/MSTestAdapter.PlatformServices.dll",
+ "buildTransitive/uap10.0.16299/MSTest.TestAdapter.dll",
+ "buildTransitive/uap10.0.16299/MSTestAdapter.PlatformServices.dll",
],
assemblies);
}
@@ -267,10 +299,10 @@ public void PackedMSTestTestAdapter_ClassicUwpDoesNotDuplicateRuntimeDependencie
[DataRow("Microsoft.Testing.Extensions.TrxReport")]
[DataRow("Microsoft.Testing.Extensions.Retry")]
[OSCondition(OperatingSystems.Windows, IgnoreMessage = "Classic UWP package assets are produced only by Windows packs.")]
- public void PackedMSTestTestAdapter_ClassicUwpDeclaresBootstrapDependencies(string packageId)
+ public void PackedMSTestUwp_ClassicUwpDeclaresBootstrapDependencies(string packageId)
{
- using ZipArchive archive = ZipFile.OpenRead(GetExactCurrentPackagePath("MSTest.TestAdapter"));
- using var reader = new StreamReader(archive.GetEntry("MSTest.TestAdapter.nuspec")!.Open());
+ using ZipArchive archive = ZipFile.OpenRead(GetExactCurrentPackagePath("MSTest.Uwp"));
+ using var reader = new StreamReader(archive.GetEntry("MSTest.Uwp.nuspec")!.Open());
var nuspec = XDocument.Parse(reader.ReadToEnd());
XElement[] groups = nuspec.Descendants().Where(element => element.Name.LocalName == "group").ToArray();
XElement classicGroup = groups.Single(group => (string?)group.Attribute("targetFramework") == "UAP10.0.16299");
@@ -288,11 +320,11 @@ public void PackedMSTestTestAdapter_ClassicUwpDeclaresBootstrapDependencies(stri
[TestMethod]
[OSCondition(OperatingSystems.Windows, IgnoreMessage = "Windows application-model package assets are produced only by Windows packs.")]
- public void PackedMSTestTestAdapter_UwpPropsRegisterMSTestBuilderHook()
+ public void PackedMSTestUwp_PropsRegisterMSTestBuilderHook()
{
- string packagePath = GetExactCurrentPackagePath("MSTest.TestAdapter");
+ string packagePath = GetExactCurrentPackagePath("MSTest.Uwp");
using ZipArchive archive = ZipFile.OpenRead(packagePath);
- ZipArchiveEntry propsEntry = archive.GetEntry("buildTransitive/uap10.0/MSTest.TestAdapter.props")
+ ZipArchiveEntry propsEntry = archive.GetEntry("buildTransitive/uap10.0.16299/MSTest.Uwp.props")
?? throw new AssertFailedException($"Package '{packagePath}' does not contain the classic UWP props.");
using var reader = new StreamReader(propsEntry.Open());
string props = reader.ReadToEnd();
@@ -306,7 +338,7 @@ public void PackedMSTestTestAdapter_UwpPropsRegisterMSTestBuilderHook()
[TestMethod]
[OSCondition(OperatingSystems.Windows, IgnoreMessage = "Windows application-model package assets are produced only by Windows packs.")]
- public void PackedMSTestTestFramework_ContainsRequiredWindowsApplicationModelAssets()
+ public void PackedMSTestTestFramework_ContainsSharedCoreAssets()
=> AssertPackageContainsAllEntries(
GetExactCurrentPackagePath("MSTest.TestFramework"),
RequiredTestFrameworkEntries);
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/WindowsApplicationModelTestTools.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/WindowsApplicationModelTestTools.cs
index 5bb02d4bcb..084ac2bd1f 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/WindowsApplicationModelTestTools.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/WindowsApplicationModelTestTools.cs
@@ -212,42 +212,41 @@ public static void AssertResolvedMSTestAssets(
WindowsApplicationModelAssetKind.ClassicUwp =>
(
[
- "/buildTransitive/uap10.0/MSTest.TestAdapter.dll",
- "/buildTransitive/uap10.0/MSTestAdapter.PlatformServices.dll",
- "/lib/uap10.0/MSTest.TestFramework.dll",
- "/lib/uap10.0/MSTest.TestFramework.Extensions.dll",
- ],
- [
+ "/buildTransitive/uap10.0.16299/MSTest.TestAdapter.dll",
+ "/buildTransitive/uap10.0.16299/MSTestAdapter.PlatformServices.dll",
"/lib/netstandard2.0/MSTest.TestFramework.dll",
"/lib/netstandard2.0/MSTest.TestFramework.Extensions.dll",
+ "/lib/uap10.0.16299/MSTest.Uwp.dll",
+ ],
+ [
+ "/mstest.testadapter/",
+ "/mstest.winui/",
]),
WindowsApplicationModelAssetKind.ModernUwp =>
(
[
- "/buildTransitive/net10.0/uwp/MSTest.TestFramework.dll",
- "/buildTransitive/net10.0/uwp/MSTest.TestAdapter.dll",
- "/buildTransitive/net10.0/uwp/MSTestAdapter.PlatformServices.dll",
- "/buildTransitive/net10.0/uwp/MSTest.TestFramework.Extensions.dll",
+ $"/lib/{targetFramework.Split('-')[0]}/MSTest.TestFramework.dll",
+ $"/lib/{targetFramework.Split('-')[0]}/MSTest.TestFramework.Extensions.dll",
+ "/buildTransitive/net10.0-windows10.0.17763/MSTest.TestAdapter.dll",
+ "/buildTransitive/net10.0-windows10.0.17763/MSTestAdapter.PlatformServices.dll",
+ "/lib/net10.0-windows10.0.17763/MSTest.Uwp.dll",
],
[
- $"/lib/{targetFramework.Split('-')[0]}/MSTest.TestFramework.dll",
- "/buildTransitive/net10.0/MSTest.TestAdapter.dll",
- "/buildTransitive/net10.0/MSTestAdapter.PlatformServices.dll",
- "/buildTransitive/net10.0/MSTest.TestFramework.Extensions.dll",
+ "/mstest.testadapter/",
+ "/mstest.winui/",
]),
WindowsApplicationModelAssetKind.WinUI =>
(
[
- "/buildTransitive/net10.0/winui/MSTest.TestFramework.dll",
- "/buildTransitive/net10.0/winui/MSTest.TestAdapter.dll",
- "/buildTransitive/net10.0/winui/MSTestAdapter.PlatformServices.dll",
- "/buildTransitive/net10.0/winui/MSTest.TestFramework.Extensions.dll",
+ $"/lib/{targetFramework.Split('-')[0]}/MSTest.TestFramework.dll",
+ $"/lib/{targetFramework.Split('-')[0]}/MSTest.TestFramework.Extensions.dll",
+ "/buildTransitive/net10.0-windows10.0.18362/MSTest.TestAdapter.dll",
+ "/buildTransitive/net10.0-windows10.0.18362/MSTestAdapter.PlatformServices.dll",
+ "/lib/net10.0-windows10.0.18362/MSTest.WinUI.dll",
],
[
- $"/lib/{targetFramework.Split('-')[0]}/MSTest.TestFramework.dll",
- "/buildTransitive/net10.0/MSTest.TestAdapter.dll",
- "/buildTransitive/net10.0/MSTestAdapter.PlatformServices.dll",
- "/buildTransitive/net10.0/MSTest.TestFramework.Extensions.dll",
+ "/mstest.testadapter/",
+ "/mstest.uwp/",
]),
_ => throw new ArgumentOutOfRangeException(nameof(assetKind), assetKind, "Unknown Windows application model."),
};
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/PackagedWinUITests.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/PackagedWinUITests.cs
index 132f8892e9..c96cb1a75d 100644
--- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/PackagedWinUITests.cs
+++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/PackagedWinUITests.cs
@@ -104,8 +104,7 @@ await ExecuteWithPackageCleanupAsync(
}
[TestMethod]
- [DataRow("MSTest")]
- [DataRow("MSTest.TestAdapter")]
+ [DataRow("MSTest.WinUI")]
public async Task PackagedAppContainerWinUI_ExplicitIntegrationPublishesTrx(string package)
{
GeneratedPackagedWinUIAsset generatedAsset = await GeneratePackagedWinUIAssetAsync(appContainer: true, package: package);
@@ -651,9 +650,7 @@ private async Task GeneratePackagedWinUIAssetAsync(
string source = SourceCode;
if (package is not null)
{
- string references = package == "MSTest"
- ? $""
- : $"";
+ string references = $"";
source = source
.Replace("MSTest.Sdk/$MSTestVersion$", "Microsoft.NET.Sdk", StringComparison.Ordinal)
.Replace(
@@ -970,18 +967,17 @@ private static void AssertResolvedWinUIAssets(string reportPath, bool usingSdk =
string[] required =
[
- "/buildTransitive/net10.0/winui/MSTest.TestFramework.dll",
- "/buildTransitive/net10.0/winui/MSTest.TestAdapter.dll",
- "/buildTransitive/net10.0/winui/MSTestAdapter.PlatformServices.dll",
- "/buildTransitive/net10.0/winui/MSTest.TestFramework.Extensions.dll",
+ "/lib/net10.0/MSTest.TestFramework.dll",
+ "/lib/net10.0/MSTest.TestFramework.Extensions.dll",
+ "/buildTransitive/net10.0-windows10.0.18362/MSTest.TestAdapter.dll",
+ "/buildTransitive/net10.0-windows10.0.18362/MSTestAdapter.PlatformServices.dll",
+ "/lib/net10.0-windows10.0.18362/MSTest.WinUI.dll",
"/lib/net10.0-windows10.0.19041/Microsoft.Testing.Extensions.PackagedApp.dll",
];
string[] rejected =
[
- "/lib/net10.0/MSTest.TestFramework.dll",
- "/buildTransitive/net10.0/MSTest.TestAdapter.dll",
- "/buildTransitive/net10.0/MSTestAdapter.PlatformServices.dll",
- "/buildTransitive/net10.0/MSTest.TestFramework.Extensions.dll",
+ "/mstest.testadapter/",
+ "/mstest.uwp/",
"/lib/net10.0/Microsoft.Testing.Extensions.PackagedApp.dll",
];
diff --git a/test/UnitTests/Bazel.SdkPackages.UnitTests/SdkPackageTests.cs b/test/UnitTests/Bazel.SdkPackages.UnitTests/SdkPackageTests.cs
index c99fe97d02..39b8ff88f0 100644
--- a/test/UnitTests/Bazel.SdkPackages.UnitTests/SdkPackageTests.cs
+++ b/test/UnitTests/Bazel.SdkPackages.UnitTests/SdkPackageTests.cs
@@ -191,8 +191,9 @@ private JsonObject CreateInput(bool sdk)
""" : """
-
-
+
+
+
diff --git a/test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj b/test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj
index 8c0d2f88e5..3c6640dc7c 100644
--- a/test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj
+++ b/test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj
@@ -40,7 +40,7 @@
-
+
diff --git a/test/UnitTests/MSTest.SourceGeneration.UnitTests/MSTest.SourceGeneration.UnitTests.csproj b/test/UnitTests/MSTest.SourceGeneration.UnitTests/MSTest.SourceGeneration.UnitTests.csproj
index b161a7398d..8675118066 100644
--- a/test/UnitTests/MSTest.SourceGeneration.UnitTests/MSTest.SourceGeneration.UnitTests.csproj
+++ b/test/UnitTests/MSTest.SourceGeneration.UnitTests/MSTest.SourceGeneration.UnitTests.csproj
@@ -20,7 +20,7 @@
-
+
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestAdapter.PlatformServices.UnitTests.csproj b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestAdapter.PlatformServices.UnitTests.csproj
index 1a18c2ad23..555422c57a 100644
--- a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestAdapter.PlatformServices.UnitTests.csproj
+++ b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestAdapter.PlatformServices.UnitTests.csproj
@@ -23,10 +23,10 @@
-
+
+
-
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/MSTestAdapter.UnitTests.csproj b/test/UnitTests/MSTestAdapter.UnitTests/MSTestAdapter.UnitTests.csproj
index f36d8e4224..b5fbfbf306 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/MSTestAdapter.UnitTests.csproj
+++ b/test/UnitTests/MSTestAdapter.UnitTests/MSTestAdapter.UnitTests.csproj
@@ -29,7 +29,6 @@
(PrivateAssets="all"), so reference it directly to compile against its (internals-visible) types. -->
-
diff --git a/test/UnitTests/TestFramework.UnitTests/Extensions/WinUIExtensionTests.cs b/test/UnitTests/TestFramework.UnitTests/Extensions/WinUIExtensionTests.cs
index 878b72b2c5..5ffbbdb96f 100644
--- a/test/UnitTests/TestFramework.UnitTests/Extensions/WinUIExtensionTests.cs
+++ b/test/UnitTests/TestFramework.UnitTests/Extensions/WinUIExtensionTests.cs
@@ -35,7 +35,7 @@ public void TargetAttributeValidatesAndPreservesApplicationType()
public void UnpackagedProcessHasNoPackageIdentityOrPath()
{
- Type model = typeof(UITestMethodAttribute).Assembly.GetType("Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.AppContainer.AppModel", true)!;
+ Type model = Assembly.Load("MSTestAdapter.PlatformServices").GetType("Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.AppContainer.AppModel", true)!;
model.GetMethod("IsPackagedProcess")!.Invoke(null, null).Should().Be(false);
model.GetMethod("GetCurrentPackagePath")!.Invoke(null, null).Should().BeNull();
}
diff --git a/test/UnitTests/TestFramework.UnitTests/TestFramework.UnitTests.csproj b/test/UnitTests/TestFramework.UnitTests/TestFramework.UnitTests.csproj
index bd63425ca5..87155b9eaf 100644
--- a/test/UnitTests/TestFramework.UnitTests/TestFramework.UnitTests.csproj
+++ b/test/UnitTests/TestFramework.UnitTests/TestFramework.UnitTests.csproj
@@ -25,7 +25,8 @@
-
+
+
@@ -41,7 +42,7 @@
-
+