From e11e4fed41d21bde0b0cd00c567c1798eb01971d Mon Sep 17 00:00:00 2001 From: Dominick Baier Date: Tue, 20 Jun 2023 11:03:14 +0200 Subject: [PATCH] first cut --- .github/workflows/ci.yml | 3 +-- .github/workflows/codeql-analysis.yml | 3 +-- Directory.Build.props | 5 ++++- Directory.Build.targets | 7 +++++++ global.json | 4 ++-- hosts/AspNetIdentity/Host.AspNetIdentity.csproj | 2 +- hosts/Configuration/Host.Configuration.csproj | 2 +- hosts/EntityFramework/Host.EntityFramework.csproj | 2 +- hosts/main/Host.Main.csproj | 2 +- hosts/main7/Host.Main7.csproj | 2 +- migrations/AspNetIdentityDb/AspNetIdentityDb.csproj | 2 +- migrations/IdentityServerDb/IdentityServerDb.csproj | 2 +- .../Duende.IdentityServer.AspNetIdentity.csproj | 2 +- ...nde.IdentityServer.Configuration.EntityFramework.csproj | 2 +- .../Duende.IdentityServer.Configuration.csproj | 2 +- .../Duende.IdentityServer.EntityFramework.Storage.csproj | 2 +- .../Duende.IdentityServer.EntityFramework.csproj | 2 +- src/IdentityServer/Duende.IdentityServer.csproj | 2 +- .../Default/JwtBearerClientAssertionSecretParser.cs | 4 ++-- src/Storage/Duende.IdentityServer.Storage.csproj | 2 +- .../Configuration.IntegrationTests.csproj | 2 +- .../EntityFramework.Storage.IntegrationTests.csproj | 2 +- .../EntityFramework.Storage.UnitTests.csproj | 2 +- test/EntityFramework.Tests/EntityFramework.Tests.csproj | 2 +- .../IdentityServer.IntegrationTests.csproj | 2 +- .../IdentityServer.UnitTests.csproj | 2 +- 26 files changed, 37 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a9b54542..036ab1f29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,8 +32,7 @@ jobs: uses: actions/setup-dotnet@v2 with: dotnet-version: | - 6.0.x - 7.0.x + 8.0.100-preview.5.23303.2 - run: dotnet --info diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 998b06c00..8a00a8070 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -41,8 +41,7 @@ jobs: uses: actions/setup-dotnet@v2 with: dotnet-version: | - 6.0.x - 7.0.x + 8.0.100-preview.5.23303.2 - run: dotnet --info diff --git a/Directory.Build.props b/Directory.Build.props index 93bff01f3..da2c5d3d0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -29,7 +29,10 @@ minor - True + + + + \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets index 74495eb30..6e5b7df2b 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -14,6 +14,13 @@ 6.15.1 + + 8.0.0-preview.5.23302.2 + 8.0.0-preview.5.23280.8 + 8.0.0-preview.5.23280.1 + 6.15.1 + + diff --git a/global.json b/global.json index 30e2afcae..1451ba609 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "7.0.100", + "version": "8.0.100-preview.5.23303.2", "rollForward": "latestMajor", - "allowPrerelease": false + "allowPrerelease": true } } \ No newline at end of file diff --git a/hosts/AspNetIdentity/Host.AspNetIdentity.csproj b/hosts/AspNetIdentity/Host.AspNetIdentity.csproj index dc5bd2a97..f414a5989 100644 --- a/hosts/AspNetIdentity/Host.AspNetIdentity.csproj +++ b/hosts/AspNetIdentity/Host.AspNetIdentity.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 IdentityServerHost enable enable diff --git a/hosts/Configuration/Host.Configuration.csproj b/hosts/Configuration/Host.Configuration.csproj index fdc0f9c92..8e0d65ac8 100644 --- a/hosts/Configuration/Host.Configuration.csproj +++ b/hosts/Configuration/Host.Configuration.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 InProcess IdentityServerHost e60c119c-8b86-4016-9d44-80e25948dbba diff --git a/hosts/EntityFramework/Host.EntityFramework.csproj b/hosts/EntityFramework/Host.EntityFramework.csproj index 593039444..1748e7cb8 100644 --- a/hosts/EntityFramework/Host.EntityFramework.csproj +++ b/hosts/EntityFramework/Host.EntityFramework.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 IdentityServerHost enable enable diff --git a/hosts/main/Host.Main.csproj b/hosts/main/Host.Main.csproj index 5c605e692..638a61bf7 100644 --- a/hosts/main/Host.Main.csproj +++ b/hosts/main/Host.Main.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 InProcess IdentityServerHost e60c119c-8b86-4016-9d44-80e25948dbba diff --git a/hosts/main7/Host.Main7.csproj b/hosts/main7/Host.Main7.csproj index 3cf11325c..7cc58582a 100644 --- a/hosts/main7/Host.Main7.csproj +++ b/hosts/main7/Host.Main7.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 InProcess IdentityServerHost e60c119c-8b86-4016-9d44-80e25948dbba diff --git a/migrations/AspNetIdentityDb/AspNetIdentityDb.csproj b/migrations/AspNetIdentityDb/AspNetIdentityDb.csproj index 7412cfb75..273a74124 100644 --- a/migrations/AspNetIdentityDb/AspNetIdentityDb.csproj +++ b/migrations/AspNetIdentityDb/AspNetIdentityDb.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 diff --git a/migrations/IdentityServerDb/IdentityServerDb.csproj b/migrations/IdentityServerDb/IdentityServerDb.csproj index 304dfdf74..d73eb8689 100644 --- a/migrations/IdentityServerDb/IdentityServerDb.csproj +++ b/migrations/IdentityServerDb/IdentityServerDb.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 diff --git a/src/AspNetIdentity/Duende.IdentityServer.AspNetIdentity.csproj b/src/AspNetIdentity/Duende.IdentityServer.AspNetIdentity.csproj index 0bba2e05e..72a4bbbc6 100644 --- a/src/AspNetIdentity/Duende.IdentityServer.AspNetIdentity.csproj +++ b/src/AspNetIdentity/Duende.IdentityServer.AspNetIdentity.csproj @@ -2,7 +2,7 @@ Duende.IdentityServer.AspNetIdentity - net6.0;net7.0 + net8.0 ASP.NET Core Identity Integration for Duende IdentityServer Duende.IdentityServer.AspNetIdentity diff --git a/src/Configuration.EntityFramework/Duende.IdentityServer.Configuration.EntityFramework.csproj b/src/Configuration.EntityFramework/Duende.IdentityServer.Configuration.EntityFramework.csproj index f4415b129..cbae97746 100644 --- a/src/Configuration.EntityFramework/Duende.IdentityServer.Configuration.EntityFramework.csproj +++ b/src/Configuration.EntityFramework/Duende.IdentityServer.Configuration.EntityFramework.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net8.0 enable enable true diff --git a/src/Configuration/Duende.IdentityServer.Configuration.csproj b/src/Configuration/Duende.IdentityServer.Configuration.csproj index b7cbb1b47..eb5982b77 100644 --- a/src/Configuration/Duende.IdentityServer.Configuration.csproj +++ b/src/Configuration/Duende.IdentityServer.Configuration.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net8.0 enable enable Configuration system for Duende IdentityServer diff --git a/src/EntityFramework.Storage/Duende.IdentityServer.EntityFramework.Storage.csproj b/src/EntityFramework.Storage/Duende.IdentityServer.EntityFramework.Storage.csproj index 1f87c4624..82e78c0c4 100644 --- a/src/EntityFramework.Storage/Duende.IdentityServer.EntityFramework.Storage.csproj +++ b/src/EntityFramework.Storage/Duende.IdentityServer.EntityFramework.Storage.csproj @@ -1,7 +1,7 @@ Duende.IdentityServer.EntityFramework.Storage - net6.0;net7.0 + net8.0 EntityFramework persistence layer for Duende IdentityServer true diff --git a/src/EntityFramework/Duende.IdentityServer.EntityFramework.csproj b/src/EntityFramework/Duende.IdentityServer.EntityFramework.csproj index aec5882a5..af0951f3a 100644 --- a/src/EntityFramework/Duende.IdentityServer.EntityFramework.csproj +++ b/src/EntityFramework/Duende.IdentityServer.EntityFramework.csproj @@ -2,7 +2,7 @@ Duende.IdentityServer.EntityFramework - net6.0;net7.0 + net8.0 EntityFramework persistence layer for Duende IdentityServer Duende.IdentityServer.EntityFramework diff --git a/src/IdentityServer/Duende.IdentityServer.csproj b/src/IdentityServer/Duende.IdentityServer.csproj index 576cebba9..f8bb6151c 100644 --- a/src/IdentityServer/Duende.IdentityServer.csproj +++ b/src/IdentityServer/Duende.IdentityServer.csproj @@ -2,7 +2,7 @@ Duende.IdentityServer - net6.0;net7.0 + net8.0 OpenID Connect and OAuth 2.0 Framework for ASP.NET Core diff --git a/src/IdentityServer/Validation/Default/JwtBearerClientAssertionSecretParser.cs b/src/IdentityServer/Validation/Default/JwtBearerClientAssertionSecretParser.cs index 73ed99b9d..6989cbe74 100644 --- a/src/IdentityServer/Validation/Default/JwtBearerClientAssertionSecretParser.cs +++ b/src/IdentityServer/Validation/Default/JwtBearerClientAssertionSecretParser.cs @@ -110,9 +110,9 @@ public class JwtBearerClientAssertionSecretParser : ISecretParser var jwt = new JwtSecurityToken(token); return jwt.Subject; } - catch (Exception e) + catch { - _logger.LogWarning("Could not parse client assertion", e); + _logger.LogWarning("Could not parse client assertion"); return null; } } diff --git a/src/Storage/Duende.IdentityServer.Storage.csproj b/src/Storage/Duende.IdentityServer.Storage.csproj index 351298af6..8be99440b 100644 --- a/src/Storage/Duende.IdentityServer.Storage.csproj +++ b/src/Storage/Duende.IdentityServer.Storage.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net8.0 Duende.IdentityServer.Storage Storage interfaces and models for Duende IdentityServer diff --git a/test/Configuration.IntegrationTests/Configuration.IntegrationTests.csproj b/test/Configuration.IntegrationTests/Configuration.IntegrationTests.csproj index dea5c189a..dec9c2c78 100644 --- a/test/Configuration.IntegrationTests/Configuration.IntegrationTests.csproj +++ b/test/Configuration.IntegrationTests/Configuration.IntegrationTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net8.0 enable enable diff --git a/test/EntityFramework.Storage.IntegrationTests/EntityFramework.Storage.IntegrationTests.csproj b/test/EntityFramework.Storage.IntegrationTests/EntityFramework.Storage.IntegrationTests.csproj index aef3927d1..62c23f4dd 100644 --- a/test/EntityFramework.Storage.IntegrationTests/EntityFramework.Storage.IntegrationTests.csproj +++ b/test/EntityFramework.Storage.IntegrationTests/EntityFramework.Storage.IntegrationTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net8.0 diff --git a/test/EntityFramework.Storage.UnitTests/EntityFramework.Storage.UnitTests.csproj b/test/EntityFramework.Storage.UnitTests/EntityFramework.Storage.UnitTests.csproj index 7aac66693..40deba925 100644 --- a/test/EntityFramework.Storage.UnitTests/EntityFramework.Storage.UnitTests.csproj +++ b/test/EntityFramework.Storage.UnitTests/EntityFramework.Storage.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net8.0 diff --git a/test/EntityFramework.Tests/EntityFramework.Tests.csproj b/test/EntityFramework.Tests/EntityFramework.Tests.csproj index 12d76b9fb..4aa8919c2 100644 --- a/test/EntityFramework.Tests/EntityFramework.Tests.csproj +++ b/test/EntityFramework.Tests/EntityFramework.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net8.0 diff --git a/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj b/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj index 2b42e315b..ad85719e2 100644 --- a/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj +++ b/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net8.0 diff --git a/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj b/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj index 71748f97b..7a58da61f 100644 --- a/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj +++ b/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net8.0