From ad0716853ce67be2fc6e63115ccd3f652461cce3 Mon Sep 17 00:00:00 2001 From: Struan Judd Date: Tue, 14 Jan 2025 06:48:34 +1300 Subject: [PATCH] Add .Net 9.0 as target framework --- .github/workflows/dotnet-test.yml | 8 ++++---- Directory.Build.props | 2 +- GqlPlus.sln | 1 + test/GqlPlus.ComponentTestBase/OperationData.gen.cs | 1 - test/GqlPlus.ComponentTestBase/SampleData.gen.cs | 1 - test/GqlPlus.ComponentTestBase/SchemaData.gen.cs | 1 - .../Merging/Globals/MergeCategoriesTests.cs | 4 ++-- .../Merging/Globals/MergeDirectivesTests.cs | 4 ++-- .../Merging/Globals/MergeOptionsTests.cs | 4 ++-- .../Merging/Objects/MergeDualFieldsTests.cs | 4 ++-- .../Merging/Objects/MergeInputFieldsTests.cs | 4 ++-- .../Merging/Objects/MergeInputParametersTests.cs | 4 ++-- .../Merging/Objects/MergeOutputFieldsTests.cs | 4 ++-- .../Merging/Objects/MergeTypeParametersTests.cs | 4 ++-- .../Merging/Objects/TestAlternatesMerger.cs | 4 ++-- .../Merging/Simple/MergeEnumMembersTests.cs | 4 ++-- test/GqlPlus.Parser.ClassTests/Merging/TestTyped.cs | 4 ++-- 17 files changed, 28 insertions(+), 30 deletions(-) diff --git a/.github/workflows/dotnet-test.yml b/.github/workflows/dotnet-test.yml index 59bf6051..3a13d2b9 100644 --- a/.github/workflows/dotnet-test.yml +++ b/.github/workflows/dotnet-test.yml @@ -16,20 +16,20 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - dotnet-version: ["8.0.x"] + dotnet-version: ["8.0", "9.0"] steps: - uses: actions/checkout@v4 - name: Setup dotnet uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ matrix.dotnet-version }} + dotnet-version: ${{ matrix.dotnet-version }}.x - name: Install tools run: | dotnet tool restore --tool-manifest .config/dotnet-tools-ci.json - name: Install dependencies run: dotnet restore - name: Build - run: dotnet build + run: dotnet build -f net${{ matrix.dotnet-version }} - name: Tests with Coverage run: > dotnet coverage collect -o ${{ github.workspace }}/coverage/Coverage-${{ matrix.dotnet-version }}.xml -f cobertura -s coverage.runsettings @@ -81,7 +81,7 @@ jobs: path: coverage/ - name: Upload Pages artifact uses: actions/upload-pages-artifact@v3 - if: ${{ matrix.dotnet-version == '8.0.x' }} + if: ${{ matrix.dotnet-version == '8.0' }} with: path: test/Html diff --git a/Directory.Build.props b/Directory.Build.props index 78f965f7..d71a1e94 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@  - net8.0 + net8.0;net9.0 latest enable enable diff --git a/GqlPlus.sln b/GqlPlus.sln index 8c8167fe..6ba676e6 100644 --- a/GqlPlus.sln +++ b/GqlPlus.sln @@ -114,6 +114,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {B834B2ED-0D27-4281-8523-B706B42DCC15} = {4E1645F9-6194-4B1F-B93D-5B2CDDE5E6DE} {DDB8D682-23EA-48C4-A1AD-65F114533202} = {B834B2ED-0D27-4281-8523-B706B42DCC15} {D97ABCF2-E6C4-4384-AFB7-C55943EBE1E2} = {3B90AC37-1A6B-41AF-8490-E9D48E429ACD} {B73CDEC7-3F67-444E-8A06-16C20DF56DFB} = {3B90AC37-1A6B-41AF-8490-E9D48E429ACD} diff --git a/test/GqlPlus.ComponentTestBase/OperationData.gen.cs b/test/GqlPlus.ComponentTestBase/OperationData.gen.cs index 561e59ea..5370c246 100644 --- a/test/GqlPlus.ComponentTestBase/OperationData.gen.cs +++ b/test/GqlPlus.ComponentTestBase/OperationData.gen.cs @@ -1,7 +1,6 @@ // Generated from .\test\GqlPlus.ComponentTestBase\Samples\Operation // Collected from 5e5c83d (HEAD -> main, origin/main, origin/HEAD) 2024-09-24 Merge pull request #3 from graphql-plus/samples - namespace GqlPlus; public class OperationInvalidData diff --git a/test/GqlPlus.ComponentTestBase/SampleData.gen.cs b/test/GqlPlus.ComponentTestBase/SampleData.gen.cs index b3f52ded..009aa92b 100644 --- a/test/GqlPlus.ComponentTestBase/SampleData.gen.cs +++ b/test/GqlPlus.ComponentTestBase/SampleData.gen.cs @@ -1,7 +1,6 @@ // Generated from .\test\GqlPlus.ComponentTestBase\Samples // Collected from 5e5c83d (HEAD -> main, origin/main, origin/HEAD) 2024-09-24 Merge pull request #3 from graphql-plus/samples - namespace GqlPlus; public class SampleGraphQlData diff --git a/test/GqlPlus.ComponentTestBase/SchemaData.gen.cs b/test/GqlPlus.ComponentTestBase/SchemaData.gen.cs index 7ac271c5..25fad3b6 100644 --- a/test/GqlPlus.ComponentTestBase/SchemaData.gen.cs +++ b/test/GqlPlus.ComponentTestBase/SchemaData.gen.cs @@ -1,7 +1,6 @@ // Generated from .\test\GqlPlus.ComponentTestBase\Samples\Schema // Collected from 5e5c83d (HEAD -> main, origin/main, origin/HEAD) 2024-09-24 Merge pull request #3 from graphql-plus/samples - namespace GqlPlus; public class SchemaInvalidGlobalsData diff --git a/test/GqlPlus.Parser.ClassTests/Merging/Globals/MergeCategoriesTests.cs b/test/GqlPlus.Parser.ClassTests/Merging/Globals/MergeCategoriesTests.cs index 8c8fc6db..ee553f6b 100644 --- a/test/GqlPlus.Parser.ClassTests/Merging/Globals/MergeCategoriesTests.cs +++ b/test/GqlPlus.Parser.ClassTests/Merging/Globals/MergeCategoriesTests.cs @@ -38,6 +38,6 @@ public void Merge_TwoAstsSameOutput_ReturnsExpected(string category) internal override GroupsMerger MergerGroups => _merger; - protected override IGqlpSchemaCategory MakeAliased(string input, string[]? aliases = null, string description = "") - => new CategoryDeclAst(AstNulls.At, input, description, input) { Aliases = aliases ?? [] }; + protected override IGqlpSchemaCategory MakeAliased(string name, string[]? aliases = null, string description = "") + => new CategoryDeclAst(AstNulls.At, name, description, name) { Aliases = aliases ?? [] }; } diff --git a/test/GqlPlus.Parser.ClassTests/Merging/Globals/MergeDirectivesTests.cs b/test/GqlPlus.Parser.ClassTests/Merging/Globals/MergeDirectivesTests.cs index 71cd7dc0..c83b8256 100644 --- a/test/GqlPlus.Parser.ClassTests/Merging/Globals/MergeDirectivesTests.cs +++ b/test/GqlPlus.Parser.ClassTests/Merging/Globals/MergeDirectivesTests.cs @@ -59,6 +59,6 @@ public MergeDirectivesTests(ITestOutputHelper outputHelper) internal override GroupsMerger MergerGroups => _merger; - protected override IGqlpSchemaDirective MakeAliased(string input, string[]? aliases = null, string description = "") - => new DirectiveDeclAst(AstNulls.At, input, description) { Aliases = aliases ?? [] }; + protected override IGqlpSchemaDirective MakeAliased(string name, string[]? aliases = null, string description = "") + => new DirectiveDeclAst(AstNulls.At, name, description) { Aliases = aliases ?? [] }; } diff --git a/test/GqlPlus.Parser.ClassTests/Merging/Globals/MergeOptionsTests.cs b/test/GqlPlus.Parser.ClassTests/Merging/Globals/MergeOptionsTests.cs index f85bffef..0e5f25de 100644 --- a/test/GqlPlus.Parser.ClassTests/Merging/Globals/MergeOptionsTests.cs +++ b/test/GqlPlus.Parser.ClassTests/Merging/Globals/MergeOptionsTests.cs @@ -43,6 +43,6 @@ public MergeOptionsTests(ITestOutputHelper outputHelper) internal override GroupsMerger MergerGroups => _merger; - protected override IGqlpSchemaOption MakeAliased(string input, string[]? aliases = null, string description = "") - => new OptionDeclAst(AstNulls.At, input, description) { Aliases = aliases ?? [] }; + protected override IGqlpSchemaOption MakeAliased(string name, string[]? aliases = null, string description = "") + => new OptionDeclAst(AstNulls.At, name, description) { Aliases = aliases ?? [] }; } diff --git a/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeDualFieldsTests.cs b/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeDualFieldsTests.cs index 2b48efc8..64a4f380 100644 --- a/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeDualFieldsTests.cs +++ b/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeDualFieldsTests.cs @@ -14,8 +14,8 @@ ITestOutputHelper outputHelper internal override AstObjectFieldsMerger MergerField => _merger; - protected override IGqlpDualField MakeAliased(string input, string[] aliases, string description = "") - => new DualFieldAst(AstNulls.At, input, description, new DualBaseAst(AstNulls.At, input, description)) { + protected override IGqlpDualField MakeAliased(string name, string[] aliases, string description = "") + => new DualFieldAst(AstNulls.At, name, description, new DualBaseAst(AstNulls.At, name, description)) { Aliases = aliases }; protected override IGqlpDualField MakeField(string name, string type, string fieldDescription = "", string typeDescription = "") diff --git a/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeInputFieldsTests.cs b/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeInputFieldsTests.cs index 556008c2..c91187b2 100644 --- a/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeInputFieldsTests.cs +++ b/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeInputFieldsTests.cs @@ -56,8 +56,8 @@ protected override IGqlpInputField MakeFieldModifiers(string name) => new InputFieldAst(AstNulls.At, name, new InputBaseAst(AstNulls.At, name)) { Modifiers = TestMods() }; - protected override IGqlpInputField MakeAliased(string input, string[] aliases, string description = "") - => new InputFieldAst(AstNulls.At, input, description, new InputBaseAst(AstNulls.At, input, description)) { + protected override IGqlpInputField MakeAliased(string name, string[] aliases, string description = "") + => new InputFieldAst(AstNulls.At, name, description, new InputBaseAst(AstNulls.At, name, description)) { Aliases = aliases }; } diff --git a/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeInputParametersTests.cs b/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeInputParametersTests.cs index 7b20e0c0..2e278c6a 100644 --- a/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeInputParametersTests.cs +++ b/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeInputParametersTests.cs @@ -45,8 +45,8 @@ public MergeInputParamsTests(ITestOutputHelper outputHelper) internal override GroupsMerger MergerGroups => _merger; - protected override IGqlpInputParam MakeDescribed(string input, string description = "") - => new InputParamAst(AstNulls.At, new InputBaseAst(AstNulls.At, input, description)); + protected override IGqlpInputParam MakeDescribed(string name, string description = "") + => new InputParamAst(AstNulls.At, new InputBaseAst(AstNulls.At, name, description)); private static InputParamAst MakeDefault(string name, string value) => new(AstNulls.At, new InputBaseAst(AstNulls.At, name)) { DefaultValue = new(value.FieldKey()) diff --git a/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeOutputFieldsTests.cs b/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeOutputFieldsTests.cs index 508c3d19..17c1e130 100644 --- a/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeOutputFieldsTests.cs +++ b/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeOutputFieldsTests.cs @@ -126,8 +126,8 @@ protected override IGqlpOutputField MakeFieldModifiers(string name) => new OutputFieldAst(AstNulls.At, name, new OutputBaseAst(AstNulls.At, name)) { Modifiers = TestMods() }; - protected override IGqlpOutputField MakeAliased(string input, string[] aliases, string description = "") - => new OutputFieldAst(AstNulls.At, input, description, new OutputBaseAst(AstNulls.At, input, description)) { + protected override IGqlpOutputField MakeAliased(string name, string[] aliases, string description = "") + => new OutputFieldAst(AstNulls.At, name, description, new OutputBaseAst(AstNulls.At, name, description)) { Aliases = aliases }; } diff --git a/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeTypeParametersTests.cs b/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeTypeParametersTests.cs index 07366209..ed14c556 100644 --- a/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeTypeParametersTests.cs +++ b/test/GqlPlus.Parser.ClassTests/Merging/Objects/MergeTypeParametersTests.cs @@ -23,6 +23,6 @@ public void Merge_ManyItems_ReturnsItem(string name) internal override GroupsMerger MergerGroups => _merger; - protected override IGqlpTypeParam MakeDescribed(string input, string description = "") - => new TypeParamAst(AstNulls.At, input, description); + protected override IGqlpTypeParam MakeDescribed(string name, string description = "") + => new TypeParamAst(AstNulls.At, name, description); } diff --git a/test/GqlPlus.Parser.ClassTests/Merging/Objects/TestAlternatesMerger.cs b/test/GqlPlus.Parser.ClassTests/Merging/Objects/TestAlternatesMerger.cs index 7b94385c..01c46fe4 100644 --- a/test/GqlPlus.Parser.ClassTests/Merging/Objects/TestAlternatesMerger.cs +++ b/test/GqlPlus.Parser.ClassTests/Merging/Objects/TestAlternatesMerger.cs @@ -30,8 +30,8 @@ public void Merge_TwoAstsSameModifers_ReturnsExpected(string input) internal abstract AstAlternatesMerger MergerAlternate { get; } internal override GroupsMerger MergerGroups => MergerAlternate; - protected override TObjAlt MakeDescribed(string input, string description = "") - => CheckAlternates.MakeAlternate(input, false, description); + protected override TObjAlt MakeDescribed(string name, string description = "") + => CheckAlternates.MakeAlternate(name, false, description); } internal abstract class CheckAlternatesMerger diff --git a/test/GqlPlus.Parser.ClassTests/Merging/Simple/MergeEnumMembersTests.cs b/test/GqlPlus.Parser.ClassTests/Merging/Simple/MergeEnumMembersTests.cs index d9f15112..264060bd 100644 --- a/test/GqlPlus.Parser.ClassTests/Merging/Simple/MergeEnumMembersTests.cs +++ b/test/GqlPlus.Parser.ClassTests/Merging/Simple/MergeEnumMembersTests.cs @@ -13,6 +13,6 @@ ITestOutputHelper outputHelper internal override GroupsMerger MergerGroups => _merger; - protected override IGqlpEnumItem MakeAliased(string input, string[]? aliases = null, string description = "") - => new EnumMemberAst(AstNulls.At, input, description) { Aliases = aliases ?? [] }; + protected override IGqlpEnumItem MakeAliased(string name, string[]? aliases = null, string description = "") + => new EnumMemberAst(AstNulls.At, name, description) { Aliases = aliases ?? [] }; } diff --git a/test/GqlPlus.Parser.ClassTests/Merging/TestTyped.cs b/test/GqlPlus.Parser.ClassTests/Merging/TestTyped.cs index f7cd08cd..6526e904 100644 --- a/test/GqlPlus.Parser.ClassTests/Merging/TestTyped.cs +++ b/test/GqlPlus.Parser.ClassTests/Merging/TestTyped.cs @@ -28,6 +28,6 @@ public void CanMerge_TwoAstsDifferentParents_ReturnsErrors(string name, string t protected abstract TType MakeTyped(string name, string[]? aliases = null, string description = "", TParent? parent = default); protected abstract TParent MakeParent(string parent); - protected override TType MakeAliased(string input, string[]? aliases = null, string description = "") - => MakeTyped(input, aliases, description); + protected override TType MakeAliased(string name, string[]? aliases = null, string description = "") + => MakeTyped(name, aliases, description); }