feat: Support HC14 (#95)

* Upgrade to HC 14.0.0 due to breaking changes (#93) * 11.0.0-rc.1 --------- Co-authored-by: Andreas Forsberg <andreas.h.forsberg@gmail.com>
benmccallum · Nov 25, 2024 · 665dedf · 665dedf
1 parent bc36a55
commit 665dedf
Show file tree

Hide file tree

Showing 42 changed files with 926 additions and 397 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,9 +23,11 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: | 
+          dotnet-version: |
             6.0.x
             7.0.x
+            8.0.x
+            9.0.x
 
       - name: Run tests
         run: dotnet test src/ --collect:"XPlat Code Coverage"

diff --git a/README.md b/README.md
@@ -142,7 +142,8 @@ We strive to match Hot Chocolate's supported .NET target frameworks, though this
 
 | HotChocolate | FluentValidation | FairyBread | FairyBread docs |
 | ------------ | ---------------- | ---------- | --------------- |
-|     v13.0.0 |              v10 |         v10 | right here |
+|     v14.0.0 |              v10 |         v11 | right here |
+|     v13.0.0 |              v10 |         v10 | [/v10/main](https://github.com/benmccallum/fairybread/tree/v10/main) branch |
 |     v12.4.0* |              v10 |         v9 | [/v9/main](https://github.com/benmccallum/fairybread/tree/v9/main) branch |
 |      v12.0.1 |              v10 |         v8 | [/v8/main](https://github.com/benmccallum/fairybread/tree/v8/main) branch |
 |      v11.0.9 |              v10 |         v7 | [/v7/main](https://github.com/benmccallum/fairybread/tree/v7/main) branch |

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -18,10 +18,10 @@
     <PackageIconUrl>https://github.com/benmccallum/fairybread/raw/master/logo-400x400.png</PackageIconUrl>
     <PackageLicenseUrl>https://github.com/benmccallum/fairybread/blob/master/LICENSE</PackageLicenseUrl>
 
-    <Version>10.0.0</Version>
+    <Version>11.0.0-rc.1</Version>
 
     <FluentValidationVersion>10.0.0</FluentValidationVersion>
-    <HotChocolateVersion>13.0.0</HotChocolateVersion>
+    <HotChocolateVersion>14.0.0</HotChocolateVersion>
 
     <LibraryTargetFrameworks>net7.0; net6.0; netstandard2.0</LibraryTargetFrameworks>
     <TestTargetFrameworks>net7.0; net6.0</TestTargetFrameworks>

diff --git a/src/FairyBread.Tests/CustomizationTests.CustomValidatorProvider_Works.verified.txt b/src/FairyBread.Tests/CustomizationTests.CustomValidatorProvider_Works.verified.txt
@@ -6,11 +6,17 @@
       Path: {
         Name: read,
         Parent: {
-          Length: -1,
           IsRoot: true
         },
+        Length: 1,
         IsRoot: false
       },
+      Locations: [
+        {
+          Line: 1,
+          Column: 9
+        }
+      ],
       Extensions: {
         argumentName: foo,
         attemptedValue: 1,
@@ -28,5 +34,6 @@
         validatorName: CustomValidator
       }
     }
-  ]
+  ],
+  IsDataSet: true
 }
diff --git a/src/FairyBread.Tests/CustomizationTests.cs b/src/FairyBread.Tests/CustomizationTests.cs
@@ -1,6 +1,5 @@
 namespace FairyBread.Tests;
 
-[UsesVerify]
 public class CustomizationTests
 {
     private const string Query = @"query { read(foo: { someInteger: 1, someString: ""hello"" }) }";
@@ -30,7 +29,7 @@ public async Task CustomValidationResultHandler_Works()
         });
 
         // Act
-        var result = await executor.ExecuteAsync(Query) as IQueryResult;
+        var result = await executor.ExecuteAsync(Query) as IOperationResult;
 
         // Assert
         Assert.NotNull(result);

diff --git a/src/FairyBread.Tests/FairyBread.Tests.csproj b/src/FairyBread.Tests/FairyBread.Tests.csproj
@@ -10,13 +10,13 @@
     <PackageReference Include="HotChocolate.Execution" Version="$(HotChocolateVersion)" />
     <PackageReference Include="HotChocolate.Types.CursorPagination" Version="$(HotChocolateVersion)" />
     <PackageReference Include="HotChocolate.Data" Version="$(HotChocolateVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="Moq" Version="4.18.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
+    <PackageReference Include="Moq" Version="4.20.71" />
     <PackageReference Include="Shouldly" Version="4.1.0" />
-    <PackageReference Include="Verify.Xunit" Version="18.0.0-beta.32" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2" PrivateAssets="all" />
+    <PackageReference Include="Verify.Xunit" Version="27.0.1" />
+    <PackageReference Include="xunit" Version="2.9.2"/>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/FairyBread.Tests/GeneralTests.Doesnt_Call_Field_Resolver_If_Invalid.verified.txt b/src/FairyBread.Tests/GeneralTests.Doesnt_Call_Field_Resolver_If_Invalid.verified.txt
@@ -6,11 +6,17 @@
       Path: {
         Name: someResolver,
         Parent: {
-          Length: -1,
           IsRoot: true
         },
+        Length: 1,
         IsRoot: false
       },
+      Locations: [
+        {
+          Line: 1,
+          Column: 9
+        }
+      ],
       Extensions: {
         argumentName: foo,
         attemptedValue: -1,
@@ -28,5 +34,6 @@
         validatorName: FooInputDtoValidator
       }
     }
-  ]
+  ],
+  IsDataSet: true
 }
diff --git a/src/FairyBread.Tests/GeneralTests.Ignores_Null_Argument_Value.verified.txt b/src/FairyBread.Tests/GeneralTests.Ignores_Null_Argument_Value.verified.txt
@@ -1,5 +1,6 @@
 {
   Data: {
     read: SomeInteger: 1, SomeString: hello; 
-  }
+  },
+  IsDataSet: true
 }
diff --git a/src/FairyBread.Tests/GeneralTests.Multi_TopLevelFields_And_MultiRuns_Works.verified.txt b/src/FairyBread.Tests/GeneralTests.Multi_TopLevelFields_And_MultiRuns_Works.verified.txt
@@ -7,11 +7,17 @@
         Path: {
           Name: read,
           Parent: {
-            Length: -1,
             IsRoot: true
           },
+          Length: 1,
           IsRoot: false
         },
+        Locations: [
+          {
+            Line: 3,
+            Column: 21
+          }
+        ],
         Extensions: {
           argumentName: foo,
           attemptedValue: -1,
@@ -29,7 +35,8 @@
           validatorName: FooInputDtoValidator
         }
       }
-    ]
+    ],
+    IsDataSet: true
   },
   result2: {
     Errors: [
@@ -39,11 +46,17 @@
         Path: {
           Name: read,
           Parent: {
-            Length: -1,
             IsRoot: true
           },
+          Length: 1,
           IsRoot: false
         },
+        Locations: [
+          {
+            Line: 3,
+            Column: 21
+          }
+        ],
         Extensions: {
           argumentName: foo,
           attemptedValue: -1,
@@ -61,7 +74,8 @@
           validatorName: FooInputDtoValidator
         }
       }
-    ]
+    ],
+    IsDataSet: true
   },
   result3: {
     Errors: [
@@ -71,11 +85,17 @@
         Path: {
           Name: read,
           Parent: {
-            Length: -1,
             IsRoot: true
           },
+          Length: 1,
           IsRoot: false
         },
+        Locations: [
+          {
+            Line: 3,
+            Column: 21
+          }
+        ],
         Extensions: {
           argumentName: foo,
           attemptedValue: -1,
@@ -93,6 +113,7 @@
           validatorName: FooInputDtoValidator
         }
       }
-    ]
+    ],
+    IsDataSet: true
   }
 }
diff --git a/src/FairyBread.Tests/GeneralTests.Mutation_Works_caseData=1.verified.txt b/src/FairyBread.Tests/GeneralTests.Mutation_Works_caseData=1.verified.txt
@@ -1,5 +1,6 @@
 {
   Data: {
     write: SomeInteger: 1, SomeString: hello; EmailAddress: ben@lol.com
-  }
+  },
+  IsDataSet: true
 }
diff --git a/src/FairyBread.Tests/GeneralTests.Mutation_Works_caseData=2.verified.txt b/src/FairyBread.Tests/GeneralTests.Mutation_Works_caseData=2.verified.txt
@@ -6,11 +6,17 @@
       Path: {
         Name: write,
         Parent: {
-          Length: -1,
           IsRoot: true
         },
+        Length: 1,
         IsRoot: false
       },
+      Locations: [
+        {
+          Line: 1,
+          Column: 12
+        }
+      ],
       Extensions: {
         argumentName: foo,
         attemptedValue: -1,
@@ -28,5 +34,6 @@
         validatorName: FooInputDtoValidator
       }
     }
-  ]
+  ],
+  IsDataSet: true
 }
diff --git a/src/FairyBread.Tests/GeneralTests.Mutation_Works_caseData=3.verified.txt b/src/FairyBread.Tests/GeneralTests.Mutation_Works_caseData=3.verified.txt
@@ -6,11 +6,17 @@
       Path: {
         Name: write,
         Parent: {
-          Length: -1,
           IsRoot: true
         },
+        Length: 1,
         IsRoot: false
       },
+      Locations: [
+        {
+          Line: 1,
+          Column: 12
+        }
+      ],
       Extensions: {
         argumentName: bar,
         attemptedValue: -1,
@@ -26,5 +32,6 @@
         validatorName: BarInputDtoAsyncValidator
       }
     }
-  ]
+  ],
+  IsDataSet: true
 }
diff --git a/src/FairyBread.Tests/GeneralTests.Mutation_Works_caseData=4.verified.txt b/src/FairyBread.Tests/GeneralTests.Mutation_Works_caseData=4.verified.txt
@@ -6,11 +6,17 @@
       Path: {
         Name: write,
         Parent: {
-          Length: -1,
           IsRoot: true
         },
+        Length: 1,
         IsRoot: false
       },
+      Locations: [
+        {
+          Line: 1,
+          Column: 12
+        }
+      ],
       Extensions: {
         argumentName: foo,
         attemptedValue: -1,
@@ -34,11 +40,17 @@
       Path: {
         Name: write,
         Parent: {
-          Length: -1,
           IsRoot: true
         },
+        Length: 1,
         IsRoot: false
       },
+      Locations: [
+        {
+          Line: 1,
+          Column: 12
+        }
+      ],
       Extensions: {
         argumentName: foo,
         attemptedValue: -1,
@@ -62,11 +74,17 @@
       Path: {
         Name: write,
         Parent: {
-          Length: -1,
           IsRoot: true
         },
+        Length: 1,
         IsRoot: false
       },
+      Locations: [
+        {
+          Line: 1,
+          Column: 12
+        }
+      ],
       Extensions: {
         argumentName: bar,
         attemptedValue: -1,
@@ -82,5 +100,6 @@
         validatorName: BarInputDtoAsyncValidator
       }
     }
-  ]
+  ],
+  IsDataSet: true
 }
diff --git a/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=1.verified.txt b/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=1.verified.txt
@@ -1,5 +1,6 @@
 {
   Data: {
     readWithArrayArg: SomeInteger: 1, SomeString: hello
-  }
+  },
+  IsDataSet: true
 }
diff --git a/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=2.verified.txt b/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=2.verified.txt
@@ -1,5 +1,6 @@
 {
   Data: {
     readWithArrayArg: SomeInteger: 1, SomeString: hello
-  }
+  },
+  IsDataSet: true
 }
diff --git a/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=3.verified.txt b/src/FairyBread.Tests/GeneralTests.Query_Array_Works_caseData=3.verified.txt
@@ -1,5 +1,6 @@
 {
   Data: {
     readWithArrayArg: SomeInteger: 1, SomeString: hello, SomeInteger: 1, SomeString: hello
-  }
+  },
+  IsDataSet: true
 }