Merge pull request #188 from maxkatz6/aot-compat

Add IsTrimmable and IsAotCompatible project attributes

Author: TylerBrinks

src/ExCSS/ExCSS.csproj

@@ -31,6 +31,18 @@
 		-->
 	</PropertyGroup>
 
+	<!-- Trimming parameters -->
+	<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
+		<IsTrimmable>true</IsTrimmable>
+		<SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
+		<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+	</PropertyGroup>
+	<!-- AOT parameters -->
+	<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+		<IsAotCompatible>true</IsAotCompatible>
+		<EnableAotAnalyzer>true</EnableAotAnalyzer>
+	</PropertyGroup>
+
 	<PropertyGroup Condition="'$(TargetFramework)' != ''">
 		<LangVersion>9.0</LangVersion>
 	</PropertyGroup>

src/ExCSS/Extensions/PortableExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 
@@ -13,7 +14,11 @@ public static string ConvertFromUtf32(this int utf32)
             return char.ConvertFromUtf32(utf32);
         }
 
-        public static PropertyInfo[] GetProperties(this Type type)
+        public static PropertyInfo[] GetProperties(
+#if NET6_0_OR_GREATER
+            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.NonPublicProperties)]
+#endif
+            this Type type)
         {
             return type.GetRuntimeProperties().ToArray();
         }

src/ExCSS/Factories/AttributeSelectorFactory.cs

@@ -1,23 +1,11 @@
 using System;
-using System.Collections.Generic;
 
 namespace ExCSS
 {
     public sealed class AttributeSelectorFactory
     {
         private static readonly Lazy<AttributeSelectorFactory> Lazy = new(() => new AttributeSelectorFactory());
 
-        private readonly Dictionary<string, Type> _types = new()
-        {
-            { Combinators.Exactly, typeof(AttrMatchSelector) },
-            { Combinators.InList, typeof(AttrListSelector) },
-            { Combinators.InToken, typeof(AttrHyphenSelector) },
-            { Combinators.Begins, typeof(AttrBeginsSelector) },
-            { Combinators.Ends, typeof(AttrEndsSelector) },
-            { Combinators.InText, typeof(AttrContainsSelector) },
-            { Combinators.Unlike, typeof(AttrNotMatchSelector) },
-        };
-
         private AttributeSelectorFactory()
         {
         }
@@ -34,11 +22,23 @@ public IAttrSelector Create(string combinator, string match, string value, strin
                 _ = AttributeSelectorFactory.FormMatch(prefix, match);
             }
 
-            return _types.TryGetValue(combinator, out var type)
-                ? (IAttrSelector)Activator.CreateInstance(type, name, value)
-                : new AttrAvailableSelector(name, value);
+            if (combinator == Combinators.Exactly)
+                return new AttrMatchSelector(name, value);
+            if (combinator == Combinators.InList)
+                return new AttrListSelector(name, value);
+            if (combinator == Combinators.InToken)
+                return new AttrHyphenSelector(name, value);
+            if (combinator == Combinators.Begins)
+                return new AttrBeginsSelector(name, value);
+            if (combinator == Combinators.Ends)
+                return new AttrEndsSelector(name, value);
+            if (combinator == Combinators.InText)
+                return new AttrContainsSelector(name, value);
+            if (combinator == Combinators.Unlike)
+                return new AttrNotMatchSelector(name, value);
+            return new AttrAvailableSelector(name, value);
         }
-        
+
         private static string FormFront(string prefix, string match)
         {
             return string.Concat(prefix, Combinators.Pipe, match);