From beef8f147667b01e36acd35bd129a154b937c489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Chalet?= <kevinchalet@gmail.com>
Date: Wed, 22 Apr 2026 01:03:54 +0200
Subject: [PATCH] Reference the Microsoft.AspNetCore.DataProtection package
 instead of the Microsoft.AspNetCore.App framework on .NET 8.0/9.0/10.0

---
 Directory.Packages.props                              |  3 +++
 .../OpenIddict.Client.DataProtection.csproj           | 10 +---------
 .../OpenIddict.Server.DataProtection.csproj           | 11 +----------
 .../OpenIddict.Validation.DataProtection.csproj       | 10 +---------
 4 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 244bc7b8..b0395a27 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -219,6 +219,7 @@
   <ItemGroup Label="Package versions for .NET 8.0"
     Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '8.0')) ">
     <PackageVersion Include="EntityFramework"                                                 Version="6.5.1"             />
+    <PackageVersion Include="Microsoft.AspNetCore.DataProtection"                             Version="8.0.26"            />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational"                        Version="8.0.26"            />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory"                             Version="8.0.1"             />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions"           Version="8.0.2"             />
@@ -267,6 +268,7 @@
   <ItemGroup Label="Package versions for .NET 9.0"
     Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
     <PackageVersion Include="EntityFramework"                                                 Version="6.5.1"             />
+    <PackageVersion Include="Microsoft.AspNetCore.DataProtection"                             Version="9.0.15"            />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational"                        Version="9.0.15"            />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory"                             Version="9.0.15"            />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions"           Version="9.0.15"            />
@@ -314,6 +316,7 @@
   <ItemGroup Label="Package versions for .NET 10.0"
     Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '10.0')) ">
     <PackageVersion Include="EntityFramework"                                                 Version="6.5.1"             />
+    <PackageVersion Include="Microsoft.AspNetCore.DataProtection"                             Version="10.0.7"            />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational"                        Version="10.0.7"            />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory"                             Version="10.0.7"            />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions"           Version="10.0.7"            />
diff --git a/src/OpenIddict.Client.DataProtection/OpenIddict.Client.DataProtection.csproj b/src/OpenIddict.Client.DataProtection/OpenIddict.Client.DataProtection.csproj
index 824006bd..79f5a391 100644
--- a/src/OpenIddict.Client.DataProtection/OpenIddict.Client.DataProtection.csproj
+++ b/src/OpenIddict.Client.DataProtection/OpenIddict.Client.DataProtection.csproj
@@ -17,10 +17,6 @@
     <ProjectReference Include="..\OpenIddict.Client\OpenIddict.Client.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' ">
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
   <ItemGroup>
     <!--
       Note: the versions of the System.Security.Cryptography.Xml package that are transitively referenced are
@@ -29,12 +25,8 @@
       the package is explicitly referenced here to ensure that a fixed version is used.
     -->
 
-    <PackageReference Include="System.Security.Cryptography.Xml" />
-  </ItemGroup>
-
-  <ItemGroup
-    Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' Or '$(TargetFrameworkIdentifier)' == '.NETStandard' ">
     <PackageReference Include="Microsoft.AspNetCore.DataProtection" />
+    <PackageReference Include="System.Security.Cryptography.Xml" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj b/src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj
index 22e6b9dd..62b42cb2 100644
--- a/src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj
+++ b/src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj
@@ -17,11 +17,6 @@
     <ProjectReference Include="..\OpenIddict.Server\OpenIddict.Server.csproj" />
   </ItemGroup>
 
-  <ItemGroup
-    Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' ">
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
   <ItemGroup>
     <!--
       Note: the versions of the System.Security.Cryptography.Xml package that are transitively referenced are
@@ -30,12 +25,8 @@
       the package is explicitly referenced here to ensure that a fixed version is used.
     -->
 
-    <PackageReference Include="System.Security.Cryptography.Xml" />
-  </ItemGroup>
-
-  <ItemGroup
-    Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' Or '$(TargetFrameworkIdentifier)' == '.NETStandard' ">
     <PackageReference Include="Microsoft.AspNetCore.DataProtection" />
+    <PackageReference Include="System.Security.Cryptography.Xml" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj b/src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj
index b5769417..50d58bbe 100644
--- a/src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj
+++ b/src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj
@@ -17,10 +17,6 @@
     <ProjectReference Include="..\OpenIddict.Validation\OpenIddict.Validation.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' ">
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
   <ItemGroup>
     <!--
       Note: the versions of the System.Security.Cryptography.Xml package that are transitively referenced are
@@ -29,12 +25,8 @@
       the package is explicitly referenced here to ensure that a fixed version is used.
     -->
 
-    <PackageReference Include="System.Security.Cryptography.Xml" />
-  </ItemGroup>
-
-  <ItemGroup
-    Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' Or '$(TargetFrameworkIdentifier)' == '.NETStandard' ">
     <PackageReference Include="Microsoft.AspNetCore.DataProtection" />
+    <PackageReference Include="System.Security.Cryptography.Xml" />
   </ItemGroup>
 
   <ItemGroup>