@@ -12,10 +12,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Setup .NET 6.0.x
-        uses: actions/setup-dotnet@v2
+      - name: Setup .NET 7.0.x
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.x
       - name: Restore dependencies
         run: dotnet restore
       - name: Build
 
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
     <AssemblyName>EntityGraphQL.AspNet</AssemblyName>
     <PackageId>EntityGraphQL.AspNet</PackageId>
     <PackageVersion>4.3.0</PackageVersion>
 
@@ -177,9 +177,10 @@ public Task SendErrorAsync(Guid id, IEnumerable<GraphQLError> errors)
 
         public void CompleteSubscription(Guid id)
         {
-            if (subscriptions.ContainsKey(id))
+            subscriptions.TryGetValue(id, out var subscription);
+            if (subscription != null)
             {
-                subscriptions[id].Dispose();
+                subscription.Dispose();
                 subscriptions.Remove(id);
             }
         }
 
@@ -8,7 +8,7 @@ namespace EntityGraphQL.AspNet.WebSockets
     /// Ties the GraphQL subscription to the WebSocket connection.
     /// </summary>
     /// <typeparam name="TEventType"></typeparam>
-    internal class WebSocketSubscription<TQueryContext, TEventType> : IDisposable, IObserver<TEventType>
+    internal sealed class WebSocketSubscription<TQueryContext, TEventType> : IDisposable, IObserver<TEventType>
     {
         private readonly Guid id;
         private readonly IObservable<TEventType> observable;
Original file line number	Diff line number	Diff line change
`@@ -177,9 +177,10 @@ public Task SendErrorAsync(Guid id, IEnumerable<GraphQLError> errors)`
`177`	`177`
`178`	`178`	`public void CompleteSubscription(Guid id)`
`179`	`179`	`{`
`180`		`- if (subscriptions.ContainsKey(id))`
	`180`	`+ subscriptions.TryGetValue(id, out var subscription);`
	`181`	`+ if (subscription != null)`
`181`	`182`	`{`
`182`		`- subscriptions[id].Dispose();`
	`183`	`+ subscription.Dispose();`
`183`	`184`	`subscriptions.Remove(id);`
`184`	`185`	`}`
`185`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace EntityGraphQL.AspNet.WebSockets`
`8`	`8`	`/// Ties the GraphQL subscription to the WebSocket connection.`
`9`	`9`	`/// </summary>`
`10`	`10`	`/// <typeparam name="TEventType"></typeparam>`
`11`		`- internal class WebSocketSubscription<TQueryContext, TEventType> : IDisposable, IObserver<TEventType>`
	`11`	`+ internal sealed class WebSocketSubscription<TQueryContext, TEventType> : IDisposable, IObserver<TEventType>`
`12`	`12`	`{`
`13`	`13`	`private readonly Guid id;`
`14`	`14`	`private readonly IObservable<TEventType> observable;`