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

Evangelink · 2026-06-11T19:46:09Z

Migrates Microsoft.DotNet.GenAPI.Tests from xUnit v3 to MSTest.Sdk on MTP, continuing the small-PR migration started in #54722.

What changed

Project file (Microsoft.DotNet.GenAPI.Tests.csproj)

Switched to Sdk="MSTest.Sdk" with <UseMSTestSdk>true</UseMSTestSdk> (gated in test/Directory.Build.targets from Migrate Microsoft.DotNet.HotReload.Watch.Aspire.Tests to MSTest.Sdk on MTP (pathfinder) #54722)
Dropped Microsoft.NET.TestFramework ProjectReference and OutputType=Exe
Removed cross-project <Compile Include> of SymbolFactory.cs / TempDirectory.cs (originally pulled from Microsoft.DotNet.ApiSymbolExtensions.Tests) — copied locally and ported the one Assert.Empty call to Assert.IsEmpty. The original copies remain untouched so the still-xUnit ApiSymbolExtensions.Tests project keeps working.

Test sources — mechanical conversion:

[Fact]/[Theory] → [TestMethod]
[InlineData(...)] → [DataRow(...)]
[Fact(Skip="…")] → [TestMethod, Ignore("…")]
Added [TestClass] to test classes
Assert.Equal/NotEqual/True/False/Null/NotNull/Empty → AreEqual/AreNotEqual/IsTrue/IsFalse/IsNull/IsNotNull/IsEmpty

Verification

total: 109
failed: 0
succeeded: 107
skipped: 2   (pre-existing https://github.com/dotnet/roslyn/issues/74109)

PR stack

Built on top of #54725 → #54724 → #54723 → #54722. Will rebase as the earlier PRs merge.

Copilot

Pull request overview

This PR continues the repo-wide migration from xUnit v3 to MSTest.Sdk on Microsoft.Testing.Platform (MTP) by converting several test projects (notably Microsoft.DotNet.GenAPI.Tests) to Sdk="MSTest.Sdk" and mechanically updating attributes/asserts to MSTest equivalents.

Changes:

Switch multiple test projects to MSTest.Sdk + UseMSTestSdk=true, and gate xUnit-specific defaults in test/Directory.Build.targets.
Convert test sources from xUnit [Fact]/[Theory] to MSTest [TestMethod] + [DataRow], updating assertions accordingly.
Add/adjust supporting test helpers and references (local helper copies for GenAPI tests, InternalsVisibleTo and project refs for dotnet-watch Aspire integration tests).

Show a summary per file

File	Description
test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/Microsoft.DotNet.HotReload.Watch.Aspire.Tests.csproj	Switch Aspire unit tests to `MSTest.Sdk` and update references/usings accordingly.
test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AssertEx.cs	Add a small MSTest-friendly helper to replace xUnit-coupled shared helpers.
test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AspireServerLauncherCliTests.cs	Convert xUnit tests to MSTest attributes/assertions.
test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AspireResourceLauncherCliTests.cs	Convert xUnit tests to MSTest, keep FluentAssertions-style checks where used.
test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AspireHostLauncherTests.cs	Convert xUnit tests to MSTest.
test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AspireHostLauncherCliTests.cs	Convert xUnit tests to MSTest.
test/Microsoft.DotNet.GenAPI.Tests/Microsoft.DotNet.GenAPI.Tests.csproj	Migrate GenAPI test project to `MSTest.Sdk`, drop xUnit-coupled test framework reference.
test/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs	Convert large xUnit test suite to MSTest.
test/Microsoft.DotNet.GenAPI.Tests/SyntaxRewriter/TypeDeclarationCSharpSyntaxRewriterTests.cs	Convert xUnit tests to MSTest.
test/Microsoft.DotNet.GenAPI.Tests/SyntaxRewriter/SingleLineStatementCSharpSyntaxRewriterTests.cs	Convert xUnit tests to MSTest.
test/Microsoft.DotNet.GenAPI.Tests/SyntaxRewriter/CSharpSyntaxRewriterTestBase.cs	Update base assertions to MSTest equivalents.
test/Microsoft.DotNet.GenAPI.Tests/SyntaxRewriter/BodyBlockCSharpSyntaxRewriterTests.cs	Convert xUnit tests to MSTest.
test/Microsoft.DotNet.GenAPI.Tests/SymbolFactory.cs	Copy helper locally and update assertions for MSTest.
test/Microsoft.DotNet.GenAPI.Tests/TempDirectory.cs	Copy helper locally for GenAPI tests (replacing cross-project compile includes).
test/Microsoft.DotNet.ApiCompat.Tests/Microsoft.DotNet.ApiCompat.Tests.csproj	Switch ApiCompat tests to `MSTest.Sdk`, drop xUnit-coupled test framework reference.
test/Microsoft.DotNet.ApiCompat.Tests/RegexStringTransformerTests.cs	Convert xUnit tests to MSTest.
test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests.csproj	Switch BrowserRefresh tests to `MSTest.Sdk`, drop xUnit-coupled test framework reference.
test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ScriptInjectingStreamTests.cs	Convert xUnit tests to MSTest, update async/cancellation patterns.
test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ResponseStreamWrapperCompressionTest.cs	Convert xUnit tests to MSTest, update string/sequence assertions.
test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/HostingStartupTest.cs	Convert xUnit tests to MSTest, adjust header comparisons.
test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BrowserScriptMiddlewareTest.cs	Convert xUnit tests to MSTest; rewrite header assertions without `Assert.Collection`.
test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BrowserRefreshMiddlewareTest.cs	Convert xUnit `[Theory]/[InlineData]` to MSTest `[DataRow]`.
test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BlazorWasmHotReloadMiddlewareTest.cs	Convert xUnit tests to MSTest (includes assertion helper logic).
test/dotnet-watch.Tests/dotnet-watch.Tests.csproj	Add Watch.Aspire project reference needed by moved Aspire integration tests.
test/dotnet-watch.Tests/Aspire/PipeUtilities.cs	Add Aspire integration helper for reading status events over named pipes.
test/dotnet-watch.Tests/Aspire/AspireLauncherIntegrationTests.cs	Rename moved integration test class to reflect integration scope.
test/Directory.Build.targets	Gate xUnit-specific test defaults behind `UseMSTestSdk != true`.
test/containerize.UnitTests/containerize.UnitTests.csproj	Switch containerize unit tests to `MSTest.Sdk` and drop xUnit-coupled reference.
test/containerize.UnitTests/ParserTests.cs	Convert xUnit tests to MSTest, update assertions/data rows.
src/Dotnet.Watch/Watch.Aspire/Properties/AssemblyInfo.cs	Add `InternalsVisibleTo` for `dotnet-watch.Tests`.
global.json	Add `MSTest.Sdk` to `msbuild-sdks` to support the new project SDK usage.

Copilot's findings

Files reviewed: 30/31 changed files
Comments generated: 2

Evangelink · 2026-06-12T11:58:06Z

-                Assert.Equal(expectedUpdate.Id, actualUpdate.Id);
-                Assert.Equal(expectedUpdate.Deltas.Length, expectedUpdate.Deltas.Length);
+                Assert.AreEqual(expectedUpdate.Id, actualUpdate.Id);
+                Assert.AreEqual(expectedUpdate.Deltas.Length, expectedUpdate.Deltas.Length);


@JeremyKuhne looks like an existing bug.

@Evangelink I'd include the fix if the test still passes

+namespace Microsoft.DotNet.ApiSymbolExtensions.Tests
+{
+    public class TempDirectory : IDisposable


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

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.

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:03Z

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:51Z

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:55Z

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:48Z

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>

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>

…tain for strings The migrate-xunit-to-mstest skill (.github/skills/migrate-xunit-to-mstest, PR dotnet#54727) notes that MSTest 3.8+ added Assert.Contains(needle, str) / Assert.DoesNotContain(needle, str) overloads for strings -- with the natural (needle, haystack) argument order matching xUnit's Assert.Contains. With the 4.3.0-preview MSTest.Sdk bump in dotnet#54722, these are now available throughout the migration. Replaced: - StringAssert.Contains(haystack, needle) -> Assert.Contains(needle, haystack) - Assert.IsFalse(haystack.Contains(needle)) -> Assert.DoesNotContain(needle, haystack) Touched files: - BrowserRefreshMiddlewareTest.cs - BrowserScriptMiddlewareTest.cs - ResponseStreamWrapperCompressionTest.cs Note: Assert.IsFalse(dict.ContainsKey(key)) call sites are unchanged (no Assert.DoesNotContainKey API exists). Verified: 110/110 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>

…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).

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

The original xUnit v3 test used TestContext.Current.CancellationToken to propagate test cancellation into the WriteAsync/FlushAsync calls. The MSTest migration swapped that for CancellationToken.None, dropping cancellation propagation. Restore the original behavior by adding the standard MSTest `public TestContext TestContext { get; set; }` property on the test class and routing the cancellation token through it (TestContext.Current is also valid but is currently flagged as experimental via MSTESTEXP, hence the instance-property pattern).

Mechanical xUnit v3 -> MSTest 4.x conversion: - csproj switched to Sdk="MSTest.Sdk" with UseMSTestSdk=true - Dropped Microsoft.NET.TestFramework ProjectReference and OutputType=Exe - Removed shared <Compile Include> of SymbolFactory.cs / TempDirectory.cs from Microsoft.DotNet.ApiSymbolExtensions.Tests; copied locally and ported the one Assert.Empty call to Assert.IsEmpty (TempDirectory has no asserts). - [Fact]/[Theory] -> [TestMethod] - [InlineData(...)] -> [DataRow(...)] - [Fact(Skip="url")] -> [TestMethod, Ignore("url")] - Added [TestClass] to test classes - Assert.Equal/NotEqual/True/False/Null/NotNull/Empty -> AreEqual/AreNotEqual/IsTrue/IsFalse/IsNull/IsNotNull/IsEmpty Result: 107 passed / 0 failed / 2 skipped (pre-existing roslyn#74109). 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).

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

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

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

Copilot AI reviewed Jun 11, 2026

View reviewed changes

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-genapi-tests branch from 545992e to 24ff773 Compare June 11, 2026 20:20

Evangelink force-pushed the evangelink/mstest-mtp-genapi-tests branch 2 times, most recently from 29c936b to ab88ade Compare June 11, 2026 21:04

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

Microsoft.DotNet.Watch.UnitTests.FileWatcherTests.DeleteSubfolder has flaky test assertion #49233

Open

Evangelink force-pushed the evangelink/mstest-mtp-genapi-tests branch from f419649 to 5c37ccc Compare June 12, 2026 11:36

Evangelink force-pushed the evangelink/mstest-mtp-genapi-tests branch from 5c37ccc to 6371cad Compare June 12, 2026 12:07

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

Unable to read data from the transport connection: An existing connection was forcibly closed by the remote host. dotnet/dnceng#5922

Open

3 tasks

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

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

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-genapi-tests branch from 026ad20 to 97b9135 Compare June 12, 2026 16:10

Evangelink and others added 19 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>

Remove redundant Using of Microsoft.VisualStudio.TestTools.UnitTesting

8c5f757

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)

6006b4d

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

0ce5370

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-genapi-tests branch from 97b9135 to 57c0db0 Compare June 12, 2026 16:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

Migrate Microsoft.DotNet.GenAPI.Tests to MSTest.Sdk on MTP#54726
Evangelink wants to merge 26 commits into
dotnet:mainfrom
Evangelink:evangelink/mstest-mtp-genapi-tests

Evangelink commented Jun 11, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Evangelink Jun 12, 2026

Uh oh!

JeremyKuhne Jun 12, 2026

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!

4 participants

Conversation

Evangelink commented Jun 11, 2026

What changed

Verification

PR stack

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Copilot's findings

Uh oh!

Evangelink Jun 12, 2026

Choose a reason for hiding this comment

Uh oh!

JeremyKuhne Jun 12, 2026

Choose a reason for hiding this 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!

4 participants