Fixup test

Author: pranavkm

src/Components/Components/src/Microsoft.AspNetCore.Components.WarningSuppressions.xml

@@ -79,5 +79,11 @@
       <property name="Scope">member</property>
       <property name="Target">M:Microsoft.AspNetCore.Components.LayoutView.&lt;&gt;c__DisplayClass13_0.&lt;WrapInLayout&gt;g__Render|0(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder)</property>
     </attribute>
+    <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
+      <argument>ILLink</argument>
+      <argument>IL2080</argument>
+      <property name="Scope">member</property>
+      <property name="Target">M:Microsoft.AspNetCore.Components.Reflection.MemberAssignment.&lt;GetPropertiesIncludingInherited&gt;d__0.MoveNext</property>
+    </attribute>
   </assembly>
-</linker>
+</linker>

src/Components/Components/src/Reflection/MemberAssignment.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using System.Reflection;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
 
@@ -16,13 +15,13 @@ public static IEnumerable<PropertyInfo> GetPropertiesIncludingInherited(
             [DynamicallyAccessedMembers(Component)] Type type,
             BindingFlags bindingFlags)
         {
-            var dictionary = new Dictionary<string, List<PropertyInfo>>();
+            var dictionary = new Dictionary<string, List<PropertyInfo>>(StringComparer.Ordinal);
 
             Type? currentType = type;
 
             while (currentType != null)
             {
-                var properties = currentType.GetProperties(bindingFlags  | BindingFlags.DeclaredOnly);
+                var properties = currentType.GetProperties(bindingFlags | BindingFlags.DeclaredOnly);
                 foreach (var property in properties)
                 {
                     if (!dictionary.TryGetValue(property.Name, out var others))
@@ -31,7 +30,7 @@ public static IEnumerable<PropertyInfo> GetPropertiesIncludingInherited(
                         dictionary.Add(property.Name, others);
                     }
 
-                    if (others.Any(other => other.GetMethod?.GetBaseDefinition() == property.GetMethod?.GetBaseDefinition()))
+                    if (others.Exists(other => other.GetMethod?.GetBaseDefinition() == property.GetMethod?.GetBaseDefinition()))
                     {
                         // This is an inheritance case. We can safely ignore the value of property since
                         // we have seen a more derived value.
@@ -44,7 +43,13 @@ public static IEnumerable<PropertyInfo> GetPropertiesIncludingInherited(
                 currentType = currentType.BaseType;
             }
 
-            return dictionary.Values.SelectMany(p => p);
+            foreach (var list in dictionary.Values)
+            {
+                foreach (var property in list)
+                {
+                    yield return property;
+                }
+            }
         }
     }
 }

src/Components/Components/test/ParameterViewTest.Assignment.cs

@@ -357,8 +357,8 @@ public void SettingCaptureUnmatchedValuesParameterExplicitlyAndImplicitly_Revers
             Assert.Equal(
                 $"The property '{nameof(HasCaptureUnmatchedValuesProperty.CaptureUnmatchedValues)}' on component type '{typeof(HasCaptureUnmatchedValuesProperty).FullName}' cannot be set explicitly when " +
                 $"also used to capture unmatched values. Unmatched values:" + Environment.NewLine +
-                $"test1" + Environment.NewLine +
-                $"test2",
+                $"test2" + Environment.NewLine +
+                $"test1",
                 ex.Message);
         }
 

src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs

@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using System.Reflection;
 
 namespace Microsoft.AspNetCore.Components.Forms
@@ -58,15 +57,16 @@ private static void ValidateModel(EditContext editContext, ValidationMessageStor
                     continue;
                 }
 
-                if (!validationResult.MemberNames.Any())
+                var hasMembers = false;
+                foreach (var memberName in validationResult.MemberNames)
                 {
-                    messages.Add(new FieldIdentifier(editContext.Model, fieldName: string.Empty), validationResult.ErrorMessage!);
-                    continue;
+                    hasMembers = true;
+                    messages.Add(editContext.Field(memberName), validationResult.ErrorMessage!);
                 }
 
-                foreach (var memberName in validationResult.MemberNames)
+                if (!hasMembers)
                 {
-                    messages.Add(editContext.Field(memberName), validationResult.ErrorMessage!);
+                    messages.Add(new FieldIdentifier(editContext.Model, fieldName: string.Empty), validationResult.ErrorMessage!);
                 }
             }
 
@@ -86,7 +86,10 @@ private static void ValidateField(EditContext editContext, ValidationMessageStor
 
                 Validator.TryValidateProperty(propertyValue, validationContext, results);
                 messages.Clear(fieldIdentifier);
-                messages.Add(fieldIdentifier, results.Select(result => result.ErrorMessage!));
+                for (var i = 0; i < results.Count; i++)
+                {
+                    messages.Add(fieldIdentifier, results[i].ErrorMessage!);
+                }
 
                 // We have to notify even if there were no messages before and are still no messages now,
                 // because the "state" that changed might be the completion of some async validation task

src/Components/Forms/src/ValidationMessageStore.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 
 namespace Microsoft.AspNetCore.Components.Forms
@@ -65,7 +64,7 @@ public void Add(Expression<Func<object>> accessor, IEnumerable<string> messages)
         /// <param name="fieldIdentifier">The identifier for the field.</param>
         /// <returns>The validation messages for the specified field within this <see cref="ValidationMessageStore"/>.</returns>
         public IEnumerable<string> this[FieldIdentifier fieldIdentifier]
-            => _messages.TryGetValue(fieldIdentifier, out var messages) ? messages : Enumerable.Empty<string>();
+            => _messages.TryGetValue(fieldIdentifier, out var messages) ? messages : Array.Empty<string>();
 
         /// <summary>
         /// Gets the validation messages within this <see cref="ValidationMessageStore"/> for the specified field.