diff --git a/Il2CppTests/TestExpectedResults/ExplicitInterfaces.cs b/Il2CppTests/TestExpectedResults/ExplicitInterfaces.cs index 655db0e..5297445 100644 --- a/Il2CppTests/TestExpectedResults/ExplicitInterfaces.cs +++ b/Il2CppTests/TestExpectedResults/ExplicitInterfaces.cs @@ -34,9 +34,9 @@ using System.Runtime.InteropServices; // [assembly: TypeLibVersion] // 0x000A5100-0x000A53F4 // Image 1: ExplicitInterfaces.dll - Assembly: ExplicitInterfaces, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - Types 1810-1820 -// [assembly: CompilationRelaxations] // 0x000A545C-0x000A6588 -// [assembly: Debuggable] // 0x000A545C-0x000A6588 -[assembly: RuntimeCompatibility] // 0x000A545C-0x000A6588 +// [assembly: CompilationRelaxations] // 0x000A545C-0x000A54E4 +// [assembly: Debuggable] // 0x000A545C-0x000A54E4 +[assembly: RuntimeCompatibility] // 0x000A545C-0x000A54E4 internal static class Consts // TypeDefIndex: 100 { diff --git a/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x64.cs b/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x64.cs index 101f367..c00da78 100644 --- a/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x64.cs +++ b/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x64.cs @@ -118,7 +118,7 @@ namespace Il2CppTests.TestSources public Test() {} // 0x00000001800E5000-0x00000001800E5010 // Methods - public void GenericTypesTest() {} // 0x0000000180408930-0x0000000180408930 + public void GenericTypesTest() {} // 0x0000000180408940-0x0000000180408940 } internal class ConstrainedValueType // TypeDefIndex: 1820 @@ -235,7 +235,7 @@ namespace Il2CppTests.TestSources public NonGeneric() {} // 0x00000001800E5000-0x00000001800E5010 // Methods - public void GenericMethodDefinitionInNonGenericClass(T a) {} + public static void GenericMethodDefinitionInNonGenericClass(T a) {} } public class GenericClassWithMethods // TypeDefIndex: 1834 @@ -253,9 +253,9 @@ namespace Il2CppTests.TestSources public class CallGenericMethods : GenericClassWithMethods // TypeDefIndex: 1835 { // Constructors - public CallGenericMethods() {} // 0x0000000180408870-0x00000001804088B0 + public CallGenericMethods() {} // 0x0000000180408880-0x00000001804088C0 // Methods - public void CallMethods() {} // 0x00000001804087F0-0x0000000180408870 + public void CallMethods() {} // 0x00000001804087F0-0x0000000180408880 } } diff --git a/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x86.cs b/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x86.cs index e64bb04..24edc41 100644 --- a/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x86.cs +++ b/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x86.cs @@ -118,7 +118,7 @@ namespace Il2CppTests.TestSources public Test() {} // 0x100C3000-0x100C3010 // Methods - public void GenericTypesTest() {} // 0x1036D4F0-0x1036D4F0 + public void GenericTypesTest() {} // 0x1036D500-0x1036D500 } internal class ConstrainedValueType // TypeDefIndex: 1820 @@ -235,7 +235,7 @@ namespace Il2CppTests.TestSources public NonGeneric() {} // 0x100C3000-0x100C3010 // Methods - public void GenericMethodDefinitionInNonGenericClass(T a) {} + public static void GenericMethodDefinitionInNonGenericClass(T a) {} } public class GenericClassWithMethods // TypeDefIndex: 1834 @@ -253,9 +253,9 @@ namespace Il2CppTests.TestSources public class CallGenericMethods : GenericClassWithMethods // TypeDefIndex: 1835 { // Constructors - public CallGenericMethods() {} // 0x1036D440-0x1036D480 + public CallGenericMethods() {} // 0x1036D450-0x1036D490 // Methods - public void CallMethods() {} // 0x1036D3D0-0x1036D440 + public void CallMethods() {} // 0x1036D3D0-0x1036D450 } } diff --git a/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x64.cs b/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x64.cs index a836976..7032098 100644 --- a/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x64.cs +++ b/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x64.cs @@ -11,32 +11,32 @@ using System.Runtime.InteropServices; using System.Text; // Image 0: mscorlib.dll - Assembly: mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Types 0-1809 -// [assembly: AssemblyCompany] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: AssemblyCopyright] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: AssemblyDefaultAlias] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: AssemblyDelaySign] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: AssemblyDescription] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: AssemblyFileVersion] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: AssemblyInformationalVersion] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: AssemblyKeyFile] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: AssemblyProduct] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: AssemblyTitle] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: CLSCompliant] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: CompilationRelaxations] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: ComVisible] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: Debuggable] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: DefaultDependency] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: Guid] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: NeutralResourcesLanguage] // 0x000000018000E950-0x000000018000EBC0 -[assembly: RuntimeCompatibility] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: SatelliteContractVersion] // 0x000000018000E950-0x000000018000EBC0 -[assembly: StringFreezing] // 0x000000018000E950-0x000000018000EBC0 -// [assembly: TypeLibVersion] // 0x000000018000E950-0x000000018000EBC0 +// [assembly: AssemblyCompany] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: AssemblyCopyright] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: AssemblyDefaultAlias] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: AssemblyDelaySign] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: AssemblyDescription] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: AssemblyFileVersion] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: AssemblyInformationalVersion] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: AssemblyKeyFile] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: AssemblyProduct] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: AssemblyTitle] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: CLSCompliant] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: CompilationRelaxations] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: ComVisible] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: Debuggable] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: DefaultDependency] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: Guid] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: NeutralResourcesLanguage] // 0x000000018000EDA0-0x000000018000F010 +[assembly: RuntimeCompatibility] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: SatelliteContractVersion] // 0x000000018000EDA0-0x000000018000F010 +[assembly: StringFreezing] // 0x000000018000EDA0-0x000000018000F010 +// [assembly: TypeLibVersion] // 0x000000018000EDA0-0x000000018000F010 // Image 1: Methods.dll - Assembly: Methods, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - Types 1810-1822 -// [assembly: CompilationRelaxations] // 0x000000018000CAF0-0x000000018000CB50 -// [assembly: Debuggable] // 0x000000018000CAF0-0x000000018000CB50 -[assembly: RuntimeCompatibility] // 0x000000018000CAF0-0x000000018000CB50 +// [assembly: CompilationRelaxations] // 0x000000018000CF40-0x000000018000CFA0 +// [assembly: Debuggable] // 0x000000018000CF40-0x000000018000CFA0 +[assembly: RuntimeCompatibility] // 0x000000018000CF40-0x000000018000CFA0 internal static class Consts // TypeDefIndex: 100 { @@ -75,11 +75,11 @@ internal static class Consts // TypeDefIndex: 100 internal sealed class Locale // TypeDefIndex: 101 { // Constructors - private Locale() {} // 0x00000001800E2000-0x00000001800E2010 + private Locale() {} // 0x00000001800E4000-0x00000001800E4010 // Methods - public static string GetText(string msg) => default; // 0x0000000180123590-0x00000001801235A0 - public static string GetText(string fmt, params /* 0x0000000180009C10-0x0000000180009C20 */ object[] args) => default; // 0x00000001802C64F0-0x00000001802C6560 + public static string GetText(string msg) => default; // 0x00000001801263C0-0x00000001801263D0 + public static string GetText(string fmt, params /* 0x0000000180009AF0-0x0000000180009B00 */ object[] args) => default; // 0x00000001802D6880-0x00000001802D68F0 } namespace Il2CppTests.TestSources @@ -87,24 +87,24 @@ namespace Il2CppTests.TestSources internal class Test // TypeDefIndex: 1811 { // Constructors - public Test() {} // 0x00000001800E2000-0x00000001800E2010 + public Test() {} // 0x00000001800E4000-0x00000001800E4010 // Methods - public virtual void VirtualMethod() {} // 0x00000001800EA7B0-0x00000001800EA7C0 - public double ValueTypeReturnMethod() => default; // 0x00000001803E0EC0-0x00000001803E0EC0 - public StringBuilder ReferenceTypeReturnMethod() => default; // 0x00000001803E0E70-0x00000001803E0EC0 + public virtual void VirtualMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 + public double ValueTypeReturnMethod() => default; // 0x00000001803FBAF0-0x00000001803FBAF0 + public StringBuilder ReferenceTypeReturnMethod() => default; // 0x00000001803FBAA0-0x00000001803FBAF0 } public static class TestExtension // TypeDefIndex: 1812 { // Methods - public static double DivideByXExtension(int a, float x) => default; // 0x00000001803E0E50-0x00000001803E0E70 + public static double DivideByXExtension(int a, float x) => default; // 0x00000001803FBA80-0x00000001803FBAA0 } internal abstract class TestAbstract // TypeDefIndex: 1813 { // Constructors - protected TestAbstract() {} // 0x00000001800E2000-0x00000001800E2010 + protected TestAbstract() {} // 0x00000001800E4000-0x00000001800E4010 // Methods public abstract void AbstractMethod(); @@ -113,70 +113,70 @@ namespace Il2CppTests.TestSources internal class TestOverride : Test // TypeDefIndex: 1814 { // Constructors - public TestOverride() {} // 0x00000001800E2000-0x00000001800E2010 + public TestOverride() {} // 0x00000001800E4000-0x00000001800E4010 // Methods - public override void VirtualMethod() {} // 0x00000001800EA7B0-0x00000001800EA7C0 + public override void VirtualMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 } internal class TestHideVirtual : Test // TypeDefIndex: 1815 { // Constructors - public TestHideVirtual() {} // 0x00000001800E2000-0x00000001800E2010 + public TestHideVirtual() {} // 0x00000001800E4000-0x00000001800E4010 // Methods - public new void VirtualMethod() {} // 0x00000001800EA7B0-0x00000001800EA7C0 + public new void VirtualMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 } internal class TestHideOverride : TestOverride // TypeDefIndex: 1816 { // Constructors - public TestHideOverride() {} // 0x00000001800E2000-0x00000001800E2010 + public TestHideOverride() {} // 0x00000001800E4000-0x00000001800E4010 // Methods - public new void VirtualMethod() {} // 0x00000001800EA7B0-0x00000001800EA7C0 + public new void VirtualMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 } internal class TestOverrideAbstract : TestAbstract // TypeDefIndex: 1817 { // Constructors - public TestOverrideAbstract() {} // 0x00000001800E2000-0x00000001800E2010 + public TestOverrideAbstract() {} // 0x00000001800E4000-0x00000001800E4010 // Methods - public override void AbstractMethod() {} // 0x00000001800EA7B0-0x00000001800EA7C0 + public override void AbstractMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 } internal class TestHideAbstractOverride : TestOverrideAbstract // TypeDefIndex: 1818 { // Constructors - public TestHideAbstractOverride() {} // 0x00000001800E2000-0x00000001800E2010 + public TestHideAbstractOverride() {} // 0x00000001800E4000-0x00000001800E4010 // Methods - public new void AbstractMethod() {} // 0x00000001800EA7B0-0x00000001800EA7C0 + public new void AbstractMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 } internal class TestHideVirtualAndNewVirtual : Test // TypeDefIndex: 1819 { // Constructors - public TestHideVirtualAndNewVirtual() {} // 0x00000001800E2000-0x00000001800E2010 + public TestHideVirtualAndNewVirtual() {} // 0x00000001800E4000-0x00000001800E4010 // Methods - public virtual new void VirtualMethod() {} // 0x00000001800EA7B0-0x00000001800EA7C0 + public virtual new void VirtualMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 } internal class TestHideOverrideAndNewVirtual : TestOverride // TypeDefIndex: 1820 { // Constructors - public TestHideOverrideAndNewVirtual() {} // 0x00000001800E2000-0x00000001800E2010 + public TestHideOverrideAndNewVirtual() {} // 0x00000001800E4000-0x00000001800E4010 // Methods - public virtual new void VirtualMethod() {} // 0x00000001800EA7B0-0x00000001800EA7C0 + public virtual new void VirtualMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 } internal abstract class TestAbstractNew : TestOverride // TypeDefIndex: 1821 { // Constructors - protected TestAbstractNew() {} // 0x00000001800E2000-0x00000001800E2010 + protected TestAbstractNew() {} // 0x00000001800E4000-0x00000001800E4010 // Methods public abstract new void VirtualMethod(); @@ -185,9 +185,9 @@ namespace Il2CppTests.TestSources internal class TestNewNonVirtualMethod : Test // TypeDefIndex: 1822 { // Constructors - public TestNewNonVirtualMethod() {} // 0x00000001800E2000-0x00000001800E2010 + public TestNewNonVirtualMethod() {} // 0x00000001800E4000-0x00000001800E4010 // Methods - public int ValueTypeReturnMethod() => default; // 0x0000000180119A50-0x0000000180119A60 + public int ValueTypeReturnMethod() => default; // 0x000000018011C6F0-0x000000018011C700 } } diff --git a/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x86.cs b/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x86.cs index 2173d92..659312b 100644 --- a/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x86.cs +++ b/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x86.cs @@ -11,32 +11,32 @@ using System.Runtime.InteropServices; using System.Text; // Image 0: mscorlib.dll - Assembly: mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Types 0-1809 -// [assembly: AssemblyCompany] // 0x1000F760-0x1000F970 -// [assembly: AssemblyCopyright] // 0x1000F760-0x1000F970 -// [assembly: AssemblyDefaultAlias] // 0x1000F760-0x1000F970 -// [assembly: AssemblyDelaySign] // 0x1000F760-0x1000F970 -// [assembly: AssemblyDescription] // 0x1000F760-0x1000F970 -// [assembly: AssemblyFileVersion] // 0x1000F760-0x1000F970 -// [assembly: AssemblyInformationalVersion] // 0x1000F760-0x1000F970 -// [assembly: AssemblyKeyFile] // 0x1000F760-0x1000F970 -// [assembly: AssemblyProduct] // 0x1000F760-0x1000F970 -// [assembly: AssemblyTitle] // 0x1000F760-0x1000F970 -// [assembly: CLSCompliant] // 0x1000F760-0x1000F970 -// [assembly: CompilationRelaxations] // 0x1000F760-0x1000F970 -// [assembly: ComVisible] // 0x1000F760-0x1000F970 -// [assembly: Debuggable] // 0x1000F760-0x1000F970 -// [assembly: DefaultDependency] // 0x1000F760-0x1000F970 -// [assembly: Guid] // 0x1000F760-0x1000F970 -// [assembly: NeutralResourcesLanguage] // 0x1000F760-0x1000F970 -[assembly: RuntimeCompatibility] // 0x1000F760-0x1000F970 -// [assembly: SatelliteContractVersion] // 0x1000F760-0x1000F970 -[assembly: StringFreezing] // 0x1000F760-0x1000F970 -// [assembly: TypeLibVersion] // 0x1000F760-0x1000F970 +// [assembly: AssemblyCompany] // 0x1000FC60-0x1000FE70 +// [assembly: AssemblyCopyright] // 0x1000FC60-0x1000FE70 +// [assembly: AssemblyDefaultAlias] // 0x1000FC60-0x1000FE70 +// [assembly: AssemblyDelaySign] // 0x1000FC60-0x1000FE70 +// [assembly: AssemblyDescription] // 0x1000FC60-0x1000FE70 +// [assembly: AssemblyFileVersion] // 0x1000FC60-0x1000FE70 +// [assembly: AssemblyInformationalVersion] // 0x1000FC60-0x1000FE70 +// [assembly: AssemblyKeyFile] // 0x1000FC60-0x1000FE70 +// [assembly: AssemblyProduct] // 0x1000FC60-0x1000FE70 +// [assembly: AssemblyTitle] // 0x1000FC60-0x1000FE70 +// [assembly: CLSCompliant] // 0x1000FC60-0x1000FE70 +// [assembly: CompilationRelaxations] // 0x1000FC60-0x1000FE70 +// [assembly: ComVisible] // 0x1000FC60-0x1000FE70 +// [assembly: Debuggable] // 0x1000FC60-0x1000FE70 +// [assembly: DefaultDependency] // 0x1000FC60-0x1000FE70 +// [assembly: Guid] // 0x1000FC60-0x1000FE70 +// [assembly: NeutralResourcesLanguage] // 0x1000FC60-0x1000FE70 +[assembly: RuntimeCompatibility] // 0x1000FC60-0x1000FE70 +// [assembly: SatelliteContractVersion] // 0x1000FC60-0x1000FE70 +[assembly: StringFreezing] // 0x1000FC60-0x1000FE70 +// [assembly: TypeLibVersion] // 0x1000FC60-0x1000FE70 // Image 1: Methods.dll - Assembly: Methods, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - Types 1810-1822 -// [assembly: CompilationRelaxations] // 0x1000DC90-0x1000DCE0 -// [assembly: Debuggable] // 0x1000DC90-0x1000DCE0 -[assembly: RuntimeCompatibility] // 0x1000DC90-0x1000DCE0 +// [assembly: CompilationRelaxations] // 0x1000E190-0x1000E1E0 +// [assembly: Debuggable] // 0x1000E190-0x1000E1E0 +[assembly: RuntimeCompatibility] // 0x1000E190-0x1000E1E0 internal static class Consts // TypeDefIndex: 100 { @@ -75,11 +75,11 @@ internal static class Consts // TypeDefIndex: 100 internal sealed class Locale // TypeDefIndex: 101 { // Constructors - private Locale() {} // 0x100BF000-0x100BF010 + private Locale() {} // 0x100C2000-0x100C2010 // Methods - public static string GetText(string msg) => default; // 0x100F7810-0x100F7820 - public static string GetText(string fmt, params /* 0x1000A660-0x1000A680 */ object[] args) => default; // 0x10261460-0x102614B0 + public static string GetText(string msg) => default; // 0x100FC9C0-0x100FC9D0 + public static string GetText(string fmt, params /* 0x1000A7D0-0x1000A7F0 */ object[] args) => default; // 0x1026FEA0-0x1026FF10 } namespace Il2CppTests.TestSources @@ -87,24 +87,24 @@ namespace Il2CppTests.TestSources internal class Test // TypeDefIndex: 1811 { // Constructors - public Test() {} // 0x100BF000-0x100BF010 + public Test() {} // 0x100C2000-0x100C2010 // Methods - public virtual void VirtualMethod() {} // 0x100C5530-0x100C5540 - public double ValueTypeReturnMethod() => default; // 0x1034DAD0-0x1034DAD0 - public StringBuilder ReferenceTypeReturnMethod() => default; // 0x1034DA90-0x1034DAD0 + public virtual void VirtualMethod() {} // 0x100C97A0-0x100C97B0 + public double ValueTypeReturnMethod() => default; // 0x10362BF0-0x10362BF0 + public StringBuilder ReferenceTypeReturnMethod() => default; // 0x10362BB0-0x10362BF0 } public static class TestExtension // TypeDefIndex: 1812 { // Methods - public static double DivideByXExtension(int a, float x) => default; // 0x1034DA60-0x1034DA90 + public static double DivideByXExtension(int a, float x) => default; // 0x10362B80-0x10362BB0 } internal abstract class TestAbstract // TypeDefIndex: 1813 { // Constructors - protected TestAbstract() {} // 0x100BF000-0x100BF010 + protected TestAbstract() {} // 0x100C2000-0x100C2010 // Methods public abstract void AbstractMethod(); @@ -113,70 +113,70 @@ namespace Il2CppTests.TestSources internal class TestOverride : Test // TypeDefIndex: 1814 { // Constructors - public TestOverride() {} // 0x100BF000-0x100BF010 + public TestOverride() {} // 0x100C2000-0x100C2010 // Methods - public override void VirtualMethod() {} // 0x100C5530-0x100C5540 + public override void VirtualMethod() {} // 0x100C97A0-0x100C97B0 } internal class TestHideVirtual : Test // TypeDefIndex: 1815 { // Constructors - public TestHideVirtual() {} // 0x100BF000-0x100BF010 + public TestHideVirtual() {} // 0x100C2000-0x100C2010 // Methods - public new void VirtualMethod() {} // 0x100C5530-0x100C5540 + public new void VirtualMethod() {} // 0x100C97A0-0x100C97B0 } internal class TestHideOverride : TestOverride // TypeDefIndex: 1816 { // Constructors - public TestHideOverride() {} // 0x100BF000-0x100BF010 + public TestHideOverride() {} // 0x100C2000-0x100C2010 // Methods - public new void VirtualMethod() {} // 0x100C5530-0x100C5540 + public new void VirtualMethod() {} // 0x100C97A0-0x100C97B0 } internal class TestOverrideAbstract : TestAbstract // TypeDefIndex: 1817 { // Constructors - public TestOverrideAbstract() {} // 0x100BF000-0x100BF010 + public TestOverrideAbstract() {} // 0x100C2000-0x100C2010 // Methods - public override void AbstractMethod() {} // 0x100C5530-0x100C5540 + public override void AbstractMethod() {} // 0x100C97A0-0x100C97B0 } internal class TestHideAbstractOverride : TestOverrideAbstract // TypeDefIndex: 1818 { // Constructors - public TestHideAbstractOverride() {} // 0x100BF000-0x100BF010 + public TestHideAbstractOverride() {} // 0x100C2000-0x100C2010 // Methods - public new void AbstractMethod() {} // 0x100C5530-0x100C5540 + public new void AbstractMethod() {} // 0x100C97A0-0x100C97B0 } internal class TestHideVirtualAndNewVirtual : Test // TypeDefIndex: 1819 { // Constructors - public TestHideVirtualAndNewVirtual() {} // 0x100BF000-0x100BF010 + public TestHideVirtualAndNewVirtual() {} // 0x100C2000-0x100C2010 // Methods - public virtual new void VirtualMethod() {} // 0x100C5530-0x100C5540 + public virtual new void VirtualMethod() {} // 0x100C97A0-0x100C97B0 } internal class TestHideOverrideAndNewVirtual : TestOverride // TypeDefIndex: 1820 { // Constructors - public TestHideOverrideAndNewVirtual() {} // 0x100BF000-0x100BF010 + public TestHideOverrideAndNewVirtual() {} // 0x100C2000-0x100C2010 // Methods - public virtual new void VirtualMethod() {} // 0x100C5530-0x100C5540 + public virtual new void VirtualMethod() {} // 0x100C97A0-0x100C97B0 } internal abstract class TestAbstractNew : TestOverride // TypeDefIndex: 1821 { // Constructors - protected TestAbstractNew() {} // 0x100BF000-0x100BF010 + protected TestAbstractNew() {} // 0x100C2000-0x100C2010 // Methods public abstract new void VirtualMethod(); @@ -185,9 +185,9 @@ namespace Il2CppTests.TestSources internal class TestNewNonVirtualMethod : Test // TypeDefIndex: 1822 { // Constructors - public TestNewNonVirtualMethod() {} // 0x100BF000-0x100BF010 + public TestNewNonVirtualMethod() {} // 0x100C2000-0x100C2010 // Methods - public int ValueTypeReturnMethod() => default; // 0x100EF660-0x100EF670 + public int ValueTypeReturnMethod() => default; // 0x100F4720-0x100F4730 } } diff --git a/Il2CppTests/TestExpectedResults/GenericTypes.cs b/Il2CppTests/TestExpectedResults/GenericTypes.cs index aad651c..b4a1171 100644 --- a/Il2CppTests/TestExpectedResults/GenericTypes.cs +++ b/Il2CppTests/TestExpectedResults/GenericTypes.cs @@ -11,32 +11,32 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // Image 0: mscorlib.dll - Assembly: mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Types 0-1809 -// [assembly: AssemblyCompany] // 0x000A7AE4-0x000A7DD8 -// [assembly: AssemblyCopyright] // 0x000A7AE4-0x000A7DD8 -// [assembly: AssemblyDefaultAlias] // 0x000A7AE4-0x000A7DD8 -// [assembly: AssemblyDelaySign] // 0x000A7AE4-0x000A7DD8 -// [assembly: AssemblyDescription] // 0x000A7AE4-0x000A7DD8 -// [assembly: AssemblyFileVersion] // 0x000A7AE4-0x000A7DD8 -// [assembly: AssemblyInformationalVersion] // 0x000A7AE4-0x000A7DD8 -// [assembly: AssemblyKeyFile] // 0x000A7AE4-0x000A7DD8 -// [assembly: AssemblyProduct] // 0x000A7AE4-0x000A7DD8 -// [assembly: AssemblyTitle] // 0x000A7AE4-0x000A7DD8 -// [assembly: CLSCompliant] // 0x000A7AE4-0x000A7DD8 -// [assembly: CompilationRelaxations] // 0x000A7AE4-0x000A7DD8 -// [assembly: ComVisible] // 0x000A7AE4-0x000A7DD8 -// [assembly: Debuggable] // 0x000A7AE4-0x000A7DD8 -// [assembly: DefaultDependency] // 0x000A7AE4-0x000A7DD8 -// [assembly: Guid] // 0x000A7AE4-0x000A7DD8 -// [assembly: NeutralResourcesLanguage] // 0x000A7AE4-0x000A7DD8 -[assembly: RuntimeCompatibility] // 0x000A7AE4-0x000A7DD8 -// [assembly: SatelliteContractVersion] // 0x000A7AE4-0x000A7DD8 -[assembly: StringFreezing] // 0x000A7AE4-0x000A7DD8 -// [assembly: TypeLibVersion] // 0x000A7AE4-0x000A7DD8 +// [assembly: AssemblyCompany] // 0x000A7AFC-0x000A7DF0 +// [assembly: AssemblyCopyright] // 0x000A7AFC-0x000A7DF0 +// [assembly: AssemblyDefaultAlias] // 0x000A7AFC-0x000A7DF0 +// [assembly: AssemblyDelaySign] // 0x000A7AFC-0x000A7DF0 +// [assembly: AssemblyDescription] // 0x000A7AFC-0x000A7DF0 +// [assembly: AssemblyFileVersion] // 0x000A7AFC-0x000A7DF0 +// [assembly: AssemblyInformationalVersion] // 0x000A7AFC-0x000A7DF0 +// [assembly: AssemblyKeyFile] // 0x000A7AFC-0x000A7DF0 +// [assembly: AssemblyProduct] // 0x000A7AFC-0x000A7DF0 +// [assembly: AssemblyTitle] // 0x000A7AFC-0x000A7DF0 +// [assembly: CLSCompliant] // 0x000A7AFC-0x000A7DF0 +// [assembly: CompilationRelaxations] // 0x000A7AFC-0x000A7DF0 +// [assembly: ComVisible] // 0x000A7AFC-0x000A7DF0 +// [assembly: Debuggable] // 0x000A7AFC-0x000A7DF0 +// [assembly: DefaultDependency] // 0x000A7AFC-0x000A7DF0 +// [assembly: Guid] // 0x000A7AFC-0x000A7DF0 +// [assembly: NeutralResourcesLanguage] // 0x000A7AFC-0x000A7DF0 +[assembly: RuntimeCompatibility] // 0x000A7AFC-0x000A7DF0 +// [assembly: SatelliteContractVersion] // 0x000A7AFC-0x000A7DF0 +[assembly: StringFreezing] // 0x000A7AFC-0x000A7DF0 +// [assembly: TypeLibVersion] // 0x000A7AFC-0x000A7DF0 // Image 1: GenericTypes.dll - Assembly: GenericTypes, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - Types 1810-1835 -// [assembly: CompilationRelaxations] // 0x000A7EEC-0x000A7F40 -// [assembly: Debuggable] // 0x000A7EEC-0x000A7F40 -[assembly: RuntimeCompatibility] // 0x000A7EEC-0x000A7F40 +// [assembly: CompilationRelaxations] // 0x000A7F04-0x000A7F58 +// [assembly: Debuggable] // 0x000A7F04-0x000A7F58 +[assembly: RuntimeCompatibility] // 0x000A7F04-0x000A7F58 internal static class Consts // TypeDefIndex: 100 { @@ -75,11 +75,11 @@ internal static class Consts // TypeDefIndex: 100 internal sealed class Locale // TypeDefIndex: 101 { // Constructors - private Locale() {} // 0x003EDAF8-0x003EDB00 + private Locale() {} // 0x003EDB10-0x003EDB18 // Methods - public static string GetText(string msg) => default; // 0x003EDB00-0x003EDB04 - public static string GetText(string fmt, params /* 0x000A6310-0x000A6320 */ object[] args) => default; // 0x003EDB04-0x003EDB90 + public static string GetText(string msg) => default; // 0x003EDB18-0x003EDB1C + public static string GetText(string fmt, params /* 0x000A6328-0x000A6338 */ object[] args) => default; // 0x003EDB1C-0x003EDBA8 } namespace Il2CppTests.TestSources @@ -115,10 +115,10 @@ namespace Il2CppTests.TestSources internal class Test // TypeDefIndex: 1819 { // Constructors - public Test() {} // 0x0057B30C-0x0057B314 + public Test() {} // 0x0057B348-0x0057B350 // Methods - public void GenericTypesTest() {} // 0x0057B150-0x0057B30C + public void GenericTypesTest() {} // 0x0057B18C-0x0057B348 } internal class ConstrainedValueType // TypeDefIndex: 1820 @@ -169,7 +169,7 @@ namespace Il2CppTests.TestSources public ConstrainedRefType() {} // Methods - // [NullableContext] // 0x000A7ED8-0x000A7EEC + // [NullableContext] // 0x000A7EF0-0x000A7F04 public void ConstrainedMethodNotNull(N notnullArgument, R bar) {} public void ConstrainedUnmanaged(U unmanagedArgument) where U : struct {} @@ -232,10 +232,10 @@ namespace Il2CppTests.TestSources public class NonGeneric // TypeDefIndex: 1833 { // Constructors - public NonGeneric() {} // 0x0057B148-0x0057B150 + public NonGeneric() {} // 0x0057B184-0x0057B18C // Methods - public void GenericMethodDefinitionInNonGenericClass(T a) {} + public static void GenericMethodDefinitionInNonGenericClass(T a) {} } public class GenericClassWithMethods // TypeDefIndex: 1834 @@ -253,9 +253,9 @@ namespace Il2CppTests.TestSources public class CallGenericMethods : GenericClassWithMethods // TypeDefIndex: 1835 { // Constructors - public CallGenericMethods() {} // 0x0057B0E4-0x0057B148 + public CallGenericMethods() {} // 0x0057B120-0x0057B184 // Methods - public void CallMethods() {} // 0x0057B01C-0x0057B0E4 + public void CallMethods() {} // 0x0057B03C-0x0057B120 } } diff --git a/Il2CppTests/TestExpectedResults/Methods.cs b/Il2CppTests/TestExpectedResults/Methods.cs index f30df35..0cf24d7 100644 --- a/Il2CppTests/TestExpectedResults/Methods.cs +++ b/Il2CppTests/TestExpectedResults/Methods.cs @@ -34,9 +34,9 @@ using System.Text; // [assembly: TypeLibVersion] // 0x000A5098-0x000A538C // Image 1: Methods.dll - Assembly: Methods, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - Types 1810-1822 -// [assembly: CompilationRelaxations] // 0x000A538C-0x000A64B8 -// [assembly: Debuggable] // 0x000A538C-0x000A64B8 -[assembly: RuntimeCompatibility] // 0x000A538C-0x000A64B8 +// [assembly: CompilationRelaxations] // 0x000A538C-0x000A5414 +// [assembly: Debuggable] // 0x000A538C-0x000A5414 +[assembly: RuntimeCompatibility] // 0x000A538C-0x000A5414 internal static class Consts // TypeDefIndex: 100 { diff --git a/Il2CppTests/TestExpectedResults/References.cs b/Il2CppTests/TestExpectedResults/References.cs index c5501f7..ec72836 100644 --- a/Il2CppTests/TestExpectedResults/References.cs +++ b/Il2CppTests/TestExpectedResults/References.cs @@ -33,9 +33,9 @@ using System.Runtime.InteropServices; // [assembly: TypeLibVersion] // 0x000A4F58-0x000A524C // Image 1: References.dll - Assembly: References, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - Types 1810-1812 -// [assembly: CompilationRelaxations] // 0x000A5284-0x000A63B0 -// [assembly: Debuggable] // 0x000A5284-0x000A63B0 -[assembly: RuntimeCompatibility] // 0x000A5284-0x000A63B0 +// [assembly: CompilationRelaxations] // 0x000A5284-0x000A530C +// [assembly: Debuggable] // 0x000A5284-0x000A530C +[assembly: RuntimeCompatibility] // 0x000A5284-0x000A530C internal static class Consts // TypeDefIndex: 100 { diff --git a/Il2CppTests/TestExpectedResults/Scope.cs b/Il2CppTests/TestExpectedResults/Scope.cs index 7e6615f..b04827d 100644 --- a/Il2CppTests/TestExpectedResults/Scope.cs +++ b/Il2CppTests/TestExpectedResults/Scope.cs @@ -39,9 +39,9 @@ using Some.Namespace.SameLeafName; // [assembly: TypeLibVersion] // 0x000A5410-0x000A5704 // Image 1: Scope.dll - Assembly: Scope, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - Types 1810-1832 -// [assembly: CompilationRelaxations] // 0x000A5704-0x000A6830 -// [assembly: Debuggable] // 0x000A5704-0x000A6830 -[assembly: RuntimeCompatibility] // 0x000A5704-0x000A6830 +// [assembly: CompilationRelaxations] // 0x000A5704-0x000A578C +// [assembly: Debuggable] // 0x000A5704-0x000A578C +[assembly: RuntimeCompatibility] // 0x000A5704-0x000A578C internal static class Consts // TypeDefIndex: 100 {