Skip to content

Fix mutex cleanup crash on macOS/Linux #15684

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
nohwnd merged 2 commits into from
Apr 16, 2026
Merged

Fix mutex cleanup crash on macOS/Linux #15684

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d525d7b
Catch InvalidOperationException on mutex cleanup for macOS/Linux
nohwnd Apr 16, 2026
9c5ae6d
Narrow catch to only ApplicationException and InvalidOperationException
nohwnd Apr 16, 2026
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
5 changes: 4 additions & 1 deletion test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBuild.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,10 @@ public static void CleanupTestAssets()
{
if (s_isSessionMutexOwner)
{
try { s_sessionMutex.ReleaseMutex(); } catch (ApplicationException) { }
// AssemblyCleanup may run on a different thread than AssemblyInitialize.
// On macOS/Linux the runtime throws InvalidOperationException for
// cross-thread release; on Windows it throws ApplicationException.
try { s_sessionMutex.ReleaseMutex(); } catch (Exception ex) when (ex is ApplicationException or InvalidOperationException) { }
Comment thread
nohwnd marked this conversation as resolved.
}
s_sessionMutex.Dispose();
s_sessionMutex = null;
Expand Down