Bump to GraphQL.NET v8 (#23)

Shane32 · Aug 20, 2024 · f3fb80c · f3fb80c
1 parent 6f3add4
commit f3fb80c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -22,8 +22,8 @@
     <IsPackable>false</IsPackable>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <AnalysisMode>Recommended</AnalysisMode>
-    <GraphQLVersion>7.0.0</GraphQLVersion>
-    <GraphQLAspNetCore3Version>5.0.0</GraphQLAspNetCore3Version>
+    <GraphQLVersion>8.0.0</GraphQLVersion>
+    <GraphQLAspNetCore3Version>6.0.0</GraphQLAspNetCore3Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Sample/Sample.csproj b/Sample/Sample.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="EfLocalDb" Version="8.5.0" />
     <PackageReference Include="GraphQL.DataLoader" Version="$(GraphQLVersion)" />
     <PackageReference Include="GraphQL.AspNetCore3" Version="$(GraphQLAspNetCore3Version)" />
-    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="$(GraphQLVersion)" />
+    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="7.7.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.16" />
   </ItemGroup>
 

diff --git a/src/GraphQL.DI/DIObjectGraphBase.cs b/src/GraphQL.DI/DIObjectGraphBase.cs
@@ -54,6 +54,7 @@ public abstract class DIObjectGraphBase<TSource> : IDIObjectGraphBase<TSource>,
     Dictionary<string, (GraphQLField Field, FieldType FieldType)>? IResolveFieldContext.SubFields => Context.SubFields;
     IReadOnlyDictionary<string, object?> IResolveFieldContext.InputExtensions => Context.InputExtensions;
     IDictionary<string, object?> IResolveFieldContext.OutputExtensions => Context.OutputExtensions;
+    IExecutionContext IResolveFieldContext.ExecutionContext => Context.ExecutionContext;
 }
 
 /// <summary>

diff --git a/src/Tests/DIObjectGraphBaseTests.cs b/src/Tests/DIObjectGraphBaseTests.cs
@@ -66,7 +66,7 @@ public void SourceTyped()
     [Fact]
     public void RFC_FieldAst()
     {
-        var fieldAst = new GraphQLField();
+        var fieldAst = new GraphQLField(new("test"));
         _mockContext.Setup(x => x.FieldAst).Returns(fieldAst);
         _graphContext.FieldAst.ShouldBe(fieldAst);
     }
@@ -130,15 +130,15 @@ public void RFC_Schema()
     [Fact]
     public void RFC_Document()
     {
-        var obj = new GraphQLDocument();
+        var obj = new GraphQLDocument(new());
         _mockContext.Setup(x => x.Document).Returns(obj);
         _graphContext.Document.ShouldBe(obj);
     }
 
     [Fact]
     public void RFC_Operation()
     {
-        var obj = new GraphQLOperationDefinition();
+        var obj = new GraphQLOperationDefinition(new(new()));
         _mockContext.Setup(x => x.Operation).Returns(obj);
         _graphContext.Operation.ShouldBe(obj);
     }

diff --git a/src/Tests/DIObjectGraphTypeTests/Argument.cs b/src/Tests/DIObjectGraphTypeTests/Argument.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using System.Globalization;
+using GraphQL.Conversion;
 
 namespace DIObjectGraphTypeTests;
 
@@ -128,10 +129,22 @@ public void IdNonNull()
     {
         Configure<CIdGraphType2, object>();
         VerifyFieldArgument("Field1", "arg", typeof(NonNullGraphType<IdGraphType>), "3");
-        VerifyField("Field1", true, false, "3");
+        InitializeSchema();
+        VerifyField("Field1", typeof(StringGraphType), false, "3");
         Verify(false);
     }
 
+    private void InitializeSchema()
+    {
+        if (_graphType == null)
+            throw new InvalidOperationException();
+        var schema = new Schema { Query = new ObjectGraphType() { Name = "Query" } };
+        schema.Query.AddField(new FieldType { Name = "dummy", Type = typeof(StringGraphType) });
+        schema.RegisterType(_graphType);
+        schema.NameConverter = DefaultNameConverter.Instance;
+        schema.Initialize();
+    }
+
     public class CIdGraphType2 : DIObjectGraphBase
     {
         public static string? Field1([Id] int arg) => arg.ToString(CultureInfo.InvariantCulture);
@@ -160,7 +173,7 @@ public void DefaultValue()
         Configure<CDefaultValue, object>();
         VerifyFieldArgument("Field1", "arg1", false, 2);
         VerifyField("Field1", false, false, 2);
-        VerifyFieldArgument<int>("Field2", "arg2", false);
+        VerifyFieldArgument("Field2", "arg2", false, 5); // as of version 8, IResolveFieldContext.Arguments include the default values
         VerifyField("Field2", false, false, 5);
         Verify(false);
     }