added [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Publ…

…icFields)] annotations to generic enums
dIeGoLi · Oct 10, 2022 · 753f48a · 753f48a
1 parent 1eda2a3
commit 753f48a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Src/Fido2.Models/Converters/EnumNameMapper.cs b/Src/Fido2.Models/Converters/EnumNameMapper.cs
@@ -1,11 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Runtime.Serialization;
 
 namespace Fido2NetLib
 {
-    public static class EnumNameMapper<TEnum>
+    public static class EnumNameMapper<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] TEnum>
         where TEnum: struct, Enum
     {
         private static readonly Dictionary<TEnum, string> valueToNames = GetIdToNameMap();

diff --git a/Src/Fido2.Models/Converters/FidoEnumConverter.cs b/Src/Fido2.Models/Converters/FidoEnumConverter.cs
@@ -1,11 +1,12 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Fido2NetLib
 {
 
-    public sealed class FidoEnumConverter<T> : JsonConverter<T>
+    public sealed class FidoEnumConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] T> : JsonConverter<T>
         where T: struct, Enum
     {
         public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)

diff --git a/Src/Fido2/Extensions/EnumExtensions.cs b/Src/Fido2/Extensions/EnumExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Fido2NetLib;
 
@@ -12,7 +13,7 @@ public static class EnumExtensions
     /// <param name="ignoreCase">ignores the case when comparing values.</param>
     /// <returns>TEnum.</returns>
     /// <exception cref="ArgumentException">No XmlEnumAttribute code exists for type " + typeof(TEnum).ToString() + " corresponding to value of " + value</exception>
-    public static TEnum ToEnum<TEnum>(this string value, bool ignoreCase = true) where TEnum : struct, Enum
+    public static TEnum ToEnum<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] TEnum>(this string value, bool ignoreCase = true) where TEnum : struct, Enum
     {
         // Try to parse it normally on the first try
         if (Enum.TryParse<TEnum>(value, ignoreCase, out var result))
@@ -33,7 +34,7 @@ public static TEnum ToEnum<TEnum>(this string value, bool ignoreCase = true) whe
     /// <typeparam name="TEnum">The type of enum.</typeparam>
     /// <param name="value">The enum's value.</param>
     /// <returns>string.</returns>
-    public static string ToEnumMemberValue<TEnum>(this TEnum value) where TEnum : struct, Enum
+    public static string ToEnumMemberValue<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] TEnum>(this TEnum value) where TEnum : struct, Enum
     {
         return EnumNameMapper<TEnum>.GetName(value);
     }