From 3459f3f29caff1190670243e78c2987fdef244d2 Mon Sep 17 00:00:00 2001 From: Shane32 Date: Wed, 16 Sep 2020 15:17:48 -0400 Subject: [PATCH 01/28] Add GitHub workflows --- .github/workflows/build.yml | 39 ++++++++++++++ .github/workflows/publish.yml | 46 +++++++++++++++++ .github/workflows/test.yml | 51 +++++++++++++++++++ Directory.Build.props | 2 + .../Samples.Schemas.Chat.csproj | 1 + samples/Samples.Server/Samples.Server.csproj | 1 + src/Benchmarks/Benchmarks.csproj | 1 + src/Core/Core.csproj | 2 - ...Transports.Subscriptions.WebSockets.csproj | 2 - ...ts.Subscriptions.Abstractions.Tests.csproj | 2 +- .../TestStartup.cs | 8 ++- ...orts.Subscriptions.WebSockets.Tests.csproj | 2 +- 12 files changed, 150 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/publish.yml create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..c3c91d11 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,39 @@ +name: Build artifacts + +# ==== NOTE: do not rename this yml file or the run_number will be reset ==== + +on: + push: + branches: + - master + - develop + paths: + - src/** + - ./* + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Use .NET Core 3.1 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' + source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json + env: + NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + - name: Install dependencies + run: dotnet restore + - name: Build solution (release config) + run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 -p:VersionSuffix=$(( 1000 + $GITHUB_RUN_NUMBER )) + - name: Pack solution (release config) + run: dotnet pack --no-restore --no-build -c Release -p:VersionSuffix=$(( 1000 + $GITHUB_RUN_NUMBER )) -o out + - name: Publish artifacts + uses: actions/upload-artifact@v2 + with: + name: Nuget packages + path: | + out/*.nupkg + - name: Publish Nuget packages to GitHub registry + run: dotnet nuget push out/*.nupkg diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 00000000..4d092300 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,46 @@ +name: Publish release + +on: + release: + types: + - published + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Check github.ref starts with 'refs/tags/' + if: ${{ !startsWith(github.ref, 'refs/tags/') }} + run: | + echo Error! github.ref does not start with 'refs/tags' + echo github.ref: ${{ github.ref }} + exit 1 + - name: Set version number environment variable + env: + github_ref: ${{ github.ref }} + run: | + ref="${github_ref:10}" + echo $ref + echo "::set-env name=ref::$ref" + - name: Use .NET Core 3.1 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' + source-url: https://api.nuget.org/v3/index.json + env: + NUGET_AUTH_TOKEN: ${{secrets.NUGET_AUTH_TOKEN}} + - name: Install dependencies + run: dotnet restore + - name: Build solution (release config) + run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 -p:Version=$ref + - name: Pack solution (release config) + run: dotnet pack --no-restore --no-build -c Release -p:Version=$ref -o out + - name: Publish artifacts + uses: actions/upload-artifact@v2 + with: + name: Nuget packages + path: | + out/*.nupkg + - name: Publish Nuget packages to Nuget registry + run: dotnet nuget push out/*.nupkg diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 00000000..bf7cb747 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,51 @@ +name: Run code tests + +on: + pull_request: + branches: + - master + - develop + paths: + - src/** + - ./* + +jobs: + test: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: + - ubuntu-latest + - windows-latest + steps: + - name: Checkout source + uses: actions/checkout@v2 + - name: Use .NET Core 2.2 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '2.2.x' + - name: Use .NET Core 3.1 LTS SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' + - name: Allow both runtimes + # https://github.com/actions/setup-dotnet/issues/25#issuecomment-646925506 + shell: pwsh + run: | + $version = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Leaf; + $root = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Parent; + $directories = Get-ChildItem $root | Where-Object { $_.Name -ne $version }; + foreach ($dir in $directories) { + $from = $dir.FullName; + $to = "$root/$version"; + Write-Host Copying from $from to $to; + Copy-Item "$from\*" $to -Recurse -Force; + } + - name: Install dependencies + run: dotnet restore + - name: Build solution (release config) + run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 + - name: Build solution (debug config) + run: dotnet build --no-restore -p:NoWarn=CS1591 + - name: Test solution (debug config) + run: dotnet test --no-restore --no-build diff --git a/Directory.Build.props b/Directory.Build.props index d8a6994b..97efa914 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -10,6 +10,8 @@ graphql-dotnet server graphql-dotnet bin\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName).xml + 4.0.0 + dev diff --git a/samples/Samples.Schemas.Chat/Samples.Schemas.Chat.csproj b/samples/Samples.Schemas.Chat/Samples.Schemas.Chat.csproj index 568c769f..68694128 100644 --- a/samples/Samples.Schemas.Chat/Samples.Schemas.Chat.csproj +++ b/samples/Samples.Schemas.Chat/Samples.Schemas.Chat.csproj @@ -4,6 +4,7 @@ netstandard2.0 GraphQL.Samples.Schemas.Chat GraphQL.Samples.Schemas.Chat + false diff --git a/samples/Samples.Server/Samples.Server.csproj b/samples/Samples.Server/Samples.Server.csproj index e0f344f6..2b3a1d72 100644 --- a/samples/Samples.Server/Samples.Server.csproj +++ b/samples/Samples.Server/Samples.Server.csproj @@ -4,6 +4,7 @@ netcoreapp3.1;netcoreapp3.0;netcoreapp2.2 GraphQL.Samples.Server GraphQL.Samples.Server + false diff --git a/src/Benchmarks/Benchmarks.csproj b/src/Benchmarks/Benchmarks.csproj index d9a8820c..5a01af10 100644 --- a/src/Benchmarks/Benchmarks.csproj +++ b/src/Benchmarks/Benchmarks.csproj @@ -4,6 +4,7 @@ Exe netcoreapp3.1 GraphQL.Server.Benchmarks + false diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index 48c706f7..b2fe1542 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -4,8 +4,6 @@ netstandard2.0 GraphQL.Server.Core GraphQL.Server - 0.0.0 - dev GraphQL Server Core GraphQL transport server diff --git a/src/Transports.Subscriptions.WebSockets/Transports.Subscriptions.WebSockets.csproj b/src/Transports.Subscriptions.WebSockets/Transports.Subscriptions.WebSockets.csproj index 0433cbe1..9f5309d4 100644 --- a/src/Transports.Subscriptions.WebSockets/Transports.Subscriptions.WebSockets.csproj +++ b/src/Transports.Subscriptions.WebSockets/Transports.Subscriptions.WebSockets.csproj @@ -4,8 +4,6 @@ netcoreapp3.1;netcoreapp3.0;netstandard2.0 GraphQL.Server.Transports.WebSockets GraphQL.Server.Transports.WebSockets - 0.0.0 - dev WebSockets transport for subscriptions GraphQL WebSockets subscriptions transport diff --git a/tests/Transports.Subscriptions.Abstractions.Tests/Transports.Subscriptions.Abstractions.Tests.csproj b/tests/Transports.Subscriptions.Abstractions.Tests/Transports.Subscriptions.Abstractions.Tests.csproj index 493ebb60..4bbb7813 100644 --- a/tests/Transports.Subscriptions.Abstractions.Tests/Transports.Subscriptions.Abstractions.Tests.csproj +++ b/tests/Transports.Subscriptions.Abstractions.Tests/Transports.Subscriptions.Abstractions.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1;netcoreapp3.0;netcoreapp2.2;net471 + netcoreapp3.1;netcoreapp3.0;netcoreapp2.2 false GraphQL.Server.Transports.Subscriptions.Abstractions.Tests GraphQL.Server.Transports.Subscriptions.Abstractions.Tests diff --git a/tests/Transports.Subscriptions.WebSockets.Tests/TestStartup.cs b/tests/Transports.Subscriptions.WebSockets.Tests/TestStartup.cs index be2abcf6..34a7e47c 100644 --- a/tests/Transports.Subscriptions.WebSockets.Tests/TestStartup.cs +++ b/tests/Transports.Subscriptions.WebSockets.Tests/TestStartup.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; namespace GraphQL.Server.Transports.WebSockets.Tests { @@ -10,6 +11,11 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(); services.AddGraphQL() .AddWebSockets(); + services.AddLogging(builder => + { + builder.ClearProviders(); + builder.AddDebug(); + }); } public void Configure(IApplicationBuilder app) @@ -18,4 +24,4 @@ public void Configure(IApplicationBuilder app) app.UseGraphQLWebSockets("/graphql"); } } -} \ No newline at end of file +} diff --git a/tests/Transports.Subscriptions.WebSockets.Tests/Transports.Subscriptions.WebSockets.Tests.csproj b/tests/Transports.Subscriptions.WebSockets.Tests/Transports.Subscriptions.WebSockets.Tests.csproj index 733dce51..f0fc2ff8 100644 --- a/tests/Transports.Subscriptions.WebSockets.Tests/Transports.Subscriptions.WebSockets.Tests.csproj +++ b/tests/Transports.Subscriptions.WebSockets.Tests/Transports.Subscriptions.WebSockets.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1;netcoreapp3.0;netcoreapp2.2;net471 + netcoreapp3.1;netcoreapp3.0;netcoreapp2.2 false GraphQL.Server.Transports.WebSockets.Tests GraphQL.Server.Transports.WebSockets.Tests From 6c49f2b472c7558db038229e5606009725e79598 Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Wed, 16 Sep 2020 15:24:47 -0400 Subject: [PATCH 02/28] Run tests for any PR, not just changes to src --- .github/workflows/test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bf7cb747..44bd55b6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,9 +5,6 @@ on: branches: - master - develop - paths: - - src/** - - ./* jobs: test: From e78e6eb05e553b3f4685f1c48309836a5d95450b Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Wed, 16 Sep 2020 15:34:12 -0400 Subject: [PATCH 03/28] Always build artifacts; why not? --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c3c91d11..9dac1b9d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,9 +7,6 @@ on: branches: - master - develop - paths: - - src/** - - ./* jobs: build: From 3a2089d225001ba0f97000a58c80c39006687c80 Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Wed, 16 Sep 2020 15:38:54 -0400 Subject: [PATCH 04/28] Update TestStartup.cs --- tests/Transports.Subscriptions.WebSockets.Tests/TestStartup.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Transports.Subscriptions.WebSockets.Tests/TestStartup.cs b/tests/Transports.Subscriptions.WebSockets.Tests/TestStartup.cs index 34a7e47c..78471d2e 100644 --- a/tests/Transports.Subscriptions.WebSockets.Tests/TestStartup.cs +++ b/tests/Transports.Subscriptions.WebSockets.Tests/TestStartup.cs @@ -13,6 +13,7 @@ public void ConfigureServices(IServiceCollection services) .AddWebSockets(); services.AddLogging(builder => { + // prevent writing errors to Console.Error during tests (required for testing on ubuntu) builder.ClearProviders(); builder.AddDebug(); }); From 621afbd1420b005b14c26ba20a5c370b119208b6 Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Wed, 16 Sep 2020 22:44:18 -0400 Subject: [PATCH 05/28] Add SourceLink support --- Directory.Build.props | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index 97efa914..9f659ce0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,6 +5,7 @@ https://github.com/graphql-dotnet/server https://github.com/graphql-dotnet/server Git + true Pekka Heikura Pekka Heikura graphql-dotnet server @@ -12,8 +13,20 @@ bin\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName).xml 4.0.0 dev + true + + True + + + + true + snupkg + + + + $(TargetFramework.StartsWith('netcoreapp3.')) From 4c9ac4b090ebbe6f14fab26c5b995afd7b6141ae Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Wed, 16 Sep 2020 23:47:15 -0400 Subject: [PATCH 06/28] Update Directory.Build.props --- Directory.Build.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 9f659ce0..26ff988b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,14 +16,14 @@ true True - - true snupkg - + + + From 9fc40a2a4d9fd1400fa751f1a6916c926f4acc6f Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Wed, 16 Sep 2020 23:51:32 -0400 Subject: [PATCH 07/28] Test build --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9dac1b9d..901507ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,9 +4,9 @@ name: Build artifacts on: push: - branches: - - master - - develop +# branches: +# - master +# - develop jobs: build: @@ -31,6 +31,6 @@ jobs: with: name: Nuget packages path: | - out/*.nupkg - - name: Publish Nuget packages to GitHub registry - run: dotnet nuget push out/*.nupkg + out/* +# - name: Publish Nuget packages to GitHub registry +# run: dotnet nuget push out/*.nupkg From 1cb0935018e192be103768a3c52ca72628e2c273 Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Thu, 17 Sep 2020 00:01:57 -0400 Subject: [PATCH 08/28] Update build.yml --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 901507ea..19024cfc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,9 +4,9 @@ name: Build artifacts on: push: -# branches: -# - master -# - develop + branches: + - master + - develop jobs: build: @@ -32,5 +32,5 @@ jobs: name: Nuget packages path: | out/* -# - name: Publish Nuget packages to GitHub registry -# run: dotnet nuget push out/*.nupkg + - name: Publish Nuget packages to GitHub registry + run: dotnet nuget push out/* From 27efd7841509615b523e170819e7c36f8510057a Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Thu, 17 Sep 2020 00:02:19 -0400 Subject: [PATCH 09/28] Update publish.yml --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4d092300..23a3bb11 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -41,6 +41,6 @@ jobs: with: name: Nuget packages path: | - out/*.nupkg + out/* - name: Publish Nuget packages to Nuget registry - run: dotnet nuget push out/*.nupkg + run: dotnet nuget push out/* From bcf05588e0e1db221a183bf3884456c68d81993f Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Thu, 17 Sep 2020 00:12:24 -0400 Subject: [PATCH 10/28] Fix naming of xml files --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 26ff988b..2e335a50 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -10,7 +10,7 @@ Pekka Heikura graphql-dotnet server graphql-dotnet - bin\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName).xml + true 4.0.0 dev true From 2c7f88e5f6ff263dcb7a235ed0527b8e9017bf0d Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Thu, 17 Sep 2020 10:55:35 -0400 Subject: [PATCH 11/28] Update Directory.Build.props --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 2e335a50..7a576830 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,7 +11,7 @@ graphql-dotnet server graphql-dotnet true - 4.0.0 + 4.0.0-preview dev true From bc15956a70ddae0f78350c5a6937fb5ff39bb39f Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Thu, 17 Sep 2020 11:31:46 -0400 Subject: [PATCH 12/28] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19024cfc..bbf6406f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,9 +23,9 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build solution (release config) - run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 -p:VersionSuffix=$(( 1000 + $GITHUB_RUN_NUMBER )) + run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 -p:VersionSuffix=$GITHUB_RUN_NUMBER - name: Pack solution (release config) - run: dotnet pack --no-restore --no-build -c Release -p:VersionSuffix=$(( 1000 + $GITHUB_RUN_NUMBER )) -o out + run: dotnet pack --no-restore --no-build -c Release -p:VersionSuffix=$GITHUB_RUN_NUMBER -o out - name: Publish artifacts uses: actions/upload-artifact@v2 with: From 309f4fe1177d5b79da88a3586f10c2a024b0c57f Mon Sep 17 00:00:00 2001 From: Shane32 Date: Mon, 26 Oct 2020 00:42:09 -0400 Subject: [PATCH 13/28] Update workflow files --- .github/dependabot.yml | 8 ++++++++ .github/labeler.yml | 19 +++++++++++++++++++ .github/workflows/build.yml | 5 ++++- .github/workflows/label.yml | 17 +++++++++++++++++ .github/workflows/publish.yml | 5 ++++- .github/workflows/test.yml | 16 +++------------- .github/workflows/wipcheck.yml | 20 ++++++++++++++++++++ Directory.Build.props | 2 +- 8 files changed, 76 insertions(+), 16 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/labeler.yml create mode 100644 .github/workflows/label.yml create mode 100644 .github/workflows/wipcheck.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..5ed6c1f6 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,8 @@ +version: 2 +updates: +- package-ecosystem: nuget + directory: "/" + schedule: + interval: daily + time: '02:00' + open-pull-requests-limit: 10 diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 00000000..951be994 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,19 @@ +"test": + - src/GraphQL.ApiTests/**/* + - src/GraphQL.DataLoader.Tests/**/* + - src/GraphQL.Dummy/**/* + - src/GraphQL.Harness.Tests/**/* + - src/GraphQL.Tests/**/* + +"CI": + - .github/workflows/**/* + +"code style": + - .editorconfig + +"documentation": + - README.md + - docs2/**/* + +"performance": + - src/GraphQL.Benchmarks/**/* diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bbf6406f..84f5aa79 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,9 @@ jobs: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} - name: Install dependencies run: dotnet restore + env: + DOTNET_NOLOGO: true + DOTNET_CLI_TELEMETRY_OPTOUT: true - name: Build solution (release config) run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 -p:VersionSuffix=$GITHUB_RUN_NUMBER - name: Pack solution (release config) @@ -33,4 +36,4 @@ jobs: path: | out/* - name: Publish Nuget packages to GitHub registry - run: dotnet nuget push out/* + run: dotnet nuget push "out/*" -k ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml new file mode 100644 index 00000000..9b2d0c9e --- /dev/null +++ b/.github/workflows/label.yml @@ -0,0 +1,17 @@ +# This workflow will triage pull requests and apply a label based on the +# paths that are modified in the pull request. +# +# To use this workflow, you will need to set up a .github/labeler.yml +# file with configuration. For more information, see: +# https://github.com/actions/labeler/blob/master/README.md + +name: Labeler +on: [pull_request] + +jobs: + label: + runs-on: ubuntu-latest + steps: + - uses: actions/labeler@v2 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 23a3bb11..8d65f257 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -32,6 +32,9 @@ jobs: NUGET_AUTH_TOKEN: ${{secrets.NUGET_AUTH_TOKEN}} - name: Install dependencies run: dotnet restore + env: + DOTNET_NOLOGO: true + DOTNET_CLI_TELEMETRY_OPTOUT: true - name: Build solution (release config) run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 -p:Version=$ref - name: Pack solution (release config) @@ -43,4 +46,4 @@ jobs: path: | out/* - name: Publish Nuget packages to Nuget registry - run: dotnet nuget push out/* + run: dotnet nuget push "out/*" -k ${{secrets.NUGET_AUTH_TOKEN}} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 44bd55b6..466b9515 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,21 +25,11 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '3.1.x' - - name: Allow both runtimes - # https://github.com/actions/setup-dotnet/issues/25#issuecomment-646925506 - shell: pwsh - run: | - $version = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Leaf; - $root = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Parent; - $directories = Get-ChildItem $root | Where-Object { $_.Name -ne $version }; - foreach ($dir in $directories) { - $from = $dir.FullName; - $to = "$root/$version"; - Write-Host Copying from $from to $to; - Copy-Item "$from\*" $to -Recurse -Force; - } - name: Install dependencies run: dotnet restore + env: + DOTNET_NOLOGO: true + DOTNET_CLI_TELEMETRY_OPTOUT: true - name: Build solution (release config) run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 - name: Build solution (debug config) diff --git a/.github/workflows/wipcheck.yml b/.github/workflows/wipcheck.yml new file mode 100644 index 00000000..b242f69a --- /dev/null +++ b/.github/workflows/wipcheck.yml @@ -0,0 +1,20 @@ +name: Check if PR title contains [WIP] + +on: + pull_request: + types: + - opened # when PR is opened + - edited # when PR is edited + - synchronize # when code is added + - reopened # when a closed PR is reopened + +jobs: + check-title: + runs-on: ubuntu-latest + + steps: + - name: Fail build if pull request title contains [WIP] + if: ${{ contains(github.event.pull_request.title, '[WIP]') }} # This function is not case sensitive. + run: | + echo Warning! PR title "${{ github.event.pull_request.title }}" contains [WIP]. Remove [WIP] from the title when PR is ready. + exit 1 diff --git a/Directory.Build.props b/Directory.Build.props index 7a576830..e785d5dd 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,7 +11,7 @@ graphql-dotnet server graphql-dotnet true - 4.0.0-preview + 4.0.3-preview dev true From 14a5648d130fa86b3665ec90e3ea8f01cc181591 Mon Sep 17 00:00:00 2001 From: Shane32 Date: Mon, 26 Oct 2020 00:45:47 -0400 Subject: [PATCH 14/28] Remove extra files --- .github/workflows/test.yml | 3 + GitVersion.yml | 0 appveyor.yml | 44 ------- build.cake | 124 ------------------ build.ps1 | 256 ------------------------------------- build.sh | 117 ----------------- tools/packages.config | 4 - 7 files changed, 3 insertions(+), 545 deletions(-) delete mode 100644 GitVersion.yml delete mode 100644 appveyor.yml delete mode 100644 build.cake delete mode 100644 build.ps1 delete mode 100755 build.sh delete mode 100644 tools/packages.config diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 466b9515..9c4cd0db 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,6 +25,9 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '3.1.x' + source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json + env: + NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} - name: Install dependencies run: dotnet restore env: diff --git a/GitVersion.yml b/GitVersion.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index b75aa821..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,44 +0,0 @@ -os: Visual Studio 2019 - -version: 0.0.0-{build} -pull_requests: - do_not_increment_build_number: true - -skip_tags: true - -build_script: - - ps: .\build.ps1 -Target "Default" - -artifacts: - - path: artifacts\*.nupkg - name: Packages - -test: off -skip_branch_with_pr: false - -install: - - ps: choco install dotnetcore-sdk --no-progress --confirm --version 3.1.402 - - dotnet --version - -on_failure: - - ps: Update-AppveyorBuild -Version "$($env:appveyor_build_version)-$(Get-Date -format HHmmss)-failed" - -deploy: - - provider: NuGet - server: https://www.myget.org/F/graphql-dotnet/api/v2/package - api_key: - secure: +l1vfBMajn1WfmXkQ2LdILKxK4fQ5AHSnnU1kf11Bn1xRGUOTCdPhLwHx232piEn - skip_symbols: true - on: - branch: - - develop - - master - -for: - -- - branches: - only: - - master - - skip_non_tags: true diff --git a/build.cake b/build.cake deleted file mode 100644 index c466d347..00000000 --- a/build.cake +++ /dev/null @@ -1,124 +0,0 @@ -#tool "nuget:?package=GitVersion.CommandLine&version=5.3.7" - -var target = Argument("target", "Default"); -var configuration = Argument("configuration", "Release"); -var artifactsDir = Directory(Argument("artifactsDir", "./artifacts")); -var publishDir = Directory(Argument("publishDir", "./publish")); -var runtime = Argument("runtime", "win-x64"); -var projectFiles = new [] { - "./src/Core/Core.csproj", - "./src/Transports.AspNetCore/Transports.AspNetCore.csproj", - "./src/Transports.AspNetCore.NewtonsoftJson/Transports.AspNetCore.NewtonsoftJson.csproj", - "./src/Transports.AspNetCore.SystemTextJson/Transports.AspNetCore.SystemTextJson.csproj", - "./src/Transports.Subscriptions.Abstractions/Transports.Subscriptions.Abstractions.csproj", - "./src/Transports.Subscriptions.WebSockets/Transports.Subscriptions.WebSockets.csproj", - "./src/Ui.Playground/Ui.Playground.csproj", - "./src/Ui.GraphiQL/Ui.GraphiQL.csproj", - "./src/Ui.Altair/Ui.Altair.csproj", - "./src/Ui.Voyager/Ui.Voyager.csproj", - "./src/Authorization.AspNetCore/Authorization.AspNetCore.csproj" - }; - -var version = "0.0.0-dev"; - -Task("Default") - .IsDependentOn("SetVersion") - .IsDependentOn("Pack"); - -Task("Publish") - .IsDependentOn("Build") - .Does(()=> - { - var settings = new DotNetCorePublishSettings - { - Configuration = configuration, - OutputDirectory = publishDir, - Runtime = runtime - }; - - foreach(var projectFile in projectFiles) - { - DotNetCorePublish(projectFile, settings); - } - }); - -Task("Pack") - .IsDependentOn("Build") - .IsDependentOn("Test") - .Does(()=> - { - var buildSettings = new DotNetCoreMSBuildSettings(); - buildSettings.SetVersion(version); - var settings = new DotNetCorePackSettings - { - Configuration = configuration, - OutputDirectory = artifactsDir, - IncludeSymbols = true, - MSBuildSettings = buildSettings - }; - - foreach (var projectFile in projectFiles) - { - DotNetCorePack(projectFile, settings); - } - }); - -Task("Build") - .IsDependentOn("Clean") - .IsDependentOn("Restore") - .Does(() => - { - var settings = new DotNetCoreBuildSettings - { - Configuration = configuration - }; - - foreach (var projectFile in projectFiles) - { - DotNetCoreBuild(projectFile, settings); - } - }); - -Task("Clean") - .Does(()=> - { - Information($"Cleaning: {artifactsDir}"); - CleanDirectory(artifactsDir); - Information($"Cleaning: {publishDir}"); - CleanDirectory(publishDir); - }); - -Task("Restore") - .Does(()=> - { - foreach (var projectFile in projectFiles) - { - DotNetCoreRestore(projectFile); - } - }); - -Task("SetVersion") - .Does(()=> - { - var versionInfo = GitVersion(new GitVersionSettings { - RepositoryPath = "." - }); - version = versionInfo.NuGetVersion; - Information($"Version: {version}, FullSemVer: {versionInfo.FullSemVer}"); - - if (AppVeyor.IsRunningOnAppVeyor) { - AppVeyor.UpdateBuildVersion(version); - } - }); - -Task("Test") - .Does(()=> - { - var testProjectFiles = GetFiles("./tests/**/*.csproj"); - foreach (var file in testProjectFiles) - { - DotNetCoreTest(file.FullPath); - } - }); - -RunTarget(target); diff --git a/build.ps1 b/build.ps1 deleted file mode 100644 index a336e298..00000000 --- a/build.ps1 +++ /dev/null @@ -1,256 +0,0 @@ -########################################################################## -# This is the Cake bootstrapper script for PowerShell. -# This file was downloaded from https://github.com/cake-build/resources -# Feel free to change this file to fit your needs. -########################################################################## - -<# - -.SYNOPSIS -This is a Powershell script to bootstrap a Cake build. - -.DESCRIPTION -This Powershell script will download NuGet if missing, restore NuGet tools (including Cake) -and execute your Cake build script with the parameters you provide. - -.PARAMETER Script -The build script to execute. -.PARAMETER Target -The build script target to run. -.PARAMETER Configuration -The build configuration to use. -.PARAMETER Verbosity -Specifies the amount of information to be displayed. -.PARAMETER ShowDescription -Shows description about tasks. -.PARAMETER DryRun -Performs a dry run. -.PARAMETER SkipToolPackageRestore -Skips restoring of packages. -.PARAMETER ScriptArgs -Remaining arguments are added here. - -.LINK -https://cakebuild.net - -#> - -[CmdletBinding()] -Param( - [string]$Script = "build.cake", - [string]$Target, - [string]$Configuration, - [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] - [string]$Verbosity, - [switch]$ShowDescription, - [Alias("WhatIf", "Noop")] - [switch]$DryRun, - [switch]$SkipToolPackageRestore, - [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] - [string[]]$ScriptArgs -) - -# Attempt to set highest encryption available for SecurityProtocol. -# PowerShell will not set this by default (until maybe .NET 4.6.x). This -# will typically produce a message for PowerShell v2 (just an info -# message though) -try { - # Set TLS 1.2 (3072), then TLS 1.1 (768), then TLS 1.0 (192), finally SSL 3.0 (48) - # Use integers because the enumeration values for TLS 1.2 and TLS 1.1 won't - # exist in .NET 4.0, even though they are addressable if .NET 4.5+ is - # installed (.NET 4.5 is an in-place upgrade). - # PowerShell Core already has support for TLS 1.2 so we can skip this if running in that. - if (-not $IsCoreCLR) { - [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48 - } - } catch { - Write-Output 'Unable to set PowerShell to use TLS 1.2 and TLS 1.1 due to old .NET Framework installed. If you see underlying connection closed or trust errors, you may need to upgrade to .NET Framework 4.5+ and PowerShell v3' - } - -[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null -function MD5HashFile([string] $filePath) -{ - if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf)) - { - return $null - } - - [System.IO.Stream] $file = $null; - [System.Security.Cryptography.MD5] $md5 = $null; - try - { - $md5 = [System.Security.Cryptography.MD5]::Create() - $file = [System.IO.File]::OpenRead($filePath) - return [System.BitConverter]::ToString($md5.ComputeHash($file)) - } - finally - { - if ($file -ne $null) - { - $file.Dispose() - } - } -} - -function GetProxyEnabledWebClient -{ - $wc = New-Object System.Net.WebClient - $proxy = [System.Net.WebRequest]::GetSystemWebProxy() - $proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials - $wc.Proxy = $proxy - return $wc -} - -Write-Host "Preparing to run build script..." - -if(!$PSScriptRoot){ - $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent -} - -$TOOLS_DIR = Join-Path $PSScriptRoot "tools" -$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins" -$MODULES_DIR = Join-Path $TOOLS_DIR "Modules" -$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" -$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" -$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" -$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum" -$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config" -$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config" - -# Make sure tools folder exists -if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { - Write-Verbose -Message "Creating tools directory..." - New-Item -Path $TOOLS_DIR -Type Directory | Out-Null -} - -# Make sure that packages.config exist. -if (!(Test-Path $PACKAGES_CONFIG)) { - Write-Verbose -Message "Downloading packages.config..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) - } catch { - Throw "Could not download packages.config." - } -} - -# Try find NuGet.exe in path if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Trying to find nuget.exe in PATH..." - $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) } - $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1 - if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) { - Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)." - $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName - } -} - -# Try download NuGet.exe if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Downloading NuGet.exe..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile($NUGET_URL, $NUGET_EXE) - } catch { - Throw "Could not download NuGet.exe." - } -} - -# Save nuget.exe path to environment to be available to child processed -$env:NUGET_EXE = $NUGET_EXE -$env:NUGET_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) { - "mono `"$NUGET_EXE`"" -} else { - "`"$NUGET_EXE`"" -} - -# Restore tools from NuGet? -if(-Not $SkipToolPackageRestore.IsPresent) { - Push-Location - Set-Location $TOOLS_DIR - - # Check for changes in packages.config and remove installed tools if true. - [string] $md5Hash = MD5HashFile $PACKAGES_CONFIG - if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or - ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { - Write-Verbose -Message "Missing or changed package.config hash..." - Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery | - Remove-Item -Recurse -Force - } - - Write-Verbose -Message "Restoring tools from NuGet..." - - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet tools." - } - else - { - $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII" - } - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Restore addins from NuGet -if (Test-Path $ADDINS_PACKAGES_CONFIG) { - Push-Location - Set-Location $ADDINS_DIR - - Write-Verbose -Message "Restoring addins from NuGet..." - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet addins." - } - - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Restore modules from NuGet -if (Test-Path $MODULES_PACKAGES_CONFIG) { - Push-Location - Set-Location $MODULES_DIR - - Write-Verbose -Message "Restoring modules from NuGet..." - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet modules." - } - - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Make sure that Cake has been installed. -if (!(Test-Path $CAKE_EXE)) { - Throw "Could not find Cake.exe at $CAKE_EXE" -} - -$CAKE_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) { - "mono `"$CAKE_EXE`"" -} else { - "`"$CAKE_EXE`"" -} - - # Build an array (not a string) of Cake arguments to be joined later -$cakeArguments = @() -if ($Script) { $cakeArguments += "`"$Script`"" } -if ($Target) { $cakeArguments += "-target=`"$Target`"" } -if ($Configuration) { $cakeArguments += "-configuration=$Configuration" } -if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" } -if ($ShowDescription) { $cakeArguments += "-showdescription" } -if ($DryRun) { $cakeArguments += "-dryrun" } -$cakeArguments += $ScriptArgs - -# Start Cake -Write-Host "Running build script..." -Invoke-Expression "& $CAKE_EXE_INVOCATION $($cakeArguments -join " ")" -exit $LASTEXITCODE diff --git a/build.sh b/build.sh deleted file mode 100755 index e5a95bcb..00000000 --- a/build.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -########################################################################## -# This is the Cake bootstrapper script for Linux and OS X. -# This file was downloaded from https://github.com/cake-build/resources -# Feel free to change this file to fit your needs. -########################################################################## - -# Define directories. -SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -TOOLS_DIR=$SCRIPT_DIR/tools -ADDINS_DIR=$TOOLS_DIR/Addins -MODULES_DIR=$TOOLS_DIR/Modules -NUGET_EXE=$TOOLS_DIR/nuget.exe -CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe -PACKAGES_CONFIG=$TOOLS_DIR/packages.config -PACKAGES_CONFIG_MD5=$TOOLS_DIR/packages.config.md5sum -ADDINS_PACKAGES_CONFIG=$ADDINS_DIR/packages.config -MODULES_PACKAGES_CONFIG=$MODULES_DIR/packages.config - -# Define md5sum or md5 depending on Linux/OSX -MD5_EXE= -if [[ "$(uname -s)" == "Darwin" ]]; then - MD5_EXE="md5 -r" -else - MD5_EXE="md5sum" -fi - -# Define default arguments. -SCRIPT="build.cake" -CAKE_ARGUMENTS=() - -# Parse arguments. -for i in "$@"; do - case $1 in - -s|--script) SCRIPT="$2"; shift ;; - --) shift; CAKE_ARGUMENTS+=("$@"); break ;; - *) CAKE_ARGUMENTS+=("$1") ;; - esac - shift -done - -# Make sure the tools folder exist. -if [ ! -d "$TOOLS_DIR" ]; then - mkdir "$TOOLS_DIR" -fi - -# Make sure that packages.config exist. -if [ ! -f "$TOOLS_DIR/packages.config" ]; then - echo "Downloading packages.config..." - curl -Lsfo "$TOOLS_DIR/packages.config" https://cakebuild.net/download/bootstrapper/packages - if [ $? -ne 0 ]; then - echo "An error occured while downloading packages.config." - exit 1 - fi -fi - -# Download NuGet if it does not exist. -if [ ! -f "$NUGET_EXE" ]; then - echo "Downloading NuGet..." - curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/latest/nuget.exe - if [ $? -ne 0 ]; then - echo "An error occured while downloading nuget.exe." - exit 1 - fi -fi - -# Restore tools from NuGet. -pushd "$TOOLS_DIR" >/dev/null -if [ ! -f "$PACKAGES_CONFIG_MD5" ] || [ "$( cat "$PACKAGES_CONFIG_MD5" | sed 's/\r$//' )" != "$( $MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' )" ]; then - find . -type d ! -name . | xargs rm -rf -fi - -mono "$NUGET_EXE" install -ExcludeVersion -if [ $? -ne 0 ]; then - echo "Could not restore NuGet tools." - exit 1 -fi - -$MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' >| "$PACKAGES_CONFIG_MD5" - -popd >/dev/null - -# Restore addins from NuGet. -if [ -f "$ADDINS_PACKAGES_CONFIG" ]; then - pushd "$ADDINS_DIR" >/dev/null - - mono "$NUGET_EXE" install -ExcludeVersion - if [ $? -ne 0 ]; then - echo "Could not restore NuGet addins." - exit 1 - fi - - popd >/dev/null -fi - -# Restore modules from NuGet. -if [ -f "$MODULES_PACKAGES_CONFIG" ]; then - pushd "$MODULES_DIR" >/dev/null - - mono "$NUGET_EXE" install -ExcludeVersion - if [ $? -ne 0 ]; then - echo "Could not restore NuGet modules." - exit 1 - fi - - popd >/dev/null -fi - -# Make sure that Cake has been installed. -if [ ! -f "$CAKE_EXE" ]; then - echo "Could not find Cake.exe at '$CAKE_EXE'." - exit 1 -fi - -# Start Cake -exec mono "$CAKE_EXE" $SCRIPT "${CAKE_ARGUMENTS[@]}" diff --git a/tools/packages.config b/tools/packages.config deleted file mode 100644 index ec87d006..00000000 --- a/tools/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - From 738e73d251ed3cb75f56c2a2736b1530dd9a125c Mon Sep 17 00:00:00 2001 From: Shane32 Date: Mon, 26 Oct 2020 00:46:48 -0400 Subject: [PATCH 15/28] Restore appveyor --- appveyor.yml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..b75aa821 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,44 @@ +os: Visual Studio 2019 + +version: 0.0.0-{build} +pull_requests: + do_not_increment_build_number: true + +skip_tags: true + +build_script: + - ps: .\build.ps1 -Target "Default" + +artifacts: + - path: artifacts\*.nupkg + name: Packages + +test: off +skip_branch_with_pr: false + +install: + - ps: choco install dotnetcore-sdk --no-progress --confirm --version 3.1.402 + - dotnet --version + +on_failure: + - ps: Update-AppveyorBuild -Version "$($env:appveyor_build_version)-$(Get-Date -format HHmmss)-failed" + +deploy: + - provider: NuGet + server: https://www.myget.org/F/graphql-dotnet/api/v2/package + api_key: + secure: +l1vfBMajn1WfmXkQ2LdILKxK4fQ5AHSnnU1kf11Bn1xRGUOTCdPhLwHx232piEn + skip_symbols: true + on: + branch: + - develop + - master + +for: + +- + branches: + only: + - master + + skip_non_tags: true From acf6028676e38dd0a20601faa094fe357b4d9696 Mon Sep 17 00:00:00 2001 From: Shane32 Date: Mon, 26 Oct 2020 00:47:28 -0400 Subject: [PATCH 16/28] Delete appveyor.yml --- appveyor.yml | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 06dedaf6..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,43 +0,0 @@ -os: Visual Studio 2019 - -version: 0.0.0-{build} -pull_requests: - do_not_increment_build_number: true - -skip_tags: false -test: off -skip_branch_with_pr: false - -build_script: - - ps: .\build.ps1 -Target "Default" - -artifacts: - - path: 'artifacts\*.nupkg' - name: Packages - -install: - - ps: choco install dotnetcore-sdk --no-progress --confirm --version 3.1.402 - - dotnet --version - -on_failure: - - ps: Update-AppveyorBuild -Version "$($env:appveyor_build_version)-$(Get-Date -format HHmmss)-failed" - -deploy: - - provider: NuGet - server: https://www.myget.org/F/graphql-dotnet/api/v2/package - api_key: - secure: +l1vfBMajn1WfmXkQ2LdILKxK4fQ5AHSnnU1kf11Bn1xRGUOTCdPhLwHx232piEn - skip_symbols: true - on: - branch: - - develop - - master - -for: - -- - branches: - only: - - master - - skip_non_tags: true From a5b49a81a14b1ba1b7790cfaf5545bfa71aee5fd Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Mon, 26 Oct 2020 01:00:59 -0400 Subject: [PATCH 17/28] Update Directory.Build.props --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 39aeee22..be2910a9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,7 +11,7 @@ graphql-dotnet server graphql-dotnet true - 4.0.3-preview + 4.1.0-preview dev true From f3ac5948ddd1f8cfca9d910bd195dbc9168e1d60 Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Mon, 26 Oct 2020 09:17:53 -0400 Subject: [PATCH 18/28] Apply suggestions from code review Co-authored-by: Ivan Maximov --- .github/workflows/publish.yml | 10 +++++----- .github/workflows/test.yml | 6 +++--- .github/workflows/wipcheck.yml | 2 +- Directory.Build.props | 9 +++------ 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8d65f257..db185097 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,9 +20,9 @@ jobs: env: github_ref: ${{ github.ref }} run: | - ref="${github_ref:10}" - echo $ref - echo "::set-env name=ref::$ref" + version="${github_ref:10}" + echo version=$version + echo "version=$version" >> $GITHUB_ENV - name: Use .NET Core 3.1 SDK uses: actions/setup-dotnet@v1 with: @@ -35,9 +35,9 @@ jobs: env: DOTNET_NOLOGO: true DOTNET_CLI_TELEMETRY_OPTOUT: true - - name: Build solution (release config) + - name: Build solution [Release] run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 -p:Version=$ref - - name: Pack solution (release config) + - name: Pack solution [Release] run: dotnet pack --no-restore --no-build -c Release -p:Version=$ref -o out - name: Publish artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9c4cd0db..830d69e4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,9 +33,9 @@ jobs: env: DOTNET_NOLOGO: true DOTNET_CLI_TELEMETRY_OPTOUT: true - - name: Build solution (release config) + - name: Build solution [Release] run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 - - name: Build solution (debug config) + - name: Build solution [Debug] run: dotnet build --no-restore -p:NoWarn=CS1591 - - name: Test solution (debug config) + - name: Test solution [Debug] run: dotnet test --no-restore --no-build diff --git a/.github/workflows/wipcheck.yml b/.github/workflows/wipcheck.yml index b242f69a..6ab31b2b 100644 --- a/.github/workflows/wipcheck.yml +++ b/.github/workflows/wipcheck.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Fail build if pull request title contains [WIP] - if: ${{ contains(github.event.pull_request.title, '[WIP]') }} # This function is not case sensitive. + if: ${{ contains(github.event.pull_request.title, '[WIP]') }} # This function is case insensitive. run: | echo Warning! PR title "${{ github.event.pull_request.title }}" contains [WIP]. Remove [WIP] from the title when PR is ready. exit 1 diff --git a/Directory.Build.props b/Directory.Build.props index be2910a9..1c92aa5a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,7 +3,6 @@ latest https://github.com/graphql-dotnet/server - https://github.com/graphql-dotnet/server Git true Pekka Heikura @@ -17,14 +16,12 @@ True - - - true - snupkg + embedded + true - + From d278168b8241f4aa05a8ed58020a294b4d9dd44d Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Mon, 26 Oct 2020 09:34:17 -0400 Subject: [PATCH 19/28] Update .github/workflows/build.yml Co-authored-by: Ivan Maximov --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 84f5aa79..b2503e45 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 -p:VersionSuffix=$GITHUB_RUN_NUMBER - name: Pack solution (release config) run: dotnet pack --no-restore --no-build -c Release -p:VersionSuffix=$GITHUB_RUN_NUMBER -o out - - name: Publish artifacts + - name: Upload artifacts uses: actions/upload-artifact@v2 with: name: Nuget packages From fcd51f1a2e8bde4b7a6621d7c93e3eea25810212 Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Mon, 26 Oct 2020 09:35:06 -0400 Subject: [PATCH 20/28] Update .github/workflows/publish.yml --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index db185097..b49569ff 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -36,7 +36,7 @@ jobs: DOTNET_NOLOGO: true DOTNET_CLI_TELEMETRY_OPTOUT: true - name: Build solution [Release] - run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 -p:Version=$ref + run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 -p:Version=$version - name: Pack solution [Release] run: dotnet pack --no-restore --no-build -c Release -p:Version=$ref -o out - name: Publish artifacts From da5ef7a96632c3157e7b73ced2ba3b9f6dea1794 Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Mon, 26 Oct 2020 09:35:43 -0400 Subject: [PATCH 21/28] Update .github/workflows/publish.yml --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b49569ff..54518b1f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -38,7 +38,7 @@ jobs: - name: Build solution [Release] run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 -p:Version=$version - name: Pack solution [Release] - run: dotnet pack --no-restore --no-build -c Release -p:Version=$ref -o out + run: dotnet pack --no-restore --no-build -c Release -p:Version=$version -o out - name: Publish artifacts uses: actions/upload-artifact@v2 with: From 04ee79ceaed20d6160b92a0b26425a2795c490b2 Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Mon, 26 Oct 2020 09:36:11 -0400 Subject: [PATCH 22/28] Update .github/workflows/publish.yml Co-authored-by: Ivan Maximov --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 54518b1f..6fcae5ae 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -39,7 +39,7 @@ jobs: run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 -p:Version=$version - name: Pack solution [Release] run: dotnet pack --no-restore --no-build -c Release -p:Version=$version -o out - - name: Publish artifacts + - name: Upload artifacts uses: actions/upload-artifact@v2 with: name: Nuget packages From a6d93c99622afc89daa0124d90711dc6041e453a Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Mon, 26 Oct 2020 09:44:38 -0400 Subject: [PATCH 23/28] Update labeler --- .github/labeler.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 951be994..bf723e16 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,9 +1,5 @@ "test": - - src/GraphQL.ApiTests/**/* - - src/GraphQL.DataLoader.Tests/**/* - - src/GraphQL.Dummy/**/* - - src/GraphQL.Harness.Tests/**/* - - src/GraphQL.Tests/**/* + - Tests/**/* "CI": - .github/workflows/**/* @@ -11,9 +7,5 @@ "code style": - .editorconfig -"documentation": - - README.md - - docs2/**/* - "performance": - - src/GraphQL.Benchmarks/**/* + - src/Benchmarks/**/* From 76d3a4a01001995222220317bd9b4ad429bd5a3d Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Mon, 26 Oct 2020 10:06:31 -0400 Subject: [PATCH 24/28] Update .github/workflows/build.yml Co-authored-by: Ivan Maximov --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2503e45..643024b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: env: DOTNET_NOLOGO: true DOTNET_CLI_TELEMETRY_OPTOUT: true - - name: Build solution (release config) + - name: Build solution [Release] run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 -p:VersionSuffix=$GITHUB_RUN_NUMBER - name: Pack solution (release config) run: dotnet pack --no-restore --no-build -c Release -p:VersionSuffix=$GITHUB_RUN_NUMBER -o out From 732e7b031591ab6c430888342a8a4add112b2b1f Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Mon, 26 Oct 2020 10:06:43 -0400 Subject: [PATCH 25/28] Update .github/workflows/build.yml Co-authored-by: Ivan Maximov --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 643024b3..77b5e5e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: DOTNET_CLI_TELEMETRY_OPTOUT: true - name: Build solution [Release] run: dotnet build --no-restore -c Release -p:NoWarn=CS1591 -p:VersionSuffix=$GITHUB_RUN_NUMBER - - name: Pack solution (release config) + - name: Pack solution [Release] run: dotnet pack --no-restore --no-build -c Release -p:VersionSuffix=$GITHUB_RUN_NUMBER -o out - name: Upload artifacts uses: actions/upload-artifact@v2 From 816299b04b971b89128ed15b40fd8be92a63d246 Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Mon, 26 Oct 2020 10:06:59 -0400 Subject: [PATCH 26/28] Update Directory.Build.props Co-authored-by: Ivan Maximov --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 1c92aa5a..2ed44462 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,7 +3,7 @@ latest https://github.com/graphql-dotnet/server - Git + git true Pekka Heikura Pekka Heikura From 3d5c36f4509149ac7e1291be219322e9b1c6c124 Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Mon, 26 Oct 2020 10:53:39 -0400 Subject: [PATCH 27/28] Update Directory.Build.props Co-authored-by: Ivan Maximov --- Directory.Build.props | 1 - 1 file changed, 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 2ed44462..630d6d64 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,7 +11,6 @@ graphql-dotnet true 4.1.0-preview - dev true True From 6334e2c3d88ddbfd06443baeef7497fc00067e37 Mon Sep 17 00:00:00 2001 From: Shane Krueger Date: Mon, 26 Oct 2020 12:53:08 -0400 Subject: [PATCH 28/28] Update Directory.Build.props --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 630d6d64..da96d5f9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,7 @@ + 4.1.0-preview latest https://github.com/graphql-dotnet/server git @@ -10,7 +11,6 @@ graphql-dotnet server graphql-dotnet true - 4.1.0-preview true True