Skip to content

Commit 5f1262f

Browse files
damienboddamienbod
authored
Merge pull request #73 from damienbod/feature/error-handling-oidc
Update .NET 10
2 parents 8497dd7 + 5dda048 commit 5f1262f

19 files changed

Lines changed: 89 additions & 91 deletions

‎.github/workflows/dotnet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET
1717
uses: actions/setup-dotnet@v4
1818
with:
19-
dotnet-version: '9.0'
19+
dotnet-version: '10.0'
2020
include-prerelease: True
2121
- name: Restore dependencies
2222
run: dotnet restore

‎Blazor.BFF.OpenIddict/Client/Blazor.BFF.OpenIddict.Client.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
66
<Nullable>enable</Nullable>
77
<ImplicitUsings>enable</ImplicitUsings>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.4" />
12-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.4" PrivateAssets="all" />
13-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.5" />
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.4" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0" PrivateAssets="all" />
13+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎Blazor.BFF.OpenIddict/Server/Blazor.BFF.OpenIddict.Server.csproj‎

Lines changed: 5 additions & 5 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>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>f70a7390-2f74-45d5-9a7b-a1345893e0c9</UserSecretsId>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.4" />
12-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.4" NoWarn="NU1605" />
13-
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.1.0" />
14-
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="1.1.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0" NoWarn="NU1605" />
13+
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.3.0" />
14+
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="1.3.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎Blazor.BFF.OpenIddict/Shared/Blazor.BFF.OpenIddict.Shared.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>

‎Blazor.BFF.Yarp.CertificateAuth/Client/Blazor.BFF.Yarp.CertificateAuth.Client.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.4" />
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.4" PrivateAssets="all" />
12-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.4" />
13-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.4" />
10+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0" PrivateAssets="all" />
12+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
13+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎Blazor.BFF.Yarp.CertificateAuth/Server/Blazor.BFF.Yarp.CertificateAuth.Server.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<UserSecretsId>501da193-a9d8-4b77-a042-939468503256</UserSecretsId>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.4" />
11-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.4" NoWarn="NU1605" />
12-
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.1.0" />
13-
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="1.1.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0" NoWarn="NU1605" />
12+
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.3.0" />
13+
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="1.3.0" />
1414
<PackageReference Include="Yarp.ReverseProxy" Version="2.3.0" />
1515
</ItemGroup>
1616

‎Blazor.BFF.Yarp.CertificateAuth/Shared/Blazor.BFF.Yarp.CertificateAuth.Shared.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
</PropertyGroup>
77

‎ClientCredentialsFlow/GrpcApi/GrpcApi.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
@@ -11,17 +11,17 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.4" />
15-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.4" />
14+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0" />
1616
<PackageReference Include="Grpc.AspNetCore" Version="2.71.0" />
17-
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="6.2.1" />
18-
<PackageReference Include="OpenIddict.Validation.SystemNetHttp" Version="6.2.1" />
17+
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="7.2.0" />
18+
<PackageReference Include="OpenIddict.Validation.SystemNetHttp" Version="7.2.0" />
1919

20-
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
21-
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
22-
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
23-
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
24-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
20+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
21+
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
22+
<PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />
23+
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.1.0" />
24+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
2525
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
2626
</ItemGroup>
2727

‎ClientCredentialsFlow/GrpcAppClientConsole/GrpcAppClientConsole.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<UserSecretsId>0464abbd-c57d-4048-873d-d16355586e50</UserSecretsId>
@@ -20,14 +20,14 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.5" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.5" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.5" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
2626
<PackageReference Include="IdentityModel" Version="7.0.0" />
27-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.4" />
28-
<PackageReference Include="Google.Protobuf" Version="3.30.2" />
27+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0" />
28+
<PackageReference Include="Google.Protobuf" Version="3.33.1" />
2929
<PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
30-
<PackageReference Include="Grpc.Tools" Version="2.72.0">
30+
<PackageReference Include="Grpc.Tools" Version="2.76.0">
3131
<PrivateAssets>all</PrivateAssets>
3232
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3333
</PackageReference>

‎OpeniddictServer/Areas/Identity/Pages/Account/Login.cshtml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,7 @@
8383
@section Scripts {
8484
<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
8585
<script src="~/lib/jquery-validation-unobtrusive/dist/jquery.validate.unobtrusive.min.js"></script>
86+
87+
8688
}
89+

0 commit comments

Comments
 (0)