Merge pull request #9 from snifter/master

Support for HotChocolate v13
VarunSaiTeja · Oct 11, 2023 · e3e9a95 · e3e9a95
2 parents b5e8574 + 0dadc6b
commit e3e9a95
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 78 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,9 @@ As HotChocolate doesn't validate input arguments, After installing this package,
 [!["Buy Me A Coffee"](https://cdn.buymeacoffee.com/assets/img/home-page-v3/bmc-new-logo.png)](https://www.buymeacoffee.com/varunteja)
 
 
-**Installation Note**: 
+**Installation Note**:
+
+Use Graph.ArgumentValidator v3.0.0 if you are using HotChocolate v13.
 
 Use Graph.ArgumentValidator v2.0.0 if you are using HotChocolate v12.
 

diff --git a/Sample/Program.cs b/Sample/Program.cs
@@ -1,20 +1,17 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
+using Graph.ArgumentValidator;
+using Shared;
 
-namespace Sample
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
+var builder = WebApplication.CreateBuilder(args);
 
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
-}
+builder.Services
+    .AddGraphQLServer()
+    .AddArgumentValidator()
+    .AddQueryType<Query>();
+builder.Services
+    .AddSingleton<DuplicateEmailValidatorService>();
+
+var app = builder.Build();
+
+app.MapGraphQL();
+
+app.Run();
diff --git a/Sample/Sample.csproj b/Sample/Sample.csproj
@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HotChocolate.AspNetCore" Version="12.6.2" />
+    <PackageReference Include="HotChocolate.AspNetCore" Version="13.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Sample/Startup.cs b/Sample/Startup.cs
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -16,7 +16,7 @@
     <PackageId>$(MSBuildProjectName)</PackageId>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
 
-    <Version>2.1.1</Version>
+    <Version>3.0.0</Version>
 
     <LibraryTargetFrameworks>net6.0;net5.0; netcoreapp3.1; netstandard2.0</LibraryTargetFrameworks>
     <TestTargetFrameworks>net6.0;net5.0; netcoreapp3.1; netcoreapp2.1</TestTargetFrameworks>

diff --git a/src/Graph.ArgumentValidator.csproj b/src/Graph.ArgumentValidator.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HotChocolate.Execution" Version="12.6.2" />
+    <PackageReference Include="HotChocolate.Execution" Version="13.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ValidationMiddleware.cs b/src/ValidationMiddleware.cs
@@ -4,6 +4,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
+using HotChocolate.Execution;
 
 namespace Graph.ArgumentValidator
 {
@@ -41,7 +42,7 @@ public async Task InvokeAsync(IMiddlewareContext context)
                             context.ReportError(ErrorBuilder.New()
                                 .SetMessage(validationResult.ErrorMessage)
                                 .SetExtension("field", char.ToLowerInvariant(field[0]) + field.Substring(1))
-                                .SetPath(Path.New(argument.Name))
+                                .SetPath(PathFactory.Instance.New(argument.Name))
                                 .Build());
                         }
 

diff --git a/src/ValidationTypeInterceptor.cs b/src/ValidationTypeInterceptor.cs
@@ -15,8 +15,7 @@ internal class ValidationTypeInterceptor : TypeInterceptor
 
         public override void OnBeforeCompleteType(
             ITypeCompletionContext completionContext,
-            DefinitionBase definition,
-            IDictionary<string, object> contextData)
+            DefinitionBase definition)
         {
             if (definition is ObjectTypeDefinition objectTypeDef)
             {