Fix NativeAOT warnings on comparers. (#35559)

dotnet · Feb 4, 2025 · bbdb097 · bbdb097
1 parent a130def
commit bbdb097
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 10 deletions.
diff --git a/src/EFCore/ChangeTracking/GeometryValueComparer.cs b/src/EFCore/ChangeTracking/GeometryValueComparer.cs
@@ -11,7 +11,11 @@ namespace Microsoft.EntityFrameworkCore.ChangeTracking;
 /// <remarks>
 ///     See <see href="https://aka.ms/efcore-docs-value-comparers">EF Core value comparers</see> for more information and examples.
 /// </remarks>
-public class GeometryValueComparer<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] TGeometry>
+public class GeometryValueComparer
+    <[DynamicallyAccessedMembers(
+        DynamicallyAccessedMemberTypes.PublicMethods
+        | DynamicallyAccessedMemberTypes.PublicProperties)]
+    TGeometry>
     : ValueComparer<TGeometry>
 {
     /// <summary>

diff --git a/src/EFCore/ChangeTracking/Internal/ConvertingValueComparer.cs b/src/EFCore/ChangeTracking/Internal/ConvertingValueComparer.cs
@@ -3,6 +3,7 @@
 
 namespace Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
 
+using System.Diagnostics.CodeAnalysis;
 using static Expression;
 
 /// <summary>
@@ -15,7 +16,11 @@ namespace Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
 ///     any release. You should only use it directly in your code with extreme caution and knowing that
 ///     doing so can result in application failures when updating to a new Entity Framework Core release.
 /// </remarks>
-public class ConvertingValueComparer<TTo, TFrom> : ValueComparer<TTo>, IInfrastructure<ValueComparer>
+public class ConvertingValueComparer
+    <[DynamicallyAccessedMembers(
+        DynamicallyAccessedMemberTypes.PublicMethods
+        | DynamicallyAccessedMemberTypes.PublicProperties)]
+    TTo, TFrom> : ValueComparer<TTo>, IInfrastructure<ValueComparer>
 {
     private readonly ValueComparer<TFrom> _valueComparer;
 

diff --git a/src/EFCore/ChangeTracking/Internal/NullableValueComparer`.cs b/src/EFCore/ChangeTracking/Internal/NullableValueComparer`.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
+
 namespace Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
 
 /// <summary>
@@ -9,7 +11,11 @@ namespace Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
 ///     any release. You should only use it directly in your code with extreme caution and knowing that
 ///     doing so can result in application failures when updating to a new Entity Framework Core release.
 /// </summary>
-public class NullableValueComparer<T> : ValueComparer<T?>, IInfrastructure<ValueComparer>
+public class NullableValueComparer
+    <[DynamicallyAccessedMembers(
+        DynamicallyAccessedMemberTypes.PublicMethods
+        | DynamicallyAccessedMemberTypes.PublicProperties)]
+    T> : ValueComparer<T?>, IInfrastructure<ValueComparer>
     where T : struct
 {
     private static readonly PropertyInfo _hasValueProperty = typeof(T?).GetProperty("HasValue")!;

diff --git a/src/EFCore/ChangeTracking/ValueComparer.cs b/src/EFCore/ChangeTracking/ValueComparer.cs
@@ -256,7 +256,6 @@ public static HashCode Add(HashCode hash, int code)
     public static ValueComparer CreateDefault(
         [DynamicallyAccessedMembers(
             DynamicallyAccessedMemberTypes.PublicMethods
-            | DynamicallyAccessedMemberTypes.NonPublicMethods
             | DynamicallyAccessedMemberTypes.PublicProperties)]
         Type type,
         bool favorStructuralComparisons)
@@ -279,7 +278,11 @@ public static ValueComparer CreateDefault(
     /// </param>
     /// <typeparam name="T">The type.</typeparam>
     /// <returns>The <see cref="ValueComparer{T}" />.</returns>
-    public static ValueComparer CreateDefault<T>(bool favorStructuralComparisons)
+    public static ValueComparer CreateDefault
+        <[DynamicallyAccessedMembers(
+            DynamicallyAccessedMemberTypes.PublicMethods
+            | DynamicallyAccessedMemberTypes.PublicProperties)]
+        T>(bool favorStructuralComparisons)
     {
         var nonNullableType = typeof(T).UnwrapNullableType();
 
@@ -313,7 +316,11 @@ public static ValueComparer CreateDefault<T>(bool favorStructuralComparisons)
     }
 
     // PublicMethods is required to preserve e.g. GetHashCode
-    internal class DefaultValueComparer<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] T> : ValueComparer<T>
+    internal class DefaultValueComparer
+        <[DynamicallyAccessedMembers(
+            DynamicallyAccessedMemberTypes.PublicMethods
+            | DynamicallyAccessedMemberTypes.PublicProperties)]
+        T> : ValueComparer<T>
     {
         public DefaultValueComparer(bool favorStructuralComparisons)
             : base(favorStructuralComparisons)

diff --git a/src/EFCore/ChangeTracking/ValueComparer`.cs b/src/EFCore/ChangeTracking/ValueComparer`.cs
@@ -29,12 +29,10 @@ namespace Microsoft.EntityFrameworkCore.ChangeTracking;
 /// <typeparam name="T">The type.</typeparam>
 // PublicMethods is required to preserve e.g. GetHashCode
 public class ValueComparer
-<[DynamicallyAccessedMembers(
+    <[DynamicallyAccessedMembers(
         DynamicallyAccessedMemberTypes.PublicMethods
-        | DynamicallyAccessedMemberTypes.NonPublicMethods
         | DynamicallyAccessedMemberTypes.PublicProperties)]
-    T>
-    : ValueComparer, IEqualityComparer<T>
+    T> : ValueComparer, IEqualityComparer<T>
 {
     private Func<T?, T?, bool>? _equals;
     private Func<T, int>? _hashCode;