Migrate Microsoft.DotNet.ApiCompat.Tests to MSTest.Sdk on MTP by Evangelink · Pull Request #54724 · dotnet/sdk

Evangelink · 2026-06-11T19:28:55Z

Same pattern as #54723. This project's single test file (RegexStringTransformerTests.cs) only uses xUnit Fact/Assert.Equal — no Microsoft.NET.TestFramework types — so the TestFramework ProjectReference can be dropped and the project switched to MSTest.Sdk in one self-contained change.

Changes

test/Microsoft.DotNet.ApiCompat.Tests/Microsoft.DotNet.ApiCompat.Tests.csproj
- Use Sdk="MSTest.Sdk", set UseMSTestSdk=true.
- Drop ProjectReference to Microsoft.NET.TestFramework (unused).
- Drop OutputType=Exe (MSTest.Sdk handles it).
- Add Microsoft.VisualStudio.TestTools.UnitTesting global using.
test/Microsoft.DotNet.ApiCompat.Tests/RegexStringTransformerTests.cs: [Fact] → [TestMethod], add [TestClass], Assert.Equal → Assert.AreEqual.

Verification

✅ 5/5 tests pass on MTP (~250 ms).

Merge ordering

Stacks on top of #54723 which stacks on #54722. Once both merge, this PR will rebase cleanly onto main.

Relates to #52914.

Copilot

Pull request overview

This PR migrates several test projects from xUnit-based defaults to MSTest.Sdk (running on Microsoft.Testing.Platform) by introducing a per-project opt-out switch (UseMSTestSdk=true) and mechanically converting affected tests/asserters. It also adjusts dotnet-watch.Tests to host Aspire-related integration tests that still depend on Microsoft.NET.TestFramework.

Changes:

Add MSTest.Sdk to global.json and gate the test-folder xUnit defaults in test/Directory.Build.targets behind UseMSTestSdk.
Convert multiple unit test projects to Sdk="MSTest.Sdk" and update test attributes/assertions accordingly (including a local AssertEx helper where needed).
Move/enable Aspire integration-test support in dotnet-watch.Tests via additional references and InternalsVisibleTo.

Show a summary per file

File	Description
global.json	Pins `MSTest.Sdk` MSBuild SDK version so `Sdk="MSTest.Sdk"` projects restore/build.
test/Directory.Build.targets	Gates xUnit-specific defaults/usings behind `UseMSTestSdk` to allow per-project MSTest adoption.
test/Microsoft.DotNet.ApiCompat.Tests/Microsoft.DotNet.ApiCompat.Tests.csproj	Switches ApiCompat test project to `MSTest.Sdk` and adds MSTest global using.
test/Microsoft.DotNet.ApiCompat.Tests/RegexStringTransformerTests.cs	Converts xUnit `[Fact]`/`Assert.Equal` to MSTest `[TestMethod]`/`Assert.AreEqual`.
test/containerize.UnitTests/containerize.UnitTests.csproj	Switches to `MSTest.Sdk`, opts out of xUnit defaults, removes `Microsoft.NET.TestFramework` reference.
test/containerize.UnitTests/ParserTests.cs	Converts xUnit tests to MSTest equivalents (`[DataRow]`, `Assert.AreEqual`, etc.).
test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/Microsoft.DotNet.HotReload.Watch.Aspire.Tests.csproj	Switches the Aspire unit test project to `MSTest.Sdk`, drops xUnit-coupled test utilities, adds assertion packages/usings.
test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AssertEx.cs	Adds a small local assertion helper to avoid depending on xUnit-coupled shared test utilities.
test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AspireServerLauncherCliTests.cs	Converts xUnit tests to MSTest (`[TestClass]`, `[TestMethod]`, MSTest asserts).
test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AspireResourceLauncherCliTests.cs	Converts xUnit tests to MSTest, including theory/data conversion to `[DataRow]`.
test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AspireHostLauncherTests.cs	Converts xUnit tests to MSTest and updates asserts accordingly.
test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AspireHostLauncherCliTests.cs	Converts xUnit tests to MSTest and updates asserts accordingly.
src/Dotnet.Watch/Watch.Aspire/Properties/AssemblyInfo.cs	Grants `InternalsVisibleTo` for `dotnet-watch.Tests` to support moved integration tests.
test/dotnet-watch.Tests/dotnet-watch.Tests.csproj	Adds a reference to `Watch.Aspire` for Aspire integration tests that execute the launcher.
test/dotnet-watch.Tests/Aspire/PipeUtilities.cs	Adds helper for reading status events from a named pipe in integration tests.
test/dotnet-watch.Tests/Aspire/AspireLauncherIntegrationTests.cs	Renames the Aspire launcher test class to reflect its integration-test nature.

Copilot's findings

Files reviewed: 15/16 changed files
Comments generated: 1

    "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26303.111",
    "Microsoft.Build.NoTargets": "3.7.134",
    "Microsoft.Build.Traversal": "4.1.82",
-    "Microsoft.WixToolset.Sdk": "6.0.3-dotnet.4"
+    "Microsoft.WixToolset.Sdk": "6.0.3-dotnet.4",
+    "MSTest.Sdk": "4.3.0-preview.26307.5"
  }


… on MTP Same pattern as previous migrations. None of the 6 test files used any Microsoft.NET.TestFramework types - only xUnit primitives - so the TestFramework ProjectReference can be dropped and the project switched to MSTest.Sdk in one self-contained change. Changes: * test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/csproj: - Use Sdk="MSTest.Sdk", set UseMSTestSdk=true. - Drop ProjectReference to Microsoft.NET.TestFramework (unused). - Drop OutputType=Exe (MSTest.Sdk handles it). - Add Microsoft.VisualStudio.TestTools.UnitTesting global using. * 6 test files: xUnit -> MSTest mechanical conversion plus targeted fixes: - [Fact]/[Theory] -> [TestMethod], [InlineData] -> [DataRow], add [TestClass]. - Assert.True/False/Null/NotNull/Empty/NotEmpty/Equal/NotEqual -> IsTrue/IsFalse/IsNull/IsNotNull/IsEmpty/IsNotEmpty/AreEqual/AreNotEqual. - Assert.Single(x) -> Assert.HasCount(1, x). - String Assert.Contains(needle, haystack) -> StringAssert.Contains(haystack, needle) (xUnit and MSTest argument orders are reversed). - One Assert.DoesNotContain(needle, str) -> Assert.IsFalse(str.Contains(needle)). - Assert.Collection in BrowserScriptMiddlewareTest expanded to inline Assert.HasCount + indexed AreEqual checks. - Assert.ThrowsAsync<T> -> Assert.ThrowsExactlyAsync<T>. - Assert.AreEqual on byte[]/int[] -> Assert.AreSequenceEqual (MSTEST0065: MSTest does not do element-wise equality on collections; the analyzer catches a real semantic difference vs xUnit). - StringValues (Microsoft.Extensions.Primitives) ambiguity with Assert.AreEqual<T> resolved by calling .ToString() at 5 call sites. - xUnit v3 TestContext.Current.CancellationToken -> CancellationToken.None (MSTest's TestContext.Current is experimental; tests do not actually require test-cancellation propagation). Verification: 110/110 tests pass on MTP in ~480 ms. Stacks on dotnet#54724 which stacks on dotnet#54723 which stacks on dotnet#54722. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Evangelink · 2026-06-11T20:21:43Z

Re-validated this PR against the new migrate-xunit-to-mstest skill landed in #54727 and bumped MSTest.Sdk to 4.3.0-preview.26311.10 (latest internal preview) via the pathfinder.

Changes applied in the latest push on this branch:
Re-validated; no changes required.

Other gotchas reviewed (no changes needed here):

Assert.AreEqual argument order — verified (expected, actual) throughout, matching the xUnit Assert.Equal(expected, actual) original.
CollectionAssert argument order — verified.
Assert.ThrowsExactly<T> vs Assert.Throws<T> semantics — verified (xUnit Throws<T> is exact; MSTest's same-named API is inclusive, so the migration uses ThrowsExactly<T>).
IsInstanceOfType<T> vs IsExactInstanceOfType<T> — see dotnet/skills#755 for the cheatsheet update we filed upstream.

Tests still pass locally on the bumped MSTest.Sdk.

… on MTP Same pattern as previous migrations. None of the 6 test files used any Microsoft.NET.TestFramework types - only xUnit primitives - so the TestFramework ProjectReference can be dropped and the project switched to MSTest.Sdk in one self-contained change. Changes: * test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/csproj: - Use Sdk="MSTest.Sdk", set UseMSTestSdk=true. - Drop ProjectReference to Microsoft.NET.TestFramework (unused). - Drop OutputType=Exe (MSTest.Sdk handles it). - Add Microsoft.VisualStudio.TestTools.UnitTesting global using. * 6 test files: xUnit -> MSTest mechanical conversion plus targeted fixes: - [Fact]/[Theory] -> [TestMethod], [InlineData] -> [DataRow], add [TestClass]. - Assert.True/False/Null/NotNull/Empty/NotEmpty/Equal/NotEqual -> IsTrue/IsFalse/IsNull/IsNotNull/IsEmpty/IsNotEmpty/AreEqual/AreNotEqual. - Assert.Single(x) -> Assert.HasCount(1, x). - String Assert.Contains(needle, haystack) -> StringAssert.Contains(haystack, needle) (xUnit and MSTest argument orders are reversed). - One Assert.DoesNotContain(needle, str) -> Assert.IsFalse(str.Contains(needle)). - Assert.Collection in BrowserScriptMiddlewareTest expanded to inline Assert.HasCount + indexed AreEqual checks. - Assert.ThrowsAsync<T> -> Assert.ThrowsExactlyAsync<T>. - Assert.AreEqual on byte[]/int[] -> Assert.AreSequenceEqual (MSTEST0065: MSTest does not do element-wise equality on collections; the analyzer catches a real semantic difference vs xUnit). - StringValues (Microsoft.Extensions.Primitives) ambiguity with Assert.AreEqual<T> resolved by calling .ToString() at 5 call sites. - xUnit v3 TestContext.Current.CancellationToken -> CancellationToken.None (MSTest's TestContext.Current is experimental; tests do not actually require test-cancellation propagation). Verification: 110/110 tests pass on MTP in ~480 ms. Stacks on dotnet#54724 which stacks on dotnet#54723 which stacks on dotnet#54722. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Imports the migrate-xunit-to-mstest skill from dotnet/skills@main (plugins/dotnet-test/skills/migrate-xunit-to-mstest) into this repo so the xUnit -> MSTest migration that's currently in progress (#54722, #54723, #54724, #54725, #54726) has a documented, repeatable procedure that contributors and agents can follow consistently. Files added (verbatim from upstream): - .github/skills/migrate-xunit-to-mstest/SKILL.md - .github/skills/migrate-xunit-to-mstest/references/mapping-cheatsheet.md Note: SKILL.md is 546 lines, slightly above the 500-line "Progressive Disclosure" guideline checked by .github/skills/ValidateSkill.cs. The validator is advisory (not CI-enforced) and we are intentionally mirroring the upstream content verbatim to keep future syncs trivial. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Evangelink · 2026-06-12T11:31:00Z

Replaced the manual <UseMSTestSdk>true</UseMSTestSdk> opt-in with the property MSTest.Sdk already sets for us: UsingMSTestSdk. Since MSTest.Sdk's Sdk.props runs before Microsoft.NET.Sdk.props and test/Directory.Build.targets is imported at the bottom of evaluation, the property is in scope wherever we need it — no per-project knob required.

Also refreshed the related comments in XUnitPublish.targets / XUnitRunner.targets and renamed the intermediate _UseMSTestSdk MSBuild property to _UsingMSTestSdk for clarity. (Thanks @Evangelink for the catch.)

Evangelink · 2026-06-12T11:37:49Z

Made --report-trx conditional on Microsoft.Testing.Extensions.TrxReport actually being loaded. MSTest.Sdk enables that extension by default via EnableMicrosoftTestingExtensionsTrxReport=true for the Default / AllMicrosoft profiles, but other MTP hosts (xUnit v3 MTP, MSTest.Sdk with TestingExtensionsProfile=None, etc.) do not — passing --report-trx there fails with 'unknown argument'.

The new GetTrxReportEnabled target queries that property; XUnitRunner.targets propagates it as EnableTrxReport metadata, and SDKCustomCreateXUnitWorkItemsWithTestExclusion only emits the flag when it's true. No behavioural change for the current PRs since all migrated projects are MSTest.Sdk-based, but the dispatcher is now forward-safe.

(Applied to all 9 stacked PRs since they share these plumbing files.)

Evangelink · 2026-06-12T11:37:52Z

Replaced the custom <UseMSTestSdk> opt-in property with the built-in UsingMSTestSdk property that MSTest.Sdk already sets in its Sdk.props before Directory.Build.props is evaluated. This drops a redundant declaration in every migrated csproj and just reads what the SDK already publishes.

Evangelink · 2026-06-12T12:09:45Z

Round 3: moved FluentAssertions Using and AwesomeAssertions PackageReference to test/Directory.Build.targets.

The Using is now global for any test project ('$(IsTestProject)' == 'true' OR '$(UsingMSTestSdk)' == 'true'). The PackageReference is added for MSTest.Sdk projects only — xUnit projects already get it transitively via the Microsoft.NET.TestFramework project reference.

Deviation from your literal suggestion: I left the Microsoft.NET.TestFramework.* Usings and Xunit Using gated on UsingMSTestSdk != true. Moving them unconditional would also require a global <ProjectReference Include="Microsoft.NET.TestFramework" /> (otherwise MSTest projects would fail with CS0246), which would drag xunit.v3.assert and other xUnit pieces into the MSTest projects. Happy to apply the broader change (with a global ProjectRef) if you'd prefer.

…n MTP This is a pathfinder PR for migrating the test suite to MSTest on Microsoft.Testing.Platform (MTP). Microsoft.DotNet.HotReload.Watch.Aspire.Tests was chosen because it has no dependency on the shared Microsoft.NET.TestFramework (which is xUnit-coupled and referenced by ~57 of 78 test projects), so it can migrate in isolation without unblocking dependents first. Changes: * global.json: add MSTest.Sdk 4.3.0-preview.26307.5 to msbuild-sdks. * test/Directory.Build.targets: gate the xUnit defaults (TestRunnerName=XUnitV3, Using Include=Xunit, etc.) behind $(UseMSTestSdk) != true, so MSTest.Sdk projects opt out cleanly. * test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests: - csproj now uses Sdk="MSTest.Sdk", sets UseMSTestSdk=true, references AwesomeAssertions and only the Watch.Aspire project. MTP is on by default via MSTest.Sdk (EnableMSTestRunner + TestingPlatformDotnetTestSupport). - All 4 unit-test files converted from xUnit to MSTest attributes/asserts ([Fact]/[Theory] -> [TestMethod]/[DataRow], Assert.* equivalents, Assert.IsInstanceOfType<T>, Assert.HasCount, Assert.IsEmpty). - Local AssertEx.SequenceEqual<T> helper replaces the xUnit-coupled one from HotReload.Test.Utilities. * Move the 2 integration tests (AspireLauncherTests + PipeUtilities) to test/dotnet-watch.Tests/Aspire/ so the Aspire.Tests project stays a pure MSTest unit-test project. They keep xUnit because they depend on WatchSdkTest, WatchableApp, [PlatformSpecificFact], ITestOutputHelper and TestAssets from Microsoft.NET.TestFramework. AspireLauncherTests was renamed to AspireLauncherIntegrationTests to reflect its new role. * src/Dotnet.Watch/Watch.Aspire/Properties/AssemblyInfo.cs: grant InternalsVisibleTo to dotnet-watch.Tests (needed by PipeUtilities, which uses internal WatchStatusEvent). * test/dotnet-watch.Tests/dotnet-watch.Tests.csproj: add ProjectReference to Watch.Aspire (ExcludeAssets=Runtime) so the moved integration tests compile. Verification: * Microsoft.DotNet.HotReload.Watch.Aspire.Tests builds with MSTest.Sdk and all 58 unit tests pass under MTP (705 ms). * test/dotnet-watch.Tests builds successfully with the moved files. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

- Bumps MSTest.Sdk to the latest internal preview to pick up the newest 4.3 assertion APIs (Assert.ContainsSingle, Assert.Contains for strings with the more natural (needle, haystack) signature, etc.). - Applies the assertion mapping flagged by the migrate-xunit-to-mstest skill in this repo (.github/skills/migrate-xunit-to-mstest, PR dotnet#54727): Assert.HasCount(1, x) -> Assert.ContainsSingle(x) (one occurrence in AspireResourceLauncherCliTests.cs) Verified: 58/58 tests still pass. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

…parity Per reviewer feedback: MSTest 4.1.0+ exposes Assert.IsExactInstanceOfType<T>(value) which returns T and enforces exact-type semantics -- the proper equivalent of xUnit's Assert.IsType<T>(x). Assert.IsInstanceOfType<T> is the equivalent of xUnit's Assert.IsAssignableFrom<T> (assignable, not exact), which would be a silent semantic regression for the IsType<T> originals. All 39 occurrences across AspireHostLauncherCliTests.cs, AspireResourceLauncherCliTests.cs, AspireServerLauncherCliTests.cs, and AspireLauncherIntegrationTests.cs were originally Assert.IsType<T> in xUnit (verified against main), so all 39 are flipped to Assert.IsExactInstanceOfType<T>. Note: the migrate-xunit-to-mstest skill cheatsheet at .github/skills/migrate-xunit-to-mstest/references/mapping-cheatsheet.md recommends `Assert.IsInstanceOfType<T>` plus an extra typeof-check for exact-type semantics; that guidance predates IsExactInstanceOfType being available. Follow-up upstream (dotnet/skills) suggested. Verified: 58/58 Aspire tests still pass; dotnet-watch.Tests builds clean. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

MSTest.Sdk already adds this as an implicit global using. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

MSTest 4.3+ provides Assert.AreSequenceEqual for element-wise IEnumerable<T> compare with a nice diff message, so the project-local AssertEx helper is no longer needed. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

@Evangelink

…est/Directory.Build.targets Per @Evangelink: keep per-csproj boilerplate minimal. FluentAssertions is now a global using for any test project (gated on IsTestProject OR UsingMSTestSdk), and AwesomeAssertions is added as a PackageReference for MSTest.Sdk projects. xUnit projects continue to pick it up transitively via Microsoft.NET.TestFramework. The Microsoft.NET.TestFramework.* and Xunit usings remain gated on the xUnit branch (UsingMSTestSdk != true) because MSTest projects in this repo do not reference Microsoft.NET.TestFramework; making those usings global would fail with CS0246. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

The recent `Helix dispatcher: gate --report-trx on TrxReport extension being loaded` commit accidentally removed the ProjectReference to Microsoft.DotNet.HotReload.Watch.Aspire from dotnet-watch.Tests.csproj (introduced in the `Migrate Microsoft.DotNet.HotReload.Watch.Aspire.Tests to MSTest.Sdk on MTP` commit to allow the moved AspireLauncherIntegrationTests and PipeUtilities to compile). Without that reference, the build fails with: error CS0246: The type or namespace name 'WatchStatusEvent' could not be found (are you missing a using directive or an assembly reference?) [test/dotnet-watch.Tests/Aspire/PipeUtilities.cs] Re-add the ProjectReference. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

… on MTP Same pattern as previous migrations. None of the 6 test files used any Microsoft.NET.TestFramework types - only xUnit primitives - so the TestFramework ProjectReference can be dropped and the project switched to MSTest.Sdk in one self-contained change. Changes: * test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/csproj: - Use Sdk="MSTest.Sdk", set UseMSTestSdk=true. - Drop ProjectReference to Microsoft.NET.TestFramework (unused). - Drop OutputType=Exe (MSTest.Sdk handles it). - Add Microsoft.VisualStudio.TestTools.UnitTesting global using. * 6 test files: xUnit -> MSTest mechanical conversion plus targeted fixes: - [Fact]/[Theory] -> [TestMethod], [InlineData] -> [DataRow], add [TestClass]. - Assert.True/False/Null/NotNull/Empty/NotEmpty/Equal/NotEqual -> IsTrue/IsFalse/IsNull/IsNotNull/IsEmpty/IsNotEmpty/AreEqual/AreNotEqual. - Assert.Single(x) -> Assert.HasCount(1, x). - String Assert.Contains(needle, haystack) -> StringAssert.Contains(haystack, needle) (xUnit and MSTest argument orders are reversed). - One Assert.DoesNotContain(needle, str) -> Assert.IsFalse(str.Contains(needle)). - Assert.Collection in BrowserScriptMiddlewareTest expanded to inline Assert.HasCount + indexed AreEqual checks. - Assert.ThrowsAsync<T> -> Assert.ThrowsExactlyAsync<T>. - Assert.AreEqual on byte[]/int[] -> Assert.AreSequenceEqual (MSTEST0065: MSTest does not do element-wise equality on collections; the analyzer catches a real semantic difference vs xUnit). - StringValues (Microsoft.Extensions.Primitives) ambiguity with Assert.AreEqual<T> resolved by calling .ToString() at 5 call sites. - xUnit v3 TestContext.Current.CancellationToken -> CancellationToken.None (MSTest's TestContext.Current is experimental; tests do not actually require test-cancellation propagation). Verification: 110/110 tests pass on MTP in ~480 ms. Stacks on dotnet#54724 which stacks on dotnet#54723 which stacks on dotnet#54722. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Introduces an MSTest-flavored counterpart to the xUnit-based Microsoft.DotNet.HotReload.Test.Utilities so that test helpers that need MSTest's TestContext (e.g. TestLogger, TestLoggerFactory) can be shared across MSTest.Sdk test projects instead of being copy-pasted per project. This commit also migrates the inline TestLogger from Microsoft.DotNet.HotReload.Client.Tests to consume the shared project, which serves as the first reference consumer. Subsequent migration PRs (DeltaApplier.Tests, Containers.UnitTests) will adopt the same project reference instead of adding their own TestLogger/TestLoggerFactory copies. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Follow-up to the pathfinder migration. containerize.UnitTests only uses xUnit Fact/Theory/InlineData/Assert APIs - it does not use any types from Microsoft.NET.TestFramework. So the project can drop its TestFramework ProjectReference and switch to MSTest.Sdk in one self-contained PR. Changes: * test/containerize.UnitTests/containerize.UnitTests.csproj: - Use Sdk="MSTest.Sdk", set UseMSTestSdk=true (opts the project out of the xUnit defaults in test/Directory.Build.targets - gate introduced in PR dotnet#54722). - Drop the ProjectReference to Microsoft.NET.TestFramework (unused). - Drop OutputType=Exe (MSTest.Sdk handles it). - Add Microsoft.VisualStudio.TestTools.UnitTesting global using. * test/containerize.UnitTests/ParserTests.cs: xUnit -> MSTest mechanical conversion: [Fact]/[Theory] -> [TestMethod], [InlineData] -> [DataRow], add [TestClass], Assert.NotNull/Equal/Empty/Single -> IsNotNull/AreEqual/IsEmpty/HasCount(1, ...). Verification: 9/9 tests pass on MTP in ~400 ms. Stacks on top of PR dotnet#54722 (pathfinder). Merge after that one. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

…le(x) Applies the assertion mapping flagged by the migrate-xunit-to-mstest skill (.github/skills/migrate-xunit-to-mstest, PR dotnet#54727). Two occurrences in ParserTests.cs converted from `Assert.HasCount(1, parseResult.Errors)` to the more idiomatic `Assert.ContainsSingle(parseResult.Errors)`, which matches the xUnit original (`Assert.Single`) more directly. Verified: 9/9 tests still pass. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

MSTest.Sdk already adds this as an implicit global using. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

MSTest.Sdk's Runner/Common.targets already sets `<IsPackable>false</IsPackable>` for every MSTest.Sdk project, so the per-project declaration is redundant.

Same pattern as containerize.UnitTests (dotnet#54723). This project's single test file only uses xUnit Fact/Assert.Equal - no Microsoft.NET.TestFramework types - so the TestFramework ProjectReference can be dropped and the project switched to MSTest.Sdk in one self-contained change. Changes: * test/Microsoft.DotNet.ApiCompat.Tests/Microsoft.DotNet.ApiCompat.Tests.csproj: - Use Sdk="MSTest.Sdk", set UseMSTestSdk=true. - Drop ProjectReference to Microsoft.NET.TestFramework (unused). - Drop OutputType=Exe (MSTest.Sdk handles it). - Add Microsoft.VisualStudio.TestTools.UnitTesting global using. * test/Microsoft.DotNet.ApiCompat.Tests/RegexStringTransformerTests.cs: [Fact] -> [TestMethod], add [TestClass], Assert.Equal -> Assert.AreEqual. Verification: 5/5 tests pass on MTP in ~250 ms. Stacks on top of dotnet#54723 which stacks on dotnet#54722. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

MSTest.Sdk already adds this as an implicit global using. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

…Sdk) MSTest.Sdk already sets $(UsingMSTestSdk)=true in its Sdk.props before Directory.Build.props is evaluated, so the custom <UseMSTestSdk>true</UseMSTestSdk> opt-in property is redundant. This change: - Removes <UseMSTestSdk>true</UseMSTestSdk> from MSTest.Sdk csproj(s). - Renames $(UseMSTestSdk) -> $(UsingMSTestSdk) in test/Directory.Build.targets (the xUnit-defaults gating condition) and in xunit-runner/{XUnitPublish,XUnitRunner}.targets (Helix MTP dispatcher detection).

--report-trx is an MTP CLI argument provided only when the Microsoft.Testing.Extensions.TrxReport extension is loaded on the test host. MSTest.Sdk's Default/AllMicrosoft profiles enable it by default, but other MTP runners (e.g. xUnit v3 MTP) do not bundle the extension, so passing --report-trx to those hosts fails with 'unknown argument'. XUnitPublish.targets now exposes the GetTrxReportEnabled target which returns the value of EnableMicrosoftTestingExtensionsTrxReport. XUnitRunner.targets calls that target and propagates the value as the EnableTrxReport metadata of SDKCustomXUnitProject items. SDKCustomCreateXUnitWorkItemsWithTestExclusion reads that metadata and only appends --report-trx to the MTP command line when it is true. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

The recent `Helix dispatcher: gate --report-trx on TrxReport extension being loaded` commit accidentally removed the ProjectReference to Microsoft.DotNet.HotReload.Watch.Aspire from dotnet-watch.Tests.csproj (introduced in the `Migrate Microsoft.DotNet.HotReload.Watch.Aspire.Tests to MSTest.Sdk on MTP` commit to allow the moved AspireLauncherIntegrationTests and PipeUtilities to compile). Without that reference, the build fails with: error CS0246: The type or namespace name 'WatchStatusEvent' could not be found (are you missing a using directive or an assembly reference?) [test/dotnet-watch.Tests/Aspire/PipeUtilities.cs] Re-add the ProjectReference. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

… on MTP Same pattern as previous migrations. None of the 6 test files used any Microsoft.NET.TestFramework types - only xUnit primitives - so the TestFramework ProjectReference can be dropped and the project switched to MSTest.Sdk in one self-contained change. Changes: * test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/csproj: - Use Sdk="MSTest.Sdk", set UseMSTestSdk=true. - Drop ProjectReference to Microsoft.NET.TestFramework (unused). - Drop OutputType=Exe (MSTest.Sdk handles it). - Add Microsoft.VisualStudio.TestTools.UnitTesting global using. * 6 test files: xUnit -> MSTest mechanical conversion plus targeted fixes: - [Fact]/[Theory] -> [TestMethod], [InlineData] -> [DataRow], add [TestClass]. - Assert.True/False/Null/NotNull/Empty/NotEmpty/Equal/NotEqual -> IsTrue/IsFalse/IsNull/IsNotNull/IsEmpty/IsNotEmpty/AreEqual/AreNotEqual. - Assert.Single(x) -> Assert.HasCount(1, x). - String Assert.Contains(needle, haystack) -> StringAssert.Contains(haystack, needle) (xUnit and MSTest argument orders are reversed). - One Assert.DoesNotContain(needle, str) -> Assert.IsFalse(str.Contains(needle)). - Assert.Collection in BrowserScriptMiddlewareTest expanded to inline Assert.HasCount + indexed AreEqual checks. - Assert.ThrowsAsync<T> -> Assert.ThrowsExactlyAsync<T>. - Assert.AreEqual on byte[]/int[] -> Assert.AreSequenceEqual (MSTEST0065: MSTest does not do element-wise equality on collections; the analyzer catches a real semantic difference vs xUnit). - StringValues (Microsoft.Extensions.Primitives) ambiguity with Assert.AreEqual<T> resolved by calling .ToString() at 5 call sites. - xUnit v3 TestContext.Current.CancellationToken -> CancellationToken.None (MSTest's TestContext.Current is experimental; tests do not actually require test-cancellation propagation). Verification: 110/110 tests pass on MTP in ~480 ms. Stacks on dotnet#54724 which stacks on dotnet#54723 which stacks on dotnet#54722. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings June 11, 2026 19:28

Evangelink requested review from a team and tmat as code owners June 11, 2026 19:28

github-actions Bot added the Area-Infrastructure label Jun 11, 2026

Copilot started reviewing on behalf of Evangelink June 11, 2026 19:29 View session

Copilot AI reviewed Jun 11, 2026

View reviewed changes

This was referenced Jun 11, 2026

Migrate Microsoft.AspNetCore.Watch.BrowserRefresh.Tests to MSTest.Sdk on MTP #54725

Open

Migrate Microsoft.DotNet.GenAPI.Tests to MSTest.Sdk on MTP #54726

Open

Evangelink marked this pull request as draft June 11, 2026 19:53

Evangelink mentioned this pull request Jun 11, 2026

Add migrate-xunit-to-mstest skill from dotnet/skills #54727

Merged

Evangelink force-pushed the evangelink/mstest-mtp-apicompat-tests branch 2 times, most recently from 71c989f to c6d27b7 Compare June 11, 2026 20:17

Evangelink force-pushed the evangelink/mstest-mtp-apicompat-tests branch from c6d27b7 to d5fdfd0 Compare June 11, 2026 20:34

Evangelink force-pushed the evangelink/mstest-mtp-apicompat-tests branch from d5fdfd0 to 4cf42fa Compare June 11, 2026 21:04

build-analysis Bot mentioned this pull request Jun 12, 2026

Template engine tests hitting known parallelism issue in GetVisualStudioInstances #44878

Open

Evangelink marked this pull request as ready for review June 12, 2026 15:10

Evangelink and others added 3 commits June 12, 2026 18:03

Evangelink and others added 4 commits June 12, 2026 18:04

Remove redundant Using of Microsoft.VisualStudio.TestTools.UnitTesting

27da8c4

MSTest.Sdk already adds this as an implicit global using. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Evangelink force-pushed the evangelink/mstest-mtp-apicompat-tests branch from aa10856 to 888b114 Compare June 12, 2026 16:09

Evangelink and others added 10 commits June 12, 2026 18:29

Remove redundant Using of Microsoft.VisualStudio.TestTools.UnitTesting

72bc005

MSTest.Sdk already adds this as an implicit global using. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Remove redundant <IsPackable>false</IsPackable> (MSTest.Sdk default)

439fef5

MSTest.Sdk's Runner/Common.targets already sets `<IsPackable>false</IsPackable>` for every MSTest.Sdk project, so the per-project declaration is redundant.

Remove redundant Using of Microsoft.VisualStudio.TestTools.UnitTesting

4aa3024

MSTest.Sdk already adds this as an implicit global using. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Evangelink force-pushed the evangelink/mstest-mtp-apicompat-tests branch from 888b114 to 6f740e7 Compare June 12, 2026 16:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate Microsoft.DotNet.ApiCompat.Tests to MSTest.Sdk on MTP#54724

Migrate Microsoft.DotNet.ApiCompat.Tests to MSTest.Sdk on MTP#54724
Evangelink wants to merge 17 commits into
dotnet:mainfrom
Evangelink:evangelink/mstest-mtp-apicompat-tests

Evangelink commented Jun 11, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Evangelink commented Jun 11, 2026

Uh oh!

Evangelink commented Jun 12, 2026

Uh oh!

Evangelink commented Jun 12, 2026

Uh oh!

Evangelink commented Jun 12, 2026

Uh oh!

Evangelink commented Jun 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

Evangelink commented Jun 11, 2026

Changes

Verification

Merge ordering

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Copilot's findings

Uh oh!

Evangelink commented Jun 11, 2026

Uh oh!

Evangelink commented Jun 12, 2026

Uh oh!

Evangelink commented Jun 12, 2026

Uh oh!

Evangelink commented Jun 12, 2026

Uh oh!

Evangelink commented Jun 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants