diff --git a/Dockerfile b/Dockerfile index 524132a16..e1dcba413 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0 +FROM mcr.microsoft.com/dotnet/sdk:8.0 WORKDIR /src COPY . . RUN /src/build.sh \ No newline at end of file diff --git a/README.md b/README.md index b00b65b6d..8f65542a8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# .NET 6.0 Port of IdentityServer4 +# .NET 8.0 Port of IdentityServer4 Once a new tag is created, NuGet packages are automatically added to a release as an asset. Packages are to be uploaded manually to whathever package hosting server you please - Nexus, etc. ## Important update from the original creators diff --git a/global.json b/global.json index adf50e1f7..70976d298 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.412" + "version": "8.0.*" } } \ No newline at end of file diff --git a/samples/Clients/old/MvcHybrid/MvcHybrid.csproj b/samples/Clients/old/MvcHybrid/MvcHybrid.csproj index 0f9a84153..9e20d004c 100644 --- a/samples/Clients/old/MvcHybrid/MvcHybrid.csproj +++ b/samples/Clients/old/MvcHybrid/MvcHybrid.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/old/MvcImplicit/MvcImplicit.csproj b/samples/Clients/old/MvcImplicit/MvcImplicit.csproj index 3c844c78a..a95d8634d 100644 --- a/samples/Clients/old/MvcImplicit/MvcImplicit.csproj +++ b/samples/Clients/old/MvcImplicit/MvcImplicit.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/old/MvcImplicitJwtRequest/MvcImplicitJwtRequest.csproj b/samples/Clients/old/MvcImplicitJwtRequest/MvcImplicitJwtRequest.csproj index 330d86809..bdcaa3f59 100644 --- a/samples/Clients/old/MvcImplicitJwtRequest/MvcImplicitJwtRequest.csproj +++ b/samples/Clients/old/MvcImplicitJwtRequest/MvcImplicitJwtRequest.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/old/MvcManual/MvcManual.csproj b/samples/Clients/old/MvcManual/MvcManual.csproj index f928ec165..0c1bb005c 100644 --- a/samples/Clients/old/MvcManual/MvcManual.csproj +++ b/samples/Clients/old/MvcManual/MvcManual.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj b/samples/Clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj index 0e02bd21c..449a2b999 100644 --- a/samples/Clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj +++ b/samples/Clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/src/APIs/SimpleApi/SimpleApi.csproj b/samples/Clients/src/APIs/SimpleApi/SimpleApi.csproj index bc24c9142..356d888f7 100644 --- a/samples/Clients/src/APIs/SimpleApi/SimpleApi.csproj +++ b/samples/Clients/src/APIs/SimpleApi/SimpleApi.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj b/samples/Clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj +++ b/samples/Clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj b/samples/Clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj +++ b/samples/Clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj b/samples/Clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj index be424b745..981758807 100644 --- a/samples/Clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj +++ b/samples/Clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleCode/ConsoleCode.csproj b/samples/Clients/src/ConsoleCode/ConsoleCode.csproj index f13a17911..6bd4d5cae 100644 --- a/samples/Clients/src/ConsoleCode/ConsoleCode.csproj +++ b/samples/Clients/src/ConsoleCode/ConsoleCode.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe ConsoleHybridWithPkce diff --git a/samples/Clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj b/samples/Clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj +++ b/samples/Clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj b/samples/Clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj +++ b/samples/Clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj b/samples/Clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj index ff708bb4e..e944b98c9 100644 --- a/samples/Clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj +++ b/samples/Clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/samples/Clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj b/samples/Clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj +++ b/samples/Clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj b/samples/Clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj index 0da5c0567..60c7f9822 100644 --- a/samples/Clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj +++ b/samples/Clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj b/samples/Clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj index b9433b0c2..8b3cf2ad9 100644 --- a/samples/Clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj +++ b/samples/Clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 ConsoleStructuredScopeClient diff --git a/samples/Clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj b/samples/Clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj index 4f549d8a6..d5600b96f 100644 --- a/samples/Clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj +++ b/samples/Clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj b/samples/Clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj b/samples/Clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj b/samples/Clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj b/samples/Clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj b/samples/Clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj index fddfa4c4c..193f9022e 100644 --- a/samples/Clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj +++ b/samples/Clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Clients/src/JsOidc/JsOidc.csproj b/samples/Clients/src/JsOidc/JsOidc.csproj index 51c150a86..fbd3afa8a 100644 --- a/samples/Clients/src/JsOidc/JsOidc.csproj +++ b/samples/Clients/src/JsOidc/JsOidc.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 \ No newline at end of file diff --git a/samples/Clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj b/samples/Clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj index d0290a8e7..fe7877f0a 100644 --- a/samples/Clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj +++ b/samples/Clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/src/MvcCode/MvcCode.csproj b/samples/Clients/src/MvcCode/MvcCode.csproj index cb1ac7a8f..c37ef772e 100644 --- a/samples/Clients/src/MvcCode/MvcCode.csproj +++ b/samples/Clients/src/MvcCode/MvcCode.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj b/samples/Clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj index 3c844c78a..a95d8634d 100644 --- a/samples/Clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj +++ b/samples/Clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/KeyManagement/FileSystem/FileSystemSample.csproj b/samples/KeyManagement/FileSystem/FileSystemSample.csproj index 23283cd5e..fab51d516 100644 --- a/samples/KeyManagement/FileSystem/FileSystemSample.csproj +++ b/samples/KeyManagement/FileSystem/FileSystemSample.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 diff --git a/samples/KeyManagement/database/EF/EfSample.csproj b/samples/KeyManagement/database/EF/EfSample.csproj index 3573c07cf..7b1dd8e99 100644 --- a/samples/KeyManagement/database/EF/EfSample.csproj +++ b/samples/KeyManagement/database/EF/EfSample.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/KeyManagement/database/migrations/migrations.csproj b/samples/KeyManagement/database/migrations/migrations.csproj index 527eb978b..c292cda05 100644 --- a/samples/KeyManagement/database/migrations/migrations.csproj +++ b/samples/KeyManagement/database/migrations/migrations.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/1_ClientCredentials/src/Api/Api.csproj b/samples/Quickstarts/1_ClientCredentials/src/Api/Api.csproj index 349516ccf..0e32db300 100644 --- a/samples/Quickstarts/1_ClientCredentials/src/Api/Api.csproj +++ b/samples/Quickstarts/1_ClientCredentials/src/Api/Api.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/1_ClientCredentials/src/Client/Client.csproj b/samples/Quickstarts/1_ClientCredentials/src/Client/Client.csproj index fc777d05e..ec3bcc8d8 100644 --- a/samples/Quickstarts/1_ClientCredentials/src/Client/Client.csproj +++ b/samples/Quickstarts/1_ClientCredentials/src/Client/Client.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj b/samples/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj index cbc1e0bd1..a081e4fa6 100644 --- a/samples/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj +++ b/samples/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj b/samples/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj index 349516ccf..0e32db300 100644 --- a/samples/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj +++ b/samples/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/2_InteractiveAspNetCore/src/Client/Client.csproj b/samples/Quickstarts/2_InteractiveAspNetCore/src/Client/Client.csproj index fc777d05e..ec3bcc8d8 100644 --- a/samples/Quickstarts/2_InteractiveAspNetCore/src/Client/Client.csproj +++ b/samples/Quickstarts/2_InteractiveAspNetCore/src/Client/Client.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj b/samples/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj index 4c2dae2b7..7b6335395 100644 --- a/samples/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj +++ b/samples/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/2_InteractiveAspNetCore/src/MvcClient/MvcClient.csproj b/samples/Quickstarts/2_InteractiveAspNetCore/src/MvcClient/MvcClient.csproj index e08aacd4f..4905641d5 100644 --- a/samples/Quickstarts/2_InteractiveAspNetCore/src/MvcClient/MvcClient.csproj +++ b/samples/Quickstarts/2_InteractiveAspNetCore/src/MvcClient/MvcClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj b/samples/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj index 349516ccf..0e32db300 100644 --- a/samples/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj +++ b/samples/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/3_AspNetCoreAndApis/src/Client/Client.csproj b/samples/Quickstarts/3_AspNetCoreAndApis/src/Client/Client.csproj index fc777d05e..ec3bcc8d8 100644 --- a/samples/Quickstarts/3_AspNetCoreAndApis/src/Client/Client.csproj +++ b/samples/Quickstarts/3_AspNetCoreAndApis/src/Client/Client.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj b/samples/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj index 4c2dae2b7..7b6335395 100644 --- a/samples/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj +++ b/samples/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/3_AspNetCoreAndApis/src/MvcClient/MvcClient.csproj b/samples/Quickstarts/3_AspNetCoreAndApis/src/MvcClient/MvcClient.csproj index a9f9ff051..e27988ebc 100644 --- a/samples/Quickstarts/3_AspNetCoreAndApis/src/MvcClient/MvcClient.csproj +++ b/samples/Quickstarts/3_AspNetCoreAndApis/src/MvcClient/MvcClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/4_JavaScriptClient/src/Api/Api.csproj b/samples/Quickstarts/4_JavaScriptClient/src/Api/Api.csproj index 349516ccf..0e32db300 100644 --- a/samples/Quickstarts/4_JavaScriptClient/src/Api/Api.csproj +++ b/samples/Quickstarts/4_JavaScriptClient/src/Api/Api.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/4_JavaScriptClient/src/Client/Client.csproj b/samples/Quickstarts/4_JavaScriptClient/src/Client/Client.csproj index fc777d05e..ec3bcc8d8 100644 --- a/samples/Quickstarts/4_JavaScriptClient/src/Client/Client.csproj +++ b/samples/Quickstarts/4_JavaScriptClient/src/Client/Client.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Quickstarts/4_JavaScriptClient/src/IdentityServer/IdentityServer.csproj b/samples/Quickstarts/4_JavaScriptClient/src/IdentityServer/IdentityServer.csproj index 4c2dae2b7..7b6335395 100644 --- a/samples/Quickstarts/4_JavaScriptClient/src/IdentityServer/IdentityServer.csproj +++ b/samples/Quickstarts/4_JavaScriptClient/src/IdentityServer/IdentityServer.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/4_JavaScriptClient/src/JavaScriptClient/JavaScriptClient.csproj b/samples/Quickstarts/4_JavaScriptClient/src/JavaScriptClient/JavaScriptClient.csproj index e948168d3..d1e4d6ede 100644 --- a/samples/Quickstarts/4_JavaScriptClient/src/JavaScriptClient/JavaScriptClient.csproj +++ b/samples/Quickstarts/4_JavaScriptClient/src/JavaScriptClient/JavaScriptClient.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 diff --git a/samples/Quickstarts/4_JavaScriptClient/src/MvcClient/MvcClient.csproj b/samples/Quickstarts/4_JavaScriptClient/src/MvcClient/MvcClient.csproj index a9f9ff051..e27988ebc 100644 --- a/samples/Quickstarts/4_JavaScriptClient/src/MvcClient/MvcClient.csproj +++ b/samples/Quickstarts/4_JavaScriptClient/src/MvcClient/MvcClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/5_EntityFramework/src/Api/Api.csproj b/samples/Quickstarts/5_EntityFramework/src/Api/Api.csproj index 349516ccf..0e32db300 100644 --- a/samples/Quickstarts/5_EntityFramework/src/Api/Api.csproj +++ b/samples/Quickstarts/5_EntityFramework/src/Api/Api.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/5_EntityFramework/src/Client/Client.csproj b/samples/Quickstarts/5_EntityFramework/src/Client/Client.csproj index fc777d05e..ec3bcc8d8 100644 --- a/samples/Quickstarts/5_EntityFramework/src/Client/Client.csproj +++ b/samples/Quickstarts/5_EntityFramework/src/Client/Client.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Quickstarts/5_EntityFramework/src/IdentityServer/IdentityServer.csproj b/samples/Quickstarts/5_EntityFramework/src/IdentityServer/IdentityServer.csproj index 632b9fc94..6eb759a23 100644 --- a/samples/Quickstarts/5_EntityFramework/src/IdentityServer/IdentityServer.csproj +++ b/samples/Quickstarts/5_EntityFramework/src/IdentityServer/IdentityServer.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 diff --git a/samples/Quickstarts/5_EntityFramework/src/MvcClient/MvcClient.csproj b/samples/Quickstarts/5_EntityFramework/src/MvcClient/MvcClient.csproj index a9f9ff051..e27988ebc 100644 --- a/samples/Quickstarts/5_EntityFramework/src/MvcClient/MvcClient.csproj +++ b/samples/Quickstarts/5_EntityFramework/src/MvcClient/MvcClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/6_AspNetIdentity/src/Api/Api.csproj b/samples/Quickstarts/6_AspNetIdentity/src/Api/Api.csproj index 349516ccf..0e32db300 100644 --- a/samples/Quickstarts/6_AspNetIdentity/src/Api/Api.csproj +++ b/samples/Quickstarts/6_AspNetIdentity/src/Api/Api.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/6_AspNetIdentity/src/Client/Client.csproj b/samples/Quickstarts/6_AspNetIdentity/src/Client/Client.csproj index fc777d05e..ec3bcc8d8 100644 --- a/samples/Quickstarts/6_AspNetIdentity/src/Client/Client.csproj +++ b/samples/Quickstarts/6_AspNetIdentity/src/Client/Client.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe diff --git a/samples/Quickstarts/6_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj b/samples/Quickstarts/6_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj index 9f455bf76..12eef7bb4 100644 --- a/samples/Quickstarts/6_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj +++ b/samples/Quickstarts/6_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/6_AspNetIdentity/src/MvcClient/MvcClient.csproj b/samples/Quickstarts/6_AspNetIdentity/src/MvcClient/MvcClient.csproj index a9f9ff051..e27988ebc 100644 --- a/samples/Quickstarts/6_AspNetIdentity/src/MvcClient/MvcClient.csproj +++ b/samples/Quickstarts/6_AspNetIdentity/src/MvcClient/MvcClient.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/samples/Quickstarts/Directory.Build.targets b/samples/Quickstarts/Directory.Build.targets index 1611f8603..bdab1cb9d 100644 --- a/samples/Quickstarts/Directory.Build.targets +++ b/samples/Quickstarts/Directory.Build.targets @@ -16,7 +16,7 @@ - + diff --git a/src/AspNetIdentity/build/build.csproj b/src/AspNetIdentity/build/build.csproj index b9a5a48d9..d8b27a074 100644 --- a/src/AspNetIdentity/build/build.csproj +++ b/src/AspNetIdentity/build/build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/src/AspNetIdentity/host/Host.csproj b/src/AspNetIdentity/host/Host.csproj index 490b95451..04f0950e3 100644 --- a/src/AspNetIdentity/host/Host.csproj +++ b/src/AspNetIdentity/host/Host.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/AspNetIdentity/migrations/SqlServer/SqlServer.csproj b/src/AspNetIdentity/migrations/SqlServer/SqlServer.csproj index e8c87b6f2..274e828c7 100644 --- a/src/AspNetIdentity/migrations/SqlServer/SqlServer.csproj +++ b/src/AspNetIdentity/migrations/SqlServer/SqlServer.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/AspNetIdentity/src/IdentityServer4.AspNetIdentity.csproj b/src/AspNetIdentity/src/IdentityServer4.AspNetIdentity.csproj index 1e84a8fb7..5fd869a22 100644 --- a/src/AspNetIdentity/src/IdentityServer4.AspNetIdentity.csproj +++ b/src/AspNetIdentity/src/IdentityServer4.AspNetIdentity.csproj @@ -2,7 +2,7 @@ IdentityServer4.AspNetIdentity - net6.0 + net8.0 ASP.NET Core Identity Integration for IdentityServer4 Brock Allen;Dominick Baier diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index b2a9bad25..10cc6b9ae 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,9 +1,9 @@ - 6.0.20 - 6.0.20 - 6.0.20 + 8.0.12 + 8.0.12 + 8.0.12 4.1.3-kistler.* @@ -39,11 +39,11 @@ - - - - - + + + + + diff --git a/src/EntityFramework.Storage/build/build.csproj b/src/EntityFramework.Storage/build/build.csproj index b9a5a48d9..d8b27a074 100644 --- a/src/EntityFramework.Storage/build/build.csproj +++ b/src/EntityFramework.Storage/build/build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj b/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj index ce90be60b..d6fb6623f 100644 --- a/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj +++ b/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/src/EntityFramework.Storage/migrations/SqlServer/SqlServer.csproj b/src/EntityFramework.Storage/migrations/SqlServer/SqlServer.csproj index ed2f56466..782672215 100644 --- a/src/EntityFramework.Storage/migrations/SqlServer/SqlServer.csproj +++ b/src/EntityFramework.Storage/migrations/SqlServer/SqlServer.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/EntityFramework.Storage/src/IdentityServer4.EntityFramework.Storage.csproj b/src/EntityFramework.Storage/src/IdentityServer4.EntityFramework.Storage.csproj index 3ccf24783..426f88e55 100644 --- a/src/EntityFramework.Storage/src/IdentityServer4.EntityFramework.Storage.csproj +++ b/src/EntityFramework.Storage/src/IdentityServer4.EntityFramework.Storage.csproj @@ -2,7 +2,7 @@ IdentityServer4.EntityFramework.Storage - net6.0 + net8.0 EntityFramework persistence layer for IdentityServer4 Brock Allen;Dominick Baier;Scott Brady diff --git a/src/EntityFramework.Storage/test/IntegrationTests/IdentityServer4.EntityFramework.IntegrationTests.csproj b/src/EntityFramework.Storage/test/IntegrationTests/IdentityServer4.EntityFramework.IntegrationTests.csproj index 6f27fe939..a08904389 100644 --- a/src/EntityFramework.Storage/test/IntegrationTests/IdentityServer4.EntityFramework.IntegrationTests.csproj +++ b/src/EntityFramework.Storage/test/IntegrationTests/IdentityServer4.EntityFramework.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 ../../../../key.snk true diff --git a/src/EntityFramework.Storage/test/UnitTests/IdentityServer4.EntityFramework.UnitTests.csproj b/src/EntityFramework.Storage/test/UnitTests/IdentityServer4.EntityFramework.UnitTests.csproj index e01330b77..a289be71a 100644 --- a/src/EntityFramework.Storage/test/UnitTests/IdentityServer4.EntityFramework.UnitTests.csproj +++ b/src/EntityFramework.Storage/test/UnitTests/IdentityServer4.EntityFramework.UnitTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 ../../../../key.snk true diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/ApiResourceMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/ApiResourceMappersTests.cs index ec55c1a66..b297caff5 100644 --- a/src/EntityFramework.Storage/test/UnitTests/Mappers/ApiResourceMappersTests.cs +++ b/src/EntityFramework.Storage/test/UnitTests/Mappers/ApiResourceMappersTests.cs @@ -15,7 +15,7 @@ public class ApiResourceMappersTests [Fact] public void AutomapperConfigurationIsValid() { - ApiResourceMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); + ApiResourceMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); } [Fact] diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/ClientMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/ClientMappersTests.cs index 99a0e4459..91ac1b01f 100644 --- a/src/EntityFramework.Storage/test/UnitTests/Mappers/ClientMappersTests.cs +++ b/src/EntityFramework.Storage/test/UnitTests/Mappers/ClientMappersTests.cs @@ -16,7 +16,7 @@ public class ClientMappersTests [Fact] public void AutomapperConfigurationIsValid() { - ClientMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); + ClientMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); } [Fact] diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/IdentityResourcesMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/IdentityResourcesMappersTests.cs index fe2119319..783b11079 100644 --- a/src/EntityFramework.Storage/test/UnitTests/Mappers/IdentityResourcesMappersTests.cs +++ b/src/EntityFramework.Storage/test/UnitTests/Mappers/IdentityResourcesMappersTests.cs @@ -13,7 +13,7 @@ public class IdentityResourcesMappersTests [Fact] public void IdentityResourceAutomapperConfigurationIsValid() { - IdentityResourceMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); + IdentityResourceMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); } [Fact] diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/PersistedGrantMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/PersistedGrantMappersTests.cs index 48fbeffb4..6cdad39ac 100644 --- a/src/EntityFramework.Storage/test/UnitTests/Mappers/PersistedGrantMappersTests.cs +++ b/src/EntityFramework.Storage/test/UnitTests/Mappers/PersistedGrantMappersTests.cs @@ -14,7 +14,7 @@ public class PersistedGrantMappersTests [Fact] public void PersistedGrantAutomapperConfigurationIsValid() { - PersistedGrantMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); + PersistedGrantMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); } [Fact] diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/ScopeMappersTests.cs b/src/EntityFramework.Storage/test/UnitTests/Mappers/ScopeMappersTests.cs index 2765e4aa4..a7395b540 100644 --- a/src/EntityFramework.Storage/test/UnitTests/Mappers/ScopeMappersTests.cs +++ b/src/EntityFramework.Storage/test/UnitTests/Mappers/ScopeMappersTests.cs @@ -15,7 +15,7 @@ public class ScopesMappersTests [Fact] public void ScopeAutomapperConfigurationIsValid() { - ScopeMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); + ScopeMappers.Mapper.ConfigurationProvider.AssertConfigurationIsValid(); } [Fact] diff --git a/src/EntityFramework/build/build.csproj b/src/EntityFramework/build/build.csproj index b9a5a48d9..d8b27a074 100644 --- a/src/EntityFramework/build/build.csproj +++ b/src/EntityFramework/build/build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/src/EntityFramework/host/Host.csproj b/src/EntityFramework/host/Host.csproj index 8e5ed0cb2..6bd1cefa1 100644 --- a/src/EntityFramework/host/Host.csproj +++ b/src/EntityFramework/host/Host.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/EntityFramework/migrations/SqlServer/SqlServer.csproj b/src/EntityFramework/migrations/SqlServer/SqlServer.csproj index 0ce43c362..51a50258c 100644 --- a/src/EntityFramework/migrations/SqlServer/SqlServer.csproj +++ b/src/EntityFramework/migrations/SqlServer/SqlServer.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/EntityFramework/src/IdentityServer4.EntityFramework.csproj b/src/EntityFramework/src/IdentityServer4.EntityFramework.csproj index 17153ff8f..aba2f24e1 100644 --- a/src/EntityFramework/src/IdentityServer4.EntityFramework.csproj +++ b/src/EntityFramework/src/IdentityServer4.EntityFramework.csproj @@ -2,7 +2,7 @@ IdentityServer4.EntityFramework - net6.0 + net8.0 EntityFramework persistence layer for IdentityServer4 Brock Allen;Dominick Baier;Scott Brady diff --git a/src/EntityFramework/test/IdentityServer4.EntityFramework.Tests/IdentityServer4.EntityFramework.Tests.csproj b/src/EntityFramework/test/IdentityServer4.EntityFramework.Tests/IdentityServer4.EntityFramework.Tests.csproj index 857d701ba..ec91d09ff 100644 --- a/src/EntityFramework/test/IdentityServer4.EntityFramework.Tests/IdentityServer4.EntityFramework.Tests.csproj +++ b/src/EntityFramework/test/IdentityServer4.EntityFramework.Tests/IdentityServer4.EntityFramework.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 false diff --git a/src/IdentityServer4/build/build.csproj b/src/IdentityServer4/build/build.csproj index b9a5a48d9..d8b27a074 100644 --- a/src/IdentityServer4/build/build.csproj +++ b/src/IdentityServer4/build/build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/src/IdentityServer4/host/Host.csproj b/src/IdentityServer4/host/Host.csproj index 55377f75c..a7c6aa41b 100644 --- a/src/IdentityServer4/host/Host.csproj +++ b/src/IdentityServer4/host/Host.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 InProcess diff --git a/src/IdentityServer4/src/IdentityServer4.csproj b/src/IdentityServer4/src/IdentityServer4.csproj index 07e6d2376..61faeba98 100644 --- a/src/IdentityServer4/src/IdentityServer4.csproj +++ b/src/IdentityServer4/src/IdentityServer4.csproj @@ -2,7 +2,7 @@ IdentityServer4 - net6.0 + net8.0 OpenID Connect and OAuth 2.0 Framework for ASP.NET Core Brock Allen;Dominick Baier IdentityServer4 diff --git a/src/IdentityServer4/src/ResponseHandling/Default/DiscoveryResponseGenerator.cs b/src/IdentityServer4/src/ResponseHandling/Default/DiscoveryResponseGenerator.cs index 48755d073..9a4effc9d 100644 --- a/src/IdentityServer4/src/ResponseHandling/Default/DiscoveryResponseGenerator.cs +++ b/src/IdentityServer4/src/ResponseHandling/Default/DiscoveryResponseGenerator.cs @@ -334,7 +334,7 @@ where scope.ShowInDiscoveryDocument } // custom entries - if (!Options.Discovery.CustomEntries.IsNullOrEmpty()) + if (!IEnumerableExtensions.IsNullOrEmpty(Options.Discovery.CustomEntries)) { foreach ((string key, object value) in Options.Discovery.CustomEntries) { diff --git a/src/IdentityServer4/src/Services/Default/DefaultKeyMaterialService.cs b/src/IdentityServer4/src/Services/Default/DefaultKeyMaterialService.cs index a7590dc7a..c5ba6300d 100644 --- a/src/IdentityServer4/src/Services/Default/DefaultKeyMaterialService.cs +++ b/src/IdentityServer4/src/Services/Default/DefaultKeyMaterialService.cs @@ -38,7 +38,7 @@ public async Task GetSigningCredentialsAsync(IEnumerable - net6.0 + net8.0 diff --git a/src/IdentityServer4/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs b/src/IdentityServer4/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs index 1cad80a09..7b54ad1e2 100644 --- a/src/IdentityServer4/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs +++ b/src/IdentityServer4/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs @@ -21,7 +21,7 @@ public void AddSigningCredential_with_json_web_key_containing_asymmetric_key_sho IServiceCollection services = new ServiceCollection(); IIdentityServerBuilder identityServerBuilder = new IdentityServerBuilder(services); - String json = + var json = @"{ ""alg"" : ""RS256"", ""kty"" : ""RSA"", @@ -33,7 +33,7 @@ public void AddSigningCredential_with_json_web_key_containing_asymmetric_key_sho ""q"" : ""yDKBrS8l1DOx4dwP9hdwhqZJ3XahidiIZSL7m46I/6+cjaki/1mtNiA60MOgqTKegP7Fo7jAYvliqQwnvVGmQvLv19cfKywlIuKN9DdkLHnKh75hfo7aakEbO7GJ5zVgsNnKOdf8wvpclfvIuRDEVva4cksPzsJy6K7C8ENCSCM="", ""dp"" : ""GlYJ6o6wgawxCEQ5z5uWwETau5CS/Fk7kI2ceI14SZVHzlJQC2WglAcnQcqhmQCk57Xsy5iLM6vKyi8sdMJPh+nvR2HlyNA+w7YBy4L7odqn01VmLgv7zVVjZpNq4ZXEoDC1Q+xjtF1LoYaUt7wsRLp+a7znuPyHBXj1sAAeBwk="", ""dq"" : ""W8OK3S83T8VCTBzq1Ap6cb3XLcQq11yBaJpYaj0zXr/IKsbUW+dnFeBAFWEWS3gAX3Bod1tAFB3rs0D3FjhO1XE1ruHUT520iAEAwGiDaj+JLh994NzqELo3GW2PoIM/BtFNeKYgHd9UgQsgPnQJCzOb6Aev/z3yHeW9RRQPVbE="", - ""qi"" : ""w4KdmiDN1GtK71JxaasqmEKPNfV3v2KZDXKnfyhUsdx/idKbdTVjvMOkxFPJ4FqV4yIVn06f3QHTm4NEG18Diqxsrzd6kXQIHOa858tLsCcmt9FoGfrgCFgVceh3K/Zah/r8rl9Y61u0Z1kZumwMvFpFE+mVU01t9HgTEAVkHTc="", + ""qi"" : ""w4KdmiDN1GtK71JxaasqmEKPNfV3v2KZDXKnfyhUsdx/idKbdTVjvMOkxFPJ4FqV4yIVn06f3QHTm4NEG18Diqxsrzd6kXQIHOa858tLsCcmt9FoGfrgCFgVceh3K/Zah/r8rl9Y61u0Z1kZumwMvFpFE+mVU01t9HgTEAVkHTc="" }"; JsonWebKey jsonWebKey = new JsonWebKey(json); @@ -47,7 +47,7 @@ public void AddSigningCredential_with_json_web_key_containing_symmetric_key_shou IServiceCollection services = new ServiceCollection(); IIdentityServerBuilder identityServerBuilder = new IdentityServerBuilder(services); - String json = + var json = @"{ ""alg"" : ""HS256"", ""kty"" : ""oct"", diff --git a/src/IdentityServer4/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj b/src/IdentityServer4/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj index 007ba67c6..405718e90 100644 --- a/src/IdentityServer4/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj +++ b/src/IdentityServer4/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/Storage/build/build.csproj b/src/Storage/build/build.csproj index b9a5a48d9..d8b27a074 100644 --- a/src/Storage/build/build.csproj +++ b/src/Storage/build/build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0