Improved AOT compatibility of HtmlTagId and HtmlAttributeId extensions

jstedfast · Nov 29, 2024 · f9c53d5 · f9c53d5
1 parent 640dec6
commit f9c53d5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/MimeKit/Text/HtmlAttributeId.cs b/MimeKit/Text/HtmlAttributeId.cs
@@ -694,15 +694,18 @@ public static class HtmlAttributeIdExtensions
 		static HtmlAttributeIdExtensions ()
 		{
 #if NET8_0_OR_GREATER
-			var values = Enum.GetValues<HtmlAttributeId> ();
+			var values = Enum.GetValuesAsUnderlyingType<HtmlAttributeId> ();
 #else
-			var values = (HtmlAttributeId[]) Enum.GetValues (typeof (HtmlAttributeId));
+			var values = Enum.GetValues (typeof (HtmlAttributeId));
 #endif
 
 			IdMapping = new Dictionary<string, HtmlAttributeId> (values.Length - 1, MimeUtils.OrdinalIgnoreCase);
 
-			for (int i = 1; i < values.Length; i++)
-				IdMapping.Add (values[i].ToAttributeName (), values[i]);
+			for (int i = 1; i < values.Length; i++) {
+				var value = (HtmlAttributeId) values.GetValue (i);
+
+				IdMapping.Add (value.ToAttributeName (), value);
+			}
 		}
 
 		/// <summary>

diff --git a/MimeKit/Text/HtmlTagId.cs b/MimeKit/Text/HtmlTagId.cs
@@ -865,15 +865,18 @@ public static class HtmlTagIdExtensions
 		static HtmlTagIdExtensions ()
 		{
 #if NET8_0_OR_GREATER
-			var values = Enum.GetValues<HtmlTagId> ();
+			var values = Enum.GetValuesAsUnderlyingType<HtmlTagId> ();
 #else
-			var values = (HtmlTagId[]) Enum.GetValues (typeof (HtmlTagId));
+			var values = Enum.GetValues (typeof (HtmlTagId));
 #endif
 
 			IdMapping = new Dictionary<string, HtmlTagId> (values.Length - 1, MimeUtils.OrdinalIgnoreCase);
 
-			for (int i = 1; i < values.Length; i++)
-				IdMapping.Add (values[i].ToHtmlTagName (), values[i]);
+			for (int i = 1; i < values.Length; i++) {
+				var value = (HtmlTagId) values.GetValue (i);
+
+				IdMapping.Add (value.ToHtmlTagName (), value);
+			}
 		}
 
 		/// <summary>