From c0cbc8a70febce8684369db9d56e2e80ecd3855f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Chalet?= <kevinchalet@gmail.com>
Date: Sat, 19 Jun 2021 13:56:58 +0200
Subject: [PATCH] Bump the .NET SDK/packages and the Katana dependencies

---
 Packages.props                                | 48 +++++++++----------
 global.json                                   |  6 +--
 .../OpenIddict.Server.AspNetCore.csproj       |  4 +-
 .../OpenIddict.Server.DataProtection.csproj   |  4 +-
 .../OpenIddict.Validation.AspNetCore.csproj   |  4 +-
 ...penIddict.Validation.DataProtection.csproj |  4 +-
 6 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/Packages.props b/Packages.props
index ec65777b..d42526c5 100644
--- a/Packages.props
+++ b/Packages.props
@@ -9,8 +9,8 @@
     <PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="6.8.0" />
     <PackageReference Update="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.8.0" />
     <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
-    <PackageReference Update="Microsoft.Owin.Security" Version="4.1.1" />
-    <PackageReference Update="Microsoft.Owin.Testing" Version="4.1.1" />
+    <PackageReference Update="Microsoft.Owin.Security" Version="4.2.0" />
+    <PackageReference Update="Microsoft.Owin.Testing" Version="4.2.0" />
     <PackageReference Update="MongoDB.Bson" Version="2.10.4" />
     <PackageReference Update="MongoDB.Driver" Version="2.10.4" />
     <PackageReference Update="Moq" Version="4.16.1" />
@@ -51,21 +51,21 @@
   <ItemGroup
     Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp'  And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '3.1'))) Or
                 ('$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '2.1'))) ">
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.13" />
-    <PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="3.1.13" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.13" />
-    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="3.1.13" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="3.1.13" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.13" />
-    <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="3.1.13" />
-    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="3.1.13" />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.13" />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.13" />
-    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="3.1.13" />
-    <PackageReference Update="Microsoft.Extensions.Logging" Version="3.1.13" />
-    <PackageReference Update="Microsoft.Extensions.Options" Version="3.1.13" />
-    <PackageReference Update="Microsoft.Extensions.Primitives" Version="3.1.13" />
-    <PackageReference Update="Microsoft.Extensions.WebEncoders" Version="3.1.13" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.16" />
+    <PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="3.1.16" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.16" />
+    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="3.1.16" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="3.1.16" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.16" />
+    <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="3.1.16" />
+    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="3.1.16" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.16" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.16" />
+    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="3.1.16" />
+    <PackageReference Update="Microsoft.Extensions.Logging" Version="3.1.16" />
+    <PackageReference Update="Microsoft.Extensions.Options" Version="3.1.16" />
+    <PackageReference Update="Microsoft.Extensions.Primitives" Version="3.1.16" />
+    <PackageReference Update="Microsoft.Extensions.WebEncoders" Version="3.1.16" />
     <PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
     <PackageReference Update="System.ComponentModel.Annotations" Version="4.7.0" />
     <PackageReference Update="System.Linq.Async" Version="4.1.1" />
@@ -76,12 +76,12 @@
 
   <ItemGroup
     Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '5.0'))) ">
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.4" />
-    <PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="5.0.4" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.4" />
-    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="5.0.4" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="5.0.4" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.4" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.7" />
+    <PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="5.0.7" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.7" />
+    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="5.0.7" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="5.0.7" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.7" />
     <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
     <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
     <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
@@ -90,7 +90,7 @@
     <PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Update="Microsoft.Extensions.Options" Version="5.0.0" />
     <PackageReference Update="Microsoft.Extensions.Primitives" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.WebEncoders" Version="5.0.4" />
+    <PackageReference Update="Microsoft.Extensions.WebEncoders" Version="5.0.7" />
     <PackageReference Update="System.Collections.Immutable" Version="5.0.0" />
     <PackageReference Update="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Update="System.Linq.Async" Version="5.0.0" />
diff --git a/global.json b/global.json
index 2eb4cb3f..0db3faa4 100644
--- a/global.json
+++ b/global.json
@@ -1,11 +1,11 @@
 {
   "tools": {
-    "dotnet": "5.0.201",
+    "dotnet": "5.0.301",
 
     "runtimes": {
       "aspnetcore": [
-        "2.1.26",
-        "3.1.13"
+        "2.1.28",
+        "3.1.16"
       ]
     }
   },
diff --git a/src/OpenIddict.Server.AspNetCore/OpenIddict.Server.AspNetCore.csproj b/src/OpenIddict.Server.AspNetCore/OpenIddict.Server.AspNetCore.csproj
index d05b3a44..5e59c34b 100644
--- a/src/OpenIddict.Server.AspNetCore/OpenIddict.Server.AspNetCore.csproj
+++ b/src/OpenIddict.Server.AspNetCore/OpenIddict.Server.AspNetCore.csproj
@@ -19,7 +19,9 @@
   </ItemGroup>
 
   <ItemGroup
-    Condition=" '$(TargetFrameworkIdentifier)' != '.NETCoreApp' Or $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0')) ">
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0'))) Or
+                ('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard') ">
     <PackageReference Include="Microsoft.AspNetCore.Authentication" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
diff --git a/src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj b/src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj
index 13cca40e..ecac5301 100644
--- a/src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj
+++ b/src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj
@@ -19,7 +19,9 @@
   </ItemGroup>
 
   <ItemGroup
-    Condition=" '$(TargetFrameworkIdentifier)' != '.NETCoreApp' Or $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0')) ">
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0'))) Or
+                ('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard') ">
     <PackageReference Include="Microsoft.AspNetCore.DataProtection" />
   </ItemGroup>
 
diff --git a/src/OpenIddict.Validation.AspNetCore/OpenIddict.Validation.AspNetCore.csproj b/src/OpenIddict.Validation.AspNetCore/OpenIddict.Validation.AspNetCore.csproj
index a6dbd88e..e63dd866 100644
--- a/src/OpenIddict.Validation.AspNetCore/OpenIddict.Validation.AspNetCore.csproj
+++ b/src/OpenIddict.Validation.AspNetCore/OpenIddict.Validation.AspNetCore.csproj
@@ -19,7 +19,9 @@
   </ItemGroup>
 
   <ItemGroup
-    Condition=" '$(TargetFrameworkIdentifier)' != '.NETCoreApp' Or $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0')) ">
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0'))) Or
+                ('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard') ">
     <PackageReference Include="Microsoft.AspNetCore.Authentication" />
   </ItemGroup>
 
diff --git a/src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj b/src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj
index 7b1788d8..429b5a53 100644
--- a/src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj
+++ b/src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj
@@ -19,7 +19,9 @@
   </ItemGroup>
 
   <ItemGroup
-    Condition=" '$(TargetFrameworkIdentifier)' != '.NETCoreApp' Or $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0')) ">
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0'))) Or
+                ('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard') ">
     <PackageReference Include="Microsoft.AspNetCore.DataProtection" />
   </ItemGroup>