Bump the .NET SDK, the .NET/ASP.NET packages and the third-party dependencies

Packages.props

@@ -5,15 +5,15 @@
     <PackageReference Update="EntityFramework" Version="6.4.4" />
     <PackageReference Update="MartinCostello.Logging.XUnit" Version="0.1.0" />
     <PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.0" />
-    <PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" />
+    <PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0" />
     <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="MongoDB.Bson" Version="2.10.4" />
+    <PackageReference Update="MongoDB.Bson" Version="2.11.2" />
-    <PackageReference Update="MongoDB.Driver" Version="2.10.4" />
+    <PackageReference Update="MongoDB.Driver" Version="2.11.2" />
-    <PackageReference Update="Moq" Version="4.14.5" />
+    <PackageReference Update="Moq" Version="4.14.7" />
     <PackageReference Update="Portable.BouncyCastle" Version="1.8.6.7" />
     <PackageReference Update="Quartz.Extensions.DependencyInjection" Version="3.2.0" />
     <PackageReference Update="Quartz.Extensions.Hosting" Version="3.2.0" />
@@ -22,7 +22,7 @@
     <PackageReference Update="System.Linq.Async" Version="4.1.1" />
     <PackageReference Update="System.Net.Http.Json" Version="3.2.1" />
     <PackageReference Update="System.Text.Json" Version="4.7.2" />
-    <PackageReference Update="TunnelVisionLabs.ReferenceAssemblyAnnotator" Version="1.0.0-alpha.154" />
+    <PackageReference Update="TunnelVisionLabs.ReferenceAssemblyAnnotator" Version="1.0.0-alpha.160" />
   </ItemGroup>
 
   <ItemGroup
@@ -39,8 +39,8 @@
     <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.14" />
     <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
     <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
-    <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="2.1.2" />
+    <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="2.1.23" />
-    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="2.1.2" />
+    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="2.1.23" />
     <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="2.1.1" />
     <PackageReference Update="Microsoft.Extensions.Localization" Version="2.1.1" />
     <PackageReference Update="Microsoft.Extensions.Logging" Version="2.1.1" />
@@ -52,22 +52,22 @@
   <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.8" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.9" />
-    <PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="3.1.8" />
+    <PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="3.1.9" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.8" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.9" />
-    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="3.1.8" />
+    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="3.1.9" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="3.1.8" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="3.1.9" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.8" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.9" />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.9" />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.8" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.9" />
-    <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="3.1.8" />
+    <PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="3.1.9" />
-    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="3.1.8" />
+    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="3.1.9" />
-    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="3.1.8" />
+    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="3.1.9" />
-    <PackageReference Update="Microsoft.Extensions.Localization" Version="3.1.8" />
+    <PackageReference Update="Microsoft.Extensions.Localization" Version="3.1.9" />
-    <PackageReference Update="Microsoft.Extensions.Logging" Version="3.1.8" />
+    <PackageReference Update="Microsoft.Extensions.Logging" Version="3.1.9" />
-    <PackageReference Update="Microsoft.Extensions.Options" Version="3.1.8" />
+    <PackageReference Update="Microsoft.Extensions.Options" Version="3.1.9" />
-    <PackageReference Update="Microsoft.Extensions.Primitives" Version="3.1.8" />
+    <PackageReference Update="Microsoft.Extensions.Primitives" Version="3.1.9" />
-    <PackageReference Update="Microsoft.Extensions.WebEncoders" Version="3.1.8" />
+    <PackageReference Update="Microsoft.Extensions.WebEncoders" Version="3.1.9" />
   </ItemGroup>
 
 </Project>

eng/CodeAnalysis.ruleset

@@ -99,6 +99,7 @@
       <Rule Id="CA2011" Action="Warning" />          <!-- Avoid infinite recursion -->
       <Rule Id="CA2012" Action="Warning" />          <!-- Use ValueTasks correctly -->
       <Rule Id="CA2013" Action="Warning" />          <!-- Do not use ReferenceEquals with value types -->
+      <Rule Id="CA2016" Action="Info" />             <!-- Forward the CancellationToken parameter to methods that take one -->
       <Rule Id="CA2100" Action="None" />             <!-- Review SQL queries for security vulnerabilities -->
       <Rule Id="CA2101" Action="None" />             <!-- Specify marshaling for P/Invoke string arguments -->
       <Rule Id="CA2119" Action="None" />             <!-- Seal methods that satisfy private interfaces -->

global.json

@@ -1,11 +1,11 @@
 {
   "tools": {
-    "dotnet": "5.0.100-preview.8.20417.9",
+    "dotnet": "5.0.100-rc.2.20479.15",
 
     "runtimes": {
       "aspnetcore": [
-        "2.1.22",
+        "2.1.23",
-        "3.1.8"
+        "3.1.9"
       ]
     }
   },

src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreHelpers.cs

@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using OpenIddict.EntityFrameworkCore;
@@ -134,7 +135,15 @@ namespace Microsoft.EntityFrameworkCore
                 .ApplyConfiguration(new OpenIddictEntityFrameworkCoreTokenConfiguration<TToken, TApplication, TAuthorization, TKey>());
         }
 
-#if !SUPPORTS_BCL_ASYNC_ENUMERABLE
+#if SUPPORTS_BCL_ASYNC_ENUMERABLE
+        /// <summary>
+        /// Executes the query and returns the results as a streamed async enumeration.
+        /// </summary>
+        /// <typeparam name="T">The type of the returned entities.</typeparam>
+        /// <param name="source">The query source.</param>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
+        /// <returns>The non-streamed async enumeration containing the results.</returns>
+#else
         /// <summary>
         /// Executes the query and returns the results as a non-streamed async enumeration.
         /// </summary>
@@ -142,8 +151,8 @@ namespace Microsoft.EntityFrameworkCore
         /// <param name="source">The query source.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
         /// <returns>The non-streamed async enumeration containing the results.</returns>
-        internal static IAsyncEnumerable<T> AsAsyncEnumerable<T>(
+#endif
-            this IQueryable<T> source, CancellationToken cancellationToken = default)
+        internal static IAsyncEnumerable<T> AsAsyncEnumerable<T>(this IQueryable<T> source, CancellationToken cancellationToken)
         {
             if (source is null)
             {
@@ -154,12 +163,18 @@ namespace Microsoft.EntityFrameworkCore
 
             static async IAsyncEnumerable<T> ExecuteAsync(IQueryable<T> source, [EnumeratorCancellation] CancellationToken cancellationToken)
             {
+#if SUPPORTS_BCL_ASYNC_ENUMERABLE
+                await foreach (var element in source.AsAsyncEnumerable().WithCancellation(cancellationToken))
+                {
+                    yield return element;
+                }
+#else
                 foreach (var element in await source.ToListAsync(cancellationToken))
                 {
                     yield return element;
                 }
+#endif
             }
         }
-#endif
     }
 }

src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreApplicationStore.cs

@@ -307,7 +307,7 @@ namespace OpenIddict.EntityFrameworkCore
             {
                 var applications = (from application in Applications.AsTracking()
                                     where application.PostLogoutRedirectUris!.Contains(address)
-                                    select application).AsAsyncEnumerable();
+                                    select application).AsAsyncEnumerable(cancellationToken);
 
                 await foreach (var application in applications)
                 {
@@ -341,7 +341,7 @@ namespace OpenIddict.EntityFrameworkCore
             {
                 var applications = (from application in Applications.AsTracking()
                                     where application.RedirectUris!.Contains(address)
-                                    select application).AsAsyncEnumerable();
+                                    select application).AsAsyncEnumerable(cancellationToken);
 
                 await foreach (var application in applications)
                 {
@@ -673,7 +673,7 @@ namespace OpenIddict.EntityFrameworkCore
                 query = query.Take(count.Value);
             }
 
-            return query.AsAsyncEnumerable();
+            return query.AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -686,7 +686,7 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query(Applications.AsTracking(), state).AsAsyncEnumerable();
+            return query(Applications.AsTracking(), state).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>

src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreAuthorizationStore.cs

@@ -253,7 +253,7 @@ namespace OpenIddict.EntityFrameworkCore
                     where authorization.Subject == subject
                     join application in Applications.AsTracking() on authorization.Application!.Id equals application.Id
                     where application.Id!.Equals(key)
-                    select authorization).AsAsyncEnumerable();
+                    select authorization).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -287,7 +287,7 @@ namespace OpenIddict.EntityFrameworkCore
                     where authorization.Subject == subject && authorization.Status == status
                     join application in Applications.AsTracking() on authorization.Application!.Id equals application.Id
                     where application.Id!.Equals(key)
-                    select authorization).AsAsyncEnumerable();
+                    select authorization).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -328,7 +328,7 @@ namespace OpenIddict.EntityFrameworkCore
                           authorization.Type == type
                     join application in Applications.AsTracking() on authorization.Application!.Id equals application.Id
                     where application.Id!.Equals(key)
-                    select authorization).AsAsyncEnumerable();
+                    select authorization).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -374,7 +374,7 @@ namespace OpenIddict.EntityFrameworkCore
                                             authorization.Type == type
                                       join application in Applications.AsTracking() on authorization.Application!.Id equals application.Id
                                       where application.Id!.Equals(key)
-                                      select authorization).AsAsyncEnumerable();
+                                      select authorization).AsAsyncEnumerable(cancellationToken);
 
                 await foreach (var authorization in authorizations)
                 {
@@ -405,7 +405,7 @@ namespace OpenIddict.EntityFrameworkCore
             return (from authorization in Authorizations.Include(authorization => authorization.Application).AsTracking()
                     join application in Applications.AsTracking() on authorization.Application!.Id equals application.Id
                     where application.Id!.Equals(identifier)
-                    select authorization).AsAsyncEnumerable();
+                    select authorization).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -434,7 +434,7 @@ namespace OpenIddict.EntityFrameworkCore
 
             return (from authorization in Authorizations.Include(authorization => authorization.Application).AsTracking()
                     where authorization.Subject == subject
-                    select authorization).AsAsyncEnumerable();
+                    select authorization).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -642,7 +642,7 @@ namespace OpenIddict.EntityFrameworkCore
                 query = query.Take(count.Value);
             }
 
-            return query.AsAsyncEnumerable();
+            return query.AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -657,7 +657,7 @@ namespace OpenIddict.EntityFrameworkCore
 
             return query(
                 Authorizations.Include(authorization => authorization.Application)
-                              .AsTracking(), state).AsAsyncEnumerable();
+                              .AsTracking(), state).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>

src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreScopeStore.cs

@@ -194,7 +194,7 @@ namespace OpenIddict.EntityFrameworkCore
             // ImmutableArray.Contains() (which is not fully supported by Entity Framework Core) is not used instead.
             return (from scope in Scopes.AsTracking()
                     where Enumerable.Contains(names, scope.Name)
-                    select scope).AsAsyncEnumerable();
+                    select scope).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -218,7 +218,7 @@ namespace OpenIddict.EntityFrameworkCore
             {
                 var scopes = (from scope in Scopes.AsTracking()
                               where scope.Resources!.Contains(resource)
-                              select scope).AsAsyncEnumerable();
+                              select scope).AsAsyncEnumerable(cancellationToken);
 
                 await foreach (var scope in scopes)
                 {
@@ -458,7 +458,7 @@ namespace OpenIddict.EntityFrameworkCore
                 query = query.Take(count.Value);
             }
 
-            return query.AsAsyncEnumerable();
+            return query.AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -471,7 +471,7 @@ namespace OpenIddict.EntityFrameworkCore
                 throw new ArgumentNullException(nameof(query));
             }
 
-            return query(Scopes.AsTracking(), state).AsAsyncEnumerable();
+            return query(Scopes.AsTracking(), state).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>

src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreTokenStore.cs

@@ -199,7 +199,7 @@ namespace OpenIddict.EntityFrameworkCore
                     where token.Subject == subject
                     join application in Applications.AsTracking() on token.Application!.Id equals application.Id
                     where application.Id!.Equals(key)
-                    select token).AsAsyncEnumerable();
+                    select token).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -234,7 +234,7 @@ namespace OpenIddict.EntityFrameworkCore
                           token.Status == status
                     join application in Applications.AsTracking() on token.Application!.Id equals application.Id
                     where application.Id!.Equals(key)
-                    select token).AsAsyncEnumerable();
+                    select token).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -275,7 +275,7 @@ namespace OpenIddict.EntityFrameworkCore
                           token.Type == type
                     join application in Applications.AsTracking() on token.Application!.Id equals application.Id
                     where application.Id!.Equals(key)
-                    select token).AsAsyncEnumerable();
+                    select token).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -296,7 +296,7 @@ namespace OpenIddict.EntityFrameworkCore
             return (from token in Tokens.Include(token => token.Application).Include(token => token.Authorization).AsTracking()
                     join application in Applications.AsTracking() on token.Application!.Id equals application.Id
                     where application.Id!.Equals(key)
-                    select token).AsAsyncEnumerable();
+                    select token).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -317,7 +317,7 @@ namespace OpenIddict.EntityFrameworkCore
             return (from token in Tokens.Include(token => token.Application).Include(token => token.Authorization).AsTracking()
                     join authorization in Authorizations.AsTracking() on token.Authorization!.Id equals authorization.Id
                     where authorization.Id!.Equals(key)
-                    select token).AsAsyncEnumerable();
+                    select token).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -358,7 +358,7 @@ namespace OpenIddict.EntityFrameworkCore
 
             return (from token in Tokens.Include(token => token.Application).Include(token => token.Authorization).AsTracking()
                     where token.Subject == subject
-                    select token).AsAsyncEnumerable();
+                    select token).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -599,7 +599,7 @@ namespace OpenIddict.EntityFrameworkCore
                 query = query.Take(count.Value);
             }
 
-            return query.AsAsyncEnumerable();
+            return query.AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -615,7 +615,7 @@ namespace OpenIddict.EntityFrameworkCore
             return query(
                 Tokens.Include(token => token.Application)
                       .Include(token => token.Authorization)
-                      .AsTracking(), state).AsAsyncEnumerable();
+                      .AsTracking(), state).AsAsyncEnumerable(cancellationToken);
         }
 
         /// <inheritdoc/>