Skip to content

Commit f5a5b1e

Browse files
rose-arose-a
authored
Merge pull request #157 from graphql-dotnet/releases/2.0.0
Release 2.0.0
2 parents aa41007 + e1c3b86 commit f5a5b1e

File tree

86 files changed

+3473
-950
lines changed

Some content is hidden

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

86 files changed

+3473
-950
lines changed

‎.github/FUNDING.yml‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.github/workflows/branches.yml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: Branch workflow
2+
on:
3+
push:
4+
branches-ignore:
5+
- develop
6+
- 'release/**'
7+
- 'releases/**'
8+
jobs:
9+
generateVersionInfo:
10+
name: GenerateVersionInfo
11+
runs-on: windows-latest
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v2
15+
with:
16+
fetch-depth: 0
17+
- name: Setup dotnet environment
18+
uses: actions/setup-dotnet@master
19+
with:
20+
dotnet-version: '3.1.100'
21+
- name: Restore dotnet tools
22+
run: dotnet tool restore
23+
- name: Fetch complete repository
24+
run: git fetch
25+
- name: Generate version info from git history
26+
run: dotnet dotnet-gitversion /output json | Out-File gitversion.json; Get-Content gitversion.json
27+
- name: Upload version info file
28+
uses: actions/upload-artifact@v1
29+
with:
30+
name: gitversion
31+
path: gitversion.json
32+
33+
build:
34+
name: Build
35+
needs: generateVersionInfo
36+
runs-on: windows-latest
37+
steps:
38+
- name: Checkout
39+
uses: actions/checkout@v2
40+
- name: Setup dotnet environment
41+
uses: actions/setup-dotnet@master
42+
with:
43+
dotnet-version: '3.1.100'
44+
- name: Download version info file
45+
uses: actions/download-artifact@v1
46+
with:
47+
name: gitversion
48+
path: ./
49+
- name: Inject version info into environment
50+
run: Get-Content gitversion.json | ConvertFrom-Json | ForEach-Object { foreach ($item in $_.PSObject.properties) { "::set-env name=GitVersion_$($item.Name)::$($item.Value)" } }; $env:GitVersion_SemVer
51+
- name: Build solution
52+
run: dotnet build -c Release
53+
- name: Create NuGet packages
54+
run: dotnet pack -c Release --no-build -o nupkg
55+
- name: Upload nuget packages
56+
uses: actions/upload-artifact@v1
57+
with:
58+
name: nupkg
59+
path: nupkg
60+
61+
test:
62+
name: Test
63+
needs: [build, generateVersionInfo]
64+
runs-on: windows-latest
65+
steps:
66+
- name: Checkout
67+
uses: actions/checkout@v2
68+
- name: Setup dotnet environment
69+
uses: actions/setup-dotnet@master
70+
with:
71+
dotnet-version: '3.1.100'
72+
- name: Download version info file
73+
uses: actions/download-artifact@v1
74+
with:
75+
name: gitversion
76+
path: ./
77+
- name: Inject version info into environment
78+
run: Get-Content gitversion.json | ConvertFrom-Json | ForEach-Object { foreach ($item in $_.PSObject.properties) { "::set-env name=GitVersion_$($item.Name)::$($item.Value)" } }
79+
- name: Run tests
80+
run: dotnet test -c Release -p:ParallelizeTestCollections=false

‎.github/workflows/main.yml‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
name: Main workflow
2+
on:
3+
push:
4+
branches:
5+
- develop
6+
- 'release/**'
7+
- 'releases/**'
8+
tags:
9+
- v*
10+
- V*
11+
jobs:
12+
generateVersionInfo:
13+
name: GenerateVersionInfo
14+
runs-on: windows-latest
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v2
18+
with:
19+
fetch-depth: 0
20+
- name: Setup dotnet environment
21+
uses: actions/setup-dotnet@master
22+
with:
23+
dotnet-version: '3.1.100'
24+
- name: Restore dotnet tools
25+
run: dotnet tool restore
26+
- name: Fetch complete repository
27+
run: git fetch
28+
- name: Generate version info from git history
29+
run: dotnet dotnet-gitversion /output json | Out-File gitversion.json; Get-Content gitversion.json
30+
env:
31+
IGNORE_NORMALISATION_GIT_HEAD_MOVE: 1
32+
- name: Upload version info file
33+
uses: actions/upload-artifact@v1
34+
with:
35+
name: gitversion
36+
path: gitversion.json
37+
38+
build:
39+
name: Build
40+
needs: generateVersionInfo
41+
runs-on: windows-latest
42+
steps:
43+
- name: Checkout
44+
uses: actions/checkout@v2
45+
- name: Setup dotnet environment
46+
uses: actions/setup-dotnet@master
47+
with:
48+
dotnet-version: '3.1.100'
49+
- name: Download version info file
50+
uses: actions/download-artifact@v1
51+
with:
52+
name: gitversion
53+
path: ./
54+
- name: Inject version info into environment
55+
run: Get-Content gitversion.json | ConvertFrom-Json | ForEach-Object { foreach ($item in $_.PSObject.properties) { "::set-env name=GitVersion_$($item.Name)::$($item.Value)" } }; $env:GitVersion_SemVer
56+
- name: Build solution
57+
run: dotnet build -c Release
58+
- name: Create NuGet packages
59+
run: dotnet pack -c Release --no-build -o nupkg
60+
- name: Upload nuget packages
61+
uses: actions/upload-artifact@v1
62+
with:
63+
name: nupkg
64+
path: nupkg
65+
66+
test:
67+
name: Test
68+
needs: [build, generateVersionInfo]
69+
runs-on: windows-latest
70+
steps:
71+
- name: Checkout
72+
uses: actions/checkout@v2
73+
- name: Setup dotnet environment
74+
uses: actions/setup-dotnet@master
75+
with:
76+
dotnet-version: '3.1.100'
77+
- name: Download version info file
78+
uses: actions/download-artifact@v1
79+
with:
80+
name: gitversion
81+
path: ./
82+
- name: Inject version info into environment
83+
run: Get-Content gitversion.json | ConvertFrom-Json | ForEach-Object { foreach ($item in $_.PSObject.properties) { "::set-env name=GitVersion_$($item.Name)::$($item.Value)" } }
84+
- name: Run tests
85+
run: dotnet test -c Release -p:ParallelizeTestCollections=false
86+
87+
publish:
88+
name: Publish
89+
needs: [test]
90+
runs-on: windows-latest
91+
steps:
92+
- name: Checkout
93+
uses: actions/checkout@v2
94+
- name: Download nuget packages
95+
uses: actions/download-artifact@v1
96+
with:
97+
name: nupkg
98+
- name: Setup Nuget.exe
99+
uses: warrenbuckley/Setup-Nuget@v1
100+
- name: Configure package source
101+
run: nuget sources Add -Name "GPR" -Source https://nuget.pkg.github.com/graphql-dotnet/index.json -UserName graphql-dotnet -Password ${{secrets.GITHUB_TOKEN}}
102+
- name: push packages
103+
run: nuget push .\nupkg\*.nupkg -SkipDuplicate -Source "GPR"

‎.github/workflows/workflow.yml‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎GitVersion.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
branches:
2+
release:
3+
mode: ContinuousDeployment

‎GraphQL.Client.sln‎

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{47C98B55-08F
88
src\src.props = src\src.props
99
EndProjectSection
1010
EndProject
11-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client", "src\GraphQL.Client\GraphQL.Client.csproj", "{42BEFACE-39F9-4FE4-B725-15CD2B16292E}"
12-
EndProject
1311
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{63F75859-4698-4EDE-8B70-4ACBB8BC425A}"
1412
ProjectSection(SolutionItems) = preProject
1513
.editorconfig = .editorconfig
1614
.gitignore = .gitignore
15+
dotnet-tools.json = dotnet-tools.json
1716
LICENSE.txt = LICENSE.txt
1817
README.md = README.md
1918
root.props = root.props
20-
dotnet-tools.json = dotnet-tools.json
2119
EndProjectSection
2220
EndProject
2321
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0B0EDB0F-FF67-4B78-A8DB-B5C23E1FEE8C}"
2422
ProjectSection(SolutionItems) = preProject
2523
tests\tests.props = tests\tests.props
2624
EndProjectSection
2725
EndProject
28-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client.Tests", "tests\GraphQL.Client.Tests\GraphQL.Client.Tests.csproj", "{FEDAE425-B505-4DD6-98ED-3F8593358FC8}"
29-
EndProject
3026
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{6326E0E2-3F48-4BAF-80D3-47AED5EB647C}"
3127
ProjectSection(SolutionItems) = preProject
3228
assets\logo.64x64.png = assets\logo.64x64.png
@@ -42,47 +38,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{C421
4238
EndProject
4339
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{05CAF9B2-981E-40C0-AE31-5FA56E351F12}"
4440
ProjectSection(SolutionItems) = preProject
45-
.github\workflows\workflow.yml = .github\workflows\workflow.yml
41+
.github\workflows\branches.yml = .github\workflows\branches.yml
42+
.github\workflows\main.yml = .github\workflows\main.yml
4643
EndProjectSection
4744
EndProject
48-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client.Http", "src\GraphQL.Client.Http\GraphQL.Client.Http.csproj", "{FA10201B-AE2A-4BFC-8E8F-6F944680974D}"
49-
EndProject
50-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client.Http.Tests", "tests\GraphQL.Client.Http.Tests\GraphQL.Client.Http.Tests.csproj", "{8F5BBBDA-B3DD-458B-B97F-F67531D323E0}"
51-
EndProject
5245
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{D61415CA-D822-43DD-9AE7-993B8B60E855}"
5346
EndProject
5447
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client.Http.Examples", "examples\GraphQL.Client.Http.Examples\GraphQL.Client.Http.Examples.csproj", "{95D78D57-3232-491D-BAD6-F373D76EA34D}"
5548
EndProject
56-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphQL.Primitives", "src\GraphQL.Primitives\GraphQL.Primitives.csproj", "{87FC440E-6A4D-47D8-9EB2-416FC31CC4A6}"
49+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Primitives", "src\GraphQL.Primitives\GraphQL.Primitives.csproj", "{87FC440E-6A4D-47D8-9EB2-416FC31CC4A6}"
50+
EndProject
51+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Primitives.Tests", "tests\GraphQL.Primitives.Tests\GraphQL.Primitives.Tests.csproj", "{C212983F-67DB-44EB-BFB0-5DA75A86DF55}"
52+
EndProject
53+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTestServer", "tests\IntegrationTestServer\IntegrationTestServer.csproj", "{92107DF5-73DF-4371-8EB1-6734FED704AD}"
54+
EndProject
55+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Integration.Tests", "tests\GraphQL.Integration.Tests\GraphQL.Integration.Tests.csproj", "{C68C26EB-7659-402A-93D1-E6E248DA5427}"
56+
EndProject
57+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client.Abstractions", "src\GraphQL.Client.Abstractions\GraphQL.Client.Abstractions.csproj", "{76E622F6-7CDD-4B1F-AD06-FFABF37C55E5}"
5758
EndProject
58-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphQL.Primitives.Tests", "tests\GraphQL.Primitives.Tests\GraphQL.Primitives.Tests.csproj", "{C212983F-67DB-44EB-BFB0-5DA75A86DF55}"
59+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Client", "src\GraphQL.Client\GraphQL.Client.csproj", "{ED3541C9-D2B2-4D06-A464-38E404A3919A}"
5960
EndProject
6061
Global
6162
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6263
Debug|Any CPU = Debug|Any CPU
6364
Release|Any CPU = Release|Any CPU
6465
EndGlobalSection
6566
GlobalSection(ProjectConfigurationPlatforms) = postSolution
66-
{42BEFACE-39F9-4FE4-B725-15CD2B16292E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67-
{42BEFACE-39F9-4FE4-B725-15CD2B16292E}.Debug|Any CPU.Build.0 = Debug|Any CPU
68-
{42BEFACE-39F9-4FE4-B725-15CD2B16292E}.Release|Any CPU.ActiveCfg = Release|Any CPU
69-
{42BEFACE-39F9-4FE4-B725-15CD2B16292E}.Release|Any CPU.Build.0 = Release|Any CPU
70-
{FEDAE425-B505-4DD6-98ED-3F8593358FC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
71-
{FEDAE425-B505-4DD6-98ED-3F8593358FC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
72-
{FEDAE425-B505-4DD6-98ED-3F8593358FC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
73-
{FEDAE425-B505-4DD6-98ED-3F8593358FC8}.Release|Any CPU.Build.0 = Release|Any CPU
7467
{E95A1258-F666-4D4E-9101-E0C46F6A3CB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7568
{E95A1258-F666-4D4E-9101-E0C46F6A3CB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
7669
{E95A1258-F666-4D4E-9101-E0C46F6A3CB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
7770
{E95A1258-F666-4D4E-9101-E0C46F6A3CB3}.Release|Any CPU.Build.0 = Release|Any CPU
78-
{FA10201B-AE2A-4BFC-8E8F-6F944680974D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79-
{FA10201B-AE2A-4BFC-8E8F-6F944680974D}.Debug|Any CPU.Build.0 = Debug|Any CPU
80-
{FA10201B-AE2A-4BFC-8E8F-6F944680974D}.Release|Any CPU.ActiveCfg = Release|Any CPU
81-
{FA10201B-AE2A-4BFC-8E8F-6F944680974D}.Release|Any CPU.Build.0 = Release|Any CPU
82-
{8F5BBBDA-B3DD-458B-B97F-F67531D323E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83-
{8F5BBBDA-B3DD-458B-B97F-F67531D323E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
84-
{8F5BBBDA-B3DD-458B-B97F-F67531D323E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
85-
{8F5BBBDA-B3DD-458B-B97F-F67531D323E0}.Release|Any CPU.Build.0 = Release|Any CPU
8671
{95D78D57-3232-491D-BAD6-F373D76EA34D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8772
{95D78D57-3232-491D-BAD6-F373D76EA34D}.Debug|Any CPU.Build.0 = Debug|Any CPU
8873
{95D78D57-3232-491D-BAD6-F373D76EA34D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -95,22 +80,35 @@ Global
9580
{C212983F-67DB-44EB-BFB0-5DA75A86DF55}.Debug|Any CPU.Build.0 = Debug|Any CPU
9681
{C212983F-67DB-44EB-BFB0-5DA75A86DF55}.Release|Any CPU.ActiveCfg = Release|Any CPU
9782
{C212983F-67DB-44EB-BFB0-5DA75A86DF55}.Release|Any CPU.Build.0 = Release|Any CPU
83+
{92107DF5-73DF-4371-8EB1-6734FED704AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84+
{92107DF5-73DF-4371-8EB1-6734FED704AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
85+
{92107DF5-73DF-4371-8EB1-6734FED704AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
86+
{92107DF5-73DF-4371-8EB1-6734FED704AD}.Release|Any CPU.Build.0 = Release|Any CPU
87+
{C68C26EB-7659-402A-93D1-E6E248DA5427}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88+
{C68C26EB-7659-402A-93D1-E6E248DA5427}.Debug|Any CPU.Build.0 = Debug|Any CPU
89+
{C68C26EB-7659-402A-93D1-E6E248DA5427}.Release|Any CPU.ActiveCfg = Release|Any CPU
90+
{C68C26EB-7659-402A-93D1-E6E248DA5427}.Release|Any CPU.Build.0 = Release|Any CPU
91+
{76E622F6-7CDD-4B1F-AD06-FFABF37C55E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
92+
{76E622F6-7CDD-4B1F-AD06-FFABF37C55E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
93+
{76E622F6-7CDD-4B1F-AD06-FFABF37C55E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
94+
{76E622F6-7CDD-4B1F-AD06-FFABF37C55E5}.Release|Any CPU.Build.0 = Release|Any CPU
95+
{ED3541C9-D2B2-4D06-A464-38E404A3919A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
96+
{ED3541C9-D2B2-4D06-A464-38E404A3919A}.Debug|Any CPU.Build.0 = Debug|Any CPU
97+
{ED3541C9-D2B2-4D06-A464-38E404A3919A}.Release|Any CPU.ActiveCfg = Release|Any CPU
98+
{ED3541C9-D2B2-4D06-A464-38E404A3919A}.Release|Any CPU.Build.0 = Release|Any CPU
9899
EndGlobalSection
99100
GlobalSection(SolutionProperties) = preSolution
100101
HideSolutionNode = FALSE
101102
EndGlobalSection
102103
GlobalSection(NestedProjects) = preSolution
103-
{42BEFACE-39F9-4FE4-B725-15CD2B16292E} = {47C98B55-08F1-4428-863E-2C5C876DEEFE}
104-
{FEDAE425-B505-4DD6-98ED-3F8593358FC8} = {0B0EDB0F-FF67-4B78-A8DB-B5C23E1FEE8C}
105-
{6326E0E2-3F48-4BAF-80D3-47AED5EB647C} = {63F75859-4698-4EDE-8B70-4ACBB8BC425A}
106104
{E95A1258-F666-4D4E-9101-E0C46F6A3CB3} = {0B0EDB0F-FF67-4B78-A8DB-B5C23E1FEE8C}
107-
{C42106CF-F685-4F29-BC18-A70616BD68A0} = {63F75859-4698-4EDE-8B70-4ACBB8BC425A}
108-
{05CAF9B2-981E-40C0-AE31-5FA56E351F12} = {C42106CF-F685-4F29-BC18-A70616BD68A0}
109-
{FA10201B-AE2A-4BFC-8E8F-6F944680974D} = {47C98B55-08F1-4428-863E-2C5C876DEEFE}
110-
{8F5BBBDA-B3DD-458B-B97F-F67531D323E0} = {0B0EDB0F-FF67-4B78-A8DB-B5C23E1FEE8C}
111105
{95D78D57-3232-491D-BAD6-F373D76EA34D} = {D61415CA-D822-43DD-9AE7-993B8B60E855}
112106
{87FC440E-6A4D-47D8-9EB2-416FC31CC4A6} = {47C98B55-08F1-4428-863E-2C5C876DEEFE}
113107
{C212983F-67DB-44EB-BFB0-5DA75A86DF55} = {0B0EDB0F-FF67-4B78-A8DB-B5C23E1FEE8C}
108+
{92107DF5-73DF-4371-8EB1-6734FED704AD} = {0B0EDB0F-FF67-4B78-A8DB-B5C23E1FEE8C}
109+
{C68C26EB-7659-402A-93D1-E6E248DA5427} = {0B0EDB0F-FF67-4B78-A8DB-B5C23E1FEE8C}
110+
{76E622F6-7CDD-4B1F-AD06-FFABF37C55E5} = {47C98B55-08F1-4428-863E-2C5C876DEEFE}
111+
{ED3541C9-D2B2-4D06-A464-38E404A3919A} = {47C98B55-08F1-4428-863E-2C5C876DEEFE}
114112
EndGlobalSection
115113
GlobalSection(ExtensibilityGlobals) = postSolution
116114
SolutionGuid = {387AC1AC-F90C-4EF8-955A-04D495C75AF4}

‎GraphQL.Client.sln.DotSettings‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QL/@EntryIndexedValue">QL</s:String></wpf:ResourceDictionary>

0 commit comments

Comments
 (0)