Ensure AOT Compatibility (#100)

ds5678 · web-flow · commit 9b50c206e940 · 2023-12-31T15:25:03.000Z
diff --git a/Cpp2IL.Core/Attributes/RegisterCpp2IlPluginAttribute.cs b/Cpp2IL.Core/Attributes/RegisterCpp2IlPluginAttribute.cs
@@ -7,12 +7,10 @@ namespace Cpp2IL.Core.Attributes;
 [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
 public class RegisterCpp2IlPluginAttribute : Attribute
 {
-#if NET6_0
     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
-#endif
     public Type PluginType { get; }
 
-    public RegisterCpp2IlPluginAttribute(Type pluginType)
+    public RegisterCpp2IlPluginAttribute([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type pluginType)
     {
         if (!typeof(Cpp2IlPlugin).IsAssignableFrom(pluginType))
             throw new ArgumentException("Plugin type to register must extend Cpp2IlPlugin", nameof(pluginType));
@@ -22,4 +20,4 @@ public RegisterCpp2IlPluginAttribute(Type pluginType)
 
         PluginType = pluginType;
     }
-}
+}
diff --git a/Cpp2IL.Core/Cpp2IL.Core.csproj b/Cpp2IL.Core/Cpp2IL.Core.csproj
@@ -16,12 +16,20 @@
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/SamboyCoding/Cpp2IL.git</RepositoryUrl>
-        <TargetFrameworks>net7.0;net6.0;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
         <Title>Cpp2IL.Core</Title>
         <VersionPrefix>2022.1.0</VersionPrefix>
-        <!--Plugins make this non-trimmable-->
 
         <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
+        <PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
+        <IsTrimmable>true</IsTrimmable>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
     <ItemGroup>
@@ -40,7 +48,7 @@
         <!--Not used at runtime, but needed for the build-->
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 
-        <PackageReference Include="PolySharp" Version="1.12.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+        <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
diff --git a/Cpp2IL.Core/Cpp2IlApi.cs b/Cpp2IL.Core/Cpp2IlApi.cs
@@ -20,6 +20,7 @@ public static class Cpp2IlApi
     {
         public static ApplicationAnalysisContext? CurrentAppContext;
 
+        [RequiresUnreferencedCode("Plugins are loaded dynamically.")]
         public static void Init(string pluginsDir = "Plugins")
         {
             Cpp2IlPluginManager.LoadFromDirectory(Path.Combine(Environment.CurrentDirectory, pluginsDir));
diff --git a/Cpp2IL.Core/Cpp2IlPluginManager.cs b/Cpp2IL.Core/Cpp2IlPluginManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -13,6 +14,7 @@ public static class Cpp2IlPluginManager
 {
     private static List<Cpp2IlPlugin> _loadedPlugins = new();
 
+    [RequiresUnreferencedCode("Plugins are loaded dynamically.")]
     internal static void LoadFromDirectory(string pluginsDir)
     {
         Logger.InfoNewline($"Loading plugins from {pluginsDir}...", "Plugins");
@@ -101,4 +103,4 @@ public static void CallOnFinish()
             cpp2IlPlugin.CallOnFinish();
         }
     }
-}
+}
diff --git a/LibCpp2IL/LibCpp2IL.csproj b/LibCpp2IL/LibCpp2IL.csproj
@@ -17,21 +17,25 @@
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <Description>Library for interacting with IL2CPP metadata and binaries</Description>
         <Configurations>Debug;Release</Configurations>
-        <TargetFrameworks>net7.0;net6.0;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
+        <PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
     </PropertyGroup>
 
     <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
         <IsTrimmable>true</IsTrimmable>
     </PropertyGroup>
 
+    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+        <IsAotCompatible>true</IsAotCompatible>
+    </PropertyGroup>
+
     <ItemGroup>
         <PackageReference Include="AssetRipper.Primitives" Version="2.1.0" />
+        <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
-        <PackageReference Include="IndexRange" Version="1.0.2" />
         <PackageReference Include="System.Memory" Version="4.5.5" />
-        <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/WasmDisassembler/WasmDisassembler.csproj b/WasmDisassembler/WasmDisassembler.csproj
@@ -15,8 +15,15 @@
         <RepositoryUrl>https://github.com/SamboyCoding/Cpp2IL.git</RepositoryUrl>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <Description>Simple, zero-dependency disassembler for WebAssembly bytecode</Description>
-        <TargetFrameworks>net7.0;net6.0;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
         <IsTrimmable>true</IsTrimmable>
     </PropertyGroup>
 
+    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+        <IsAotCompatible>true</IsAotCompatible>
+    </PropertyGroup>
+
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,10 @@ namespace Cpp2IL.Core.Attributes;`
`7`	`7`	`[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]`
`8`	`8`	`public class RegisterCpp2IlPluginAttribute : Attribute`
`9`	`9`	`{`
`10`		`-#if NET6_0`
`11`	`10`	`[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]`
`12`		`-#endif`
`13`	`11`	`public Type PluginType { get; }`
`14`	`12`
`15`		`- public RegisterCpp2IlPluginAttribute(Type pluginType)`
	`13`	`+ public RegisterCpp2IlPluginAttribute([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type pluginType)`
`16`	`14`	`{`
`17`	`15`	`if (!typeof(Cpp2IlPlugin).IsAssignableFrom(pluginType))`
`18`	`16`	`throw new ArgumentException("Plugin type to register must extend Cpp2IlPlugin", nameof(pluginType));`
`@@ -22,4 +20,4 @@ public RegisterCpp2IlPluginAttribute(Type pluginType)`
`22`	`20`
`23`	`21`	`PluginType = pluginType;`
`24`	`22`	`}`
`25`		`-}`
	`23`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public static class Cpp2IlApi`
`20`	`20`	`{`
`21`	`21`	`public static ApplicationAnalysisContext? CurrentAppContext;`
`22`	`22`
	`23`	`+ [RequiresUnreferencedCode("Plugins are loaded dynamically.")]`
`23`	`24`	`public static void Init(string pluginsDir = "Plugins")`
`24`	`25`	`{`
`25`	`26`	`Cpp2IlPluginManager.LoadFromDirectory(Path.Combine(Environment.CurrentDirectory, pluginsDir));`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using System.Diagnostics.CodeAnalysis;`
`3`	`4`	`using System.IO;`
`4`	`5`	`using System.Linq;`
`5`	`6`	`using System.Reflection;`
`@@ -13,6 +14,7 @@ public static class Cpp2IlPluginManager`
`13`	`14`	`{`
`14`	`15`	`private static List<Cpp2IlPlugin> _loadedPlugins = new();`
`15`	`16`
	`17`	`+ [RequiresUnreferencedCode("Plugins are loaded dynamically.")]`
`16`	`18`	`internal static void LoadFromDirectory(string pluginsDir)`
`17`	`19`	`{`
`18`	`20`	`Logger.InfoNewline($"Loading plugins from {pluginsDir}...", "Plugins");`
`@@ -101,4 +103,4 @@ public static void CallOnFinish()`
`101`	`103`	`cpp2IlPlugin.CallOnFinish();`
`102`	`104`	`}`
`103`	`105`	`}`
`104`		`-}`
	`106`	`+}`