Merge pull request #25039 from dotnet-maestro-bot/merge/release/5.0-to-master

[automated] Merge branch 'release/5.0' => 'master'

Author: BrennanConroy

src/Components/WebAssembly/Sdk/integrationtests/WasmPublishIntegrationTest.cs

@@ -141,8 +141,6 @@ public async Task Publish_WithScopedCss_Works()
                 serviceWorkerPath: Path.Combine("serviceworkers", "my-service-worker.js"),
                 serviceWorkerContent: "// This is the production service worker",
                 assetsManifestPath: "custom-service-worker-assets.js");
-
-            VerifyTypeGranularTrimming(result, blazorPublishDirectory);
         }
 
         [Fact]
@@ -906,16 +904,17 @@ static string ParseWebFormattedHash(string webFormattedHash)
 
         private void VerifyTypeGranularTrimming(MSBuildResult result, string blazorPublishDirectory)
         {
-            var loggingAssemblyPath = Path.Combine(blazorPublishDirectory, "_framework", "Microsoft.Extensions.Logging.Abstractions.dll");
-            Assert.FileExists(result, loggingAssemblyPath);
+            var componentsShimAssemblyPath = Path.Combine(blazorPublishDirectory, "_framework", "Microsoft.AspNetCore.Razor.Test.ComponentShim.dll");
+            Assert.FileExists(result, componentsShimAssemblyPath);
+
+            // RouteView is referenced by the app, so we expect it to be preserved
+            Assert.AssemblyContainsType(result, componentsShimAssemblyPath, "Microsoft.AspNetCore.Components.RouteView");
 
-            // ILogger is referenced by the app, so we expect it to be preserved
-            Assert.AssemblyContainsType(result, loggingAssemblyPath, "Microsoft.Extensions.Logging.ILogger");
-            // LogLevel is referenced by ILogger and therefore must be preserved.
-            Assert.AssemblyContainsType(result, loggingAssemblyPath, "Microsoft.Extensions.Logging.LogLevel");
+            // RouteData is referenced by RouteView so we expect it to be preserved.
+            Assert.AssemblyContainsType(result, componentsShimAssemblyPath, "Microsoft.AspNetCore.Components.RouteData");
 
-            // NullLogger is not referenced by the app, and should be trimmed.
-            Assert.AssemblyDoesNotContainType(result, loggingAssemblyPath, "Microsoft.Extensions.Logging.Abstractions.NullLogger");
+            // CascadingParameterAttribute is not referenced by the app, and should be trimmed.
+            Assert.AssemblyDoesNotContainType(result, componentsShimAssemblyPath, "Microsoft.AspNetCore.Components.CascadingParameterAttribute");
         }
 
         private static BootJsonData ReadBootJsonData(MSBuildResult result, string path)

src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets

@@ -69,6 +69,12 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   </PropertyGroup>
 
+  <ItemGroup>
+    <!-- Configuration for the platform compatibility analyzer. See https://github.com/dotnet/designs/blob/master/accepted/2020/platform-exclusion/platform-exclusion.md#build-configuration-for-platforms -->
+    <SupportedPlatform Remove="@(SupportedPlatform)" />
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
   <Import Project="Microsoft.NET.Sdk.BlazorWebAssembly.ServiceWorkerAssetsManifest.targets" Condition="'$(ServiceWorkerAssetsManifest)' != ''" />
 
   <Target Name="_ScrambleDotnetJsFileName" AfterTargets="ResolveRuntimePackAssets">
@@ -395,7 +401,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ItemGroup>
       <_BlazorTypeGranularAssembly
           Include="@(ManagedAssemblyToLink)"
-          Condition="'%(Extension)' == '.dll' AND ($([System.String]::Copy('%(Filename)').StartsWith('Microsoft.AspNetCore.')) or $([System.String]::Copy('%(Filename)').StartsWith('Microsoft.Extensions.')))">
+          Condition="'%(Extension)' == '.dll' AND $([System.String]::Copy('%(Filename)').StartsWith('Microsoft.AspNetCore.'))">
         <Required>false</Required>
         <Preserve>all</Preserve>
       </_BlazorTypeGranularAssembly>

src/Components/WebAssembly/Sdk/testassets/blazorwasm/Program.cs

@@ -8,7 +8,6 @@ public static void Main(string[] args)
         {
             GC.KeepAlive(typeof(System.Text.Json.JsonSerializer));
             GC.KeepAlive(typeof(RazorClassLibrary.Class1));
-            GC.KeepAlive(typeof(Microsoft.Extensions.Logging.ILogger));
 #if REFERENCE_classlibrarywithsatelliteassemblies
             GC.KeepAlive(typeof(classlibrarywithsatelliteassemblies.Class1));
 #endif

src/FileProviders/Embedded/src/Manifest/ManifestDirectory.cs

@@ -98,7 +98,7 @@ internal static void ValidateChildrenAndSetParent(ManifestEntry[] children, Mani
 
         private ManifestEntry[] CopyChildren()
         {
-            var list = new List<ManifestEntry>();
+            var list = new List<ManifestEntry>(Children.Count);
             for (int i = 0; i < Children.Count; i++)
             {
                 var child = Children[i];

src/Http/Http/src/Features/RequestCookiesFeature.cs

@@ -80,7 +80,7 @@ public IRequestCookieCollection Cookies
                     }
                     else
                     {
-                        var headers = new List<string>();
+                        var headers = new List<string>(_parsedValues.Count);
                         foreach (var pair in _parsedValues)
                         {
                             headers.Add(new CookieHeaderValue(pair.Key, pair.Value).ToString());

src/Http/Routing/src/Patterns/RoutePatternFactory.cs

@@ -497,7 +497,7 @@ RoutePatternPart VisitPart(RoutePatternPart part)
                         updatedParameterPolicies = new Dictionary<string, List<RoutePatternParameterPolicyReference>>(StringComparer.OrdinalIgnoreCase);
                     }
 
-                    parameterConstraints = new List<RoutePatternParameterPolicyReference>();
+                    parameterConstraints = new List<RoutePatternParameterPolicyReference>(parameter.ParameterPolicies.Count);
                     updatedParameterPolicies.Add(parameter.Name, parameterConstraints);
                 }
 

src/Identity/Core/src/SignInManager.cs

@@ -169,16 +169,22 @@ public virtual async Task<bool> CanSignInAsync(TUser user)
         public virtual async Task RefreshSignInAsync(TUser user)
         {
             var auth = await Context.AuthenticateAsync(IdentityConstants.ApplicationScheme);
-            var claims = new List<Claim>();
+            IList<Claim> claims = Array.Empty<Claim>();
+
             var authenticationMethod = auth?.Principal?.FindFirst(ClaimTypes.AuthenticationMethod);
-            if (authenticationMethod != null)
-            {
-                claims.Add(authenticationMethod);
-            }
             var amr = auth?.Principal?.FindFirst("amr");
-            if (amr != null)
+
+            if (authenticationMethod != null || amr != null)
             {
-                claims.Add(amr);
+                claims = new List<Claim>();
+                if (authenticationMethod != null)
+                {
+                    claims.Add(authenticationMethod);
+                }
+                if (amr != null)
+                {
+                    claims.Add(amr);
+                }
             }
 
             await SignInWithClaimsAsync(user, auth?.Properties, claims);
@@ -203,9 +209,10 @@ public virtual Task SignInAsync(TUser user, bool isPersistent, string authentica
         /// <returns>The task object representing the asynchronous operation.</returns>
         public virtual Task SignInAsync(TUser user, AuthenticationProperties authenticationProperties, string authenticationMethod = null)
         {
-            var additionalClaims = new List<Claim>();
+            IList<Claim> additionalClaims = Array.Empty<Claim>();
             if (authenticationMethod != null)
             {
+                additionalClaims = new List<Claim>();
                 additionalClaims.Add(new Claim(ClaimTypes.AuthenticationMethod, authenticationMethod));
             }
             return SignInWithClaimsAsync(user, authenticationProperties, additionalClaims);

src/Middleware/Localization/src/RequestLocalizationOptions.cs

@@ -122,7 +122,7 @@ public RequestCulture DefaultRequestCulture
         /// <returns>The <see cref="RequestLocalizationOptions"/>.</returns>
         public RequestLocalizationOptions AddSupportedCultures(params string[] cultures)
         {
-            var supportedCultures = new List<CultureInfo>();
+            var supportedCultures = new List<CultureInfo>(cultures.Length);
 
             foreach (var culture in cultures)
             {
@@ -140,7 +140,7 @@ public RequestLocalizationOptions AddSupportedCultures(params string[] cultures)
         /// <returns>The <see cref="RequestLocalizationOptions"/>.</returns>
         public RequestLocalizationOptions AddSupportedUICultures(params string[] uiCultures)
         {
-            var supportedUICultures = new List<CultureInfo>();
+            var supportedUICultures = new List<CultureInfo>(uiCultures.Length);
             foreach (var culture in uiCultures)
             {
                 supportedUICultures.Add(new CultureInfo(culture));

src/Mvc/Mvc.Core/src/ApplicationModels/ApplicationModelFactory.cs

@@ -309,7 +309,7 @@ private static string CreateMixedRoutedActionDescriptorsErrorMessage(
             // Text to show as the attribute route template for conventionally routed actions.
             var nullTemplate = Resources.AttributeRoute_NullTemplateRepresentation;
 
-            var actionDescriptions = new List<string>();
+            var actionDescriptions = new List<string>(actions.Count);
             for (var i = 0; i < actions.Count; i++)
             {
                 var (action, selector) = actions[i];

src/Mvc/Mvc.Core/src/ApplicationModels/ControllerActionDescriptorBuilder.cs

@@ -63,7 +63,7 @@ private static void AddControllerPropertyDescriptors(ActionDescriptor actionDesc
 
         private static void AddParameterDescriptors(ActionDescriptor actionDescriptor, ActionModel action)
         {
-            var parameterDescriptors = new List<ParameterDescriptor>();
+            var parameterDescriptors = new List<ParameterDescriptor>(action.Parameters.Count);
             foreach (var parameter in action.Parameters)
             {
                 var parameterDescriptor = CreateParameterDescriptor(parameter);