From 648d838b231c8d4ca8e2a34bbe47944bf66aa3be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Fri, 21 Oct 2022 13:02:03 +0200 Subject: [PATCH] Use ICacheEntry's properties instead of the CacheEntryExtensions helpers to work around incorrect nullable annotations in .NET 7.0 --- src/OpenIddict.Core/Caches/OpenIddictApplicationCache.cs | 8 ++++---- .../Caches/OpenIddictAuthorizationCache.cs | 8 ++++---- src/OpenIddict.Core/Caches/OpenIddictScopeCache.cs | 8 ++++---- src/OpenIddict.Core/Caches/OpenIddictTokenCache.cs | 8 ++++---- .../Stores/OpenIddictEntityFrameworkApplicationStore.cs | 4 ++-- .../Stores/OpenIddictEntityFrameworkAuthorizationStore.cs | 2 +- .../Stores/OpenIddictEntityFrameworkScopeStore.cs | 6 +++--- .../Stores/OpenIddictEntityFrameworkTokenStore.cs | 2 +- .../OpenIddictEntityFrameworkCoreApplicationStore.cs | 4 ++-- .../OpenIddictEntityFrameworkCoreAuthorizationStore.cs | 2 +- .../Stores/OpenIddictEntityFrameworkCoreScopeStore.cs | 6 +++--- .../Stores/OpenIddictEntityFrameworkCoreTokenStore.cs | 2 +- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/OpenIddict.Core/Caches/OpenIddictApplicationCache.cs b/src/OpenIddict.Core/Caches/OpenIddictApplicationCache.cs index 9ba5be58..b84cdd63 100644 --- a/src/OpenIddict.Core/Caches/OpenIddictApplicationCache.cs +++ b/src/OpenIddict.Core/Caches/OpenIddictApplicationCache.cs @@ -291,8 +291,8 @@ public class OpenIddictApplicationCache : IOpenIddictApplicationCa throw new InvalidOperationException(SR.GetResourceString(SR.ID0197))); } - entry.SetSize(1L); - entry.SetValue(application); + entry.Size = 1L; + entry.Value = application; } /// @@ -318,8 +318,8 @@ public class OpenIddictApplicationCache : IOpenIddictApplicationCa throw new InvalidOperationException(SR.GetResourceString(SR.ID0197))); } - entry.SetSize(applications.Length); - entry.SetValue(applications); + entry.Size = applications.Length; + entry.Value = applications; } /// diff --git a/src/OpenIddict.Core/Caches/OpenIddictAuthorizationCache.cs b/src/OpenIddict.Core/Caches/OpenIddictAuthorizationCache.cs index cffc13f8..e02be39d 100644 --- a/src/OpenIddict.Core/Caches/OpenIddictAuthorizationCache.cs +++ b/src/OpenIddict.Core/Caches/OpenIddictAuthorizationCache.cs @@ -467,8 +467,8 @@ public class OpenIddictAuthorizationCache : IOpenIddictAuthoriza throw new InvalidOperationException(SR.GetResourceString(SR.ID0197))); } - entry.SetSize(1L); - entry.SetValue(authorization); + entry.Size = 1L; + entry.Value = authorization; } /// @@ -494,8 +494,8 @@ public class OpenIddictAuthorizationCache : IOpenIddictAuthoriza throw new InvalidOperationException(SR.GetResourceString(SR.ID0197))); } - entry.SetSize(authorizations.Length); - entry.SetValue(authorizations); + entry.Size = authorizations.Length; + entry.Value = authorizations; } /// diff --git a/src/OpenIddict.Core/Caches/OpenIddictScopeCache.cs b/src/OpenIddict.Core/Caches/OpenIddictScopeCache.cs index 761643f1..9e6874b1 100644 --- a/src/OpenIddict.Core/Caches/OpenIddictScopeCache.cs +++ b/src/OpenIddict.Core/Caches/OpenIddictScopeCache.cs @@ -264,8 +264,8 @@ public class OpenIddictScopeCache : IOpenIddictScopeCache, IDisp throw new InvalidOperationException(SR.GetResourceString(SR.ID0197))); } - entry.SetSize(1L); - entry.SetValue(scope); + entry.Size = 1L; + entry.Value = scope; } /// @@ -291,8 +291,8 @@ public class OpenIddictScopeCache : IOpenIddictScopeCache, IDisp throw new InvalidOperationException(SR.GetResourceString(SR.ID0197))); } - entry.SetSize(scopes.Length); - entry.SetValue(scopes); + entry.Size = scopes.Length; + entry.Value = scopes; } /// diff --git a/src/OpenIddict.Core/Caches/OpenIddictTokenCache.cs b/src/OpenIddict.Core/Caches/OpenIddictTokenCache.cs index 70411384..7b98dc08 100644 --- a/src/OpenIddict.Core/Caches/OpenIddictTokenCache.cs +++ b/src/OpenIddict.Core/Caches/OpenIddictTokenCache.cs @@ -519,8 +519,8 @@ public class OpenIddictTokenCache : IOpenIddictTokenCache, IDisp throw new InvalidOperationException(SR.GetResourceString(SR.ID0197))); } - entry.SetSize(1L); - entry.SetValue(token); + entry.Size = 1L; + entry.Value = token; } /// @@ -546,8 +546,8 @@ public class OpenIddictTokenCache : IOpenIddictTokenCache, IDisp throw new InvalidOperationException(SR.GetResourceString(SR.ID0197))); } - entry.SetSize(tokens.Length); - entry.SetValue(tokens); + entry.Size = tokens.Length; + entry.Value = tokens; } /// diff --git a/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkApplicationStore.cs b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkApplicationStore.cs index fb73a97e..97145830 100644 --- a/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkApplicationStore.cs +++ b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkApplicationStore.cs @@ -406,7 +406,7 @@ public class OpenIddictEntityFrameworkApplicationStore : IOpen } return builder.ToImmutable(); - }); + })!; return new(descriptions); } @@ -319,7 +319,7 @@ public class OpenIddictEntityFrameworkScopeStore : IOpen } return builder.ToImmutable(); - }); + })!; return new(names); } @@ -376,7 +376,7 @@ public class OpenIddictEntityFrameworkScopeStore : IOpen } return builder.ToImmutable(); - }); + })!; return new(properties); } diff --git a/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkTokenStore.cs b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkTokenStore.cs index 23b7a0ad..0c4d8e0d 100644 --- a/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkTokenStore.cs +++ b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkTokenStore.cs @@ -456,7 +456,7 @@ public class OpenIddictEntityFrameworkTokenStore : I } return builder.ToImmutable(); - }); + })!; return new(descriptions); } @@ -335,7 +335,7 @@ public class OpenIddictEntityFrameworkCoreScopeStore : I } return builder.ToImmutable(); - }); + })!; return new(names); } @@ -392,7 +392,7 @@ public class OpenIddictEntityFrameworkCoreScopeStore : I } return builder.ToImmutable(); - }); + })!; return new(properties); } diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreTokenStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreTokenStore.cs index 97cd5005..cd33881d 100644 --- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreTokenStore.cs +++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreTokenStore.cs @@ -505,7 +505,7 @@ public class OpenIddictEntityFrameworkCoreTokenStore