Merge pull request #2160 from ds5678/trim-support

JimBobSquarePants · web-flow · commit 909df99ae705 · 2022-07-18T11:11:21.000+10:00
Assembly Trimming Support
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
@@ -24,11 +24,13 @@
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
         <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+        <IsTrimmable>true</IsTrimmable>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
         <TargetFrameworks>net6.0</TargetFrameworks>
+        <IsTrimmable>true</IsTrimmable>
       </PropertyGroup>
     </Otherwise>
   </Choose>
diff --git a/src/ImageSharp/Metadata/Profiles/Exif/ExifTagDescriptionAttribute.cs b/src/ImageSharp/Metadata/Profiles/Exif/ExifTagDescriptionAttribute.cs
@@ -32,7 +32,7 @@ public ExifTagDescriptionAttribute(object value, string description)
         public static string GetDescription(ExifTag tag, object value)
         {
             var tagValue = (ExifTagValue)(ushort)tag;
-            FieldInfo field = tagValue.GetType().GetTypeInfo().GetDeclaredField(tagValue.ToString());
+            FieldInfo field = typeof(ExifTagValue).GetField(tagValue.ToString(), BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
 
             if (field is null)
             {

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public ExifTagDescriptionAttribute(object value, string description)`
`32`	`32`	`public static string GetDescription(ExifTag tag, object value)`
`33`	`33`	`{`
`34`	`34`	`var tagValue = (ExifTagValue)(ushort)tag;`
`35`		`- FieldInfo field = tagValue.GetType().GetTypeInfo().GetDeclaredField(tagValue.ToString());`
	`35`	`+ FieldInfo field = typeof(ExifTagValue).GetField(tagValue.ToString(), BindingFlags.Public \| BindingFlags.NonPublic \| BindingFlags.Static);`
`36`	`36`
`37`	`37`	`if (field is null)`
`38`	`38`	`{`