From f99f14e4a45957adefcbaff70b639b5c8188c7fa Mon Sep 17 00:00:00 2001
From: Ivan Maximov <sungam3r@yandex.ru>
Date: Mon, 27 Jun 2022 14:40:41 +0300
Subject: [PATCH 1/5] Update packages

---
 src/Directory.Build.props                                | 2 +-
 src/GraphQL.Relay.StarWars/GraphQL.Relay.StarWars.csproj | 8 ++++----
 src/GraphQL.Relay.Todo/GraphQL.Relay.Todo.csproj         | 8 ++++----
 src/GraphQL.Relay/GraphQL.Relay.csproj                   | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index ce07b12b8..eadb0ef4b 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -19,7 +19,7 @@
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <IsPackable>true</IsPackable>
     <!--<TreatWarningsAsErrors>true</TreatWarningsAsErrors>-->
-    <GraphQLTestVersion>5.2.0</GraphQLTestVersion>
+    <GraphQLTestVersion>5.3.1</GraphQLTestVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/src/GraphQL.Relay.StarWars/GraphQL.Relay.StarWars.csproj b/src/GraphQL.Relay.StarWars/GraphQL.Relay.StarWars.csproj
index 75dcbb979..191202673 100644
--- 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.2.0" />
-    <PackageReference Include="GraphQL.SystemTextJson" Version="5.2.0" />
-    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="6.0.0" />
-    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="6.0.0" />
+    <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="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
diff --git a/src/GraphQL.Relay.Todo/GraphQL.Relay.Todo.csproj b/src/GraphQL.Relay.Todo/GraphQL.Relay.Todo.csproj
index 6aff7aed9..fba456996 100644
--- 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.2.0" />
-    <PackageReference Include="GraphQL.SystemTextJson" Version="5.2.0" />
-    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="6.0.0" />
-    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="6.0.0" />
+    <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="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.6" />
   </ItemGroup>
 
diff --git a/src/GraphQL.Relay/GraphQL.Relay.csproj b/src/GraphQL.Relay/GraphQL.Relay.csproj
index f7698ca3c..69699941d 100644
--- 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.2.0" />
+    <PackageReference Include="GraphQL" Version="5.3.1" />
   </ItemGroup>
 
 </Project>

From 8d665f97a3f439ba34130ab474fc7f300922feb1 Mon Sep 17 00:00:00 2001
From: Ivan Maximov <sungam3r@yandex.ru>
Date: Mon, 27 Jun 2022 14:44:24 +0300
Subject: [PATCH 2/5] fix

---
 src/GraphQL.Relay.StarWars/Startup.cs | 2 +-
 src/GraphQL.Relay.Todo/Startup.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/GraphQL.Relay.StarWars/Startup.cs b/src/GraphQL.Relay.StarWars/Startup.cs
index 2148f4923..0d553aa0b 100644
--- a/src/GraphQL.Relay.StarWars/Startup.cs
+++ b/src/GraphQL.Relay.StarWars/Startup.cs
@@ -27,7 +27,7 @@ public void ConfigureServices(IServiceCollection services)
                 .AddSingleton<ResponseCache>();
 
             services.AddGraphQL(b => b
-                .AddMetrics(true)
+                .AddApolloTracing(true)
                 .AddHttpMiddleware<StarWarsSchema>()
                 .AddSchema<StarWarsSchema>()
                 .AddSystemTextJson()
diff --git a/src/GraphQL.Relay.Todo/Startup.cs b/src/GraphQL.Relay.Todo/Startup.cs
index 83c7cf192..f90dc7ae0 100644
--- a/src/GraphQL.Relay.Todo/Startup.cs
+++ b/src/GraphQL.Relay.Todo/Startup.cs
@@ -11,7 +11,7 @@ public class Startup
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddGraphQL(b => b
-                .AddMetrics(true)
+                .AddApolloTracing(true)
                 .AddHttpMiddleware<TodoSchema>()
                 .AddSchema<TodoSchema>()
                 .AddSystemTextJson()

From 8c10af008c53e5591d1cc319c6ab4045142cc819 Mon Sep 17 00:00:00 2001
From: Ivan Maximov <sungam3r@yandex.ru>
Date: Mon, 27 Jun 2022 14:53:24 +0300
Subject: [PATCH 3/5] more tests

---
 .github/workflows/test-code.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-code.yml b/.github/workflows/test-code.yml
index 67b795ca8..40037eee5 100644
--- a/.github/workflows/test-code.yml
+++ b/.github/workflows/test-code.yml
@@ -33,6 +33,7 @@ jobs:
         graphqlversion:
           - 5.0.0
           - 5.2.0
+          - 5.3.1
     steps:
       - name: Checkout source
         uses: actions/checkout@v3

From 10230e80d930fdaee9609dbb46b8b205d0477433 Mon Sep 17 00:00:00 2001
From: Ivan Maximov <sungam3r@yandex.ru>
Date: Mon, 27 Jun 2022 15:02:29 +0300
Subject: [PATCH 4/5] fix version

---
 src/GraphQL.Relay/GraphQL.Relay.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GraphQL.Relay/GraphQL.Relay.csproj b/src/GraphQL.Relay/GraphQL.Relay.csproj
index 69699941d..1f51c7a45 100644
--- 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.3.1" />
+    <PackageReference Include="GraphQL" Version="$(GraphQLTestVersion)" />
   </ItemGroup>
 
 </Project>

From 3eea36ebe27df0516c6c25ccb1011cf1dcc477e3 Mon Sep 17 00:00:00 2001
From: Ivan Maximov <sungam3r@yandex.ru>
Date: Mon, 27 Jun 2022 15:29:52 +0300
Subject: [PATCH 5/5] move

---
 .github/workflows/test-code.yml                  | 2 +-
 src/Directory.Build.props                        | 1 -
 src/GraphQL.Relay.Test/GraphQL.Relay.Test.csproj | 3 ++-
 src/GraphQL.Relay/GraphQL.Relay.csproj           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-code.yml b/.github/workflows/test-code.yml
index 40037eee5..49962e8b9 100644
--- a/.github/workflows/test-code.yml
+++ b/.github/workflows/test-code.yml
@@ -31,7 +31,7 @@ jobs:
           - ubuntu-latest
           - windows-latest
         graphqlversion:
-          - 5.0.0
+          - 5.1.1
           - 5.2.0
           - 5.3.1
     steps:
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index eadb0ef4b..13e2ecd4e 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -19,7 +19,6 @@
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <IsPackable>true</IsPackable>
     <!--<TreatWarningsAsErrors>true</TreatWarningsAsErrors>-->
-    <GraphQLTestVersion>5.3.1</GraphQLTestVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/src/GraphQL.Relay.Test/GraphQL.Relay.Test.csproj b/src/GraphQL.Relay.Test/GraphQL.Relay.Test.csproj
index 296120217..62aec7aa3 100644
--- a/src/GraphQL.Relay.Test/GraphQL.Relay.Test.csproj
+++ b/src/GraphQL.Relay.Test/GraphQL.Relay.Test.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Tests.props" />
 
   <PropertyGroup>
     <TargetFramework>net6</TargetFramework>
+    <GraphQLTestVersion>5.1.1</GraphQLTestVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/GraphQL.Relay/GraphQL.Relay.csproj b/src/GraphQL.Relay/GraphQL.Relay.csproj
index 1f51c7a45..e4e621718 100644
--- a/src/GraphQL.Relay/GraphQL.Relay.csproj
+++ b/src/GraphQL.Relay/GraphQL.Relay.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL" Version="$(GraphQLTestVersion)" />
+    <PackageReference Include="GraphQL" Version="5.1.1" />
   </ItemGroup>
 
 </Project>