Skip to content

Fix hot reload cancellation race #11401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Amaury Levé (Evangelink) merged 1 commit into from
Sep 21, 2026
Merged

Fix hot reload cancellation race #11401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions src/Platform/Microsoft.Testing.Extensions.HotReload/HotReloadHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,15 @@ public async Task<bool> ShouldRunAsync(Task? waitExecutionCompletion, Cancellati
return false;
}

cancellationToken.Register(() => s_shutdownProcess = true);
using CancellationTokenRegistration registration = cancellationToken.Register(RequestShutdown);

if (waitExecutionCompletion is not null)
{
await waitExecutionCompletion.ConfigureAwait(false);
await _outputDevice.DisplayAsync(_outputDeviceDataProducer, new TextOutputDeviceData(ExtensionResources.HotReloadSessionCompleted), cancellationToken).ConfigureAwait(false);
}

try
{
await SemaphoreSlim.WaitAsync(cancellationToken).ConfigureAwait(false);
}
catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
{
// We're closing
}
await SemaphoreSlim.WaitAsync(CancellationToken.None).ConfigureAwait(false);

if (!_console.IsOutputRedirected && !IsClearNotSupported())
{
Expand Down
2 changes: 2 additions & 0 deletions test/UnitTests/Microsoft.Testing.Extensions.UnitTests/HotReloadTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@ public async Task ShouldRunAsync_WaiterIsBlockedAndCancellationIsRequested_Stops
await cancellationTokenSource.CancelAsync();

Assert.IsFalse(await shouldRunTask.WaitAsync(TimeSpan.FromSeconds(30), TestContext.CancellationToken));
Assert.IsTrue(IsShutdownRequested());
Assert.IsFalse(await handler.ShouldRunAsync(waitExecutionCompletion: null, CancellationToken.None));
}
#else
[TestMethod]
Expand Down
Loading