Upgrade GraphQL to 7.0.2 (#179)

myty · web-flow · commit 9cf539c0711c · 2022-10-07T12:21:48.000-04:00
diff --git a/.github/workflows/test-code.yml b/.github/workflows/test-code.yml
@@ -31,9 +31,8 @@ jobs:
           - ubuntu-latest
           - windows-latest
         graphqlversion:
-          - 5.1.1
-          - 5.2.0
-          - 5.3.1
+          - 7.0.2
+          - 7.1.1
     steps:
       - name: Checkout source
         uses: actions/checkout@v3
diff --git a/src/GraphQL.Relay.StarWars/GraphQL.Relay.StarWars.csproj b/src/GraphQL.Relay.StarWars/GraphQL.Relay.StarWars.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.MicrosoftDI" Version="5.3.1" />
-    <PackageReference Include="GraphQL.SystemTextJson" Version="5.3.1" />
-    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="6.1.0" />
-    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="6.1.0" />
+    <PackageReference Include="GraphQL.MicrosoftDI" Version="7.0.2" />
+    <PackageReference Include="GraphQL.SystemTextJson" Version="7.0.2" />
+    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="7.1.1" />
+    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="7.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
diff --git a/src/GraphQL.Relay.StarWars/Startup.cs b/src/GraphQL.Relay.StarWars/Startup.cs
@@ -1,9 +1,6 @@
-using GraphQL.MicrosoftDI;
 using GraphQL.Relay.StarWars.Api;
 using GraphQL.Relay.StarWars.Types;
 using GraphQL.Relay.Types;
-using GraphQL.Server;
-using GraphQL.SystemTextJson;
 using GraphQL.Types.Relay;
 
 namespace GraphQL.Relay.StarWars
@@ -28,8 +25,8 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddGraphQL(b => b
                 .AddApolloTracing(true)
-                .AddHttpMiddleware<StarWarsSchema>()
                 .AddSchema<StarWarsSchema>()
+                .AddAutoClrMappings()
                 .AddSystemTextJson()
                 .AddErrorInfoProvider(options => options.ExposeExceptionStackTrace = true)
                 .AddGraphTypes(typeof(StarWarsSchema).Assembly));
@@ -43,7 +40,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseDeveloperExceptionPage();
             }
 
-            app.UseGraphQL<StarWarsSchema>();
+            app.UseGraphQL();
             app.UseGraphQLGraphiQL();
         }
     }
diff --git a/src/GraphQL.Relay.Test/GraphQL.Relay.Test.csproj b/src/GraphQL.Relay.Test/GraphQL.Relay.Test.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6</TargetFramework>
-    <GraphQLTestVersion>5.1.1</GraphQLTestVersion>
+    <GraphQLTestVersion>7.0.2</GraphQLTestVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/GraphQL.Relay.Todo/GraphQL.Relay.Todo.csproj b/src/GraphQL.Relay.Todo/GraphQL.Relay.Todo.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.MicrosoftDI" Version="5.3.1" />
-    <PackageReference Include="GraphQL.SystemTextJson" Version="5.3.1" />
-    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="6.1.0" />
-    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="6.1.0" />
+    <PackageReference Include="GraphQL.MicrosoftDI" Version="7.0.2" />
+    <PackageReference Include="GraphQL.SystemTextJson" Version="7.0.2" />
+    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="7.1.1" />
+    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="7.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.9" />
   </ItemGroup>
 
diff --git a/src/GraphQL.Relay.Todo/Startup.cs b/src/GraphQL.Relay.Todo/Startup.cs
@@ -1,8 +1,5 @@
 using System.Text;
-using GraphQL.MicrosoftDI;
 using GraphQL.Relay.Todo.Schema;
-using GraphQL.Server;
-using GraphQL.SystemTextJson;
 
 namespace GraphQL.Relay.Todo
 {
@@ -12,11 +9,10 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddGraphQL(b => b
                 .AddApolloTracing(true)
-                .AddHttpMiddleware<TodoSchema>()
                 .AddSchema<TodoSchema>()
+                .AddAutoClrMappings()
                 .AddSystemTextJson()
-                .AddErrorInfoProvider(options => options.ExposeExceptionStackTrace = true)
-                .AddSystemTextJson());
+                .AddErrorInfoProvider(options => options.ExposeExceptionStackTrace = true));
         }
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
@@ -39,7 +35,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app
                 .UseStaticFiles()
                 .UseDefaultFiles()
-                .UseGraphQL<TodoSchema>()
+                .UseGraphQL()
                 .UseGraphQLGraphiQL();
         }
     }
diff --git a/src/GraphQL.Relay/GraphQL.Relay.csproj b/src/GraphQL.Relay/GraphQL.Relay.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL" Version="5.1.1" />
+    <PackageReference Include="GraphQL" Version="7.0.2" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`	`1`	`using System.Text;`
`2`		`-using GraphQL.MicrosoftDI;`
`3`	`2`	`using GraphQL.Relay.Todo.Schema;`
`4`		`-using GraphQL.Server;`
`5`		`-using GraphQL.SystemTextJson;`
`6`	`3`
`7`	`4`	`namespace GraphQL.Relay.Todo`
`8`	`5`	`{`
`@@ -12,11 +9,10 @@ public void ConfigureServices(IServiceCollection services)`
`12`	`9`	`{`
`13`	`10`	`services.AddGraphQL(b => b`
`14`	`11`	`.AddApolloTracing(true)`
`15`		`- .AddHttpMiddleware<TodoSchema>()`
`16`	`12`	`.AddSchema<TodoSchema>()`
	`13`	`+ .AddAutoClrMappings()`
`17`	`14`	`.AddSystemTextJson()`
`18`		`- .AddErrorInfoProvider(options => options.ExposeExceptionStackTrace = true)`
`19`		`- .AddSystemTextJson());`
	`15`	`+ .AddErrorInfoProvider(options => options.ExposeExceptionStackTrace = true));`
`20`	`16`	`}`
`21`	`17`
`22`	`18`	`public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`@@ -39,7 +35,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`39`	`35`	`app`
`40`	`36`	`.UseStaticFiles()`
`41`	`37`	`.UseDefaultFiles()`
`42`		`- .UseGraphQL<TodoSchema>()`
	`38`	`+ .UseGraphQL()`
`43`	`39`	`.UseGraphQLGraphiQL();`
`44`	`40`	`}`
`45`	`41`	`}`