Merge pull request #11 from snifter/master

Support for HotChocolate v14
VarunSaiTeja · Jan 4, 2025 · e163f27 · e163f27
2 parents f10f44f + caa36d6
commit e163f27
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -127,6 +127,9 @@ $tf/
 # Guidance Automation Toolkit
 *.gpState
 
+# JetBrains IDE files
+.idea/
+
 # ReSharper is a .NET coding add-in
 _ReSharper*/
 *.[Rr]e[Ss]harper

diff --git a/README.md b/README.md
@@ -14,6 +14,8 @@ As HotChocolate doesn't validate input arguments, After installing this package,
 
 **Installation Note**:
 
+Use Graph.ArgumentValidator v4.0.0 if you are using HotChocolate v14.
+
 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/Sample.csproj b/Sample/Sample.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HotChocolate.AspNetCore" Version="13.7.0" />
+    <PackageReference Include="HotChocolate.AspNetCore" Version="14.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -16,9 +16,6 @@
     <PackageId>$(MSBuildProjectName)</PackageId>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
 
-    <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>
+    <Version>4.0.0</Version>
   </PropertyGroup>
 </Project>
diff --git a/src/Graph.ArgumentValidator.csproj b/src/Graph.ArgumentValidator.csproj
@@ -2,8 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(LibraryTargetFrameworks)</TargetFrameworks>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net8.0; net6.0</TargetFrameworks>
+    <ExtendedTargetFrameworks>net8.0; net6.0; netstandard2.0</ExtendedTargetFrameworks>
     <PackageTags>HotChocolate.Validator, HotChocolate, GraphQL</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HotChocolate.Execution" Version="13.7.0" />
+    <PackageReference Include="HotChocolate.Execution" Version="14.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Graph.ArgumentValidator.Tests.csproj b/test/Graph.ArgumentValidator.Tests.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>net6.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Snapshooter.Xunit" Version="0.13.0" />
+    <PackageReference Include="Snapshooter.Xunit" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="xunit" Version="2.6.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/__snapshots__/ValidationTests.Ensure_Validation_Works_On_Arguments.snap b/test/__snapshots__/ValidationTests.Ensure_Validation_Works_On_Arguments.snap
@@ -2,6 +2,12 @@
   "errors": [
     {
       "message": "The String field is not a valid e-mail address.",
+      "locations": [
+        {
+          "line": 1,
+          "column": 3
+        }
+      ],
       "path": [
         "email"
       ],

diff --git a/test/__snapshots__/ValidationTests.Ensure_Validation_Works_On_DuplicateEmail.snap b/test/__snapshots__/ValidationTests.Ensure_Validation_Works_On_DuplicateEmail.snap
@@ -2,6 +2,12 @@
   "errors": [
     {
       "message": "Email already exist",
+      "locations": [
+        {
+          "line": 1,
+          "column": 3
+        }
+      ],
       "path": [
         "email"
       ],
@@ -13,4 +19,4 @@
   "data": {
     "checkDuplicateEmail": null
   }
-}
+}
diff --git a/test/__snapshots__/ValidationTests.Ensure_Validation_Works_On_InputObjects.snap b/test/__snapshots__/ValidationTests.Ensure_Validation_Works_On_InputObjects.snap
@@ -2,6 +2,12 @@
   "errors": [
     {
       "message": "The Email field is not a valid e-mail address.",
+      "locations": [
+        {
+          "line": 1,
+          "column": 3
+        }
+      ],
       "path": [
         "input"
       ],

diff --git a/test/__snapshots__/ValidationTests.Ensure_Validation_Works_On_StudentWithOutScoreCard.snap b/test/__snapshots__/ValidationTests.Ensure_Validation_Works_On_StudentWithOutScoreCard.snap
@@ -1,7 +1,7 @@
 {
   "errors": [
     {
-      "message": "\u0060scoreCard\u0060 is a required field and cannot be null.",
+      "message": "`scoreCard` is a required field and cannot be null.",
       "locations": [
         {
           "line": 1,
@@ -13,7 +13,7 @@
       ],
       "extensions": {
         "field": "scoreCard",
-        "specifiedBy": "http://spec.graphql.org/October2021/#sec-Input-Object-Required-Fields"
+        "specifiedBy": "https://spec.graphql.org/October2021/#sec-Input-Object-Required-Fields"
       }
     }
   ]