Update to AspNetCore3

Shane32 · Mar 31, 2022 · eb0b9ab · eb0b9ab
1 parent 5a44c9d
commit eb0b9ab
Show file tree

Hide file tree

Showing 44 changed files with 56 additions and 56 deletions.
diff --git a/GraphQL.AspNetCore.sln → GraphQL.AspNetCore3.sln b/GraphQL.AspNetCore.sln → GraphQL.AspNetCore3.sln
@@ -39,7 +39,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndpointRoutingSample", "sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PagesSample", "src\Samples\PagesSample\PagesSample.csproj", "{1C67EC05-89BA-4C14-A874-7A0D8A2D564B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.AspNetCore", "src\GraphQL.AspNetCore\GraphQL.AspNetCore.csproj", "{113AA7CB-5B8B-4D0F-9447-CE8DB70D4688}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.AspNetCore3", "src\GraphQL.AspNetCore3\GraphQL.AspNetCore3.csproj", "{8DFDAD38-C530-4A90-B1F3-C26491FFA0A7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -75,10 +75,10 @@ Global
 		{1C67EC05-89BA-4C14-A874-7A0D8A2D564B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1C67EC05-89BA-4C14-A874-7A0D8A2D564B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C67EC05-89BA-4C14-A874-7A0D8A2D564B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{113AA7CB-5B8B-4D0F-9447-CE8DB70D4688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{113AA7CB-5B8B-4D0F-9447-CE8DB70D4688}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{113AA7CB-5B8B-4D0F-9447-CE8DB70D4688}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{113AA7CB-5B8B-4D0F-9447-CE8DB70D4688}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DFDAD38-C530-4A90-B1F3-C26491FFA0A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DFDAD38-C530-4A90-B1F3-C26491FFA0A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DFDAD38-C530-4A90-B1F3-C26491FFA0A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DFDAD38-C530-4A90-B1F3-C26491FFA0A7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# GraphQL.AspNetCore
+# GraphQL.AspNetCore3
 
-[![NuGet](https://img.shields.io/nuget/v/GraphQL.AspNetCore.svg)](https://www.nuget.org/packages/GraphQL.AspNetCore) [![Coverage Status](https://coveralls.io/repos/github/Shane32/GraphQL.AspNetCore/badge.svg?branch=master)](https://coveralls.io/github/Shane32/GraphQL.AspNetCore?branch=master)
+[![NuGet](https://img.shields.io/nuget/v/GraphQL.AspNetCore3.svg)](https://www.nuget.org/packages/GraphQL.AspNetCore3) [![Coverage Status](https://coveralls.io/repos/github/Shane32/GraphQL.AspNetCore3/badge.svg?branch=master)](https://coveralls.io/github/Shane32/GraphQL.AspNetCore3?branch=master)
 
 This package is designed for ASP.Net Core 3.1+ to facilitate easy set-up of GraphQL requests
 over HTTP.  The code is designed to be used as middleware within the ASP.Net Core pipeline,
@@ -24,7 +24,7 @@ framework in order to use them.
 
 ### Typical configuration with HTTP middleware
 
-First add the `GraphQL.AspNetCore` nuget package to your application.  It requires
+First add the `GraphQL.AspNetCore3` nuget package to your application.  It requires
 `GraphQL` version 5.0 or later and will default to the newest available 5.x version if none
 are installed in your application.
 
@@ -50,7 +50,7 @@ Below is a complete sample of a .NET 6 console app that hosts a GraphQL endpoint
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.AspNetCore" Version="1.0.0" />
+    <PackageReference Include="GraphQL.AspNetCore3" Version="1.0.0" />
     <PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0" />
   </ItemGroup>
 
@@ -63,7 +63,7 @@ Below is a complete sample of a .NET 6 console app that hosts a GraphQL endpoint
 using GraphQL;
 using GraphQL.MicrosoftDI;
 using GraphQL.SystemTextJson;
-using GraphQL.AspNetCore;
+using GraphQL.AspNetCore3;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddGraphQL(b => b

diff --git a/src/GraphQL.AspNetCore/Assembly.cs → src/GraphQL.AspNetCore3/Assembly.cs b/src/GraphQL.AspNetCore/Assembly.cs → src/GraphQL.AspNetCore3/Assembly.cs
diff --git a/...AspNetCore/ExecutionResultActionResult.cs → ...spNetCore3/ExecutionResultActionResult.cs b/...AspNetCore/ExecutionResultActionResult.cs → ...spNetCore3/ExecutionResultActionResult.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore;
+namespace GraphQL.AspNetCore3;
 
 /// <summary>
 /// An action result that formats the <see cref="ExecutionResult"/> as JSON.

diff --git a/...phQL.AspNetCore/GraphQL.AspNetCore.csproj → ...QL.AspNetCore3/GraphQL.AspNetCore3.csproj b/...phQL.AspNetCore/GraphQL.AspNetCore.csproj → ...QL.AspNetCore3/GraphQL.AspNetCore3.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <Using Include="GraphQL" />
-    <Using Include="GraphQL.AspNetCore.WebSockets" />
+    <Using Include="GraphQL.AspNetCore3.WebSockets" />
     <Using Include="GraphQL.DI" />
     <Using Include="GraphQL.Execution" />
     <Using Include="GraphQL.Transport" />

diff --git a/...QL.AspNetCore/GraphQLBuilderExtensions.cs → ...L.AspNetCore3/GraphQLBuilderExtensions.cs b/...QL.AspNetCore/GraphQLBuilderExtensions.cs → ...L.AspNetCore3/GraphQLBuilderExtensions.cs
@@ -1,6 +1,6 @@
 using ServiceLifetime = GraphQL.DI.ServiceLifetime;
 
-namespace GraphQL.AspNetCore;
+namespace GraphQL.AspNetCore3;
 
 /// <summary>
 /// GraphQL specific extension methods for <see cref="IGraphQLBuilder"/>.

diff --git a/...raphQLHttpApplicationBuilderExtensions.cs → ...raphQLHttpApplicationBuilderExtensions.cs b/...raphQLHttpApplicationBuilderExtensions.cs → ...raphQLHttpApplicationBuilderExtensions.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore;
+namespace GraphQL.AspNetCore3;
 
 /// <summary>
 /// Extensions for <see cref="IApplicationBuilder"/> to add <see cref="GraphQLHttpMiddleware{TSchema}"/>

diff --git a/...phQLHttpEndpointRouteBuilderExtensions.cs → ...phQLHttpEndpointRouteBuilderExtensions.cs b/...phQLHttpEndpointRouteBuilderExtensions.cs → ...phQLHttpEndpointRouteBuilderExtensions.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore;
+namespace GraphQL.AspNetCore3;
 
 /// <summary>
 /// Extensions for <see cref="IEndpointRouteBuilder"/> to add <see cref="GraphQLHttpMiddleware{TSchema}"/>

diff --git a/...aphQL.AspNetCore/GraphQLHttpMiddleware.cs → ...phQL.AspNetCore3/GraphQLHttpMiddleware.cs b/...aphQL.AspNetCore/GraphQLHttpMiddleware.cs → ...phQL.AspNetCore3/GraphQLHttpMiddleware.cs
@@ -1,6 +1,6 @@
 #pragma warning disable CA1716 // Identifiers should not match keywords
 
-namespace GraphQL.AspNetCore;
+namespace GraphQL.AspNetCore3;
 
 /// <inheritdoc/>
 /// <typeparam name="TSchema">

diff --git a/...spNetCore/GraphQLHttpMiddlewareOptions.cs → ...pNetCore3/GraphQLHttpMiddlewareOptions.cs b/...spNetCore/GraphQLHttpMiddlewareOptions.cs → ...pNetCore3/GraphQLHttpMiddlewareOptions.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore;
+namespace GraphQL.AspNetCore3;
 
 /// <summary>
 /// Configuration options for <see cref="GraphQLHttpMiddleware{TSchema}"/>.

diff --git a/...aphQL.AspNetCore/HttpGetValidationRule.cs → ...phQL.AspNetCore3/HttpGetValidationRule.cs b/...aphQL.AspNetCore/HttpGetValidationRule.cs → ...phQL.AspNetCore3/HttpGetValidationRule.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore;
+namespace GraphQL.AspNetCore3;
 
 /// <summary>
 /// Validates that HTTP GET requests only execute queries; not mutations or subscriptions.

diff --git a/...L.AspNetCore/HttpMethodValidationError.cs → ....AspNetCore3/HttpMethodValidationError.cs b/...L.AspNetCore/HttpMethodValidationError.cs → ....AspNetCore3/HttpMethodValidationError.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore;
+namespace GraphQL.AspNetCore3;
 
 /// <summary>
 /// Represents a validation error indicating that the requested operation is not valid

diff --git a/...phQL.AspNetCore/HttpPostValidationRule.cs → ...hQL.AspNetCore3/HttpPostValidationRule.cs b/...phQL.AspNetCore/HttpPostValidationRule.cs → ...hQL.AspNetCore3/HttpPostValidationRule.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore;
+namespace GraphQL.AspNetCore3;
 
 /// <summary>
 /// Validates that HTTP POST requests do not execute subscriptions.

diff --git a/...GraphQL.AspNetCore/IUserContextBuilder.cs → ...raphQL.AspNetCore3/IUserContextBuilder.cs b/...GraphQL.AspNetCore/IUserContextBuilder.cs → ...raphQL.AspNetCore3/IUserContextBuilder.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore;
+namespace GraphQL.AspNetCore3;
 
 /// <summary>
 /// Creates a user context from a <see cref="HttpContext"/>.

diff --git a/src/GraphQL.AspNetCore/IWebSocketHandler.cs → src/GraphQL.AspNetCore3/IWebSocketHandler.cs b/src/GraphQL.AspNetCore/IWebSocketHandler.cs → src/GraphQL.AspNetCore3/IWebSocketHandler.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore;
+namespace GraphQL.AspNetCore3;
 
 /// <inheritdoc/>
 public interface IWebSocketHandler<TSchema> : IWebSocketHandler

diff --git a/src/GraphQL.AspNetCore/UserContextBuilder.cs → ...GraphQL.AspNetCore3/UserContextBuilder.cs b/src/GraphQL.AspNetCore/UserContextBuilder.cs → ...GraphQL.AspNetCore3/UserContextBuilder.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore;
+namespace GraphQL.AspNetCore3;
 
 /// <summary>
 /// Represents a user context builder based on a delegate.

diff --git a/...AspNetCore/WebSockets/AsyncMessagePump.cs → ...spNetCore3/WebSockets/AsyncMessagePump.cs b/...AspNetCore/WebSockets/AsyncMessagePump.cs → ...spNetCore3/WebSockets/AsyncMessagePump.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore.WebSockets;
+namespace GraphQL.AspNetCore3.WebSockets;
 
 /// <summary>
 /// <para>

diff --git a/...Core/WebSockets/BaseSubscriptionServer.cs → ...ore3/WebSockets/BaseSubscriptionServer.cs b/...Core/WebSockets/BaseSubscriptionServer.cs → ...ore3/WebSockets/BaseSubscriptionServer.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore.WebSockets;
+namespace GraphQL.AspNetCore3.WebSockets;
 
 /// <summary>
 /// Manages a WebSocket message stream.

diff --git a/...tCore/WebSockets/GraphQLWs/MessageType.cs → ...Core3/WebSockets/GraphQLWs/MessageType.cs b/...tCore/WebSockets/GraphQLWs/MessageType.cs → ...Core3/WebSockets/GraphQLWs/MessageType.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore.WebSockets.GraphQLWs;
+namespace GraphQL.AspNetCore3.WebSockets.GraphQLWs;
 
 /// <summary>
 /// Protocol message types defined in

diff --git a/...ebSockets/GraphQLWs/SubscriptionServer.cs → ...ebSockets/GraphQLWs/SubscriptionServer.cs b/...ebSockets/GraphQLWs/SubscriptionServer.cs → ...ebSockets/GraphQLWs/SubscriptionServer.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore.WebSockets.GraphQLWs;
+namespace GraphQL.AspNetCore3.WebSockets.GraphQLWs;
 
 /// <inheritdoc/>
 public class SubscriptionServer : BaseSubscriptionServer

diff --git a/.../WebSockets/IOperationMessageProcessor.cs → .../WebSockets/IOperationMessageProcessor.cs b/.../WebSockets/IOperationMessageProcessor.cs → .../WebSockets/IOperationMessageProcessor.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore.WebSockets;
+namespace GraphQL.AspNetCore3.WebSockets;
 
 /// <summary>
 /// Processes a stream of messages received from a WebSockets client.

diff --git a/...etCore/WebSockets/IWebSocketConnection.cs → ...tCore3/WebSockets/IWebSocketConnection.cs b/...etCore/WebSockets/IWebSocketConnection.cs → ...tCore3/WebSockets/IWebSocketConnection.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore.WebSockets;
+namespace GraphQL.AspNetCore3.WebSockets;
 
 /// <summary>
 /// Represents a WebSocket connection, dispatching received messages over

diff --git a/.../WebSockets/ReusableMemoryReaderStream.cs → .../WebSockets/ReusableMemoryReaderStream.cs b/.../WebSockets/ReusableMemoryReaderStream.cs → .../WebSockets/ReusableMemoryReaderStream.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore.WebSockets;
+namespace GraphQL.AspNetCore3.WebSockets;
 
 /// <summary>
 /// A readable memory stream based on a buffer, with a resettable maximum length.

diff --git a/...AspNetCore/WebSockets/SubscriptionList.cs → ...spNetCore3/WebSockets/SubscriptionList.cs b/...AspNetCore/WebSockets/SubscriptionList.cs → ...spNetCore3/WebSockets/SubscriptionList.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore.WebSockets;
+namespace GraphQL.AspNetCore3.WebSockets;
 
 /// <summary>
 /// A list of subscriptions represented by <see cref="IDisposable"/> objects.

diff --git a/...s/SubscriptionsTransportWs/MessageType.cs → ...s/SubscriptionsTransportWs/MessageType.cs b/...s/SubscriptionsTransportWs/MessageType.cs → ...s/SubscriptionsTransportWs/MessageType.cs
@@ -1,6 +1,6 @@
 #pragma warning disable CA1707 // Identifiers should not contain underscores
 
-namespace GraphQL.AspNetCore.WebSockets.SubscriptionsTransportWs;
+namespace GraphQL.AspNetCore3.WebSockets.SubscriptionsTransportWs;
 
 /// <summary>
 ///     Protocol message types defined in

diff --git a/...riptionsTransportWs/SubscriptionServer.cs → ...riptionsTransportWs/SubscriptionServer.cs b/...riptionsTransportWs/SubscriptionServer.cs → ...riptionsTransportWs/SubscriptionServer.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore.WebSockets.SubscriptionsTransportWs;
+namespace GraphQL.AspNetCore3.WebSockets.SubscriptionsTransportWs;
 
 /// <inheritdoc/>
 public class SubscriptionServer : BaseSubscriptionServer

diff --git a/...NetCore/WebSockets/WebSocketConnection.cs → ...etCore3/WebSockets/WebSocketConnection.cs b/...NetCore/WebSockets/WebSocketConnection.cs → ...etCore3/WebSockets/WebSocketConnection.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore.WebSockets;
+namespace GraphQL.AspNetCore3.WebSockets;
 
 /// <summary>
 /// Manages a WebSocket connection, dispatching messages to the specified <see cref="IOperationMessageProcessor"/>,

diff --git a/...AspNetCore/WebSockets/WebSocketHandler.cs → ...spNetCore3/WebSockets/WebSocketHandler.cs b/...AspNetCore/WebSockets/WebSocketHandler.cs → ...spNetCore3/WebSockets/WebSocketHandler.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore.WebSockets;
+namespace GraphQL.AspNetCore3.WebSockets;
 
 /// <inheritdoc cref="WebSocketHandler"/>
 public class WebSocketHandler<TSchema> : WebSocketHandler, IWebSocketHandler<TSchema>

diff --git a/...ore/WebSockets/WebSocketHandlerOptions.cs → ...re3/WebSockets/WebSocketHandlerOptions.cs b/...ore/WebSockets/WebSocketHandlerOptions.cs → ...re3/WebSockets/WebSocketHandlerOptions.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore.WebSockets;
+namespace GraphQL.AspNetCore3.WebSockets;
 
 /// <summary>
 /// Configuration options for a WebSocket connection.

diff --git a/...tCore/WebSockets/WebSocketWriterStream.cs → ...Core3/WebSockets/WebSocketWriterStream.cs b/...tCore/WebSockets/WebSocketWriterStream.cs → ...Core3/WebSockets/WebSocketWriterStream.cs
@@ -1,4 +1,4 @@
-namespace GraphQL.AspNetCore.WebSockets;
+namespace GraphQL.AspNetCore3.WebSockets;
 
 internal class WebSocketWriterStream : Stream
 {

diff --git a/src/Samples/BasicSample/BasicSample.csproj b/src/Samples/BasicSample/BasicSample.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\GraphQL.AspNetCore\GraphQL.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\GraphQL.AspNetCore3\GraphQL.AspNetCore3.csproj" />
     <ProjectReference Include="..\ChatSchema\Chat.csproj" />
     <PackageReference Include="GraphQL.Server.Ui.Playground" Version="5.2.1" />
     <PackageReference Include="GraphQL.SystemTextJson" Version="$(GraphQLVersion)" />

diff --git a/src/Samples/BasicSample/Program.cs b/src/Samples/BasicSample/Program.cs
@@ -1,5 +1,5 @@
 using GraphQL;
-using GraphQL.AspNetCore;
+using GraphQL.AspNetCore3;
 using GraphQL.MicrosoftDI;
 using GraphQL.SystemTextJson;
 

diff --git a/src/Samples/ControllerSample/ControllerSample.csproj b/src/Samples/ControllerSample/ControllerSample.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\GraphQL.AspNetCore\GraphQL.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\GraphQL.AspNetCore3\GraphQL.AspNetCore3.csproj" />
     <ProjectReference Include="..\ChatSchema\Chat.csproj" />
     <PackageReference Include="GraphQL.SystemTextJson" Version="$(GraphQLVersion)" />
   </ItemGroup>

diff --git a/src/Samples/ControllerSample/Controllers/HomeController.cs b/src/Samples/ControllerSample/Controllers/HomeController.cs
@@ -1,5 +1,5 @@
 using GraphQL;
-using GraphQL.AspNetCore;
+using GraphQL.AspNetCore3;
 using GraphQL.Transport;
 using GraphQL.Types;
 using GraphQL.Validation;

diff --git a/src/Samples/EndpointRoutingSample/EndpointRoutingSample.csproj b/src/Samples/EndpointRoutingSample/EndpointRoutingSample.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\GraphQL.AspNetCore\GraphQL.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\GraphQL.AspNetCore3\GraphQL.AspNetCore3.csproj" />
     <ProjectReference Include="..\ChatSchema\Chat.csproj" />
     <PackageReference Include="GraphQL.Server.Ui.Playground" Version="5.2.1" />
     <PackageReference Include="GraphQL.SystemTextJson" Version="$(GraphQLVersion)" />

diff --git a/src/Samples/EndpointRoutingSample/Program.cs b/src/Samples/EndpointRoutingSample/Program.cs
@@ -1,5 +1,5 @@
 using GraphQL;
-using GraphQL.AspNetCore;
+using GraphQL.AspNetCore3;
 using GraphQL.MicrosoftDI;
 using GraphQL.SystemTextJson;
 

diff --git a/src/Samples/MultipleSchema/MultipleSchema.csproj b/src/Samples/MultipleSchema/MultipleSchema.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\GraphQL.AspNetCore\GraphQL.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\GraphQL.AspNetCore3\GraphQL.AspNetCore3.csproj" />
     <ProjectReference Include="..\ChatSchema\Chat.csproj" />
     <PackageReference Include="GraphQL.Server.Ui.Playground" Version="5.2.1" />
     <PackageReference Include="GraphQL.SystemTextJson" Version="$(GraphQLVersion)" />

diff --git a/src/Samples/MultipleSchema/Program.cs b/src/Samples/MultipleSchema/Program.cs
@@ -1,4 +1,4 @@
-using GraphQL.AspNetCore;
+using GraphQL.AspNetCore3;
 using GraphQL.MicrosoftDI;
 using GraphQL.SystemTextJson;
 

diff --git a/src/Samples/PagesSample/PagesSample.csproj b/src/Samples/PagesSample/PagesSample.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\GraphQL.AspNetCore\GraphQL.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\GraphQL.AspNetCore3\GraphQL.AspNetCore3.csproj" />
     <ProjectReference Include="..\ChatSchema\Chat.csproj" />
     <PackageReference Include="GraphQL.SystemTextJson" Version="$(GraphQLVersion)" />
   </ItemGroup>

diff --git a/src/Samples/PagesSample/Program.cs b/src/Samples/PagesSample/Program.cs
@@ -1,5 +1,5 @@
 using GraphQL;
-using GraphQL.AspNetCore;
+using GraphQL.AspNetCore3;
 using GraphQL.MicrosoftDI;
 using GraphQL.SystemTextJson;
 

diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -28,7 +28,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Samples\ChatSchema\Chat.csproj" />
-    <ProjectReference Include="..\GraphQL.AspNetCore\GraphQL.AspNetCore.csproj" />
+    <ProjectReference Include="..\GraphQL.AspNetCore3\GraphQL.AspNetCore3.csproj" />
     <PackageReference Include="GraphQL.SystemTextJson" Version="$(GraphQLVersion)" />
   </ItemGroup>
 
@@ -46,8 +46,8 @@
     <Using Include="Microsoft.Extensions.DependencyInjection" />
     <Using Include="Moq" />
     <Using Include="Moq.Protected" />
-    <Using Include="GraphQL.AspNetCore" />
-    <Using Include="GraphQL.AspNetCore.WebSockets" />
+    <Using Include="GraphQL.AspNetCore3" />
+    <Using Include="GraphQL.AspNetCore3.WebSockets" />
     <Using Include="Shouldly" />
     <Using Include="System.Text" />
     <Using Include="System.Threading" />

diff --git a/src/Tests/WebSockets/TestNewSubscriptionServer.cs b/src/Tests/WebSockets/TestNewSubscriptionServer.cs
@@ -1,4 +1,4 @@
-using GraphQL.AspNetCore.WebSockets.GraphQLWs;
+using GraphQL.AspNetCore3.WebSockets.GraphQLWs;
 
 namespace Tests.WebSockets;
 

diff --git a/src/Tests/WebSockets/TestOldSubscriptionServer.cs b/src/Tests/WebSockets/TestOldSubscriptionServer.cs
@@ -1,4 +1,4 @@
-using GraphQL.AspNetCore.WebSockets.SubscriptionsTransportWs;
+using GraphQL.AspNetCore3.WebSockets.SubscriptionsTransportWs;
 
 namespace Tests.WebSockets;
 

diff --git a/src/Tests/WebSockets/WebSocketHandlerTests.cs b/src/Tests/WebSockets/WebSocketHandlerTests.cs
@@ -179,7 +179,7 @@ public void CreateSendStream_Old()
         _options.ConnectionInitWaitTimeout = Timeout.InfiniteTimeSpan;
         var mockSendStream = new Mock<IWebSocketConnection>(MockBehavior.Strict);
         var receiveStream = _handler.Do_CreateReceiveStream(mockSendStream.Object, "graphql-transport-ws", _userContext);
-        receiveStream.ShouldBeOfType<GraphQL.AspNetCore.WebSockets.GraphQLWs.SubscriptionServer>();
+        receiveStream.ShouldBeOfType<GraphQL.AspNetCore3.WebSockets.GraphQLWs.SubscriptionServer>();
     }
 
     [Fact]
@@ -188,7 +188,7 @@ public void CreateSendStream_New()
         _options.ConnectionInitWaitTimeout = Timeout.InfiniteTimeSpan;
         var mockSendStream = new Mock<IWebSocketConnection>(MockBehavior.Strict);
         var receiveStream = _handler.Do_CreateReceiveStream(mockSendStream.Object, "graphql-ws", _userContext);
-        receiveStream.ShouldBeOfType<GraphQL.AspNetCore.WebSockets.SubscriptionsTransportWs.SubscriptionServer>();
+        receiveStream.ShouldBeOfType<GraphQL.AspNetCore3.WebSockets.SubscriptionsTransportWs.SubscriptionServer>();
     }
 
     [Fact]