diff --git a/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj b/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj
index 5df0603..ca40887 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..1235c69 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/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 d5e5eca..aa82a2c 100644
--- a/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj
+++ b/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj
@@ -1,28 +1,28 @@
- 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 c473d56..a3b1182 100644
--- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj
+++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.OIDC/WebClient.OIDC.csproj
@@ -1,16 +1,16 @@
- 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 fbec043..cd35326 100644
--- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj
+++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj
@@ -1,19 +1,19 @@
- net7.0
+ net6.0
enable
enable
WebClient
-
-
+
+
-
-
+
+
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..e3fb027 100644
--- a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj
+++ b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj
@@ -1,23 +1,22 @@
- net7.0
+ net6.0
enable
enable
WebClient
-
+
-
-
+
+
-
-
+
PreserveNewest
diff --git a/IdentityServer4/idp/idp.csproj b/IdentityServer4/idp/idp.csproj
index 0eb31a0..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 a5becdc..7743c9b 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..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 824bfca..f0fb968 100644
--- a/IdentityServer4/sp/sp.csproj
+++ b/IdentityServer4/sp/sp.csproj
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj b/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj
index cd242d8..8b43253 100644
--- a/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj
+++ b/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj
@@ -1,7 +1,7 @@
- net7.0
+ net6.0
false
@@ -11,23 +11,23 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/OpenIddict/OpenIddictIdP/Startup.cs b/OpenIddict/OpenIddictIdP/Startup.cs
index c92e88e..843b069 100644
--- a/OpenIddict/OpenIddictIdP/Startup.cs
+++ b/OpenIddict/OpenIddictIdP/Startup.cs
@@ -11,9 +11,9 @@
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;
using Rsk.Saml.Samples;
+using Rsk.Saml.OpenIddict.EntityFrameworkCore.Configuration.DependencyInjection;
using static OpenIddict.Abstractions.OpenIddictConstants;
namespace openiddictidp;
@@ -120,20 +120,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 =>
{
diff --git a/spWithIdpInitiated/spWithIdpInitiated.csproj b/spWithIdpInitiated/spWithIdpInitiated.csproj
index 608c977..7b8d5c9 100644
--- a/spWithIdpInitiated/spWithIdpInitiated.csproj
+++ b/spWithIdpInitiated/spWithIdpInitiated.csproj
@@ -5,12 +5,12 @@
-
+
-
-
+
+
diff --git a/spWithMultipleIdps/spWithMultipleIdps.csproj b/spWithMultipleIdps/spWithMultipleIdps.csproj
index f6f7919..1f9992d 100644
--- a/spWithMultipleIdps/spWithMultipleIdps.csproj
+++ b/spWithMultipleIdps/spWithMultipleIdps.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/spWithSingleIdp/spWithSingleIdp.csproj b/spWithSingleIdp/spWithSingleIdp.csproj
index ea08391..d22fbb5 100644
--- a/spWithSingleIdp/spWithSingleIdp.csproj
+++ b/spWithSingleIdp/spWithSingleIdp.csproj
@@ -11,7 +11,7 @@
-
+