Skip to content

Commit 844ee7e

Browse files
okhorsunenko-lulaxperiandri
okhorsunenko-lula
authored and
xperiandri
committed
Installed fsdocs-tool instead of legacy fsharp.formatting.commandtool 
1 parent fb6f128 commit 844ee7e

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

+5051
-8292
lines changed

‎.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
]
1010
},
1111
"fantomas": {
12-
"version": "5.1.4",
12+
"version": "5.2.0",
1313
"commands": [
1414
"fantomas"
1515
]

‎.github/workflows/publish_ci.yml

+13-5
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ on:
77

88
jobs:
99
publish:
10-
10+
1111
runs-on: ubuntu-latest
1212

1313
steps:
1414
- name: Checkout
1515
uses: actions/checkout@v3
16-
16+
1717
- name: Set Build Version
1818
run: |
1919
$File = (
@@ -24,10 +24,10 @@ jobs:
2424
$File.OwnerDocument.Save((Join-Path $PWD.ProviderPath Directory.Build.targets))
2525
echo "VERSION=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
2626
shell: pwsh
27-
27+
2828
- name: Install .NET Core
2929
uses: actions/setup-dotnet@v3
30-
30+
3131
- name: Add the GitHub source
3232
run: dotnet nuget add source --username USERNAME --password ${{secrets.GITHUB_TOKEN}} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/fsprojects/index.json"
3333

@@ -61,6 +61,14 @@ jobs:
6161
run: |
6262
dotnet nuget push nuget/*Server*.nupkg -s "github" -k ${{secrets.GITHUB_TOKEN}}
6363
64+
- name: Pack FSharp.Data.GraphQL.Server.Relay project
65+
run: |
66+
cd src/FSharp.Data.GraphQL.Server.Relay
67+
dotnet pack --no-build --nologo --configuration Release /p:IsNuget=true -o ../../nuget
68+
- name: Publish FSharp.Data.GraphQL.Server.Relay project to GitHub
69+
run: |
70+
dotnet nuget push nuget/*Server.Relay*.nupkg -s "github" -k ${{secrets.GITHUB_TOKEN}}
71+
6472
- name: Pack FSharp.Data.GraphQL.Server.Middleware project
6573
run: |
6674
cd src/FSharp.Data.GraphQL.Server.Middleware
@@ -82,4 +90,4 @@ jobs:
8290
run: |
8391
$path = "nuget/FSharp.Data.GraphQL.ProjectTemplates.$Env:VERSION.nupkg"
8492
dotnet nuget push $path -s "github" -k ${{secrets.GITHUB_TOKEN}}
85-
shell: pwsh
93+
shell: pwsh

‎.github/workflows/publish_release.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
# This is necessary so that we have the tags.
1717
fetch-depth: 0
18-
18+
1919
- name: Set Build Version
2020
run: |
2121
$version = "$env:GITHUB_REF_NAME"
@@ -60,6 +60,14 @@ jobs:
6060
run: |
6161
dotnet nuget push nuget/*Server*.nupkg -k ${{secrets.NUGET_SECRET}}
6262
63+
- name: Pack FSharp.Data.GraphQL.Server.Relay project
64+
run: |
65+
cd src/FSharp.Data.GraphQL.Server.Relay
66+
dotnet pack --no-build --nologo --configuration Release /p:IsNuget=true -o ../../nuget
67+
- name: Publish FSharp.Data.GraphQL.Server.Relay project to NuGet
68+
run: |
69+
dotnet nuget push nuget/*Server.Relay*.nupkg -k ${{secrets.NUGET_SECRET}}
70+
6371
- name: Pack FSharp.Data.GraphQL.Server.Middleware project
6472
run: |
6573
cd src/FSharp.Data.GraphQL.Server.Middleware
@@ -81,4 +89,4 @@ jobs:
8189
run: |
8290
$path = "nuget/FSharp.Data.GraphQL.ProjectTemplates.$Env:VERSION.nupkg"
8391
dotnet nuget push $path -k ${{secrets.NUGET_SECRET}}
84-
shell: pwsh
92+
shell: pwsh

‎FSharp.Data.GraphQL.sln

+94-61
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,59 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.3.32811.315
55
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E3330910-8B6C-4191-8046-D6D57FBC39B1}"
7+
ProjectSection(SolutionItems) = preProject
8+
.editorconfig = .editorconfig
9+
Directory.Build.targets = Directory.Build.targets
10+
global.json = global.json
11+
LICENSE.txt = LICENSE.txt
12+
Packages.props = Packages.props
13+
Prepare template project for packing.ps1 = Prepare template project for packing.ps1
14+
README.md = README.md
15+
RELEASE_NOTES.md = RELEASE_NOTES.md
16+
EndProjectSection
17+
EndProject
18+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub", "GitHub", "{313AC7F5-4282-4779-8FEF-1536B4145860}"
19+
ProjectSection(SolutionItems) = preProject
20+
.github\workflows\publish_ci.yml = .github\workflows\publish_ci.yml
21+
.github\workflows\publish_release.yml = .github\workflows\publish_release.yml
22+
.github\workflows\pull_request.yml = .github\workflows\pull_request.yml
23+
EndProjectSection
24+
EndProject
625
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}"
726
EndProject
27+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{56640EAF-82A6-4439-AD14-69F44A90DA99}"
28+
ProjectSection(SolutionItems) = preProject
29+
docs\files\introspection_query.graphql = docs\files\introspection_query.graphql
30+
EndProjectSection
31+
EndProject
32+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{78D10788-601D-4D53-808B-36661911EDD1}"
33+
ProjectSection(SolutionItems) = preProject
34+
docs\files\img\logo-template.pdn = docs\files\img\logo-template.pdn
35+
docs\files\img\logo.png = docs\files\img\logo.png
36+
EndProjectSection
37+
EndProject
38+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "star-wars-api", "star-wars-api", "{F66BEE6C-0CB7-4F39-97E4-243F797E8723}"
39+
EndProject
40+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Samples.StarWarsApi", "samples\star-wars-api\FSharp.Data.GraphQL.Samples.StarWarsApi.fsproj", "{B837B3ED-83CE-446F-A4E5-44CB06AA6505}"
41+
EndProject
42+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BEFD8748-2467-45F9-A4AD-B450B12D5F78}"
43+
EndProject
44+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Shared", "src\FSharp.Data.GraphQL.Shared\FSharp.Data.GraphQL.Shared.fsproj", "{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}"
45+
EndProject
846
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server", "src\FSharp.Data.GraphQL.Server\FSharp.Data.GraphQL.Server.fsproj", "{474179D3-0090-49E9-88F8-2971C0966077}"
947
EndProject
48+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Relay", "src\FSharp.Data.GraphQL.Server.Relay\FSharp.Data.GraphQL.Server.Relay.fsproj", "{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}"
49+
EndProject
50+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Middleware", "src\FSharp.Data.GraphQL.Server.Middleware\FSharp.Data.GraphQL.Server.Middleware.fsproj", "{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}"
51+
EndProject
52+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Client.DesignTime", "src\FSharp.Data.GraphQL.Client.DesignTime\FSharp.Data.GraphQL.Client.DesignTime.fsproj", "{B075CD55-CEA4-4C30-A088-48319AADF070}"
53+
EndProject
54+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Client", "src\FSharp.Data.GraphQL.Client\FSharp.Data.GraphQL.Client.fsproj", "{F7858DA7-E067-486B-9E9C-697F0A56C620}"
55+
ProjectSection(ProjectDependencies) = postProject
56+
{B075CD55-CEA4-4C30-A088-48319AADF070} = {B075CD55-CEA4-4C30-A088-48319AADF070}
57+
EndProjectSection
58+
EndProject
1059
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
1160
ProjectSection(SolutionItems) = preProject
1261
build.fsx = build.fsx
@@ -32,6 +81,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD
3281
EndProject
3382
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Tests", "tests\FSharp.Data.GraphQL.Tests\FSharp.Data.GraphQL.Tests.fsproj", "{54AAFE43-FA5F-485A-AD40-0240165FC633}"
3483
EndProject
84+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Benchmarks", "tests\FSharp.Data.GraphQL.Benchmarks\FSharp.Data.GraphQL.Benchmarks.fsproj", "{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}"
85+
EndProject
3586
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{B0C25450-74BF-40C2-9E02-09AADBAE2C2F}"
3687
EndProject
3788
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "graphiql-client", "graphiql-client", "{CAE5916B-1415-4982-B705-7318D77C029C}"
@@ -44,21 +95,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "graphiql-client", "graphiql
4495
samples\graphiql-client\webpack.config.js = samples\graphiql-client\webpack.config.js
4596
EndProjectSection
4697
EndProject
47-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "relay-starter-kit", "relay-starter-kit", "{9B25360F-2CE4-43D2-AFF0-5EAA693E98F7}"
48-
ProjectSection(SolutionItems) = preProject
49-
samples\relay-starter-kit\.babelrc = samples\relay-starter-kit\.babelrc
50-
samples\relay-starter-kit\index.html = samples\relay-starter-kit\index.html
51-
samples\relay-starter-kit\index.jsx = samples\relay-starter-kit\index.jsx
52-
samples\relay-starter-kit\package.json = samples\relay-starter-kit\package.json
53-
samples\relay-starter-kit\server.fsx = samples\relay-starter-kit\server.fsx
54-
samples\relay-starter-kit\webpack.config.js = samples\relay-starter-kit\webpack.config.js
55-
EndProjectSection
56-
EndProject
57-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "data", "{E7139F5F-22CA-4392-8C1C-481A39EEB554}"
58-
ProjectSection(SolutionItems) = preProject
59-
samples\relay-starter-kit\data\schema.json = samples\relay-starter-kit\data\schema.json
60-
EndProjectSection
61-
EndProject
6298
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DFA5AAFF-31B8-4203-822C-8ACC4D7A7D74}"
6399
ProjectSection(SolutionItems) = preProject
64100
samples\relay-starter-kit\build\babelRelayPlugin.js = samples\relay-starter-kit\build\babelRelayPlugin.js
@@ -83,36 +119,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client-provider", "client-p
83119
samples\client-provider\using_query_file.fsx = samples\client-provider\using_query_file.fsx
84120
EndProjectSection
85121
EndProject
86-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Shared", "src\FSharp.Data.GraphQL.Shared\FSharp.Data.GraphQL.Shared.fsproj", "{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}"
87-
EndProject
88-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BEFD8748-2467-45F9-A4AD-B450B12D5F78}"
89-
EndProject
90-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Middleware", "src\FSharp.Data.GraphQL.Server.Middleware\FSharp.Data.GraphQL.Server.Middleware.fsproj", "{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}"
91-
EndProject
92-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Benchmarks", "tests\FSharp.Data.GraphQL.Benchmarks\FSharp.Data.GraphQL.Benchmarks.fsproj", "{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}"
93-
EndProject
94-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{56640EAF-82A6-4439-AD14-69F44A90DA99}"
95-
ProjectSection(SolutionItems) = preProject
96-
docs\files\introspection_query.graphql = docs\files\introspection_query.graphql
97-
EndProjectSection
98-
EndProject
99-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{78D10788-601D-4D53-808B-36661911EDD1}"
100-
ProjectSection(SolutionItems) = preProject
101-
docs\files\img\logo-template.pdn = docs\files\img\logo-template.pdn
102-
docs\files\img\logo.png = docs\files\img\logo.png
103-
EndProjectSection
104-
EndProject
105-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Client.DesignTime", "src\FSharp.Data.GraphQL.Client.DesignTime\FSharp.Data.GraphQL.Client.DesignTime.fsproj", "{B075CD55-CEA4-4C30-A088-48319AADF070}"
106-
EndProject
107-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Client", "src\FSharp.Data.GraphQL.Client\FSharp.Data.GraphQL.Client.fsproj", "{F7858DA7-E067-486B-9E9C-697F0A56C620}"
108-
ProjectSection(ProjectDependencies) = postProject
109-
{B075CD55-CEA4-4C30-A088-48319AADF070} = {B075CD55-CEA4-4C30-A088-48319AADF070}
110-
EndProjectSection
111-
EndProject
112-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "star-wars-api", "star-wars-api", "{F66BEE6C-0CB7-4F39-97E4-243F797E8723}"
113-
EndProject
114-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Samples.StarWarsApi", "samples\star-wars-api\FSharp.Data.GraphQL.Samples.StarWarsApi.fsproj", "{B837B3ED-83CE-446F-A4E5-44CB06AA6505}"
115-
EndProject
116122
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "file-upload", "file-upload", "{A47968E2-CDD1-4BCF-9093-D0C5225A815B}"
117123
ProjectSection(SolutionItems) = preProject
118124
samples\client-provider\file-upload\multiple_files_upload.fsx = samples\client-provider\file-upload\multiple_files_upload.fsx
@@ -134,23 +140,35 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{9D5C46
134140
samples\client-provider\file-upload\server\types.mjs = samples\client-provider\file-upload\server\types.mjs
135141
EndProjectSection
136142
EndProject
137-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E3330910-8B6C-4191-8046-D6D57FBC39B1}"
143+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "relay-modern-starter-kit", "relay-modern-starter-kit", "{600D4BE2-FCE0-4684-AC6F-2DC829B395BA}"
138144
ProjectSection(SolutionItems) = preProject
139-
.editorconfig = .editorconfig
140-
Directory.Build.targets = Directory.Build.targets
141-
global.json = global.json
142-
LICENSE.txt = LICENSE.txt
143-
Packages.props = Packages.props
144-
Prepare template project for packing.ps1 = Prepare template project for packing.ps1
145-
README.md = README.md
146-
RELEASE_NOTES.md = RELEASE_NOTES.md
145+
samples\relay-modern-starter-kit\.babelrc = samples\relay-modern-starter-kit\.babelrc
146+
samples\relay-modern-starter-kit\index.html = samples\relay-modern-starter-kit\index.html
147+
samples\relay-modern-starter-kit\package.json = samples\relay-modern-starter-kit\package.json
148+
samples\relay-modern-starter-kit\server.fsx = samples\relay-modern-starter-kit\server.fsx
149+
samples\relay-modern-starter-kit\webpack.config.js = samples\relay-modern-starter-kit\webpack.config.js
150+
samples\relay-modern-starter-kit\yarn.lock = samples\relay-modern-starter-kit\yarn.lock
147151
EndProjectSection
148152
EndProject
149-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub", "GitHub", "{313AC7F5-4282-4779-8FEF-1536B4145860}"
153+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "data", "{E9DACEDD-1166-4142-9726-33CCA56218BA}"
150154
ProjectSection(SolutionItems) = preProject
151-
.github\workflows\publish_ci.yml = .github\workflows\publish_ci.yml
152-
.github\workflows\publish_release.yml = .github\workflows\publish_release.yml
153-
.github\workflows\pull_request.yml = .github\workflows\pull_request.yml
155+
samples\relay-modern-starter-kit\data\schema.json = samples\relay-modern-starter-kit\data\schema.json
156+
EndProjectSection
157+
EndProject
158+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A8F031E0-2BD5-4BAE-830A-60CBA76A047D}"
159+
ProjectSection(SolutionItems) = preProject
160+
samples\relay-modern-starter-kit\src\app.jsx = samples\relay-modern-starter-kit\src\app.jsx
161+
samples\relay-modern-starter-kit\src\relayEnvironment.js = samples\relay-modern-starter-kit\src\relayEnvironment.js
162+
EndProjectSection
163+
EndProject
164+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{6EEA0E79-693F-4D4F-B55B-DB0C64EBDA45}"
165+
ProjectSection(SolutionItems) = preProject
166+
jsonToGraphql.js = jsonToGraphql.js
167+
EndProjectSection
168+
EndProject
169+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components", "components", "{7AA3516E-60F5-4969-878F-4E3DCF3E63A3}"
170+
ProjectSection(SolutionItems) = preProject
171+
user.jsx = user.jsx
154172
EndProjectSection
155173
EndProject
156174
Global
@@ -259,6 +277,18 @@ Global
259277
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x64.Build.0 = Release|Any CPU
260278
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x86.ActiveCfg = Release|Any CPU
261279
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x86.Build.0 = Release|Any CPU
280+
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
281+
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
282+
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x64.ActiveCfg = Debug|Any CPU
283+
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x64.Build.0 = Debug|Any CPU
284+
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x86.ActiveCfg = Debug|Any CPU
285+
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x86.Build.0 = Debug|Any CPU
286+
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
287+
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|Any CPU.Build.0 = Release|Any CPU
288+
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x64.ActiveCfg = Release|Any CPU
289+
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x64.Build.0 = Release|Any CPU
290+
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x86.ActiveCfg = Release|Any CPU
291+
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x86.Build.0 = Release|Any CPU
262292
EndGlobalSection
263293
GlobalSection(SolutionProperties) = preSolution
264294
HideSolutionNode = FALSE
@@ -269,9 +299,6 @@ Global
269299
{8E6D5255-776D-4B61-85F9-73C37AA1FB9A} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
270300
{54AAFE43-FA5F-485A-AD40-0240165FC633} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
271301
{CAE5916B-1415-4982-B705-7318D77C029C} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
272-
{9B25360F-2CE4-43D2-AFF0-5EAA693E98F7} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
273-
{E7139F5F-22CA-4392-8C1C-481A39EEB554} = {9B25360F-2CE4-43D2-AFF0-5EAA693E98F7}
274-
{DFA5AAFF-31B8-4203-822C-8ACC4D7A7D74} = {9B25360F-2CE4-43D2-AFF0-5EAA693E98F7}
275302
{3D948D55-3CD2-496D-A04C-3B4E7BB69140} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
276303
{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
277304
{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
@@ -284,6 +311,12 @@ Global
284311
{B837B3ED-83CE-446F-A4E5-44CB06AA6505} = {F66BEE6C-0CB7-4F39-97E4-243F797E8723}
285312
{A47968E2-CDD1-4BCF-9093-D0C5225A815B} = {3D948D55-3CD2-496D-A04C-3B4E7BB69140}
286313
{9D5C46E8-0C07-4384-8E58-903F7C2C7171} = {A47968E2-CDD1-4BCF-9093-D0C5225A815B}
314+
{600D4BE2-FCE0-4684-AC6F-2DC829B395BA} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
315+
{E9DACEDD-1166-4142-9726-33CCA56218BA} = {600D4BE2-FCE0-4684-AC6F-2DC829B395BA}
316+
{A8F031E0-2BD5-4BAE-830A-60CBA76A047D} = {600D4BE2-FCE0-4684-AC6F-2DC829B395BA}
317+
{6EEA0E79-693F-4D4F-B55B-DB0C64EBDA45} = {600D4BE2-FCE0-4684-AC6F-2DC829B395BA}
318+
{7AA3516E-60F5-4969-878F-4E3DCF3E63A3} = {A8F031E0-2BD5-4BAE-830A-60CBA76A047D}
319+
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
287320
EndGlobalSection
288321
GlobalSection(ExtensibilityGlobals) = postSolution
289322
SolutionGuid = {C5B9895C-9DF8-4557-8D44-7D0C4C31F86E}

‎Prepare template project for packing.ps1

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ $version = $dirBuildTargets.SelectSingleNode("//PropertyGroup[@Label='NuGet']/Ve
1010
[xml]$fsharpPackages = @"
1111
<ItemGroup Label="PackageReferences">
1212
<PackageReference Include="FSharp.Data.GraphQL.Server.Middleware" Version="$($version)" />
13+
<PackageReference Include="FSharp.Data.GraphQL.Server.Relay" Version="$($version)" />
1314
<PackageReference Include="FSharp.Data.GraphQL.Server" Version="$($version)" />
1415
<PackageReference Include="FSharp.Data.GraphQL.Shared" Version="$($version)" />
1516
</ItemGroup>

‎build.fsx

+16-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
open System.IO
12
open System.Net.Http
2-
3+
open System.Text.Json
34

45
#r "nuget: Fake.Api.GitHub"
56
#r "nuget: Fake.Core.ReleaseNotes"
@@ -14,7 +15,6 @@ open System.Net.Http
1415
#r "nuget: System.Reactive"
1516
#r "nuget: Octokit"
1617

17-
open System.IO
1818
open Fake
1919
open Fake.DotNet
2020
open Fake.IO
@@ -154,11 +154,20 @@ Target.createFinal "StopIntegrationServer" <| fun _ ->
154154

155155
Target.create "UpdateIntrospectionFile" <| fun _ ->
156156
let client = new HttpClient ()
157-
let result = client.GetAsync("http://localhost:8086").Result
158-
let file = new FileStream("tests/FSharp.Data.GraphQL.IntegrationTests/introspection.json", FileMode.Create, FileAccess.Write, FileShare.None)
159-
result.Content.CopyTo(file, null, System.Threading.CancellationToken.None)
160-
file.Close()
161-
result.Dispose()
157+
(task{
158+
let! result = client.GetAsync("http://localhost:8086")
159+
let! contentStream = result.Content.ReadAsStreamAsync()
160+
let! jsonDocument = JsonDocument.ParseAsync contentStream
161+
let file = new FileStream("tests/FSharp.Data.GraphQL.IntegrationTests/introspection.json", FileMode.Create, FileAccess.Write, FileShare.None)
162+
let encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
163+
let jsonWriterOptions = JsonWriterOptions(Indented = true, Encoder = encoder)
164+
let writer = new Utf8JsonWriter(file, jsonWriterOptions)
165+
jsonDocument.WriteTo writer
166+
do! writer.FlushAsync()
167+
do! writer.DisposeAsync()
168+
do! file.DisposeAsync()
169+
result.Dispose()
170+
}).Wait()
162171
client.Dispose()
163172

164173
Target.create "RunUnitTests" <| fun _ ->

0 commit comments

Comments
 (0)