Do not catch OperationCanceledException

Author: tmat

src/BuiltInTools/AspireService/AspireServerService.cs

@@ -170,7 +170,7 @@ private async ValueTask SendNotificationAsync<TNotification>(TNotification notif
             var jsonSerialized = JsonSerializer.SerializeToUtf8Bytes(notification, JsonSerializerOptions);
             await SendMessageAsync(dcpId, jsonSerialized, cancelationToken);
         }
-        catch (Exception e) when (LogAndPropagate(e))
+        catch (Exception e) when (e is not OperationCanceledException && LogAndPropagate(e))
         {
         }
 
@@ -340,7 +340,7 @@ private async Task HandleStartSessionRequestAsync(HttpContext context)
             context.Response.StatusCode = (int)HttpStatusCode.Created;
             context.Response.Headers.Location = $"{context.Request.Scheme}://{context.Request.Host}{context.Request.Path}/{sessionId}";
         }
-        catch (Exception e)
+        catch (Exception e) when (e is not OperationCanceledException)
         {
             Log($"Failed to start project{(projectPath == null ? "" : $" '{projectPath}'")}: {e}");
 
@@ -419,7 +419,7 @@ private async ValueTask HandleStopSessionRequestAsync(HttpContext context, strin
             var sessionExists = await _aspireServerEvents.StopSessionAsync(context.GetDcpId(), sessionId, _shutdownCancellationTokenSource.Token);
             context.Response.StatusCode = (int)(sessionExists ? HttpStatusCode.OK : HttpStatusCode.NoContent);
         }
-        catch (Exception e)
+        catch (Exception e) when (e is not OperationCanceledException)
         {
             Log($"[#{sessionId}] Failed to stop: {e}");
 

src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs

@@ -157,11 +157,7 @@ async Task StartChannelReader(CancellationToken cancellationToken)
                         await _service.NotifyLogMessageAsync(dcpId, sessionId, isStdErr: line.IsError, data: line.Content, cancellationToken);
                     }
                 }
-                catch (OperationCanceledException)
-                {
-                    // nop
-                }
-                catch (Exception e)
+                catch (Exception e) when (e is not OperationCanceledException)
                 {
                     Reporter.Error($"Unexpected error reading output of session '{sessionId}': {e}");
                 }

src/BuiltInTools/dotnet-watch/Build/ProjectGraphUtilities.cs

@@ -39,7 +39,7 @@ internal static class ProjectGraphUtilities
 
             return new ProjectGraph([entryPoint], collection, projectInstanceFactory: null, cancellationToken);
         }
-        catch (Exception e)
+        catch (Exception e) when (e is not OperationCanceledException)
         {
             reporter.Verbose("Failed to load project graph.");