From 7cab0d17721d67b4a7fe813701fd60558a41d881 Mon Sep 17 00:00:00 2001 From: Sean Farrow Date: Tue, 24 Oct 2023 10:38:44 +0100 Subject: [PATCH 01/13] Upgrade all NuGet packages for the Duende Identity Server samples. --- .../DuendeDynamicProviders.csproj | 11 ++++--- .../DuendeIdP/DuendeIdP.csproj | 5 ++-- .../IdentityServer/IdentityServer.csproj | 30 +++++++++---------- .../WebClient.OIDC/WebClient.OIDC.csproj | 6 ++-- .../WebClient.SAML.1/WebClient.SAML.1.csproj | 4 +-- .../WebClient.SAML.2/WebClient.SAML.2.csproj | 2 +- 6 files changed, 28 insertions(+), 30 deletions(-) diff --git a/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj b/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj index 5df0603..6832f4a 100644 --- a/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj +++ b/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj @@ -6,15 +6,14 @@ - + - - - - - + + + + diff --git a/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj b/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj index 9de21dd..a2eb93a 100644 --- a/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj +++ b/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj @@ -6,14 +6,13 @@ - + - - + \ No newline at end of file diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj index d5e5eca..bfe1b92 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj @@ -6,23 +6,23 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + - - + + diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj index c473d56..61b0598 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj index fbec043..bed9190 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj @@ -8,13 +8,13 @@ - + - + diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj index b394960..d3fa525 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj @@ -8,7 +8,7 @@ - + From d0c44ae340d2eb6ffd85cbe5ae20a8435fcf2c78 Mon Sep 17 00:00:00 2001 From: Sean Farrow Date: Tue, 24 Oct 2023 10:43:45 +0100 Subject: [PATCH 02/13] Update the NuGet packages for the IdentityServer4 samples. --- IdentityServer4/idp/idp.csproj | 4 ++-- IdentityServer4/idpWithEf/idpWithEf.csproj | 8 ++++---- .../idpWithIdpInitiated/idpWithIdpInitiated.csproj | 4 ++-- IdentityServer4/sp/sp.csproj | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/IdentityServer4/idp/idp.csproj b/IdentityServer4/idp/idp.csproj index 0eb31a0..bc4a19a 100644 --- a/IdentityServer4/idp/idp.csproj +++ b/IdentityServer4/idp/idp.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/IdentityServer4/idpWithEf/idpWithEf.csproj b/IdentityServer4/idpWithEf/idpWithEf.csproj index a5becdc..c6c2ba0 100644 --- a/IdentityServer4/idpWithEf/idpWithEf.csproj +++ b/IdentityServer4/idpWithEf/idpWithEf.csproj @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/IdentityServer4/idpWithIdpInitiated/idpWithIdpInitiated.csproj b/IdentityServer4/idpWithIdpInitiated/idpWithIdpInitiated.csproj index 0eb31a0..bc4a19a 100644 --- a/IdentityServer4/idpWithIdpInitiated/idpWithIdpInitiated.csproj +++ b/IdentityServer4/idpWithIdpInitiated/idpWithIdpInitiated.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/IdentityServer4/sp/sp.csproj b/IdentityServer4/sp/sp.csproj index 824bfca..dbbae95 100644 --- a/IdentityServer4/sp/sp.csproj +++ b/IdentityServer4/sp/sp.csproj @@ -10,8 +10,8 @@ - - + + From a20ef5f1909394db14d3e85890c5b6099d050d2e Mon Sep 17 00:00:00 2001 From: Sean Farrow Date: Tue, 24 Oct 2023 10:49:22 +0100 Subject: [PATCH 03/13] Update the NuGet packages for the OpenIddict sample. --- OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj b/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj index cd242d8..e637a13 100644 --- a/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj +++ b/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj @@ -24,7 +24,7 @@ - + From 3f39005f4c86df26ad42b16cedefc87691897d8e Mon Sep 17 00:00:00 2001 From: Sean Farrow Date: Tue, 24 Oct 2023 10:51:25 +0100 Subject: [PATCH 04/13] Update NuGet pacakges for the spWithIdpInitiated sample. --- spWithIdpInitiated/spWithIdpInitiated.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spWithIdpInitiated/spWithIdpInitiated.csproj b/spWithIdpInitiated/spWithIdpInitiated.csproj index 608c977..321fecc 100644 --- a/spWithIdpInitiated/spWithIdpInitiated.csproj +++ b/spWithIdpInitiated/spWithIdpInitiated.csproj @@ -5,12 +5,12 @@ - + - - + + From 16ac5e2025e9963f55ff10d5d3da4d8f9629c619 Mon Sep 17 00:00:00 2001 From: Sean Farrow Date: Tue, 24 Oct 2023 11:18:13 +0100 Subject: [PATCH 05/13] Update the NuGet packages for the spWithMultipleIdps sample. --- spWithMultipleIdps/spWithMultipleIdps.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spWithMultipleIdps/spWithMultipleIdps.csproj b/spWithMultipleIdps/spWithMultipleIdps.csproj index f6f7919..7c0b057 100644 --- a/spWithMultipleIdps/spWithMultipleIdps.csproj +++ b/spWithMultipleIdps/spWithMultipleIdps.csproj @@ -9,8 +9,8 @@ - - + + From a46bbcd76fb0333c15ab1eb46e30d98b82adb03d Mon Sep 17 00:00:00 2001 From: Sean Farrow Date: Tue, 24 Oct 2023 11:19:13 +0100 Subject: [PATCH 06/13] Update the NuGet pacakges in the spWithSingleIdp sample. --- spWithSingleIdp/spWithSingleIdp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spWithSingleIdp/spWithSingleIdp.csproj b/spWithSingleIdp/spWithSingleIdp.csproj index ea08391..84a16e1 100644 --- a/spWithSingleIdp/spWithSingleIdp.csproj +++ b/spWithSingleIdp/spWithSingleIdp.csproj @@ -11,7 +11,7 @@ - + From 4a32182d423ed007cb24db14cd35a0846bca8d6b Mon Sep 17 00:00:00 2001 From: Sean Farrow Date: Mon, 30 Oct 2023 09:31:03 +0000 Subject: [PATCH 07/13] Update the Rsk.SAML packages to 8.0.0-preview2. --- OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj | 8 ++++---- spWithIdpInitiated/spWithIdpInitiated.csproj | 2 +- spWithMultipleIdps/spWithMultipleIdps.csproj | 2 +- spWithSingleIdp/spWithSingleIdp.csproj | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj b/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj index e637a13..5e789b5 100644 --- a/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj +++ b/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj @@ -14,7 +14,7 @@ - + @@ -25,9 +25,9 @@ - - - + + + diff --git a/spWithIdpInitiated/spWithIdpInitiated.csproj b/spWithIdpInitiated/spWithIdpInitiated.csproj index 321fecc..7b8d5c9 100644 --- a/spWithIdpInitiated/spWithIdpInitiated.csproj +++ b/spWithIdpInitiated/spWithIdpInitiated.csproj @@ -9,7 +9,7 @@ - + diff --git a/spWithMultipleIdps/spWithMultipleIdps.csproj b/spWithMultipleIdps/spWithMultipleIdps.csproj index 7c0b057..1f9992d 100644 --- a/spWithMultipleIdps/spWithMultipleIdps.csproj +++ b/spWithMultipleIdps/spWithMultipleIdps.csproj @@ -9,7 +9,7 @@ - + diff --git a/spWithSingleIdp/spWithSingleIdp.csproj b/spWithSingleIdp/spWithSingleIdp.csproj index 84a16e1..e3c6005 100644 --- a/spWithSingleIdp/spWithSingleIdp.csproj +++ b/spWithSingleIdp/spWithSingleIdp.csproj @@ -11,7 +11,7 @@ - + From d255ad3bbf0d3814de972438ea7b8821333d6a52 Mon Sep 17 00:00:00 2001 From: Sean Farrow Date: Mon, 30 Oct 2023 09:35:06 +0000 Subject: [PATCH 08/13] Upgrade any out-of-date packages to the latest minor versions. --- .../IdentityServer/IdentityServer.csproj | 14 +++++++------- .../WebClient.OIDC/WebClient.OIDC.csproj | 2 +- .../WebClient.SAML.1/WebClient.SAML.1.csproj | 2 +- .../WebClient.SAML.2/WebClient.SAML.2.csproj | 2 +- OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj | 14 +++++++------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj index bfe1b92..432256f 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj @@ -7,18 +7,18 @@ - - - - - - + + + + + + - + diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj index 61b0598..52f73ca 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj @@ -8,7 +8,7 @@ - + diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj index bed9190..33d5a60 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj @@ -9,7 +9,7 @@ - + diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj index d3fa525..299b998 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj @@ -13,7 +13,7 @@ - + diff --git a/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj b/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj index 5e789b5..dc46330 100644 --- a/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj +++ b/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj @@ -11,18 +11,18 @@ - - + + - - - - - + + + + + From 30a5283504d4a4daecfe90d3f02a135585b72b81 Mon Sep 17 00:00:00 2001 From: Sean Farrow Date: Wed, 13 Dec 2023 10:44:48 +0000 Subject: [PATCH 09/13] Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6. --- .../DuendeDynamicProviders.csproj | 4 ++++ .../DuendeIdP/DuendeIdP.csproj | 8 ++++++++ .../SLO/SamlOidcSLO/Common/Common.csproj | 2 +- .../IdentityServer/IdentityServer.csproj | 18 +++++++++--------- .../WebClient.OIDC/WebClient.OIDC.csproj | 4 ++-- .../WebClient.SAML.1/WebClient.SAML.1.csproj | 8 +++++++- .../WebClient.SAML.2/WebClient.SAML.2.csproj | 6 +++++- OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj | 18 +++++++++--------- OpenIddict/OpenIddictIdP/Startup.cs | 5 ++++- spWithIdpInitiated/spWithIdpInitiated.csproj | 4 ++++ spWithMultipleIdps/spWithMultipleIdps.csproj | 4 ++++ spWithSingleIdp/spWithSingleIdp.csproj | 2 +- spWithSingleIdp/spWithSingleIdp.csproj.txt | 13 +++++++++++++ 13 files changed, 71 insertions(+), 25 deletions(-) create mode 100644 spWithSingleIdp/spWithSingleIdp.csproj.txt diff --git a/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj b/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj index 6832f4a..2925384 100644 --- a/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj +++ b/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj @@ -6,11 +6,15 @@ +<<<<<<< HEAD +======= + +>>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.) diff --git a/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj b/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj index a2eb93a..a185e56 100644 --- a/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj +++ b/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj @@ -6,6 +6,7 @@ +<<<<<<< HEAD @@ -14,5 +15,12 @@ +======= + + + + + +>>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.) \ No newline at end of file diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/Common/Common.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/Common/Common.csproj index 6836c68..eb2460e 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/Common/Common.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/Common/Common.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable enable diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj index 432256f..ced8cca 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj @@ -1,24 +1,24 @@  - net7.0 + net6.0 enable 38ced442-cf32-4289-bb08-57d4a78831b3 - - - - - - - + + + + + + + - + diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj index 52f73ca..1c94453 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj @@ -1,14 +1,14 @@ - net7.0 + net6.0 enable enable WebClient - + diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj index 33d5a60..ab2680f 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj @@ -1,13 +1,14 @@  - net7.0 + net6.0 enable enable WebClient +<<<<<<< HEAD @@ -15,6 +16,11 @@ +======= + + + +>>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.) diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj index 299b998..07df7ff 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj @@ -1,18 +1,22 @@  - net7.0 + net6.0 enable enable WebClient +<<<<<<< HEAD +======= + +>>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.) diff --git a/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj b/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj index dc46330..636539b 100644 --- a/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj +++ b/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj @@ -1,7 +1,7 @@  - net7.0 + net6.0 false @@ -11,18 +11,18 @@ - - - + + + - - - - - + + + + + diff --git a/OpenIddict/OpenIddictIdP/Startup.cs b/OpenIddict/OpenIddictIdP/Startup.cs index c92e88e..e378d6c 100644 --- a/OpenIddict/OpenIddictIdP/Startup.cs +++ b/OpenIddict/OpenIddictIdP/Startup.cs @@ -11,9 +11,12 @@ using Rsk.Saml.Configuration; using Rsk.Saml.OpenIddict.AspNetCore.Identity.Configuration.DependencyInjection; using Rsk.Saml.OpenIddict.Configuration.DependencyInjection; -using Rsk.Saml.OpenIddict.EntityFrameworkCore.Configuration.DependacyInjection; using openiddictidp.Data; +<<<<<<< HEAD using Rsk.Saml.Samples; +======= +using Rsk.Saml.OpenIddict.EntityFrameworkCore.Configuration.DependencyInjection; +>>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.) using static OpenIddict.Abstractions.OpenIddictConstants; namespace openiddictidp; diff --git a/spWithIdpInitiated/spWithIdpInitiated.csproj b/spWithIdpInitiated/spWithIdpInitiated.csproj index 7b8d5c9..5d0a46c 100644 --- a/spWithIdpInitiated/spWithIdpInitiated.csproj +++ b/spWithIdpInitiated/spWithIdpInitiated.csproj @@ -5,7 +5,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.) diff --git a/spWithMultipleIdps/spWithMultipleIdps.csproj b/spWithMultipleIdps/spWithMultipleIdps.csproj index 1f9992d..c51018f 100644 --- a/spWithMultipleIdps/spWithMultipleIdps.csproj +++ b/spWithMultipleIdps/spWithMultipleIdps.csproj @@ -5,7 +5,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.) diff --git a/spWithSingleIdp/spWithSingleIdp.csproj b/spWithSingleIdp/spWithSingleIdp.csproj index e3c6005..5ddebb2 100644 --- a/spWithSingleIdp/spWithSingleIdp.csproj +++ b/spWithSingleIdp/spWithSingleIdp.csproj @@ -11,7 +11,7 @@ - + diff --git a/spWithSingleIdp/spWithSingleIdp.csproj.txt b/spWithSingleIdp/spWithSingleIdp.csproj.txt new file mode 100644 index 0000000..7b7d74b --- /dev/null +++ b/spWithSingleIdp/spWithSingleIdp.csproj.txt @@ -0,0 +1,13 @@ + + + + net6.0 + enable + enable + + + + + + + From 402fc2ca4cdacd4071fad387397a5680b2ca8a52 Mon Sep 17 00:00:00 2001 From: Sean Farrow Date: Wed, 13 Dec 2023 10:46:15 +0000 Subject: [PATCH 10/13] Remove unwanted files. --- spWithSingleIdp/spWithSingleIdp.csproj.txt | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 spWithSingleIdp/spWithSingleIdp.csproj.txt diff --git a/spWithSingleIdp/spWithSingleIdp.csproj.txt b/spWithSingleIdp/spWithSingleIdp.csproj.txt deleted file mode 100644 index 7b7d74b..0000000 --- a/spWithSingleIdp/spWithSingleIdp.csproj.txt +++ /dev/null @@ -1,13 +0,0 @@ - - - - net6.0 - enable - enable - - - - - - - From 1963a85d0e83c94bb2462d6064b377a053f20966 Mon Sep 17 00:00:00 2001 From: Sean Farrow Date: Wed, 13 Dec 2023 11:00:10 +0000 Subject: [PATCH 11/13] Add the required DbContexts in one call in the OpenIddict IDP sample as well as pruning old artifacts using Quartz. --- OpenIddict/OpenIddictIdP/Startup.cs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/OpenIddict/OpenIddictIdP/Startup.cs b/OpenIddict/OpenIddictIdP/Startup.cs index e378d6c..4a9588f 100644 --- a/OpenIddict/OpenIddictIdP/Startup.cs +++ b/OpenIddict/OpenIddictIdP/Startup.cs @@ -123,20 +123,15 @@ public void ConfigureServices(IServiceCollection services) { //use quartz to prune old SAML messages every 14 days. builder.PruneSamlMessages(); + builder.PruneSamlArtifacts(); //Already added the DbContext above builder.UseSamlEntityFrameworkCore() - .AddSamlMessageDbContext(optionsBuilder => - { - //Configure the database provider to use. - optionsBuilder.UseSqlServer(defaultConnectionString, x =>x.MigrationsAssembly(typeof(Startup).Assembly.FullName)); - }) - .AddSamlConfigurationDbContext(optionsBuilder => - { - //Configure the database provider to use. - optionsBuilder.UseSqlServer(defaultConnectionString, - x => x.MigrationsAssembly(typeof(Startup).Assembly.FullName)); - }); + .AddSamlDbContexts(optionsBuilder => + { + //Configure the database provider to use. + optionsBuilder.UseSqlServer(defaultConnectionString, x => x.MigrationsAssembly(typeof(Startup).Assembly.FullName)); + }); builder.ConfigureSamlOpenIddictServerOptions(serverOptions => { From c747640fbf7d922450b3a6d7981f1c365600c381 Mon Sep 17 00:00:00 2001 From: Sean Farrow Date: Thu, 14 Dec 2023 11:34:47 +0000 Subject: [PATCH 12/13] Update the Rsk.Saml.* packages to version 8.0.0 except any projects that work with IdentityServer version 4. --- .../DuendeDynamicProviders.csproj | 10 +++------- DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj | 12 ++---------- .../SamlOidcSLO/IdentityServer/IdentityServer.csproj | 4 ++-- .../SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj | 2 +- .../WebClient.SAML.1/WebClient.SAML.1.csproj | 10 ++-------- .../WebClient.SAML.2/WebClient.SAML.2.csproj | 11 +++-------- OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj | 8 ++++---- OpenIddict/OpenIddictIdP/Startup.cs | 3 --- spWithIdpInitiated/spWithIdpInitiated.csproj | 4 ---- spWithMultipleIdps/spWithMultipleIdps.csproj | 4 ---- spWithSingleIdp/spWithSingleIdp.csproj | 2 +- 11 files changed, 18 insertions(+), 52 deletions(-) diff --git a/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj b/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj index 2925384..ca40887 100644 --- a/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj +++ b/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj @@ -6,18 +6,14 @@ -<<<<<<< HEAD - -======= ->>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.) - - - + + + diff --git a/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj b/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj index a185e56..1235c69 100644 --- a/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj +++ b/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj @@ -6,21 +6,13 @@ -<<<<<<< HEAD - - - - -======= - - - + + ->>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.) \ No newline at end of file diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj index ced8cca..aa82a2c 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj index 1c94453..a3b1182 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj @@ -10,7 +10,7 @@ - + diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj index ab2680f..cd35326 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj @@ -8,19 +8,13 @@ -<<<<<<< HEAD - - - -======= - - + + ->>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.) diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj index 07df7ff..e3fb027 100644 --- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj +++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj @@ -8,20 +8,15 @@ -<<<<<<< HEAD - -======= - ->>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.) - + + - - + PreserveNewest diff --git a/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj b/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj index 636539b..8b43253 100644 --- a/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj +++ b/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj @@ -14,7 +14,7 @@ - + @@ -25,9 +25,9 @@ - - - + + + diff --git a/OpenIddict/OpenIddictIdP/Startup.cs b/OpenIddict/OpenIddictIdP/Startup.cs index 4a9588f..843b069 100644 --- a/OpenIddict/OpenIddictIdP/Startup.cs +++ b/OpenIddict/OpenIddictIdP/Startup.cs @@ -12,11 +12,8 @@ using Rsk.Saml.OpenIddict.AspNetCore.Identity.Configuration.DependencyInjection; using Rsk.Saml.OpenIddict.Configuration.DependencyInjection; using openiddictidp.Data; -<<<<<<< HEAD using Rsk.Saml.Samples; -======= using Rsk.Saml.OpenIddict.EntityFrameworkCore.Configuration.DependencyInjection; ->>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.) using static OpenIddict.Abstractions.OpenIddictConstants; namespace openiddictidp; diff --git a/spWithIdpInitiated/spWithIdpInitiated.csproj b/spWithIdpInitiated/spWithIdpInitiated.csproj index 5d0a46c..7b8d5c9 100644 --- a/spWithIdpInitiated/spWithIdpInitiated.csproj +++ b/spWithIdpInitiated/spWithIdpInitiated.csproj @@ -5,11 +5,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.) diff --git a/spWithMultipleIdps/spWithMultipleIdps.csproj b/spWithMultipleIdps/spWithMultipleIdps.csproj index c51018f..1f9992d 100644 --- a/spWithMultipleIdps/spWithMultipleIdps.csproj +++ b/spWithMultipleIdps/spWithMultipleIdps.csproj @@ -5,11 +5,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> d677df3 (Ensure all projects target .Net 6.0 and that all packages are upgraded to the latest minor versions that work with .Net 6.) diff --git a/spWithSingleIdp/spWithSingleIdp.csproj b/spWithSingleIdp/spWithSingleIdp.csproj index 5ddebb2..d22fbb5 100644 --- a/spWithSingleIdp/spWithSingleIdp.csproj +++ b/spWithSingleIdp/spWithSingleIdp.csproj @@ -11,7 +11,7 @@ - + From 4ffbc5460c49b973fbe2310913371f7c8a4a3c99 Mon Sep 17 00:00:00 2001 From: Sean Farrow Date: Thu, 14 Dec 2023 11:38:33 +0000 Subject: [PATCH 13/13] Update all the Rsk.* packages in the projects targeting .NetCore 3.1 to the latest minor versions. --- IdentityServer4/idp/idp.csproj | 4 ++-- IdentityServer4/idpWithEf/idpWithEf.csproj | 4 ++-- .../idpWithIdpInitiated/idpWithIdpInitiated.csproj | 4 ++-- IdentityServer4/sp/sp.csproj | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/IdentityServer4/idp/idp.csproj b/IdentityServer4/idp/idp.csproj index bc4a19a..a4868d0 100644 --- a/IdentityServer4/idp/idp.csproj +++ b/IdentityServer4/idp/idp.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/IdentityServer4/idpWithEf/idpWithEf.csproj b/IdentityServer4/idpWithEf/idpWithEf.csproj index c6c2ba0..7743c9b 100644 --- a/IdentityServer4/idpWithEf/idpWithEf.csproj +++ b/IdentityServer4/idpWithEf/idpWithEf.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/IdentityServer4/idpWithIdpInitiated/idpWithIdpInitiated.csproj b/IdentityServer4/idpWithIdpInitiated/idpWithIdpInitiated.csproj index bc4a19a..a4868d0 100644 --- a/IdentityServer4/idpWithIdpInitiated/idpWithIdpInitiated.csproj +++ b/IdentityServer4/idpWithIdpInitiated/idpWithIdpInitiated.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/IdentityServer4/sp/sp.csproj b/IdentityServer4/sp/sp.csproj index dbbae95..f0fb968 100644 --- a/IdentityServer4/sp/sp.csproj +++ b/IdentityServer4/sp/sp.csproj @@ -10,8 +10,8 @@ - - + +