[release/9.0-preview4] Update dependencies from dotnet/efcore, dotnet/runtime (#55372)

dotnet-maestro[bot] · javiercn · BrennanConroy · web-flow · commit 3d8b8c3efbbb · 2024-04-30T22:52:21.000-07:00
* Update dependencies from https://github.com/dotnet/runtime build 20240425.7 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.0-preview.4.24222.10 -> To Version 9.0.0-preview.4.24225.7 * Update dependencies from https://github.com/dotnet/efcore build 20240426.1 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 9.0.0-preview.5.24223.1 -> To Version 9.0.0-preview.4.24226.1 * Update the severity of CA1826 to suggestion Update the severity of CA1826 to suggestion as it's not really applicable in modern TFMs (#55361) * [Infrastructure] Unblock installer (#55358) * Fixes to analyzers and build infrastructure. * Update dependencies from https://github.com/dotnet/runtime build 20240427.4 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.0-preview.4.24222.10 -> To Version 9.0.0-preview.4.24227.4 * fix reflection * readonly * Update dependencies from https://github.com/dotnet/runtime build 20240430.10 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.0-preview.4.24222.10 -> To Version 9.0.0-preview.4.24230.10 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Javier Calvarro Nelson <jacalvar@microsoft.com> Co-authored-by: Brennan <brecon@microsoft.com>
diff --git a/.editorconfig b/.editorconfig
@@ -147,7 +147,7 @@ dotnet_diagnostic.CA1823.severity = warning
 dotnet_diagnostic.CA1825.severity = warning
 
 # CA1826: Do not use Enumerable methods on indexable collections. Instead use the collection directly
-dotnet_diagnostic.CA1826.severity = warning
+dotnet_diagnostic.CA1826.severity = suggestion
 
 # CA1827: Do not use Count() or LongCount() when Any() can be used
 dotnet_diagnostic.CA1827.severity = warning
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
diff --git a/eng/Versions.props b/eng/Versions.props
diff --git a/eng/tools/RepoTasks/RemoveSharedFrameworkDependencies.cs b/eng/tools/RepoTasks/RemoveSharedFrameworkDependencies.cs
@@ -64,12 +64,17 @@ private void FilterDependencies(string targetPath, ISet<string> dependencyToRemo
                     var updatedGroup = new PackageDependencyGroup(group.TargetFramework, packages);
                     foreach (var dependency in group.Packages)
                     {
-                        if (dependencyToRemove.Contains(dependency.Id))
+                        // Hack to temporarily avoid using ISet.Contains
+                        if (!dependencyToRemove.Add(dependency.Id))
                         {
                             referencesFrameworkOnlyAssembly = true;
                             Log.LogMessage($"  Remove dependency on '{dependency.Id}'");
                             continue;
                         }
+                        else
+                        {
+                            dependencyToRemove.Remove(dependency.Id);
+                        }
 
                         packages.Add(dependency);
                     }
@@ -107,4 +112,4 @@ private void FilterDependencies(string targetPath, ISet<string> dependencyToRemo
             }
         }
     }
-}
+}
diff --git a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs
@@ -581,9 +581,9 @@ public async Task CanCreateUserAddLogin()
         var logins = await manager.GetLoginsAsync(user);
         Assert.NotNull(logins);
         Assert.Single(logins);
-        Assert.Equal(provider, logins.First().LoginProvider);
-        Assert.Equal(providerKey, logins.First().ProviderKey);
-        Assert.Equal(display, logins.First().ProviderDisplayName);
+        Assert.Equal(provider, logins[0].LoginProvider);
+        Assert.Equal(providerKey, logins[0].ProviderKey);
+        Assert.Equal(display, logins[0].ProviderDisplayName);
     }
 
     /// <summary>
@@ -644,9 +644,9 @@ public async Task CanCreateUserAddRemoveLogin()
         var logins = await manager.GetLoginsAsync(user);
         Assert.NotNull(logins);
         Assert.Single(logins);
-        Assert.Equal(login.LoginProvider, logins.Last().LoginProvider);
-        Assert.Equal(login.ProviderKey, logins.Last().ProviderKey);
-        Assert.Equal(login.ProviderDisplayName, logins.Last().ProviderDisplayName);
+        Assert.Equal(login.LoginProvider, logins[^1].LoginProvider);
+        Assert.Equal(login.ProviderKey, logins[^1].ProviderKey);
+        Assert.Equal(login.ProviderDisplayName, logins[^1].ProviderDisplayName);
         var stamp = await manager.GetSecurityStampAsync(user);
         IdentityResultAssert.IsSuccess(await manager.RemoveLoginAsync(user, login.LoginProvider, login.ProviderKey));
         Assert.Null(await manager.FindByLoginAsync(login.LoginProvider, login.ProviderKey));
@@ -772,11 +772,11 @@ public async Task CanReplaceUserClaim()
         var userClaims = await manager.GetClaimsAsync(user);
         Assert.Equal(1, userClaims.Count);
         Claim claim = new Claim("c", "b");
-        Claim oldClaim = userClaims.FirstOrDefault();
+        Claim oldClaim = userClaims.Count == 0 ? null : userClaims[0];
         IdentityResultAssert.IsSuccess(await manager.ReplaceClaimAsync(user, oldClaim, claim));
         var newUserClaims = await manager.GetClaimsAsync(user);
         Assert.Equal(1, newUserClaims.Count);
-        Claim newClaim = newUserClaims.FirstOrDefault();
+        Claim newClaim = newUserClaims.Count == 0 ? null : newUserClaims[0];
         Assert.Equal(claim.Type, newClaim.Type);
         Assert.Equal(claim.Value, newClaim.Value);
     }
@@ -800,16 +800,16 @@ public async Task ReplaceUserClaimOnlyAffectsUser()
         var userClaims2 = await manager.GetClaimsAsync(user);
         Assert.Equal(1, userClaims2.Count);
         Claim claim = new Claim("c", "b");
-        Claim oldClaim = userClaims.FirstOrDefault();
+        Claim oldClaim = userClaims.Count == 0 ? null : userClaims[0];
         IdentityResultAssert.IsSuccess(await manager.ReplaceClaimAsync(user, oldClaim, claim));
         var newUserClaims = await manager.GetClaimsAsync(user);
         Assert.Equal(1, newUserClaims.Count);
-        Claim newClaim = newUserClaims.FirstOrDefault();
+        Claim newClaim = newUserClaims.Count == 0 ? null : newUserClaims[0];
         Assert.Equal(claim.Type, newClaim.Type);
         Assert.Equal(claim.Value, newClaim.Value);
         userClaims2 = await manager.GetClaimsAsync(user2);
         Assert.Equal(1, userClaims2.Count);
-        Claim oldClaim2 = userClaims2.FirstOrDefault();
+        Claim oldClaim2 = userClaims2.Count == 0 ? null : userClaims2[0];
         Assert.Equal("c", oldClaim2.Type);
         Assert.Equal("a", oldClaim2.Value);
     }
diff --git a/src/Mvc/Mvc.Core/src/ApplicationModels/ActionAttributeRouteModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ActionAttributeRouteModel.cs
@@ -31,7 +31,7 @@ public static IEnumerable<SelectorModel> FlattenSelectors(ActionModel actionMode
             //
             // This is fragile wrt application model customizing the data - but no one has
             // run into an issue with this and its pretty esoteric.
-            additionalSelector = new SelectorModel(actionModel.Controller.Selectors.First());
+            additionalSelector = new SelectorModel(actionModel.Controller.Selectors[0]);
             additionalSelector.AttributeRouteModel = null;
 
             for (var i = additionalSelector.ActionConstraints.Count - 1; i >= 0; i--)
diff --git a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
-using System.Linq;
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
@@ -376,9 +375,9 @@ internal void Serialize(Utf8JsonWriter writer)
     {
         try
         {
-            var cert = CertificateManager.Instance.ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: false)
-                .FirstOrDefault();
+            var certs = CertificateManager.Instance.ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: false);
 
+            var cert = certs.Count > 0 ? certs[0] : null;
             if (cert is null)
             {
                 logger.UnableToLocateDevelopmentCertificate();
diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs
@@ -829,12 +829,22 @@ private void LaunchStreams(ConnectionState connectionState, Dictionary<string, o
             {
                 _ = _sendIAsyncStreamItemsMethod
                     .MakeGenericMethod(reader.GetType().GetInterface("IAsyncEnumerable`1")!.GetGenericArguments())
-                    .Invoke(this, new object[] { connectionState, kvp.Key.ToString(), reader, cts });
+                    .Invoke(this, [connectionState, kvp.Key.ToString(), reader, cts]);
                 continue;
             }
-            _ = _sendStreamItemsMethod
-                .MakeGenericMethod(reader.GetType().GetGenericArguments())
-                .Invoke(this, new object[] { connectionState, kvp.Key.ToString(), reader, cts });
+            else
+            {
+                if (ReflectionHelper.TryGetStreamType(reader.GetType(), out var channelGenericType))
+                {
+                    _ = _sendStreamItemsMethod
+                        .MakeGenericMethod(channelGenericType)
+                        .Invoke(this, [connectionState, kvp.Key.ToString(), reader, cts]);
+                    continue;
+                }
+
+                // Should never get here, we should have already verified the stream types when the user initially calls send/invoke
+                throw new InvalidOperationException($"{reader.GetType()} is not a {typeof(ChannelReader<>).Name}.");
+            }
         }
     }
 
diff --git a/src/SignalR/common/Shared/ReflectionHelper.cs b/src/SignalR/common/Shared/ReflectionHelper.cs
@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Channels;
@@ -11,6 +13,8 @@ namespace Microsoft.AspNetCore.SignalR;
 
 internal static class ReflectionHelper
 {
+    private static readonly ConcurrentDictionary<Type, Type> _streamTypeLookup = new();
+
     // mustBeDirectType - Hub methods must use the base 'stream' type and not be a derived class that just implements the 'stream' type
     // and 'stream' types from the client are allowed to inherit from accepted 'stream' types
     public static bool IsStreamingType([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)] Type type, bool mustBeDirectType = false)
@@ -28,6 +32,9 @@ public static bool IsStreamingType([DynamicallyAccessedMembers(DynamicallyAccess
         {
             if (nullableType.IsGenericType && nullableType.GetGenericTypeDefinition() == typeof(ChannelReader<>))
             {
+                Debug.Assert(nullableType.GetGenericArguments().Length == 1);
+
+                _streamTypeLookup.GetOrAdd(type, nullableType.GetGenericArguments()[0]);
                 return true;
             }
 
@@ -59,4 +66,7 @@ public static bool IsIAsyncEnumerable([DynamicallyAccessedMembers(DynamicallyAcc
             }
         });
     }
+
+    public static bool TryGetStreamType(Type stream, [NotNullWhen(true)] out Type? streamType)
+        => _streamTypeLookup.TryGetValue(stream, out streamType);
 }

Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,17 @@ private void FilterDependencies(string targetPath, ISet<string> dependencyToRemo`
`64`	`64`	`var updatedGroup = new PackageDependencyGroup(group.TargetFramework, packages);`
`65`	`65`	`foreach (var dependency in group.Packages)`
`66`	`66`	`{`
`67`		`- if (dependencyToRemove.Contains(dependency.Id))`
	`67`	`+ // Hack to temporarily avoid using ISet.Contains`
	`68`	`+ if (!dependencyToRemove.Add(dependency.Id))`
`68`	`69`	`{`
`69`	`70`	`referencesFrameworkOnlyAssembly = true;`
`70`	`71`	`Log.LogMessage($" Remove dependency on '{dependency.Id}'");`
`71`	`72`	`continue;`
`72`	`73`	`}`
	`74`	`+ else`
	`75`	`+ {`
	`76`	`+ dependencyToRemove.Remove(dependency.Id);`
	`77`	`+ }`
`73`	`78`
`74`	`79`	`packages.Add(dependency);`
`75`	`80`	`}`
`@@ -107,4 +112,4 @@ private void FilterDependencies(string targetPath, ISet<string> dependencyToRemo`
`107`	`112`	`}`
`108`	`113`	`}`
`109`	`114`	`}`
`110`		`-}`
	`115`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`	`4`	`using System.Diagnostics;`
`5`		`-using System.Linq;`
`6`	`5`	`using System.Net;`
`7`	`6`	`using System.Security.Cryptography.X509Certificates;`
`8`	`7`	`using System.Text;`
`@@ -376,9 +375,9 @@ internal void Serialize(Utf8JsonWriter writer)`
`376`	`375`	`{`
`377`	`376`	`try`
`378`	`377`	`{`
`379`		`- var cert = CertificateManager.Instance.ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: false)`
`380`		`- .FirstOrDefault();`
	`378`	`+ var certs = CertificateManager.Instance.ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: false);`
`381`	`379`
	`380`	`+ var cert = certs.Count > 0 ? certs[0] : null;`
`382`	`381`	`if (cert is null)`
`383`	`382`	`{`
`384`	`383`	`logger.UnableToLocateDevelopmentCertificate();`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`	`4`	`using System;`
	`5`	`+using System.Collections.Concurrent;`
`5`	`6`	`using System.Collections.Generic;`
	`7`	`+using System.Diagnostics;`
`6`	`8`	`using System.Diagnostics.CodeAnalysis;`
`7`	`9`	`using System.Linq;`
`8`	`10`	`using System.Threading.Channels;`
`@@ -11,6 +13,8 @@ namespace Microsoft.AspNetCore.SignalR;`
`11`	`13`
`12`	`14`	`internal static class ReflectionHelper`
`13`	`15`	`{`
	`16`	`+ private static readonly ConcurrentDictionary<Type, Type> _streamTypeLookup = new();`
	`17`	`+`
`14`	`18`	`// mustBeDirectType - Hub methods must use the base 'stream' type and not be a derived class that just implements the 'stream' type`
`15`	`19`	`// and 'stream' types from the client are allowed to inherit from accepted 'stream' types`
`16`	`20`	`public static bool IsStreamingType([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)] Type type, bool mustBeDirectType = false)`
`@@ -28,6 +32,9 @@ public static bool IsStreamingType([DynamicallyAccessedMembers(DynamicallyAccess`
`28`	`32`	`{`
`29`	`33`	`if (nullableType.IsGenericType && nullableType.GetGenericTypeDefinition() == typeof(ChannelReader<>))`
`30`	`34`	`{`
	`35`	`+ Debug.Assert(nullableType.GetGenericArguments().Length == 1);`
	`36`	`+`
	`37`	`+ _streamTypeLookup.GetOrAdd(type, nullableType.GetGenericArguments()[0]);`
`31`	`38`	`return true;`
`32`	`39`	`}`
`33`	`40`
`@@ -59,4 +66,7 @@ public static bool IsIAsyncEnumerable([DynamicallyAccessedMembers(DynamicallyAcc`
`59`	`66`	`}`
`60`	`67`	`});`
`61`	`68`	`}`
	`69`	`+`
	`70`	`+ public static bool TryGetStreamType(Type stream, [NotNullWhen(true)] out Type? streamType)`
	`71`	`+ => _streamTypeLookup.TryGetValue(stream, out streamType);`
`62`	`72`	`}`