From 3986ff7b35e49eee5136bff141443ed1a9bdc645 Mon Sep 17 00:00:00 2001 From: ds5678 <49847914+ds5678@users.noreply.github.com> Date: Sun, 30 Jun 2024 19:46:33 -0700 Subject: [PATCH] AsmResolver 6 --- Il2CppInterop.Generator/CecilAdapter.cs | 3 +-- .../Contexts/AssemblyRewriteContext.cs | 2 +- Il2CppInterop.Generator/Contexts/FieldRewriteContext.cs | 2 +- Il2CppInterop.Generator/Contexts/MethodRewriteContext.cs | 3 +-- Il2CppInterop.Generator/Contexts/RewriteGlobalContext.cs | 2 +- Il2CppInterop.Generator/Contexts/TypeRewriteContext.cs | 1 - Il2CppInterop.Generator/Extensions/EnumEx.cs | 2 +- Il2CppInterop.Generator/Extensions/ILGeneratorEx.cs | 9 ++++----- .../Extensions/ParameterDefinitionEx.cs | 2 +- Il2CppInterop.Generator/Extensions/StringEx.cs | 2 +- Il2CppInterop.Generator/Extensions/TypeReferenceEx.cs | 2 +- Il2CppInterop.Generator/Il2CppInterop.Generator.csproj | 2 +- .../MetadataAccess/CecilMetadataAccess.cs | 2 +- .../MetadataAccess/IIl2CppMetadataAccess.cs | 2 +- .../MetadataAccess/NullMetadataAccess.cs | 2 +- .../Passes/Pass05CreateRenameGroups.cs | 4 ++-- Il2CppInterop.Generator/Passes/Pass10CreateTypedefs.cs | 2 +- .../Passes/Pass11ComputeTypeSpecifics.cs | 2 +- .../Passes/Pass19CopyMethodParameters.cs | 2 +- .../Passes/Pass20GenerateStaticConstructors.cs | 1 - .../Passes/Pass21GenerateValueTypeFields.cs | 4 ++-- Il2CppInterop.Generator/Passes/Pass22GenerateEnums.cs | 2 +- .../Passes/Pass23GeneratePointerConstructors.cs | 2 +- .../Pass25GenerateNonBlittableValueTypeDefaultCtors.cs | 2 +- .../Pass30GenerateGenericMethodStoreConstructors.cs | 1 - .../Passes/Pass40GenerateFieldAccessors.cs | 2 +- Il2CppInterop.Generator/Passes/Pass50GenerateMethods.cs | 2 +- .../Passes/Pass60AddImplicitConversions.cs | 5 ++--- Il2CppInterop.Generator/Passes/Pass79UnstripTypes.cs | 3 +-- Il2CppInterop.Generator/Passes/Pass80UnstripFields.cs | 2 +- Il2CppInterop.Generator/Passes/Pass80UnstripMethods.cs | 3 +-- .../Passes/Pass89GenerateForwarders.cs | 2 +- .../Runners/DeobfuscationMapGenerator.cs | 4 ++-- Il2CppInterop.Generator/Utils/CorlibReferences.cs | 1 - Il2CppInterop.Generator/Utils/FieldAccessorGenerator.cs | 2 +- .../Utils/RuntimeAssemblyReferences.cs | 1 - Il2CppInterop.Generator/Utils/UnstripGenerator.cs | 3 +-- Il2CppInterop.Generator/Utils/UnstripTranslator.cs | 2 +- 38 files changed, 40 insertions(+), 52 deletions(-) diff --git a/Il2CppInterop.Generator/CecilAdapter.cs b/Il2CppInterop.Generator/CecilAdapter.cs index 94566d81..dd122b9f 100644 --- a/Il2CppInterop.Generator/CecilAdapter.cs +++ b/Il2CppInterop.Generator/CecilAdapter.cs @@ -3,9 +3,8 @@ using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Collections; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; namespace Il2CppInterop.Generator; internal static class CecilAdapter diff --git a/Il2CppInterop.Generator/Contexts/AssemblyRewriteContext.cs b/Il2CppInterop.Generator/Contexts/AssemblyRewriteContext.cs index ec6f6e11..dcc5401a 100644 --- a/Il2CppInterop.Generator/Contexts/AssemblyRewriteContext.cs +++ b/Il2CppInterop.Generator/Contexts/AssemblyRewriteContext.cs @@ -1,5 +1,5 @@ using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using Il2CppInterop.Generator.Extensions; using Il2CppInterop.Generator.Utils; diff --git a/Il2CppInterop.Generator/Contexts/FieldRewriteContext.cs b/Il2CppInterop.Generator/Contexts/FieldRewriteContext.cs index 50aa0082..09734419 100644 --- a/Il2CppInterop.Generator/Contexts/FieldRewriteContext.cs +++ b/Il2CppInterop.Generator/Contexts/FieldRewriteContext.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Generator.Extensions; using Il2CppInterop.Generator.Utils; diff --git a/Il2CppInterop.Generator/Contexts/MethodRewriteContext.cs b/Il2CppInterop.Generator/Contexts/MethodRewriteContext.cs index 141ae22a..0c241eda 100644 --- a/Il2CppInterop.Generator/Contexts/MethodRewriteContext.cs +++ b/Il2CppInterop.Generator/Contexts/MethodRewriteContext.cs @@ -2,8 +2,7 @@ using System.Text; using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Common.XrefScans; using Il2CppInterop.Generator.Extensions; using Il2CppInterop.Generator.Passes; diff --git a/Il2CppInterop.Generator/Contexts/RewriteGlobalContext.cs b/Il2CppInterop.Generator/Contexts/RewriteGlobalContext.cs index 2d70dd03..41c2b480 100644 --- a/Il2CppInterop.Generator/Contexts/RewriteGlobalContext.cs +++ b/Il2CppInterop.Generator/Contexts/RewriteGlobalContext.cs @@ -1,5 +1,5 @@ using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using Il2CppInterop.Generator.Extensions; using Il2CppInterop.Generator.MetadataAccess; using Il2CppInterop.Generator.Utils; diff --git a/Il2CppInterop.Generator/Contexts/TypeRewriteContext.cs b/Il2CppInterop.Generator/Contexts/TypeRewriteContext.cs index be804f17..b332130b 100644 --- a/Il2CppInterop.Generator/Contexts/TypeRewriteContext.cs +++ b/Il2CppInterop.Generator/Contexts/TypeRewriteContext.cs @@ -1,6 +1,5 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using Il2CppInterop.Generator.Utils; namespace Il2CppInterop.Generator.Contexts; diff --git a/Il2CppInterop.Generator/Extensions/EnumEx.cs b/Il2CppInterop.Generator/Extensions/EnumEx.cs index 33eaabfd..b305c61d 100644 --- a/Il2CppInterop.Generator/Extensions/EnumEx.cs +++ b/Il2CppInterop.Generator/Extensions/EnumEx.cs @@ -1,4 +1,4 @@ -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; namespace Il2CppInterop.Generator.Extensions; diff --git a/Il2CppInterop.Generator/Extensions/ILGeneratorEx.cs b/Il2CppInterop.Generator/Extensions/ILGeneratorEx.cs index 9e0aca8d..69267467 100644 --- a/Il2CppInterop.Generator/Extensions/ILGeneratorEx.cs +++ b/Il2CppInterop.Generator/Extensions/ILGeneratorEx.cs @@ -3,9 +3,8 @@ using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Collections; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Utils; @@ -243,8 +242,8 @@ private static void EmitObjectToPointerGeneric(ILProcessor body, TypeSignature o TypeSignature newType, TypeRewriteContext enclosingType, int argumentIndex, bool valueTypeArgument0IsAPointer, bool allowNullable, bool unboxNonBlittableType) { - var imports = enclosingType.AssemblyContext.Imports; - + var imports = enclosingType.AssemblyContext.Imports; + Debug.Assert(enclosingType.NewType.Module is not null); body.Add(OpCodes.Ldtoken, newType.ToTypeDefOrRef()); body.Add(OpCodes.Call, enclosingType.NewType.Module.TypeGetTypeFromHandle()); @@ -325,7 +324,7 @@ public static void EmitPointerToObject(this ILProcessor body, TypeSignature orig body.Add(OpCodes.Ldloc, pointerVariable); } else - { + { Debug.Assert(enclosingType.NewType.Module is not null); var classPointerTypeRef = new GenericInstanceTypeSignature(imports.Il2CppClassPointerStore.ToTypeDefOrRef(), imports.Il2CppClassPointerStore.IsValueType, convertedReturnType); var classPointerFieldRef = diff --git a/Il2CppInterop.Generator/Extensions/ParameterDefinitionEx.cs b/Il2CppInterop.Generator/Extensions/ParameterDefinitionEx.cs index 65d11ae3..a32f1719 100644 --- a/Il2CppInterop.Generator/Extensions/ParameterDefinitionEx.cs +++ b/Il2CppInterop.Generator/Extensions/ParameterDefinitionEx.cs @@ -1,5 +1,5 @@ using AsmResolver.DotNet.Collections; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; namespace Il2CppInterop.Generator.Extensions; diff --git a/Il2CppInterop.Generator/Extensions/StringEx.cs b/Il2CppInterop.Generator/Extensions/StringEx.cs index 00bfc1ab..3faf5fc0 100644 --- a/Il2CppInterop.Generator/Extensions/StringEx.cs +++ b/Il2CppInterop.Generator/Extensions/StringEx.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; using System.Text; using AsmResolver; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; namespace Il2CppInterop.Generator.Extensions; diff --git a/Il2CppInterop.Generator/Extensions/TypeReferenceEx.cs b/Il2CppInterop.Generator/Extensions/TypeReferenceEx.cs index 22b747a6..e898eda4 100644 --- a/Il2CppInterop.Generator/Extensions/TypeReferenceEx.cs +++ b/Il2CppInterop.Generator/Extensions/TypeReferenceEx.cs @@ -1,5 +1,5 @@ using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; namespace Il2CppInterop.Generator.Extensions; diff --git a/Il2CppInterop.Generator/Il2CppInterop.Generator.csproj b/Il2CppInterop.Generator/Il2CppInterop.Generator.csproj index 72852305..9eaf64a0 100644 --- a/Il2CppInterop.Generator/Il2CppInterop.Generator.csproj +++ b/Il2CppInterop.Generator/Il2CppInterop.Generator.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Il2CppInterop.Generator/MetadataAccess/CecilMetadataAccess.cs b/Il2CppInterop.Generator/MetadataAccess/CecilMetadataAccess.cs index 58e1e7fc..ba808653 100644 --- a/Il2CppInterop.Generator/MetadataAccess/CecilMetadataAccess.cs +++ b/Il2CppInterop.Generator/MetadataAccess/CecilMetadataAccess.cs @@ -1,5 +1,5 @@ using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using AsmResolver.IO; namespace Il2CppInterop.Generator.MetadataAccess; diff --git a/Il2CppInterop.Generator/MetadataAccess/IIl2CppMetadataAccess.cs b/Il2CppInterop.Generator/MetadataAccess/IIl2CppMetadataAccess.cs index e0a0c43e..f4f09d26 100644 --- a/Il2CppInterop.Generator/MetadataAccess/IIl2CppMetadataAccess.cs +++ b/Il2CppInterop.Generator/MetadataAccess/IIl2CppMetadataAccess.cs @@ -1,5 +1,5 @@ using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; namespace Il2CppInterop.Generator.MetadataAccess; diff --git a/Il2CppInterop.Generator/MetadataAccess/NullMetadataAccess.cs b/Il2CppInterop.Generator/MetadataAccess/NullMetadataAccess.cs index 79b10a07..dc1e4682 100644 --- a/Il2CppInterop.Generator/MetadataAccess/NullMetadataAccess.cs +++ b/Il2CppInterop.Generator/MetadataAccess/NullMetadataAccess.cs @@ -1,5 +1,5 @@ using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; namespace Il2CppInterop.Generator.MetadataAccess; diff --git a/Il2CppInterop.Generator/Passes/Pass05CreateRenameGroups.cs b/Il2CppInterop.Generator/Passes/Pass05CreateRenameGroups.cs index 2d1754ec..44bc8b28 100644 --- a/Il2CppInterop.Generator/Passes/Pass05CreateRenameGroups.cs +++ b/Il2CppInterop.Generator/Passes/Pass05CreateRenameGroups.cs @@ -1,7 +1,7 @@ using System.Text; using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Types; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.DotNet.Signatures; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Extensions; using Il2CppInterop.Generator.Utils; diff --git a/Il2CppInterop.Generator/Passes/Pass10CreateTypedefs.cs b/Il2CppInterop.Generator/Passes/Pass10CreateTypedefs.cs index 6042c14f..f222a874 100644 --- a/Il2CppInterop.Generator/Passes/Pass10CreateTypedefs.cs +++ b/Il2CppInterop.Generator/Passes/Pass10CreateTypedefs.cs @@ -1,5 +1,5 @@ using AsmResolver.DotNet; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Common; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Extensions; diff --git a/Il2CppInterop.Generator/Passes/Pass11ComputeTypeSpecifics.cs b/Il2CppInterop.Generator/Passes/Pass11ComputeTypeSpecifics.cs index 9fc84a19..686b5872 100644 --- a/Il2CppInterop.Generator/Passes/Pass11ComputeTypeSpecifics.cs +++ b/Il2CppInterop.Generator/Passes/Pass11ComputeTypeSpecifics.cs @@ -1,4 +1,4 @@ -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Extensions; diff --git a/Il2CppInterop.Generator/Passes/Pass19CopyMethodParameters.cs b/Il2CppInterop.Generator/Passes/Pass19CopyMethodParameters.cs index 461b9354..ff932d64 100644 --- a/Il2CppInterop.Generator/Passes/Pass19CopyMethodParameters.cs +++ b/Il2CppInterop.Generator/Passes/Pass19CopyMethodParameters.cs @@ -1,4 +1,4 @@ -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Extensions; diff --git a/Il2CppInterop.Generator/Passes/Pass20GenerateStaticConstructors.cs b/Il2CppInterop.Generator/Passes/Pass20GenerateStaticConstructors.cs index 28a1e768..4dc9995f 100644 --- a/Il2CppInterop.Generator/Passes/Pass20GenerateStaticConstructors.cs +++ b/Il2CppInterop.Generator/Passes/Pass20GenerateStaticConstructors.cs @@ -1,6 +1,5 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using Il2CppInterop.Common; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Extensions; diff --git a/Il2CppInterop.Generator/Passes/Pass21GenerateValueTypeFields.cs b/Il2CppInterop.Generator/Passes/Pass21GenerateValueTypeFields.cs index fe31727f..f9cc7c81 100644 --- a/Il2CppInterop.Generator/Passes/Pass21GenerateValueTypeFields.cs +++ b/Il2CppInterop.Generator/Passes/Pass21GenerateValueTypeFields.cs @@ -1,6 +1,6 @@ using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Marshal; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.DotNet.Signatures; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Extensions; using Il2CppInterop.Generator.Utils; diff --git a/Il2CppInterop.Generator/Passes/Pass22GenerateEnums.cs b/Il2CppInterop.Generator/Passes/Pass22GenerateEnums.cs index 206a0e66..85266a16 100644 --- a/Il2CppInterop.Generator/Passes/Pass22GenerateEnums.cs +++ b/Il2CppInterop.Generator/Passes/Pass22GenerateEnums.cs @@ -1,6 +1,6 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Extensions; using Il2CppInterop.Generator.Utils; diff --git a/Il2CppInterop.Generator/Passes/Pass23GeneratePointerConstructors.cs b/Il2CppInterop.Generator/Passes/Pass23GeneratePointerConstructors.cs index 47b7cab8..211613da 100644 --- a/Il2CppInterop.Generator/Passes/Pass23GeneratePointerConstructors.cs +++ b/Il2CppInterop.Generator/Passes/Pass23GeneratePointerConstructors.cs @@ -1,6 +1,6 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Utils; diff --git a/Il2CppInterop.Generator/Passes/Pass25GenerateNonBlittableValueTypeDefaultCtors.cs b/Il2CppInterop.Generator/Passes/Pass25GenerateNonBlittableValueTypeDefaultCtors.cs index dedebb5b..f50cfcdf 100644 --- a/Il2CppInterop.Generator/Passes/Pass25GenerateNonBlittableValueTypeDefaultCtors.cs +++ b/Il2CppInterop.Generator/Passes/Pass25GenerateNonBlittableValueTypeDefaultCtors.cs @@ -1,6 +1,6 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Utils; diff --git a/Il2CppInterop.Generator/Passes/Pass30GenerateGenericMethodStoreConstructors.cs b/Il2CppInterop.Generator/Passes/Pass30GenerateGenericMethodStoreConstructors.cs index cad3ca12..f32b06ee 100644 --- a/Il2CppInterop.Generator/Passes/Pass30GenerateGenericMethodStoreConstructors.cs +++ b/Il2CppInterop.Generator/Passes/Pass30GenerateGenericMethodStoreConstructors.cs @@ -1,7 +1,6 @@ using System.Reflection; using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Extensions; using Il2CppInterop.Generator.Utils; diff --git a/Il2CppInterop.Generator/Passes/Pass40GenerateFieldAccessors.cs b/Il2CppInterop.Generator/Passes/Pass40GenerateFieldAccessors.cs index 6c489e0c..c3a11c48 100644 --- a/Il2CppInterop.Generator/Passes/Pass40GenerateFieldAccessors.cs +++ b/Il2CppInterop.Generator/Passes/Pass40GenerateFieldAccessors.cs @@ -1,6 +1,6 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Utils; diff --git a/Il2CppInterop.Generator/Passes/Pass50GenerateMethods.cs b/Il2CppInterop.Generator/Passes/Pass50GenerateMethods.cs index 15cde48a..71851e26 100644 --- a/Il2CppInterop.Generator/Passes/Pass50GenerateMethods.cs +++ b/Il2CppInterop.Generator/Passes/Pass50GenerateMethods.cs @@ -1,6 +1,6 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Code.Cil; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Extensions; diff --git a/Il2CppInterop.Generator/Passes/Pass60AddImplicitConversions.cs b/Il2CppInterop.Generator/Passes/Pass60AddImplicitConversions.cs index 2d213462..4110563e 100644 --- a/Il2CppInterop.Generator/Passes/Pass60AddImplicitConversions.cs +++ b/Il2CppInterop.Generator/Passes/Pass60AddImplicitConversions.cs @@ -1,9 +1,8 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Utils; @@ -70,7 +69,7 @@ public static void DoPass(RewriteGlobalContext context) AddDelegateConversions(context); - var primitiveTypes = (ReadOnlySpan) + TypeSignature[] primitiveTypes = [ assemblyContext.Imports.Module.SByte(), assemblyContext.Imports.Module.Byte(), diff --git a/Il2CppInterop.Generator/Passes/Pass79UnstripTypes.cs b/Il2CppInterop.Generator/Passes/Pass79UnstripTypes.cs index 31ac1d18..913496da 100644 --- a/Il2CppInterop.Generator/Passes/Pass79UnstripTypes.cs +++ b/Il2CppInterop.Generator/Passes/Pass79UnstripTypes.cs @@ -1,7 +1,6 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Common; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Utils; diff --git a/Il2CppInterop.Generator/Passes/Pass80UnstripFields.cs b/Il2CppInterop.Generator/Passes/Pass80UnstripFields.cs index 397e2a11..01feb31c 100644 --- a/Il2CppInterop.Generator/Passes/Pass80UnstripFields.cs +++ b/Il2CppInterop.Generator/Passes/Pass80UnstripFields.cs @@ -1,5 +1,5 @@ using AsmResolver.DotNet; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Common; using Il2CppInterop.Generator.Contexts; using Microsoft.Extensions.Logging; diff --git a/Il2CppInterop.Generator/Passes/Pass80UnstripMethods.cs b/Il2CppInterop.Generator/Passes/Pass80UnstripMethods.cs index 67a317ba..412b1420 100644 --- a/Il2CppInterop.Generator/Passes/Pass80UnstripMethods.cs +++ b/Il2CppInterop.Generator/Passes/Pass80UnstripMethods.cs @@ -1,7 +1,6 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Common; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Extensions; diff --git a/Il2CppInterop.Generator/Passes/Pass89GenerateForwarders.cs b/Il2CppInterop.Generator/Passes/Pass89GenerateForwarders.cs index 31115fd7..dad6e668 100644 --- a/Il2CppInterop.Generator/Passes/Pass89GenerateForwarders.cs +++ b/Il2CppInterop.Generator/Passes/Pass89GenerateForwarders.cs @@ -1,5 +1,5 @@ using AsmResolver.DotNet; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Common; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Extensions; diff --git a/Il2CppInterop.Generator/Runners/DeobfuscationMapGenerator.cs b/Il2CppInterop.Generator/Runners/DeobfuscationMapGenerator.cs index b1332d99..55800269 100644 --- a/Il2CppInterop.Generator/Runners/DeobfuscationMapGenerator.cs +++ b/Il2CppInterop.Generator/Runners/DeobfuscationMapGenerator.cs @@ -1,8 +1,8 @@ using System.IO.Compression; using System.Text; using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Types; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.DotNet.Signatures; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Common; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Extensions; diff --git a/Il2CppInterop.Generator/Utils/CorlibReferences.cs b/Il2CppInterop.Generator/Utils/CorlibReferences.cs index 178d6205..720903bd 100644 --- a/Il2CppInterop.Generator/Utils/CorlibReferences.cs +++ b/Il2CppInterop.Generator/Utils/CorlibReferences.cs @@ -2,7 +2,6 @@ using System.Runtime.CompilerServices; using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; namespace Il2CppInterop.Generator.Utils; diff --git a/Il2CppInterop.Generator/Utils/FieldAccessorGenerator.cs b/Il2CppInterop.Generator/Utils/FieldAccessorGenerator.cs index fe252b4c..de57567a 100644 --- a/Il2CppInterop.Generator/Utils/FieldAccessorGenerator.cs +++ b/Il2CppInterop.Generator/Utils/FieldAccessorGenerator.cs @@ -1,7 +1,7 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Signatures; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Extensions; diff --git a/Il2CppInterop.Generator/Utils/RuntimeAssemblyReferences.cs b/Il2CppInterop.Generator/Utils/RuntimeAssemblyReferences.cs index f7a387b1..d5d93d81 100644 --- a/Il2CppInterop.Generator/Utils/RuntimeAssemblyReferences.cs +++ b/Il2CppInterop.Generator/Utils/RuntimeAssemblyReferences.cs @@ -2,7 +2,6 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using Il2CppInterop.Common.Attributes; using Il2CppInterop.Generator.Contexts; diff --git a/Il2CppInterop.Generator/Utils/UnstripGenerator.cs b/Il2CppInterop.Generator/Utils/UnstripGenerator.cs index 624e8f82..e50c4b93 100644 --- a/Il2CppInterop.Generator/Utils/UnstripGenerator.cs +++ b/Il2CppInterop.Generator/Utils/UnstripGenerator.cs @@ -2,8 +2,7 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Il2CppInterop.Common; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Extensions; diff --git a/Il2CppInterop.Generator/Utils/UnstripTranslator.cs b/Il2CppInterop.Generator/Utils/UnstripTranslator.cs index 1d146dc0..1e5bf39c 100644 --- a/Il2CppInterop.Generator/Utils/UnstripTranslator.cs +++ b/Il2CppInterop.Generator/Utils/UnstripTranslator.cs @@ -2,7 +2,7 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Collections; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; using Il2CppInterop.Generator.Contexts; using Il2CppInterop.Generator.Passes;