Modified HtmlTagId and HtmlAttributeId extensions to be AOT compatible.

jstedfast · Nov 29, 2024 · ac5a988 · ac5a988
1 parent a3ae171
commit ac5a988
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/HtmlKit/HtmlAttributeId.cs b/HtmlKit/HtmlAttributeId.cs
@@ -691,12 +691,19 @@ public static class HtmlAttributeIdExtensions
 
 		static HtmlAttributeIdExtensions ()
 		{
-			var values = (HtmlAttributeId[]) Enum.GetValues (typeof (HtmlAttributeId));
+#if NET8_0_OR_GREATER
+			var values = Enum.GetValuesAsUnderlyingType<HtmlAttributeId> ();
+#else
+			var values = Enum.GetValues (typeof (HtmlAttributeId));
+#endif
 
 			IdMapping = new Dictionary<string, HtmlAttributeId> (values.Length - 1, OptimizedOrdinalIgnoreCaseComparer.Comparer);
 
-			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/HtmlKit/HtmlKit.csproj b/HtmlKit/HtmlKit.csproj
@@ -45,6 +45,10 @@
     <DebugType>full</DebugType>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
+  </PropertyGroup>
+
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) Or $(TargetFramework.StartsWith('netstandard2.')) ">
     <PackageReference Include="System.Buffers" Version="4.6.0" />
     <PackageReference Include="System.Memory" Version="4.6.0" />

diff --git a/HtmlKit/HtmlTagId.cs b/HtmlKit/HtmlTagId.cs
@@ -859,12 +859,19 @@ public static class HtmlTagIdExtensions
 
 		static HtmlTagIdExtensions ()
 		{
-			var values = (HtmlTagId[]) Enum.GetValues (typeof (HtmlTagId));
+#if NET8_0_OR_GREATER
+			var values = Enum.GetValuesAsUnderlyingType<HtmlTagId> ();
+#else
+			var values = Enum.GetValues (typeof (HtmlTagId));
+#endif
 
 			IdMapping = new Dictionary<string, HtmlTagId> (values.Length - 1, OptimizedOrdinalIgnoreCaseComparer.Comparer);
 
-			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>