diff --git a/Packages.props b/Packages.props
index 94cedfa6..592bb3ca 100644
--- a/Packages.props
+++ b/Packages.props
@@ -98,4 +98,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/global.json b/global.json
index 6663a847..9adb0077 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "6.0.100-rc.2.21505.57",
+ "dotnet": "6.0.100",
"runtimes": {
"aspnetcore": [
diff --git a/samples/Mvc.Client/Mvc.Client.csproj b/samples/Mvc.Client/Mvc.Client.csproj
index 2a572ef5..4fdb3060 100644
--- a/samples/Mvc.Client/Mvc.Client.csproj
+++ b/samples/Mvc.Client/Mvc.Client.csproj
@@ -1,7 +1,7 @@
- net5.0
+ net6.0
false
disable
diff --git a/samples/Mvc.Server/Mvc.Server.csproj b/samples/Mvc.Server/Mvc.Server.csproj
index 27fe3485..5ab1bf0f 100644
--- a/samples/Mvc.Server/Mvc.Server.csproj
+++ b/samples/Mvc.Server/Mvc.Server.csproj
@@ -1,7 +1,7 @@
- net5.0
+ net6.0
false
false
false
diff --git a/src/OpenIddict.AspNetCore/OpenIddict.AspNetCore.csproj b/src/OpenIddict.AspNetCore/OpenIddict.AspNetCore.csproj
index 0b60675f..998e01f7 100644
--- a/src/OpenIddict.AspNetCore/OpenIddict.AspNetCore.csproj
+++ b/src/OpenIddict.AspNetCore/OpenIddict.AspNetCore.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.1;netcoreapp3.1;net5.0
+ net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0
false
false
@@ -24,6 +24,7 @@
+
diff --git a/src/OpenIddict.Core/OpenIddict.Core.csproj b/src/OpenIddict.Core/OpenIddict.Core.csproj
index 3e0a9a8f..928fe00a 100644
--- a/src/OpenIddict.Core/OpenIddict.Core.csproj
+++ b/src/OpenIddict.Core/OpenIddict.Core.csproj
@@ -1,7 +1,7 @@
- net461;net472;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1
+ net461;net472;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1
diff --git a/src/OpenIddict.EntityFramework/OpenIddict.EntityFramework.csproj b/src/OpenIddict.EntityFramework/OpenIddict.EntityFramework.csproj
index a2a1eb3c..2dbc17e2 100644
--- a/src/OpenIddict.EntityFramework/OpenIddict.EntityFramework.csproj
+++ b/src/OpenIddict.EntityFramework/OpenIddict.EntityFramework.csproj
@@ -1,7 +1,7 @@
- net461;net5.0;netstandard2.1
+ net461;net5.0;net6.0;netstandard2.1
diff --git a/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj b/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj
index 9f78bbfd..f3a529a8 100644
--- a/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj
+++ b/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1
+ net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1
diff --git a/src/OpenIddict.MongoDb/OpenIddict.MongoDb.csproj b/src/OpenIddict.MongoDb/OpenIddict.MongoDb.csproj
index c9671b8e..561a3b33 100644
--- a/src/OpenIddict.MongoDb/OpenIddict.MongoDb.csproj
+++ b/src/OpenIddict.MongoDb/OpenIddict.MongoDb.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1
+ net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1
false
false
diff --git a/src/OpenIddict.Quartz/OpenIddict.Quartz.csproj b/src/OpenIddict.Quartz/OpenIddict.Quartz.csproj
index dd8bc497..2b939f32 100644
--- a/src/OpenIddict.Quartz/OpenIddict.Quartz.csproj
+++ b/src/OpenIddict.Quartz/OpenIddict.Quartz.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1
+ net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1
diff --git a/src/OpenIddict.Server.AspNetCore/OpenIddict.Server.AspNetCore.csproj b/src/OpenIddict.Server.AspNetCore/OpenIddict.Server.AspNetCore.csproj
index b2639667..1f2dea14 100644
--- a/src/OpenIddict.Server.AspNetCore/OpenIddict.Server.AspNetCore.csproj
+++ b/src/OpenIddict.Server.AspNetCore/OpenIddict.Server.AspNetCore.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.1;netcoreapp3.1;net5.0
+ net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0
diff --git a/src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj b/src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj
index 8dc56da7..0a974b15 100644
--- a/src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj
+++ b/src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1
+ net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1
diff --git a/src/OpenIddict.Server/OpenIddict.Server.csproj b/src/OpenIddict.Server/OpenIddict.Server.csproj
index 277f415f..e00a1eff 100644
--- a/src/OpenIddict.Server/OpenIddict.Server.csproj
+++ b/src/OpenIddict.Server/OpenIddict.Server.csproj
@@ -1,7 +1,7 @@
- net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1
+ net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1
diff --git a/src/OpenIddict.Validation.AspNetCore/OpenIddict.Validation.AspNetCore.csproj b/src/OpenIddict.Validation.AspNetCore/OpenIddict.Validation.AspNetCore.csproj
index ccaa8f6e..94bb68df 100644
--- a/src/OpenIddict.Validation.AspNetCore/OpenIddict.Validation.AspNetCore.csproj
+++ b/src/OpenIddict.Validation.AspNetCore/OpenIddict.Validation.AspNetCore.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.1;netcoreapp3.1;net5.0
+ net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0
diff --git a/src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj b/src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj
index d06d131c..4d7e31e8 100644
--- a/src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj
+++ b/src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1
+ net461;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1
diff --git a/src/OpenIddict.Validation/OpenIddict.Validation.csproj b/src/OpenIddict.Validation/OpenIddict.Validation.csproj
index 219d7494..b58d9352 100644
--- a/src/OpenIddict.Validation/OpenIddict.Validation.csproj
+++ b/src/OpenIddict.Validation/OpenIddict.Validation.csproj
@@ -1,7 +1,7 @@
- net461;net472;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1
+ net461;net472;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1
diff --git a/src/OpenIddict/OpenIddict.csproj b/src/OpenIddict/OpenIddict.csproj
index 23725b2b..3db33e57 100644
--- a/src/OpenIddict/OpenIddict.csproj
+++ b/src/OpenIddict/OpenIddict.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1
+ net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1
false
false
@@ -27,6 +27,7 @@ To use these features on ASP.NET Core or OWIN/Katana/ASP.NET 4.x, reference the
+
diff --git a/test/OpenIddict.Abstractions.Tests/OpenIddict.Abstractions.Tests.csproj b/test/OpenIddict.Abstractions.Tests/OpenIddict.Abstractions.Tests.csproj
index 678d1a6e..906cbdc9 100644
--- a/test/OpenIddict.Abstractions.Tests/OpenIddict.Abstractions.Tests.csproj
+++ b/test/OpenIddict.Abstractions.Tests/OpenIddict.Abstractions.Tests.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.1;netcoreapp3.1;net5.0
+ net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0
diff --git a/test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.csproj b/test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.csproj
index 7cbf938b..98564292 100644
--- a/test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.csproj
+++ b/test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.1;netcoreapp3.1;net5.0
+ net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0
diff --git a/test/OpenIddict.EntityFramework.Tests/OpenIddict.EntityFramework.Tests.csproj b/test/OpenIddict.EntityFramework.Tests/OpenIddict.EntityFramework.Tests.csproj
index 6c556edb..5bd723b9 100644
--- a/test/OpenIddict.EntityFramework.Tests/OpenIddict.EntityFramework.Tests.csproj
+++ b/test/OpenIddict.EntityFramework.Tests/OpenIddict.EntityFramework.Tests.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp3.1;net5.0
+ net461;netcoreapp3.1;net5.0;net6.0
diff --git a/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.csproj b/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.csproj
index d1ff911f..5a4a9d88 100644
--- a/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.csproj
+++ b/test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.1;netcoreapp3.1;net5.0
+ net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0
diff --git a/test/OpenIddict.MongoDb.Tests/OpenIddict.MongoDb.Tests.csproj b/test/OpenIddict.MongoDb.Tests/OpenIddict.MongoDb.Tests.csproj
index 4f7afad3..29889e6e 100644
--- a/test/OpenIddict.MongoDb.Tests/OpenIddict.MongoDb.Tests.csproj
+++ b/test/OpenIddict.MongoDb.Tests/OpenIddict.MongoDb.Tests.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.1;netcoreapp3.1;net5.0
+ net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0
false
false
diff --git a/test/OpenIddict.Quartz.Tests/OpenIddict.Quartz.Tests.csproj b/test/OpenIddict.Quartz.Tests/OpenIddict.Quartz.Tests.csproj
index 37ad737d..c8bc45af 100644
--- a/test/OpenIddict.Quartz.Tests/OpenIddict.Quartz.Tests.csproj
+++ b/test/OpenIddict.Quartz.Tests/OpenIddict.Quartz.Tests.csproj
@@ -1,7 +1,7 @@
-
+
- net461;netcoreapp2.1;netcoreapp3.1;net5.0
+ net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0
diff --git a/test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddict.Server.AspNetCore.IntegrationTests.csproj b/test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddict.Server.AspNetCore.IntegrationTests.csproj
index c3432720..63443ddf 100644
--- a/test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddict.Server.AspNetCore.IntegrationTests.csproj
+++ b/test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddict.Server.AspNetCore.IntegrationTests.csproj
@@ -1,7 +1,7 @@
- net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0
+ net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0
diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddict.Server.IntegrationTests.csproj b/test/OpenIddict.Server.IntegrationTests/OpenIddict.Server.IntegrationTests.csproj
index 9c54f128..9d14e157 100644
--- a/test/OpenIddict.Server.IntegrationTests/OpenIddict.Server.IntegrationTests.csproj
+++ b/test/OpenIddict.Server.IntegrationTests/OpenIddict.Server.IntegrationTests.csproj
@@ -1,7 +1,7 @@
- net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0
+ net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0
diff --git a/test/OpenIddict.Server.Tests/OpenIddict.Server.Tests.csproj b/test/OpenIddict.Server.Tests/OpenIddict.Server.Tests.csproj
index 47f29f71..86d691ec 100644
--- a/test/OpenIddict.Server.Tests/OpenIddict.Server.Tests.csproj
+++ b/test/OpenIddict.Server.Tests/OpenIddict.Server.Tests.csproj
@@ -1,7 +1,7 @@
- net461;net472;netcoreapp2.1;netcoreapp3.1;net5.0
+ net461;net472;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0