Skip to content

Commit c9ba9ab

Browse files
brunobritodevbrunobritodev
authored
Merge pull request #4 from NetDevPack/feat/net7
feat: net 7
2 parents 59fe567 + cc5fe34 commit c9ba9ab

7 files changed

Lines changed: 44 additions & 65 deletions

File tree

‎.github/workflows/publish-package.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020

2121
- name: Setup .NET 6
22-
uses: actions/setup-dotnet@v1
22+
uses: actions/setup-dotnet@v3
2323
with:
2424
dotnet-version: 6.0.x
2525

2626
- name: Setup .NET 5
27-
uses: actions/setup-dotnet@v1
27+
uses: actions/setup-dotnet@v3
2828
with:
2929
dotnet-version: 5.0.x
3030

3131
- name: Setup .NET Core 3.1
32-
uses: actions/setup-dotnet@v1
32+
uses: actions/setup-dotnet@v3
3333
with:
3434
dotnet-version: 3.1.x
3535

‎.github/workflows/pull-request.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ jobs:
1313

1414
steps:
1515
- name: Checkout repository
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717

1818
- name: Setup .NET 6
19-
uses: actions/setup-dotnet@v1
19+
uses: actions/setup-dotnet@v3
2020
with:
2121
dotnet-version: 6.0.x
2222

2323
- name: Setup .NET 5
24-
uses: actions/setup-dotnet@v1
24+
uses: actions/setup-dotnet@v3
2525
with:
2626
dotnet-version: 5.0.x
2727

2828
- name: Setup .NET Core 3.1
29-
uses: actions/setup-dotnet@v1
29+
uses: actions/setup-dotnet@v3
3030
with:
3131
dotnet-version: 3.1.x
3232

‎samples/NetDevPack.Security.JwtExtensions.ApiAuthenticator/NetDevPack.Security.JwtExtensions.ApiAuthenticator.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
55
</PropertyGroup>
66

77

88
<ItemGroup>
99
<PackageReference Include="Bogus" Version="34.0.2" />
10-
<PackageReference Include="NetDevPack.Security.Jwt.AspNetCore" Version="6.0.5" />
11-
<PackageReference Include="NetDevPack.Security.Jwt.Core" Version="6.0.5" />
12-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.17.0" />
10+
<PackageReference Include="NetDevPack.Security.Jwt.AspNetCore" Version="7.0.0" />
11+
<PackageReference Include="NetDevPack.Security.Jwt.Core" Version="7.0.0" />
12+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
1313
</ItemGroup>
1414

15-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
16-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.24" />
17-
</ItemGroup>
18-
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
19-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.16" />
20-
</ItemGroup>
2115
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
22-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
16+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.11" />
17+
</ItemGroup>
18+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
19+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
2320
</ItemGroup>
2421

2522
</Project>

‎samples/NetDevPack.Security.JwtExtensions.ApiClient/NetDevPack.Security.JwtExtensions.ApiClient.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
55
</PropertyGroup>
66

77

88
<ItemGroup>
99
<ProjectReference Include="..\..\src\NetDevPack.Security.JwtExtensions\NetDevPack.Security.JwtExtensions.csproj" />
1010
</ItemGroup>
1111

12-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
13-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.0" />
14-
</ItemGroup>
15-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
16-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.24" />
17-
</ItemGroup>
18-
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
19-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.16" />
20-
</ItemGroup>
2112
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
22-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
13+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.11" />
14+
</ItemGroup>
15+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
16+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
2317
</ItemGroup>
2418

2519
</Project>

‎src/NetDevPack.Security.JwtExtensions/NetDevPack.Security.JwtExtensions.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
55
<Version>3.1.0</Version>
66
<Authors>Bruno Brito</Authors>
77
<PackageIconUrl>https://raw.githubusercontent.com/NetDevPack/NetDevPack/master/assets/IconNuget.png</PackageIconUrl>
@@ -15,20 +15,17 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.17.0" />
19-
<PackageReference Include="System.Text.Json" Version="6.0.3" />
18+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
19+
<PackageReference Include="System.Text.Json" Version="7.0.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
2323
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
2424
</ItemGroup>
25-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
26-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.24" />
27-
</ItemGroup>
28-
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
29-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.16" />
30-
</ItemGroup>
3125
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
32-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
26+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.11" />
27+
</ItemGroup>
28+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
29+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
3330
</ItemGroup>
3431
</Project>

‎tests/NetDevPack.Security.JwtExtensions.ApiTests/NetDevPack.Security.JwtExtensions.ApiTests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
55
</PropertyGroup>
66

77

88
<ItemGroup>
99
<ProjectReference Include="..\..\src\NetDevPack.Security.JwtExtensions\NetDevPack.Security.JwtExtensions.csproj" />
1010
</ItemGroup>
1111

12-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
13-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.0" />
14-
</ItemGroup>
15-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
16-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.24" />
17-
</ItemGroup>
18-
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
19-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.16" />
20-
</ItemGroup>
2112
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
22-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
13+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.11" />
14+
</ItemGroup>
15+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
16+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
2317
</ItemGroup>
2418
</Project>

‎tests/NetDevPack.Security.JwtExtensions.Tests/NetDevPack.Security.JwtExtensions.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
55
<LangVersion>10.0</LangVersion>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<PackageReference Include="Bogus" Version="34.0.2" />
11-
<PackageReference Include="FluentAssertions" Version="6.6.0" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
13-
<PackageReference Include="NetDevPack.Security.Jwt.AspNetCore" Version="6.0.5" />
14-
<PackageReference Include="NetDevPack.Security.Jwt.Store.FileSystem" Version="6.0.5" />
15-
<PackageReference Include="xunit" Version="2.4.1" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
11+
<PackageReference Include="FluentAssertions" Version="6.8.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
13+
<PackageReference Include="NetDevPack.Security.Jwt.AspNetCore" Version="7.0.0" />
14+
<PackageReference Include="NetDevPack.Security.Jwt.Store.FileSystem" Version="7.0.0" />
15+
<PackageReference Include="xunit" Version="2.4.2" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>
@@ -27,14 +27,11 @@
2727
<ProjectReference Include="..\NetDevPack.Security.JwtExtensions.ApiTests\NetDevPack.Security.JwtExtensions.ApiTests.csproj" />
2828
</ItemGroup>
2929

30-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
31-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.24" />
32-
</ItemGroup>
33-
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
34-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.16" />
35-
</ItemGroup>
3630
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
37-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.4" />
31+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.11" />
32+
</ItemGroup>
33+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
34+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" />
3835
</ItemGroup>
3936

4037
</Project>

0 commit comments

Comments
 (0)