Skip to content

Commit 665dedf

Browse files
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 <[email protected]>
1 parent bc36a55 commit 665dedf

File tree

42 files changed

+926
-397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+926
-397
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ jobs:
2323
- name: Setup dotnet
2424
uses: actions/setup-dotnet@v3
2525
with:
26-
dotnet-version: |
26+
dotnet-version: |
2727
6.0.x
2828
7.0.x
29+
8.0.x
30+
9.0.x
2931
3032
- name: Run tests
3133
run: dotnet test src/ --collect:"XPlat Code Coverage"

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ We strive to match Hot Chocolate's supported .NET target frameworks, though this
142142

143143
| HotChocolate | FluentValidation | FairyBread | FairyBread docs |
144144
| ------------ | ---------------- | ---------- | --------------- |
145-
| v13.0.0 | v10 | v10 | right here |
145+
| v14.0.0 | v10 | v11 | right here |
146+
| v13.0.0 | v10 | v10 | [/v10/main](https://github.com/benmccallum/fairybread/tree/v10/main) branch |
146147
| v12.4.0* | v10 | v9 | [/v9/main](https://github.com/benmccallum/fairybread/tree/v9/main) branch |
147148
| v12.0.1 | v10 | v8 | [/v8/main](https://github.com/benmccallum/fairybread/tree/v8/main) branch |
148149
| v11.0.9 | v10 | v7 | [/v7/main](https://github.com/benmccallum/fairybread/tree/v7/main) branch |

src/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<PackageIconUrl>https://github.com/benmccallum/fairybread/raw/master/logo-400x400.png</PackageIconUrl>
1919
<PackageLicenseUrl>https://github.com/benmccallum/fairybread/blob/master/LICENSE</PackageLicenseUrl>
2020

21-
<Version>10.0.0</Version>
21+
<Version>11.0.0-rc.1</Version>
2222

2323
<FluentValidationVersion>10.0.0</FluentValidationVersion>
24-
<HotChocolateVersion>13.0.0</HotChocolateVersion>
24+
<HotChocolateVersion>14.0.0</HotChocolateVersion>
2525

2626
<LibraryTargetFrameworks>net7.0; net6.0; netstandard2.0</LibraryTargetFrameworks>
2727
<TestTargetFrameworks>net7.0; net6.0</TestTargetFrameworks>

src/FairyBread.Tests/CustomizationTests.CustomValidatorProvider_Works.verified.txt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,17 @@
66
Path: {
77
Name: read,
88
Parent: {
9-
Length: -1,
109
IsRoot: true
1110
},
11+
Length: 1,
1212
IsRoot: false
1313
},
14+
Locations: [
15+
{
16+
Line: 1,
17+
Column: 9
18+
}
19+
],
1420
Extensions: {
1521
argumentName: foo,
1622
attemptedValue: 1,
@@ -28,5 +34,6 @@
2834
validatorName: CustomValidator
2935
}
3036
}
31-
]
37+
],
38+
IsDataSet: true
3239
}

src/FairyBread.Tests/CustomizationTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
namespace FairyBread.Tests;
22

3-
[UsesVerify]
43
public class CustomizationTests
54
{
65
private const string Query = @"query { read(foo: { someInteger: 1, someString: ""hello"" }) }";
@@ -30,7 +29,7 @@ public async Task CustomValidationResultHandler_Works()
3029
});
3130

3231
// Act
33-
var result = await executor.ExecuteAsync(Query) as IQueryResult;
32+
var result = await executor.ExecuteAsync(Query) as IOperationResult;
3433

3534
// Assert
3635
Assert.NotNull(result);

src/FairyBread.Tests/FairyBread.Tests.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<PackageReference Include="HotChocolate.Execution" Version="$(HotChocolateVersion)" />
1111
<PackageReference Include="HotChocolate.Types.CursorPagination" Version="$(HotChocolateVersion)" />
1212
<PackageReference Include="HotChocolate.Data" Version="$(HotChocolateVersion)" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
14-
<PackageReference Include="Moq" Version="4.18.2" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
14+
<PackageReference Include="Moq" Version="4.20.71" />
1515
<PackageReference Include="Shouldly" Version="4.1.0" />
16-
<PackageReference Include="Verify.Xunit" Version="18.0.0-beta.32" />
17-
<PackageReference Include="xunit" Version="2.4.2" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
19-
<PackageReference Include="coverlet.collector" Version="3.1.2" PrivateAssets="all" />
16+
<PackageReference Include="Verify.Xunit" Version="27.0.1" />
17+
<PackageReference Include="xunit" Version="2.9.2"/>
18+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
19+
<PackageReference Include="coverlet.collector" Version="6.0.2" PrivateAssets="all" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

src/FairyBread.Tests/GeneralTests.Doesnt_Call_Field_Resolver_If_Invalid.verified.txt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,17 @@
66
Path: {
77
Name: someResolver,
88
Parent: {
9-
Length: -1,
109
IsRoot: true
1110
},
11+
Length: 1,
1212
IsRoot: false
1313
},
14+
Locations: [
15+
{
16+
Line: 1,
17+
Column: 9
18+
}
19+
],
1420
Extensions: {
1521
argumentName: foo,
1622
attemptedValue: -1,
@@ -28,5 +34,6 @@
2834
validatorName: FooInputDtoValidator
2935
}
3036
}
31-
]
37+
],
38+
IsDataSet: true
3239
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
Data: {
33
read: SomeInteger: 1, SomeString: hello;
4-
}
4+
},
5+
IsDataSet: true
56
}

src/FairyBread.Tests/GeneralTests.Multi_TopLevelFields_And_MultiRuns_Works.verified.txt

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,17 @@
77
Path: {
88
Name: read,
99
Parent: {
10-
Length: -1,
1110
IsRoot: true
1211
},
12+
Length: 1,
1313
IsRoot: false
1414
},
15+
Locations: [
16+
{
17+
Line: 3,
18+
Column: 21
19+
}
20+
],
1521
Extensions: {
1622
argumentName: foo,
1723
attemptedValue: -1,
@@ -29,7 +35,8 @@
2935
validatorName: FooInputDtoValidator
3036
}
3137
}
32-
]
38+
],
39+
IsDataSet: true
3340
},
3441
result2: {
3542
Errors: [
@@ -39,11 +46,17 @@
3946
Path: {
4047
Name: read,
4148
Parent: {
42-
Length: -1,
4349
IsRoot: true
4450
},
51+
Length: 1,
4552
IsRoot: false
4653
},
54+
Locations: [
55+
{
56+
Line: 3,
57+
Column: 21
58+
}
59+
],
4760
Extensions: {
4861
argumentName: foo,
4962
attemptedValue: -1,
@@ -61,7 +74,8 @@
6174
validatorName: FooInputDtoValidator
6275
}
6376
}
64-
]
77+
],
78+
IsDataSet: true
6579
},
6680
result3: {
6781
Errors: [
@@ -71,11 +85,17 @@
7185
Path: {
7286
Name: read,
7387
Parent: {
74-
Length: -1,
7588
IsRoot: true
7689
},
90+
Length: 1,
7791
IsRoot: false
7892
},
93+
Locations: [
94+
{
95+
Line: 3,
96+
Column: 21
97+
}
98+
],
7999
Extensions: {
80100
argumentName: foo,
81101
attemptedValue: -1,
@@ -93,6 +113,7 @@
93113
validatorName: FooInputDtoValidator
94114
}
95115
}
96-
]
116+
],
117+
IsDataSet: true
97118
}
98119
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
Data: {
33
write: SomeInteger: 1, SomeString: hello; EmailAddress: [email protected]
4-
}
4+
},
5+
IsDataSet: true
56
}

0 commit comments

Comments
 (0)