Skip to content

Commit 5230767

Browse files
brunobritodevbrunobritodev
authored
chore: merge
.NET 8
2 parents 932fdd3 + f8eeb8e commit 5230767

File tree

21 files changed

+122
-90
lines changed

21 files changed

+122
-90
lines changed

‎.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
with:
2929
dotnet-version: 7.0.x
3030

31-
- name: Setup .NET Core 3.1
31+
- name: Setup .NET 8
3232
uses: actions/setup-dotnet@v3
3333
with:
34-
dotnet-version: 3.1.x
34+
dotnet-version: 8.0.x
3535

3636
- name: Restore dependencies
3737
run: dotnet restore

‎.github/workflows/pull-request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
with:
2525
dotnet-version: 7.0.x
2626

27-
- name: Setup .NET Core 3.1
27+
- name: Setup .NET 8
2828
uses: actions/setup-dotnet@v3
2929
with:
30-
dotnet-version: 3.1.x
30+
dotnet-version: 8.0.x
3131

3232
- name: Restore dependencies
3333
run: dotnet restore

‎samples/1_AspNet.Default/AspNet.Default.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<IsPackable>false</IsPackable>
77
<ImplicitUsings>enable</ImplicitUsings>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<PackageReference Include="Bogus" Version="34.0.2" />
12-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
13-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
12+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
1413
</ItemGroup>
1514

1615
<ItemGroup>

‎samples/2_AspNet.Store.EntityFramework/AspNet.Store.EntityFramework.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<IsPackable>false</IsPackable>
77
<ImplicitUsings>enable</ImplicitUsings>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<PackageReference Include="Bogus" Version="34.0.2" />
12-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.2" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.2" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.2" />
15-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
16-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
17-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
12+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
16+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
1817
</ItemGroup>
1918

2019
<ItemGroup>

‎samples/2_AspNet.Store.EntityFramework/Properties/launchSettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010
},
1111
"profiles": {
12-
"NetDevPack.Security.Jwt.AspNet.SymetricKey": {
12+
"AspNet.Store.EntityFramework": {
1313
"commandName": "Project",
1414
"dotnetRunMessages": true,
1515
"launchBrowser": true,

‎samples/2_AspNet.Store.EntityFramework/appsettings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"ConnectionStrings": {
3-
//"DefaultConnection": "Data Source=(LocalDb)\\MSSQLLocalDB;Initial Catalog=jwks;Integrated Security=SSPI;"
4-
"DefaultConnection": "Data Source=localhost;Initial Catalog=jwks;User Id=sa; Password=@Password1;Connection Timeout=60;MultipleActiveResultSets=True;TrustServerCertificate=True"
3+
"DefaultConnection": "Data Source=(LocalDb)\\MSSQLLocalDB;Initial Catalog=jwks;Integrated Security=SSPI;"
4+
//"DefaultConnection": "Data Source=localhost;Initial Catalog=jwks;User Id=sa; Password=@Password1;Connection Timeout=60;MultipleActiveResultSets=True;TrustServerCertificate=True"
55
},
66
"Logging": {
77
"LogLevel": {

‎samples/3_IdentityServer4/AspNet.IdentityServer4.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

8-
9-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
10-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
8+
<ItemGroup>
9+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
1110
</ItemGroup>
12-
1311
<ItemGroup>
1412
<ProjectReference Include="..\..\src\NetDevPack.Security.Jwt.AspNetCore\NetDevPack.Security.Jwt.AspNetCore.csproj" />
1513
<ProjectReference Include="..\..\src\NetDevPack.Security.Jwt.IdentityServer4\NetDevPack.Security.Jwt.IdentityServer4.csproj" />

‎samples/Microservice.Sample/Api.Sample/Api.Sample.csproj

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

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

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.2" />
10+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
1111
<PackageReference Include="NetDevPack.Security.JwtExtensions" Version="7.0.0" />
12-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
12+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
1313
</ItemGroup>
1414

1515
</Project>

‎samples/Microservice.Sample/Identity/Controllers/AuthController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ private async Task<string> GenerateAccessToken(string? email)
119119
identityClaims.AddClaim(new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()));
120120

121121
var handler = new JwtSecurityTokenHandler();
122-
122+
var key = await _jwtService.GetCurrentSigningCredentials();
123123
var securityToken = handler.CreateToken(new SecurityTokenDescriptor
124124
{
125125
Issuer = "https://www.devstore.academy", // <- Your website
126126
Audience = "NetDevPack.Security.Jwt.AspNet",
127-
SigningCredentials = await _jwtService.GetCurrentSigningCredentials(),
127+
SigningCredentials = key,
128128
Subject = identityClaims,
129129
NotBefore = DateTime.UtcNow,
130130
Expires = DateTime.UtcNow.AddMinutes(60),

‎samples/Microservice.Sample/Identity/Controllers/ProtectedController.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using Microsoft.AspNetCore.Authorization;
2+
using Microsoft.AspNetCore.Mvc;
3+
4+
namespace Identity.Controllers
5+
{
6+
[ApiController]
7+
[Route("api/protected"), Authorize]
8+
public class ProtectedController : ControllerBase
9+
{
10+
[HttpGet]
11+
public IActionResult Get()
12+
{
13+
return Ok();
14+
}
15+
}
16+
}

0 commit comments

Comments
 (0)