Skip to content

Commit ea4f0f9

Browse files
Shane32sungam3r
Shane32
and
sungam3r
authored
Run tests and samples against .NET 7 (#954)
Co-authored-by: Ivan Maximov <sungam3r@yandex.ru>
1 parent d0a0b37 commit ea4f0f9

File tree

38 files changed

+88
-62
lines changed

38 files changed

+88
-62
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v3
20-
- name: Setup .NET Core SDK
20+
- name: Setup .NET SDK
2121
uses: actions/setup-dotnet@v3
2222
with:
23-
dotnet-version: "6.0.102"
23+
dotnet-version: 7.0.x
2424
source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json
2525
env:
2626
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
- name: Checkout source
1717
uses: actions/checkout@v3
1818

19-
- name: Setup .NET Core SDK
19+
- name: Setup .NET SDK
2020
uses: actions/setup-dotnet@v3
2121
with:
22-
dotnet-version: "6.0.102"
22+
dotnet-version: 7.0.x
2323
source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json
2424
env:
2525
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎.github/workflows/formatting.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
steps:
2525
- name: Checkout source
2626
uses: actions/checkout@v3
27-
- name: Setup .NET Core SDK
27+
- name: Setup .NET SDK
2828
uses: actions/setup-dotnet@v3
2929
with:
30-
dotnet-version: 6.0.x
30+
dotnet-version: 7.0.x
3131
source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json
3232
env:
3333
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
version="${github_ref:10}"
2828
echo version=$version
2929
echo "version=$version" >> $GITHUB_ENV
30-
- name: Setup .NET Core SDK
30+
- name: Setup .NET SDK
3131
uses: actions/setup-dotnet@v3
3232
with:
33-
dotnet-version: "6.0.102"
33+
dotnet-version: 7.0.x
3434
source-url: https://api.nuget.org/v3/index.json
3535
env:
3636
NUGET_AUTH_TOKEN: ${{secrets.NUGET_AUTH_TOKEN}}

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,15 @@ jobs:
4040
steps:
4141
- name: Checkout source
4242
uses: actions/checkout@v3
43-
- name: Setup .NET Core SDK
43+
- name: Setup .NET SDK
4444
uses: actions/setup-dotnet@v3
4545
with:
4646
dotnet-version: |
4747
2.1.x
4848
3.1.x
4949
5.0.x
5050
6.0.x
51+
7.0.x
5152
source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json
5253
env:
5354
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -67,7 +68,7 @@ jobs:
6768
if: ${{ startsWith(matrix.os, 'ubuntu') }}
6869
uses: codecov/codecov-action@v3
6970
with:
70-
files: .coverage/GraphQL.Server.Transports.AspNetCore.Tests/coverage.net6.opencover.xml,.coverage/GraphQL.Server.Transports.AspNetCore.Tests/coverage.netcoreapp2.1.opencover.xml,.coverage/GraphQL.Server.Samples.Server.Tests/coverage.net6.opencover.xml
71+
files: .coverage/GraphQL.Server.Transports.AspNetCore.Tests/coverage.net7.0.opencover.xml,.coverage/GraphQL.Server.Transports.AspNetCore.Tests/coverage.netcoreapp2.1.opencover.xml,.coverage/GraphQL.Server.Samples.Server.Tests/coverage.net7.0.opencover.xml
7172

7273
buildcheck:
7374
needs:

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<AnalysisMode>Recommended</AnalysisMode>
2727
<Nullable>enable</Nullable>
2828
<IsPackable>true</IsPackable>
29-
<NoWarn>$(NoWarn);IDE0056;IDE0057</NoWarn> <!-- Index/Range operators -->
29+
<NoWarn>$(NoWarn);IDE0056;IDE0057;ASP0014</NoWarn> <!-- Index/Range operators, UseRouting -->
3030

3131
<AssemblyName>GraphQL.Server.$(MSBuildProjectName)</AssemblyName>
3232
<RootNamespace>GraphQL.Server.$(MSBuildProjectName)</RootNamespace>

‎Tests.props‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,23 @@
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
1718
<PackageReference Include="Shouldly" Version="4.1.0" />
1819
<PackageReference Include="xunit" Version="2.4.2" />
1920
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
2021
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
2122
<PackageReference Include="Moq" Version="4.18.2" />
2223
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.1.*" Condition="'$(TargetFramework)' == 'netcoreapp2.1' OR '$(TargetFramework)' == 'net48'" />
2324
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.*" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
24-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.*" Condition="'$(TargetFramework)' == 'net5'" />
25-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.*" Condition="'$(TargetFramework)' == 'net6'" />
25+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.*" Condition="'$(TargetFramework)' == 'net5.0'" />
26+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.*" Condition="'$(TargetFramework)' == 'net6.0'" />
27+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.*" Condition="'$(TargetFramework)' == 'net7.0'" />
2628
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.*" Condition="'$(TargetFramework)' == 'netcoreapp2.1' OR '$(TargetFramework)' == 'net48'" />
2729
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.*" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
28-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.*" Condition="'$(TargetFramework)' == 'net5'" />
29-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.*" Condition="'$(TargetFramework)' == 'net6'" />
30+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.*" Condition="'$(TargetFramework)' == 'net5.0'" />
31+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.*" Condition="'$(TargetFramework)' == 'net6.0'" />
32+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.*" Condition="'$(TargetFramework)' == 'net7.0'" />
3033
</ItemGroup>
3134

3235
<ItemGroup>

‎samples/Samples.Authorization/Pages/Index.cshtml.cs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,23 @@ public void OnGet()
2525
public async Task<IActionResult> OnPost([FromForm] FormInfo info)
2626
{
2727
var identity = HttpContext.User.Identity;
28-
if (identity != null)
28+
if (identity?.Name != null)
2929
{
3030
if (!await _roleManager.RoleExistsAsync("User"))
3131
{
3232
await _roleManager.CreateAsync(new IdentityRole("User"));
3333
}
3434
var user = await _userManager.FindByNameAsync(identity.Name);
35-
if (info.Do == "add")
35+
if (user != null)
3636
{
37-
await _userManager.AddToRoleAsync(user, "User");
38-
}
39-
else if (info.Do == "remove")
40-
{
41-
await _userManager.RemoveFromRoleAsync(user, "User");
37+
if (info.Do == "add")
38+
{
39+
await _userManager.AddToRoleAsync(user, "User");
40+
}
41+
else if (info.Do == "remove")
42+
{
43+
await _userManager.RemoveFromRoleAsync(user, "User");
44+
}
4245
}
4346
}
4447
return RedirectToAction("Index");

‎samples/Samples.Authorization/Samples.Authorization.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.*" />
11-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.*" />
12-
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.*" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.*" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.*">
10+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.*" />
11+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.*" />
12+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.*" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.*" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.*">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>

‎samples/Samples.Basic/Samples.Basic.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

0 commit comments

Comments
 (0)