Skip to content

Commit

Permalink
Installed fsdocs-tool instead of legacy `fsharp.formatting.commandt…
Browse files Browse the repository at this point in the history
…ool`
  • Loading branch information
okhorsunenko-lula authored and xperiandri committed Feb 24, 2023
1 parent fb6f128 commit 844ee7e
Show file tree
Hide file tree
Showing 42 changed files with 5,051 additions and 8,292 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
]
},
"fantomas": {
"version": "5.1.4",
"version": "5.2.0",
"commands": [
"fantomas"
]
Expand Down
18 changes: 13 additions & 5 deletions .github/workflows/publish_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ on:

jobs:
publish:

runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Set Build Version
run: |
$File = (
Expand All @@ -24,10 +24,10 @@ jobs:
$File.OwnerDocument.Save((Join-Path $PWD.ProviderPath Directory.Build.targets))
echo "VERSION=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
shell: pwsh

- name: Install .NET Core
uses: actions/setup-dotnet@v3

- name: Add the GitHub source
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"

Expand Down Expand Up @@ -61,6 +61,14 @@ jobs:
run: |
dotnet nuget push nuget/*Server*.nupkg -s "github" -k ${{secrets.GITHUB_TOKEN}}
- name: Pack FSharp.Data.GraphQL.Server.Relay project
run: |
cd src/FSharp.Data.GraphQL.Server.Relay
dotnet pack --no-build --nologo --configuration Release /p:IsNuget=true -o ../../nuget
- name: Publish FSharp.Data.GraphQL.Server.Relay project to GitHub
run: |
dotnet nuget push nuget/*Server.Relay*.nupkg -s "github" -k ${{secrets.GITHUB_TOKEN}}
- name: Pack FSharp.Data.GraphQL.Server.Middleware project
run: |
cd src/FSharp.Data.GraphQL.Server.Middleware
Expand All @@ -82,4 +90,4 @@ jobs:
run: |
$path = "nuget/FSharp.Data.GraphQL.ProjectTemplates.$Env:VERSION.nupkg"
dotnet nuget push $path -s "github" -k ${{secrets.GITHUB_TOKEN}}
shell: pwsh
shell: pwsh
12 changes: 10 additions & 2 deletions .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
# This is necessary so that we have the tags.
fetch-depth: 0

- name: Set Build Version
run: |
$version = "$env:GITHUB_REF_NAME"
Expand Down Expand Up @@ -60,6 +60,14 @@ jobs:
run: |
dotnet nuget push nuget/*Server*.nupkg -k ${{secrets.NUGET_SECRET}}
- name: Pack FSharp.Data.GraphQL.Server.Relay project
run: |
cd src/FSharp.Data.GraphQL.Server.Relay
dotnet pack --no-build --nologo --configuration Release /p:IsNuget=true -o ../../nuget
- name: Publish FSharp.Data.GraphQL.Server.Relay project to NuGet
run: |
dotnet nuget push nuget/*Server.Relay*.nupkg -k ${{secrets.NUGET_SECRET}}
- name: Pack FSharp.Data.GraphQL.Server.Middleware project
run: |
cd src/FSharp.Data.GraphQL.Server.Middleware
Expand All @@ -81,4 +89,4 @@ jobs:
run: |
$path = "nuget/FSharp.Data.GraphQL.ProjectTemplates.$Env:VERSION.nupkg"
dotnet nuget push $path -k ${{secrets.NUGET_SECRET}}
shell: pwsh
shell: pwsh
155 changes: 94 additions & 61 deletions FSharp.Data.GraphQL.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,59 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.3.32811.315
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E3330910-8B6C-4191-8046-D6D57FBC39B1}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
Directory.Build.targets = Directory.Build.targets
global.json = global.json
LICENSE.txt = LICENSE.txt
Packages.props = Packages.props
Prepare template project for packing.ps1 = Prepare template project for packing.ps1
README.md = README.md
RELEASE_NOTES.md = RELEASE_NOTES.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub", "GitHub", "{313AC7F5-4282-4779-8FEF-1536B4145860}"
ProjectSection(SolutionItems) = preProject
.github\workflows\publish_ci.yml = .github\workflows\publish_ci.yml
.github\workflows\publish_release.yml = .github\workflows\publish_release.yml
.github\workflows\pull_request.yml = .github\workflows\pull_request.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{56640EAF-82A6-4439-AD14-69F44A90DA99}"
ProjectSection(SolutionItems) = preProject
docs\files\introspection_query.graphql = docs\files\introspection_query.graphql
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{78D10788-601D-4D53-808B-36661911EDD1}"
ProjectSection(SolutionItems) = preProject
docs\files\img\logo-template.pdn = docs\files\img\logo-template.pdn
docs\files\img\logo.png = docs\files\img\logo.png
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "star-wars-api", "star-wars-api", "{F66BEE6C-0CB7-4F39-97E4-243F797E8723}"
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BEFD8748-2467-45F9-A4AD-B450B12D5F78}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
ProjectSection(ProjectDependencies) = postProject
{B075CD55-CEA4-4C30-A088-48319AADF070} = {B075CD55-CEA4-4C30-A088-48319AADF070}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
ProjectSection(SolutionItems) = preProject
build.fsx = build.fsx
Expand All @@ -32,6 +81,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD
EndProject
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}"
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{B0C25450-74BF-40C2-9E02-09AADBAE2C2F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "graphiql-client", "graphiql-client", "{CAE5916B-1415-4982-B705-7318D77C029C}"
Expand All @@ -44,21 +95,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "graphiql-client", "graphiql
samples\graphiql-client\webpack.config.js = samples\graphiql-client\webpack.config.js
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "relay-starter-kit", "relay-starter-kit", "{9B25360F-2CE4-43D2-AFF0-5EAA693E98F7}"
ProjectSection(SolutionItems) = preProject
samples\relay-starter-kit\.babelrc = samples\relay-starter-kit\.babelrc
samples\relay-starter-kit\index.html = samples\relay-starter-kit\index.html
samples\relay-starter-kit\index.jsx = samples\relay-starter-kit\index.jsx
samples\relay-starter-kit\package.json = samples\relay-starter-kit\package.json
samples\relay-starter-kit\server.fsx = samples\relay-starter-kit\server.fsx
samples\relay-starter-kit\webpack.config.js = samples\relay-starter-kit\webpack.config.js
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "data", "{E7139F5F-22CA-4392-8C1C-481A39EEB554}"
ProjectSection(SolutionItems) = preProject
samples\relay-starter-kit\data\schema.json = samples\relay-starter-kit\data\schema.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DFA5AAFF-31B8-4203-822C-8ACC4D7A7D74}"
ProjectSection(SolutionItems) = preProject
samples\relay-starter-kit\build\babelRelayPlugin.js = samples\relay-starter-kit\build\babelRelayPlugin.js
Expand All @@ -83,36 +119,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client-provider", "client-p
samples\client-provider\using_query_file.fsx = samples\client-provider\using_query_file.fsx
EndProjectSection
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BEFD8748-2467-45F9-A4AD-B450B12D5F78}"
EndProject
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}"
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{56640EAF-82A6-4439-AD14-69F44A90DA99}"
ProjectSection(SolutionItems) = preProject
docs\files\introspection_query.graphql = docs\files\introspection_query.graphql
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{78D10788-601D-4D53-808B-36661911EDD1}"
ProjectSection(SolutionItems) = preProject
docs\files\img\logo-template.pdn = docs\files\img\logo-template.pdn
docs\files\img\logo.png = docs\files\img\logo.png
EndProjectSection
EndProject
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}"
EndProject
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}"
ProjectSection(ProjectDependencies) = postProject
{B075CD55-CEA4-4C30-A088-48319AADF070} = {B075CD55-CEA4-4C30-A088-48319AADF070}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "star-wars-api", "star-wars-api", "{F66BEE6C-0CB7-4F39-97E4-243F797E8723}"
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "file-upload", "file-upload", "{A47968E2-CDD1-4BCF-9093-D0C5225A815B}"
ProjectSection(SolutionItems) = preProject
samples\client-provider\file-upload\multiple_files_upload.fsx = samples\client-provider\file-upload\multiple_files_upload.fsx
Expand All @@ -134,23 +140,35 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{9D5C46
samples\client-provider\file-upload\server\types.mjs = samples\client-provider\file-upload\server\types.mjs
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E3330910-8B6C-4191-8046-D6D57FBC39B1}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "relay-modern-starter-kit", "relay-modern-starter-kit", "{600D4BE2-FCE0-4684-AC6F-2DC829B395BA}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
Directory.Build.targets = Directory.Build.targets
global.json = global.json
LICENSE.txt = LICENSE.txt
Packages.props = Packages.props
Prepare template project for packing.ps1 = Prepare template project for packing.ps1
README.md = README.md
RELEASE_NOTES.md = RELEASE_NOTES.md
samples\relay-modern-starter-kit\.babelrc = samples\relay-modern-starter-kit\.babelrc
samples\relay-modern-starter-kit\index.html = samples\relay-modern-starter-kit\index.html
samples\relay-modern-starter-kit\package.json = samples\relay-modern-starter-kit\package.json
samples\relay-modern-starter-kit\server.fsx = samples\relay-modern-starter-kit\server.fsx
samples\relay-modern-starter-kit\webpack.config.js = samples\relay-modern-starter-kit\webpack.config.js
samples\relay-modern-starter-kit\yarn.lock = samples\relay-modern-starter-kit\yarn.lock
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub", "GitHub", "{313AC7F5-4282-4779-8FEF-1536B4145860}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "data", "{E9DACEDD-1166-4142-9726-33CCA56218BA}"
ProjectSection(SolutionItems) = preProject
.github\workflows\publish_ci.yml = .github\workflows\publish_ci.yml
.github\workflows\publish_release.yml = .github\workflows\publish_release.yml
.github\workflows\pull_request.yml = .github\workflows\pull_request.yml
samples\relay-modern-starter-kit\data\schema.json = samples\relay-modern-starter-kit\data\schema.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A8F031E0-2BD5-4BAE-830A-60CBA76A047D}"
ProjectSection(SolutionItems) = preProject
samples\relay-modern-starter-kit\src\app.jsx = samples\relay-modern-starter-kit\src\app.jsx
samples\relay-modern-starter-kit\src\relayEnvironment.js = samples\relay-modern-starter-kit\src\relayEnvironment.js
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{6EEA0E79-693F-4D4F-B55B-DB0C64EBDA45}"
ProjectSection(SolutionItems) = preProject
jsonToGraphql.js = jsonToGraphql.js
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components", "components", "{7AA3516E-60F5-4969-878F-4E3DCF3E63A3}"
ProjectSection(SolutionItems) = preProject
user.jsx = user.jsx
EndProjectSection
EndProject
Global
Expand Down Expand Up @@ -259,6 +277,18 @@ Global
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x64.Build.0 = Release|Any CPU
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x86.ActiveCfg = Release|Any CPU
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x86.Build.0 = Release|Any CPU
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x64.ActiveCfg = Debug|Any CPU
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x64.Build.0 = Debug|Any CPU
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x86.ActiveCfg = Debug|Any CPU
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x86.Build.0 = Debug|Any CPU
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|Any CPU.Build.0 = Release|Any CPU
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x64.ActiveCfg = Release|Any CPU
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x64.Build.0 = Release|Any CPU
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x86.ActiveCfg = Release|Any CPU
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -269,9 +299,6 @@ Global
{8E6D5255-776D-4B61-85F9-73C37AA1FB9A} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
{54AAFE43-FA5F-485A-AD40-0240165FC633} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
{CAE5916B-1415-4982-B705-7318D77C029C} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
{9B25360F-2CE4-43D2-AFF0-5EAA693E98F7} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
{E7139F5F-22CA-4392-8C1C-481A39EEB554} = {9B25360F-2CE4-43D2-AFF0-5EAA693E98F7}
{DFA5AAFF-31B8-4203-822C-8ACC4D7A7D74} = {9B25360F-2CE4-43D2-AFF0-5EAA693E98F7}
{3D948D55-3CD2-496D-A04C-3B4E7BB69140} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
Expand All @@ -284,6 +311,12 @@ Global
{B837B3ED-83CE-446F-A4E5-44CB06AA6505} = {F66BEE6C-0CB7-4F39-97E4-243F797E8723}
{A47968E2-CDD1-4BCF-9093-D0C5225A815B} = {3D948D55-3CD2-496D-A04C-3B4E7BB69140}
{9D5C46E8-0C07-4384-8E58-903F7C2C7171} = {A47968E2-CDD1-4BCF-9093-D0C5225A815B}
{600D4BE2-FCE0-4684-AC6F-2DC829B395BA} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
{E9DACEDD-1166-4142-9726-33CCA56218BA} = {600D4BE2-FCE0-4684-AC6F-2DC829B395BA}
{A8F031E0-2BD5-4BAE-830A-60CBA76A047D} = {600D4BE2-FCE0-4684-AC6F-2DC829B395BA}
{6EEA0E79-693F-4D4F-B55B-DB0C64EBDA45} = {600D4BE2-FCE0-4684-AC6F-2DC829B395BA}
{7AA3516E-60F5-4969-878F-4E3DCF3E63A3} = {A8F031E0-2BD5-4BAE-830A-60CBA76A047D}
{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C5B9895C-9DF8-4557-8D44-7D0C4C31F86E}
Expand Down
1 change: 1 addition & 0 deletions Prepare template project for packing.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ $version = $dirBuildTargets.SelectSingleNode("//PropertyGroup[@Label='NuGet']/Ve
[xml]$fsharpPackages = @"
<ItemGroup Label="PackageReferences">
<PackageReference Include="FSharp.Data.GraphQL.Server.Middleware" Version="$($version)" />
<PackageReference Include="FSharp.Data.GraphQL.Server.Relay" Version="$($version)" />
<PackageReference Include="FSharp.Data.GraphQL.Server" Version="$($version)" />
<PackageReference Include="FSharp.Data.GraphQL.Shared" Version="$($version)" />
</ItemGroup>
Expand Down
23 changes: 16 additions & 7 deletions build.fsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
open System.IO
open System.Net.Http

open System.Text.Json

#r "nuget: Fake.Api.GitHub"
#r "nuget: Fake.Core.ReleaseNotes"
Expand All @@ -14,7 +15,6 @@ open System.Net.Http
#r "nuget: System.Reactive"
#r "nuget: Octokit"

open System.IO
open Fake
open Fake.DotNet
open Fake.IO
Expand Down Expand Up @@ -154,11 +154,20 @@ Target.createFinal "StopIntegrationServer" <| fun _ ->

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

Target.create "RunUnitTests" <| fun _ ->
Expand Down
Loading

0 comments on commit 844ee7e

Please sign in to comment.