Skip to content

Commit 2a7acb5

Browse files
committed
Merge from master
2 parents e09157f + baa2d07 commit 2a7acb5

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
build:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020
- name: Setup .NET Core SDK
21-
uses: actions/setup-dotnet@v1
21+
uses: actions/setup-dotnet@v2
2222
with:
2323
dotnet-version: "6.0.102"
2424
source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414

1515
steps:
1616
- name: Checkout source
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1818

1919
- name: Setup .NET Core SDK
20-
uses: actions/setup-dotnet@v1
20+
uses: actions/setup-dotnet@v2
2121
with:
2222
dotnet-version: "6.0.102"
2323

.github/workflows/label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
label:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/labeler@v3
15+
- uses: actions/labeler@v4
1616
with:
1717
sync-labels: ""
1818
repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
build:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
- name: Check github.ref starts with 'refs/tags/'
1818
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
1919
run: |
@@ -28,7 +28,7 @@ jobs:
2828
echo version=$version
2929
echo "version=$version" >> $GITHUB_ENV
3030
- name: Setup .NET Core SDK
31-
uses: actions/setup-dotnet@v1
31+
uses: actions/setup-dotnet@v2
3232
with:
3333
dotnet-version: "6.0.102"
3434
source-url: https://api.nuget.org/v3/index.json

.github/workflows/test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ jobs:
3939
runs-on: ${{ matrix.os }}
4040
steps:
4141
- name: Checkout source
42-
uses: actions/checkout@v2
42+
uses: actions/checkout@v3
4343
- name: Setup .NET Core SDK
44-
uses: actions/setup-dotnet@v1
44+
uses: actions/setup-dotnet@v2
4545
with:
4646
dotnet-version: |
4747
3.1.x
@@ -55,9 +55,9 @@ jobs:
5555
- name: Check formatting
5656
if: ${{ startsWith(matrix.os, 'ubuntu') }}
5757
run: |
58-
dotnet tool install -g dotnet-format --version 6.0.243104 --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
59-
dotnet format --no-restore --verify-no-changes -v diag --severity warn whitespace || (echo "Run 'dotnet format' to fix whitespace issues" && exit 1)
60-
dotnet format --no-restore --verify-no-changes -v diag --severity warn analyzers || (echo "Run 'dotnet format' to fix analyzers issues" && exit 1)
58+
dotnet format --no-restore --verify-no-changes --severity warn whitespace || (echo "Run 'dotnet format' to fix whitespace issues" && exit 1)
59+
dotnet format --no-restore --verify-no-changes --severity warn analyzers || (echo "Run 'dotnet format' to fix analyzers issues" && exit 1)
60+
dotnet format --no-restore --verify-no-changes --severity warn style || (echo "Run 'dotnet format' to fix style issues" && exit 1)
6161
- name: Build solution [Release]
6262
run: dotnet build --no-restore -c Release
6363
- name: Build solution [Debug]
@@ -66,9 +66,9 @@ jobs:
6666
run: dotnet test --no-restore --no-build -p:CollectCoverage=true
6767
- name: Upload coverage to codecov
6868
if: ${{ startsWith(matrix.os, 'ubuntu') }}
69-
uses: codecov/codecov-action@v2.1.0
69+
uses: codecov/codecov-action@v3
7070
with:
71-
files: .coverage/GraphQL.Server.Authorization.AspNetCore.Tests/coverage.net5.opencover.xml,.coverage/GraphQL.Server.Samples.Server.Tests/coverage.netcoreapp3.1.opencover.xml,.coverage/GraphQL.Server.Transports.Subscriptions.Abstractions.Tests/coverage.net5.opencover.xml,.coverage/GraphQL.Server.Transports.Subscriptions.WebSockets.Tests/coverage.net5.opencover.xml,.coverage/GraphQL.Server.Transports.AspNetCore.Tests/coverage.net5.opencover.xml
71+
files: .coverage/GraphQL.Server.Authorization.AspNetCore.Tests/coverage.net5.opencover.xml,.coverage/GraphQL.Server.Samples.Server.Tests/coverage.net5.opencover.xml,.coverage/GraphQL.Server.Transports.Subscriptions.Abstractions.Tests/coverage.net5.opencover.xml,.coverage/GraphQL.Server.Transports.Subscriptions.WebSockets.Tests/coverage.net5.opencover.xml,.coverage/GraphQL.Server.Transports.AspNetCore.Tests/coverage.net5.opencover.xml
7272

7373
buildcheck:
7474
needs:

Tests.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$(MSBuildThisFileDirectory)Tests.local.props" Condition="Exists('$(MSBuildThisFileDirectory)Tests.local.props')" />
33

44
<PropertyGroup>
5-
<NoWarn>$(NoWarn);1591;IDE1006</NoWarn>
5+
<NoWarn>$(NoWarn);0612;1591;IDE1006</NoWarn>
66
<SingleTestPlatform Condition="'$(SingleTestPlatform)' == ''">false</SingleTestPlatform>
77
</PropertyGroup>
88

@@ -15,7 +15,7 @@
1515
<PackageReference Include="Shouldly" Version="4.0.3" />
1616
<PackageReference Include="xunit" Version="2.4.1" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
18-
<PackageReference Include="Moq" Version="4.16.1" />
18+
<PackageReference Include="Moq" Version="4.17.2" />
1919
<PackageReference Include="NSubstitute" Version="4.3.0" />
2020
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.19" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
2121
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.10" Condition="'$(TargetFramework)' == 'net5'" />

0 commit comments

Comments
 (0)