MTP extensions cleanup for cancellation (#7380)

Youssef1313 · web-flow · commit 5bc5a928cf62 · 2026-02-10T22:53:29.000+01:00
diff --git a/src/Platform/Microsoft.Testing.Extensions.AzureDevOpsReport/AzureDevOpsReporter.cs b/src/Platform/Microsoft.Testing.Extensions.AzureDevOpsReport/AzureDevOpsReporter.cs
@@ -107,10 +107,7 @@ public Task<bool> IsEnabledAsync()
 
     public async Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationToken cancellationToken)
     {
-        if (cancellationToken.IsCancellationRequested)
-        {
-            return;
-        }
+        cancellationToken.ThrowIfCancellationRequested();
 
         if (value is not TestNodeUpdateMessage nodeUpdateMessage)
         {
diff --git a/src/Platform/Microsoft.Testing.Extensions.CrashDump/CrashDumpProcessLifetimeHandler.cs b/src/Platform/Microsoft.Testing.Extensions.CrashDump/CrashDumpProcessLifetimeHandler.cs
@@ -55,8 +55,8 @@ public Task<bool> IsEnabledAsync()
 
     public async Task OnTestHostProcessExitedAsync(ITestHostProcessInformation testHostProcessInformation, CancellationToken cancellationToken)
     {
-        if (cancellationToken.IsCancellationRequested
-            || testHostProcessInformation.HasExitedGracefully
+        cancellationToken.ThrowIfCancellationRequested();
+        if (testHostProcessInformation.HasExitedGracefully
             || (AppDomain.CurrentDomain.GetData("ProcessKilledByHangDump") is string processKilledByHangDump && processKilledByHangDump == "true"))
         {
             return;
diff --git a/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpActivityIndicator.cs b/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpActivityIndicator.cs
@@ -83,11 +83,7 @@ public async Task OnTestSessionStartingAsync(ITestSessionContext testSessionCont
     {
         CancellationToken cancellationToken = testSessionContext.CancellationToken;
         ApplicationStateGuard.Ensure(_namedPipeClient is not null);
-
-        if (!await IsEnabledAsync().ConfigureAwait(false) || cancellationToken.IsCancellationRequested)
-        {
-            return;
-        }
+        cancellationToken.ThrowIfCancellationRequested();
 
         try
         {
@@ -139,8 +135,8 @@ private async Task<IResponse> CallbackAsync(IRequest request)
 
     public async Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationToken cancellationToken)
     {
-        if (cancellationToken.IsCancellationRequested
-            || value is not TestNodeUpdateMessage nodeChangedMessage)
+        cancellationToken.ThrowIfCancellationRequested();
+        if (value is not TestNodeUpdateMessage nodeChangedMessage)
         {
             return;
         }
diff --git a/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpProcessLifetimeHandler.cs b/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpProcessLifetimeHandler.cs
@@ -175,28 +175,23 @@ public async Task OnTestHostProcessStartedAsync(ITestHostProcessInformation test
     {
         ApplicationStateGuard.Ensure(_waitConnectionTask is not null);
         ApplicationStateGuard.Ensure(_singleConnectionNamedPipeServer is not null);
-        try
-        {
-            _testHostProcessInformation = testHostProcessInformation;
-
-            await _logger.LogDebugAsync($"Wait for test host connection to the server pipe '{_singleConnectionNamedPipeServer.PipeName.Name}'").ConfigureAwait(false);
-            await _waitConnectionTask.TimeoutAfterAsync(TimeoutHelper.DefaultHangTimeSpanTimeout).ConfigureAwait(false);
-            using CancellationTokenSource timeout = new(TimeoutHelper.DefaultHangTimeSpanTimeout);
-            using var linkedCancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeout.Token);
-            _waitConsumerPipeName.Wait(linkedCancellationToken.Token);
-            ApplicationStateGuard.Ensure(_namedPipeClient is not null);
-            await _namedPipeClient.ConnectAsync(cancellationToken).TimeoutAfterAsync(TimeoutHelper.DefaultHangTimeSpanTimeout).ConfigureAwait(false);
-            await _logger.LogDebugAsync($"Connected to the test host server pipe '{_namedPipeClient.PipeName}'").ConfigureAwait(false);
-
-            _activityTimer = new Timer(
-                _ => _activityIndicatorTask = TakeDumpOfTreeAsync(cancellationToken),
-                null,
-                _activityTimerValue!.Value,
-                TimeSpan.FromMilliseconds(-1));
-        }
-        catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
-        {
-        }
+
+        _testHostProcessInformation = testHostProcessInformation;
+
+        await _logger.LogDebugAsync($"Wait for test host connection to the server pipe '{_singleConnectionNamedPipeServer.PipeName.Name}'").ConfigureAwait(false);
+        await _waitConnectionTask.TimeoutAfterAsync(TimeoutHelper.DefaultHangTimeSpanTimeout).ConfigureAwait(false);
+        using CancellationTokenSource timeout = new(TimeoutHelper.DefaultHangTimeSpanTimeout);
+        using var linkedCancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeout.Token);
+        _waitConsumerPipeName.Wait(linkedCancellationToken.Token);
+        ApplicationStateGuard.Ensure(_namedPipeClient is not null);
+        await _namedPipeClient.ConnectAsync(cancellationToken).TimeoutAfterAsync(TimeoutHelper.DefaultHangTimeSpanTimeout).ConfigureAwait(false);
+        await _logger.LogDebugAsync($"Connected to the test host server pipe '{_namedPipeClient.PipeName}'").ConfigureAwait(false);
+
+        _activityTimer = new Timer(
+            _ => _activityIndicatorTask = TakeDumpOfTreeAsync(cancellationToken),
+            null,
+            _activityTimerValue!.Value,
+            TimeSpan.FromMilliseconds(-1));
     }
 
     private static string GetDiskInfo()
@@ -220,10 +215,7 @@ private static string GetDiskInfo()
 
     public async Task OnTestHostProcessExitedAsync(ITestHostProcessInformation testHostProcessInformation, CancellationToken cancellationToken)
     {
-        if (cancellationToken.IsCancellationRequested)
-        {
-            return;
-        }
+        cancellationToken.ThrowIfCancellationRequested();
 
         if (!testHostProcessInformation.HasExitedGracefully)
         {
diff --git a/src/Platform/Microsoft.Testing.Extensions.MSBuild/MSBuildConsumer.cs b/src/Platform/Microsoft.Testing.Extensions.MSBuild/MSBuildConsumer.cs
@@ -62,10 +62,7 @@ public Task OnTestSessionFinishingAsync(ITestSessionContext testSessionContext)
 
     public async Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationToken cancellationToken)
     {
-        if (cancellationToken.IsCancellationRequested)
-        {
-            return;
-        }
+        cancellationToken.ThrowIfCancellationRequested();
 
         // Avoid processing messages if the session has ended.
         if (_sessionEnded)
diff --git a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxDataConsumer.cs b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxDataConsumer.cs
@@ -104,10 +104,7 @@ public TrxReportGenerator(
 
     public Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationToken cancellationToken)
     {
-        if (!_isEnabled || cancellationToken.IsCancellationRequested)
-        {
-            return Task.CompletedTask;
-        }
+        cancellationToken.ThrowIfCancellationRequested();
 
         try
         {
@@ -168,10 +165,7 @@ public Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationTo
     public async Task OnTestSessionStartingAsync(ITestSessionContext testSessionContext)
     {
         CancellationToken cancellationToken = testSessionContext.CancellationToken;
-        if (!_isEnabled || cancellationToken.IsCancellationRequested)
-        {
-            return;
-        }
+        cancellationToken.ThrowIfCancellationRequested();
 
         if (_logger.IsEnabled(LogLevel.Debug))
         {
@@ -198,7 +192,7 @@ await _trxTestApplicationLifecycleCallbacks.NamedPipeClient.RequestReplyAsync<Te
         }
 
         ITrxReportCapability? trxCapability = _testFrameworkCapabilities.GetCapability<ITrxReportCapability>();
-        if (_isEnabled && trxCapability is not null && trxCapability.IsSupported)
+        if (trxCapability is not null && trxCapability.IsSupported)
         {
             _adapterSupportTrxCapability = true;
             trxCapability.Enable();
@@ -210,10 +204,7 @@ await _trxTestApplicationLifecycleCallbacks.NamedPipeClient.RequestReplyAsync<Te
     public async Task OnTestSessionFinishingAsync(ITestSessionContext testSessionContext)
     {
         CancellationToken cancellationToken = testSessionContext.CancellationToken;
-        if (!_isEnabled || cancellationToken.IsCancellationRequested)
-        {
-            return;
-        }
+        cancellationToken.ThrowIfCancellationRequested();
 
         try
         {
diff --git a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxProcessLifetimeHandler.cs b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxProcessLifetimeHandler.cs
@@ -148,10 +148,7 @@ public Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationTo
 
     public async Task OnTestHostProcessExitedAsync(ITestHostProcessInformation testHostProcessInformation, CancellationToken cancellationToken)
     {
-        if (cancellationToken.IsCancellationRequested)
-        {
-            return;
-        }
+        cancellationToken.ThrowIfCancellationRequested();
 
         Dictionary<IExtension, List<SessionFileArtifact>> artifacts = [];
 
diff --git a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxTestApplicationLifecycleCallbacks.cs b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxTestApplicationLifecycleCallbacks.cs
@@ -52,30 +52,21 @@ public TrxTestApplicationLifecycleCallbacks(
 
     public async Task BeforeRunAsync(CancellationToken cancellationToken)
     {
-        if (!_isEnabled || cancellationToken.IsCancellationRequested)
+        cancellationToken.ThrowIfCancellationRequested();
+        if (!_isEnabled)
         {
             return;
         }
 
-        try
-        {
-            if (_isEnabled)
-            {
-                string namedPipeName = _environment.GetEnvironmentVariable(TrxEnvironmentVariableProvider.TRXNAMEDPIPENAME)
-                    ?? throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, ExtensionResources.TrxReportGeneratorMissingTrxNamedPipeEnvironmentVariable, TrxEnvironmentVariableProvider.TRXNAMEDPIPENAME));
-                NamedPipeClient = new NamedPipeClient(namedPipeName, _environment);
-                NamedPipeClient.RegisterSerializer(new ReportFileNameRequestSerializer(), typeof(ReportFileNameRequest));
-                NamedPipeClient.RegisterSerializer(new TestAdapterInformationRequestSerializer(), typeof(TestAdapterInformationRequest));
-                NamedPipeClient.RegisterSerializer(new VoidResponseSerializer(), typeof(VoidResponse));
-
-                // Connect to the named pipe server
-                await NamedPipeClient.ConnectAsync(cancellationToken).TimeoutAfterAsync(TimeoutHelper.DefaultHangTimeSpanTimeout, cancellationToken).ConfigureAwait(false);
-            }
-        }
-        catch (OperationCanceledException ex) when (ex.CancellationToken == cancellationToken)
-        {
-            // Do nothing, we're stopping
-        }
+        string namedPipeName = _environment.GetEnvironmentVariable(TrxEnvironmentVariableProvider.TRXNAMEDPIPENAME)
+            ?? throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, ExtensionResources.TrxReportGeneratorMissingTrxNamedPipeEnvironmentVariable, TrxEnvironmentVariableProvider.TRXNAMEDPIPENAME));
+        NamedPipeClient = new NamedPipeClient(namedPipeName, _environment);
+        NamedPipeClient.RegisterSerializer(new ReportFileNameRequestSerializer(), typeof(ReportFileNameRequest));
+        NamedPipeClient.RegisterSerializer(new TestAdapterInformationRequestSerializer(), typeof(TestAdapterInformationRequest));
+        NamedPipeClient.RegisterSerializer(new VoidResponseSerializer(), typeof(VoidResponse));
+
+        // Connect to the named pipe server
+        await NamedPipeClient.ConnectAsync(cancellationToken).TimeoutAfterAsync(TimeoutHelper.DefaultHangTimeSpanTimeout, cancellationToken).ConfigureAwait(false);
     }
 
     public void Dispose()
diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/SimplifiedConsoleOutputDeviceBase.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/SimplifiedConsoleOutputDeviceBase.cs
@@ -233,10 +233,8 @@ public async Task DisplayAfterSessionEndRunAsync(CancellationToken cancellationT
 
     public Task OnTestSessionStartingAsync(ITestSessionContext testSessionContext)
     {
-        if (testSessionContext.CancellationToken.IsCancellationRequested)
-        {
-            return Task.CompletedTask;
-        }
+        CancellationToken cancellationToken = testSessionContext.CancellationToken;
+        cancellationToken.ThrowIfCancellationRequested();
 
         // We implement IDataConsumerService and IOutputDisplayService.
         // So the engine is calling us before as IDataConsumerService and after as IOutputDisplayService.
diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/TerminalOutputDevice.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/TerminalOutputDevice.cs
@@ -337,7 +337,9 @@ private async Task DisplayAfterSessionEndRunInternalAsync()
 
     public Task OnTestSessionStartingAsync(ITestSessionContext testSessionContext)
     {
-        if (_isServerMode || testSessionContext.CancellationToken.IsCancellationRequested)
+        CancellationToken cancellationToken = testSessionContext.CancellationToken;
+        cancellationToken.ThrowIfCancellationRequested();
+        if (_isServerMode)
         {
             return Task.CompletedTask;
         }
@@ -398,8 +400,8 @@ public async Task DisplayAsync(IOutputDeviceDataProducer producer, IOutputDevice
     public Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationToken cancellationToken)
     {
         RoslynDebug.Assert(_terminalTestReporter is not null);
-
-        if (_isServerMode || cancellationToken.IsCancellationRequested)
+        cancellationToken.ThrowIfCancellationRequested();
+        if (_isServerMode)
         {
             return Task.CompletedTask;
         }
diff --git a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/PerRequestServerDataConsumerService.cs b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/PerRequestServerDataConsumerService.cs
@@ -85,78 +85,58 @@ public TestNodeStatistics GetTestNodeStatistics()
 
     private async Task ProcessTestNodeUpdateAsync(TestNodeUpdateMessage update, CancellationToken cancellationToken)
     {
-        if (cancellationToken.IsCancellationRequested)
-        {
-            return;
-        }
+        cancellationToken.ThrowIfCancellationRequested();
 
+        await _nodeAggregatorSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
         try
         {
-            await _nodeAggregatorSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-            try
+            // Note: If there's no changes to aggregate kick off a background task,
+            //       that will send the updates on idle.
+            // Note: It's ok to do this before we aggregate the change, since the
+            //       SendTestNodeUpdatesIfNecessaryAsync will have to grab the semaphore
+            //       to complete and that will only happen if this method releases the semaphore.
+            if (!_nodeUpdatesAggregator.HasChanges)
             {
-                // Note: If there's no changes to aggregate kick off a background task,
-                //       that will send the updates on idle.
-                // Note: It's ok to do this before we aggregate the change, since the
-                //       SendTestNodeUpdatesIfNecessaryAsync will have to grab the semaphore
-                //       to complete and that will only happen if this method releases the semaphore.
-                if (!_nodeUpdatesAggregator.HasChanges)
+                // If idle task is not null observe it to throw in case of failed task.
+                if (_idleUpdateTask is not null)
                 {
-                    // If idle task is not null observe it to throw in case of failed task.
-                    if (_idleUpdateTask is not null)
+                    // Observe possible exceptions
+                    try
                     {
-                        // Observe possible exceptions
-                        try
-                        {
-                            await _idleUpdateTask.TimeoutAfterAsync(TimeoutHelper.DefaultHangTimeSpanTimeout, cancellationToken).ConfigureAwait(false);
-                        }
-                        catch (OperationCanceledException)
-                        {
-                            // We cannot check the token because it's possible that we're canceled during the
-                            // send of the information and that the current cancellation token is a combined one.
-                        }
+                        await _idleUpdateTask.TimeoutAfterAsync(TimeoutHelper.DefaultHangTimeSpanTimeout, cancellationToken).ConfigureAwait(false);
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        // We cannot check the token because it's possible that we're canceled during the
+                        // send of the information and that the current cancellation token is a combined one.
                     }
-
-                    _idleUpdateTask = SendTestNodeUpdatesOnIdleAsync(_nodeUpdatesAggregator.RunId);
                 }
 
-                _nodeUpdatesAggregator.OnStateChange(update);
-            }
-            finally
-            {
-                _nodeAggregatorSemaphore.Release();
+                _idleUpdateTask = SendTestNodeUpdatesOnIdleAsync(_nodeUpdatesAggregator.RunId);
             }
+
+            _nodeUpdatesAggregator.OnStateChange(update);
         }
-        catch (OperationCanceledException ex) when (ex.CancellationToken == cancellationToken)
+        finally
         {
-            // We do nothing we've been canceled.
+            _nodeAggregatorSemaphore.Release();
         }
     }
 
     private async Task SendTestNodeUpdatesOnIdleAsync(Guid runId)
     {
         // We get the PerRequestTestApplicationCooperativeLifetime that in server mode is linked to the per-request+global cancellation token.
         CancellationToken cancellationToken = _testSessionContext.CancellationToken;
-        try
-        {
-            // We subscribe to the per request application lifetime
-            using CancellationTokenRegistration registration = cancellationToken.Register(_testSessionEnd.SetCanceled);
+        // We subscribe to the per request application lifetime
+        using CancellationTokenRegistration registration = cancellationToken.Register(_testSessionEnd.SetCanceled);
 
-            // When batch timer expire or we're at the end of the session we can unblock the message drain
-            Ensure.NotNull(_task);
-            await Task.WhenAny(_task.Delay(TimeSpan.FromMilliseconds(TestNodeUpdateDelayInMs), cancellationToken), _testSessionEnd.Task).ConfigureAwait(false);
+        // When batch timer expire or we're at the end of the session we can unblock the message drain
+        Ensure.NotNull(_task);
+        await Task.WhenAny(_task.Delay(TimeSpan.FromMilliseconds(TestNodeUpdateDelayInMs), cancellationToken), _testSessionEnd.Task).ConfigureAwait(false);
 
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return;
-            }
+        cancellationToken.ThrowIfCancellationRequested();
 
-            await SendTestNodeUpdatesIfNecessaryAsync(runId, cancellationToken).ConfigureAwait(false);
-        }
-        catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
-        {
-            // We do nothing we've been canceled.
-        }
+        await SendTestNodeUpdatesIfNecessaryAsync(runId, cancellationToken).ConfigureAwait(false);
     }
 
     private async Task SendTestNodeUpdatesIfNecessaryAsync(Guid runId, CancellationToken cancellationToken)
@@ -197,24 +177,15 @@ private async Task SendTestNodeUpdatesIfNecessaryAsync(Guid runId, CancellationT
     public async Task OnTestSessionFinishingAsync(ITestSessionContext testSessionContext)
     {
         CancellationToken cancellationToken = testSessionContext.CancellationToken;
-        try
-        {
-            // We signal the test session end so we can complete the flush.
-            _testSessionEnd.SetResult(true);
-            await GetIdleUpdateTaskAsync().TimeoutAfterAsync(TimeoutHelper.DefaultHangTimeSpanTimeout, cancellationToken).ConfigureAwait(false);
-        }
-        catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
-        {
-            // We do nothing we've been canceled.
-        }
+        cancellationToken.ThrowIfCancellationRequested();
+        // We signal the test session end so we can complete the flush.
+        _testSessionEnd.SetResult(true);
+        await GetIdleUpdateTaskAsync().TimeoutAfterAsync(TimeoutHelper.DefaultHangTimeSpanTimeout, cancellationToken).ConfigureAwait(false);
     }
 
     public async Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationToken cancellationToken)
     {
-        if (cancellationToken.IsCancellationRequested)
-        {
-            return;
-        }
+        cancellationToken.ThrowIfCancellationRequested();
 
         switch (value)
         {

Original file line number	Diff line number	Diff line change
`@@ -107,10 +107,7 @@ public Task<bool> IsEnabledAsync()`
`107`	`107`
`108`	`108`	`public async Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationToken cancellationToken)`
`109`	`109`	`{`
`110`		`- if (cancellationToken.IsCancellationRequested)`
`111`		`- {`
`112`		`- return;`
`113`		`- }`
	`110`	`+ cancellationToken.ThrowIfCancellationRequested();`
`114`	`111`
`115`	`112`	`if (value is not TestNodeUpdateMessage nodeUpdateMessage)`
`116`	`113`	`{`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ public Task<bool> IsEnabledAsync()`
`55`	`55`
`56`	`56`	`public async Task OnTestHostProcessExitedAsync(ITestHostProcessInformation testHostProcessInformation, CancellationToken cancellationToken)`
`57`	`57`	`{`
`58`		`- if (cancellationToken.IsCancellationRequested`
`59`		`- \|\| testHostProcessInformation.HasExitedGracefully`
	`58`	`+ cancellationToken.ThrowIfCancellationRequested();`
	`59`	`+ if (testHostProcessInformation.HasExitedGracefully`
`60`	`60`	`\|\| (AppDomain.CurrentDomain.GetData("ProcessKilledByHangDump") is string processKilledByHangDump && processKilledByHangDump == "true"))`
`61`	`61`	`{`
`62`	`62`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -83,11 +83,7 @@ public async Task OnTestSessionStartingAsync(ITestSessionContext testSessionCont`
`83`	`83`	`{`
`84`	`84`	`CancellationToken cancellationToken = testSessionContext.CancellationToken;`
`85`	`85`	`ApplicationStateGuard.Ensure(_namedPipeClient is not null);`
`86`		`-`
`87`		`- if (!await IsEnabledAsync().ConfigureAwait(false) \|\| cancellationToken.IsCancellationRequested)`
`88`		`- {`
`89`		`- return;`
`90`		`- }`
	`86`	`+ cancellationToken.ThrowIfCancellationRequested();`
`91`	`87`
`92`	`88`	`try`
`93`	`89`	`{`
`@@ -139,8 +135,8 @@ private async Task<IResponse> CallbackAsync(IRequest request)`
`139`	`135`
`140`	`136`	`public async Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationToken cancellationToken)`
`141`	`137`	`{`
`142`		`- if (cancellationToken.IsCancellationRequested`
`143`		`- \|\| value is not TestNodeUpdateMessage nodeChangedMessage)`
	`138`	`+ cancellationToken.ThrowIfCancellationRequested();`
	`139`	`+ if (value is not TestNodeUpdateMessage nodeChangedMessage)`
`144`	`140`	`{`
`145`	`141`	`return;`
`146`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,10 +104,7 @@ public TrxReportGenerator(`
`104`	`104`
`105`	`105`	`public Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationToken cancellationToken)`
`106`	`106`	`{`
`107`		`- if (!_isEnabled \|\| cancellationToken.IsCancellationRequested)`
`108`		`- {`
`109`		`- return Task.CompletedTask;`
`110`		`- }`
	`107`	`+ cancellationToken.ThrowIfCancellationRequested();`
`111`	`108`
`112`	`109`	`try`
`113`	`110`	`{`
`@@ -168,10 +165,7 @@ public Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationTo`
`168`	`165`	`public async Task OnTestSessionStartingAsync(ITestSessionContext testSessionContext)`
`169`	`166`	`{`
`170`	`167`	`CancellationToken cancellationToken = testSessionContext.CancellationToken;`
`171`		`- if (!_isEnabled \|\| cancellationToken.IsCancellationRequested)`
`172`		`- {`
`173`		`- return;`
`174`		`- }`
	`168`	`+ cancellationToken.ThrowIfCancellationRequested();`
`175`	`169`
`176`	`170`	`if (_logger.IsEnabled(LogLevel.Debug))`
`177`	`171`	`{`
`@@ -198,7 +192,7 @@ await _trxTestApplicationLifecycleCallbacks.NamedPipeClient.RequestReplyAsync<Te`
`198`	`192`	`}`
`199`	`193`
`200`	`194`	`ITrxReportCapability? trxCapability = _testFrameworkCapabilities.GetCapability<ITrxReportCapability>();`
`201`		`- if (_isEnabled && trxCapability is not null && trxCapability.IsSupported)`
	`195`	`+ if (trxCapability is not null && trxCapability.IsSupported)`
`202`	`196`	`{`
`203`	`197`	`_adapterSupportTrxCapability = true;`
`204`	`198`	`trxCapability.Enable();`
`@@ -210,10 +204,7 @@ await _trxTestApplicationLifecycleCallbacks.NamedPipeClient.RequestReplyAsync<Te`
`210`	`204`	`public async Task OnTestSessionFinishingAsync(ITestSessionContext testSessionContext)`
`211`	`205`	`{`
`212`	`206`	`CancellationToken cancellationToken = testSessionContext.CancellationToken;`
`213`		`- if (!_isEnabled \|\| cancellationToken.IsCancellationRequested)`
`214`		`- {`
`215`		`- return;`
`216`		`- }`
	`207`	`+ cancellationToken.ThrowIfCancellationRequested();`
`217`	`208`
`218`	`209`	`try`
`219`	`210`	`{`
Original file line number	Diff line number	Diff line change
`@@ -148,10 +148,7 @@ public Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationTo`
`148`	`148`
`149`	`149`	`public async Task OnTestHostProcessExitedAsync(ITestHostProcessInformation testHostProcessInformation, CancellationToken cancellationToken)`
`150`	`150`	`{`
`151`		`- if (cancellationToken.IsCancellationRequested)`
`152`		`- {`
`153`		`- return;`
`154`		`- }`
	`151`	`+ cancellationToken.ThrowIfCancellationRequested();`
`155`	`152`
`156`	`153`	`Dictionary<IExtension, List<SessionFileArtifact>> artifacts = [];`
`157`	`154`
Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,9 @@ private async Task DisplayAfterSessionEndRunInternalAsync()`
`337`	`337`
`338`	`338`	`public Task OnTestSessionStartingAsync(ITestSessionContext testSessionContext)`
`339`	`339`	`{`
`340`		`- if (_isServerMode \|\| testSessionContext.CancellationToken.IsCancellationRequested)`
	`340`	`+ CancellationToken cancellationToken = testSessionContext.CancellationToken;`
	`341`	`+ cancellationToken.ThrowIfCancellationRequested();`
	`342`	`+ if (_isServerMode)`
`341`	`343`	`{`
`342`	`344`	`return Task.CompletedTask;`
`343`	`345`	`}`
`@@ -398,8 +400,8 @@ public async Task DisplayAsync(IOutputDeviceDataProducer producer, IOutputDevice`
`398`	`400`	`public Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationToken cancellationToken)`
`399`	`401`	`{`
`400`	`402`	`RoslynDebug.Assert(_terminalTestReporter is not null);`
`401`		`-`
`402`		`- if (_isServerMode \|\| cancellationToken.IsCancellationRequested)`
	`403`	`+ cancellationToken.ThrowIfCancellationRequested();`
	`404`	`+ if (_isServerMode)`
`403`	`405`	`{`
`404`	`406`	`return Task.CompletedTask;`
`405`	`407`	`}`