From a62146235d86990319a86ef54ab95b9f79a58136 Mon Sep 17 00:00:00 2001
From: Tom Longhurst <30480171+thomhurst@users.noreply.github.com>
Date: Tue, 3 Nov 2026 15:09:47 +0000
Subject: [PATCH] Fix session ownership of object tracker cleanup (#7475)
---
src/TUnit.Core/Tracking/ObjectTracker.cs | 101 +++++++++++-------
.../ObjectTrackerRollbackTests.cs | 52 ++++++++-
.../StaticPropertyHandlerCleanupTests.cs | 11 +-
3 files changed, 122 insertions(+), 42 deletions(-)
diff --git a/src/TUnit.Core/Tracking/ObjectTracker.cs b/src/TUnit.Core/Tracking/ObjectTracker.cs
index aba391f19d4..3b2b5577c45 100644
--- a/src/TUnit.Core/Tracking/ObjectTracker.cs
+++ b/src/TUnit.Core/Tracking/ObjectTracker.cs
@@ -11,8 +11,7 @@ namespace TUnit.Core.Tracking;
///
///
/// The static s_trackedObjects dictionary is shared across all tests.
-/// Call at the end of a run session to
-/// dispose any leftovers and release memory.
+/// Each tracker owns its session references. Session cleanup releases only those references.
///
internal class ObjectTracker(TrackableObjectGraphProvider trackableObjectGraphProvider, Disposer disposer)
{
@@ -20,8 +19,9 @@ internal class ObjectTracker(TrackableObjectGraphProvider trackableObjectGraphPr
private static readonly ConcurrentDictionary