From 59568aba57379cc0a0771135b6b051a069386d88 Mon Sep 17 00:00:00 2001 From: Katy Coe Date: Thu, 6 Feb 2020 02:51:54 +0100 Subject: [PATCH] Tests: Update expected results --- .../TestExpectedResults/ArraysAndPointers.cs | 1 + .../TestExpectedResults/ExplicitInterfaces.cs | 8 ++++---- .../GameAssembly-ArraysAndPointers-x64.cs | 1 + .../GameAssembly-ArraysAndPointers-x86.cs | 1 + .../GameAssembly-ExplicitInterfaces-x64.cs | 8 ++++---- .../GameAssembly-ExplicitInterfaces-x86.cs | 8 ++++---- .../GameAssembly-GenericTypes-x64.cs | 4 ++-- .../GameAssembly-GenericTypes-x86.cs | 4 ++-- .../GameAssembly-Methods-x64.cs | 18 +++++++++--------- .../GameAssembly-Methods-x86.cs | 18 +++++++++--------- .../GameAssembly-References-x64.cs | 6 ++++-- .../GameAssembly-References-x86.cs | 6 ++++-- .../TestExpectedResults/GenericTypes.cs | 4 ++-- Il2CppTests/TestExpectedResults/Methods.cs | 18 +++++++++--------- Il2CppTests/TestExpectedResults/References.cs | 6 ++++-- 15 files changed, 60 insertions(+), 51 deletions(-) diff --git a/Il2CppTests/TestExpectedResults/ArraysAndPointers.cs b/Il2CppTests/TestExpectedResults/ArraysAndPointers.cs index 752ac66..bae2a40 100644 --- a/Il2CppTests/TestExpectedResults/ArraysAndPointers.cs +++ b/Il2CppTests/TestExpectedResults/ArraysAndPointers.cs @@ -122,6 +122,7 @@ namespace Il2CppTests.TestSources } // Constructors + public Test() {} // Dummy constructor public unsafe Test(int* u) {} // 0x00562E78-0x00562EEC // Methods diff --git a/Il2CppTests/TestExpectedResults/ExplicitInterfaces.cs b/Il2CppTests/TestExpectedResults/ExplicitInterfaces.cs index 5297445..645698b 100644 --- a/Il2CppTests/TestExpectedResults/ExplicitInterfaces.cs +++ b/Il2CppTests/TestExpectedResults/ExplicitInterfaces.cs @@ -96,7 +96,7 @@ namespace Il2CppTests.TestSources void Paint(); } - internal class Test : IControl, ISurface // TypeDefIndex: 1813 + internal class Test : Il2CppTests.TestSources.IControl, Il2CppTests.TestSources.ISurface // TypeDefIndex: 1813 { // Constructors public Test() {} // 0x00561674-0x00561674 @@ -118,7 +118,7 @@ namespace Il2CppTests.TestSources int P(); } - internal class Middle : ILeft, IRight // TypeDefIndex: 1816 + internal class Middle : Il2CppTests.TestSources.ILeft, Il2CppTests.TestSources.IRight // TypeDefIndex: 1816 { // Properties int ILeft.P { get => default; } // 0x0056165C-0x00561664 @@ -136,7 +136,7 @@ namespace Il2CppTests.TestSources void GenericMethod(T t); } - internal class ImplementsGenericInterface : IGeneric> // TypeDefIndex: 1818 + internal class ImplementsGenericInterface : Il2CppTests.TestSources.IGeneric> // TypeDefIndex: 1818 { // Constructors public ImplementsGenericInterface() {} // 0x00561634-0x0056163C @@ -151,7 +151,7 @@ namespace Il2CppTests.TestSources bool this[int i] { get => default; } } - internal class ImplementsIndexer : IIndexer // TypeDefIndex: 1820 + internal class ImplementsIndexer : Il2CppTests.TestSources.IIndexer // TypeDefIndex: 1820 { // Properties public bool this[int i] { get => default; } // 0x0056163C-0x00561644 diff --git a/Il2CppTests/TestExpectedResults/GameAssembly-ArraysAndPointers-x64.cs b/Il2CppTests/TestExpectedResults/GameAssembly-ArraysAndPointers-x64.cs index c1778a9..b0c2668 100644 --- a/Il2CppTests/TestExpectedResults/GameAssembly-ArraysAndPointers-x64.cs +++ b/Il2CppTests/TestExpectedResults/GameAssembly-ArraysAndPointers-x64.cs @@ -122,6 +122,7 @@ namespace Il2CppTests.TestSources } // Constructors + public Test() {} // Dummy constructor public unsafe Test(int* u) {} // 0x00000001803E1130-0x00000001803E1130 // Methods diff --git a/Il2CppTests/TestExpectedResults/GameAssembly-ArraysAndPointers-x86.cs b/Il2CppTests/TestExpectedResults/GameAssembly-ArraysAndPointers-x86.cs index 15c975c..8e8bbfb 100644 --- a/Il2CppTests/TestExpectedResults/GameAssembly-ArraysAndPointers-x86.cs +++ b/Il2CppTests/TestExpectedResults/GameAssembly-ArraysAndPointers-x86.cs @@ -122,6 +122,7 @@ namespace Il2CppTests.TestSources } // Constructors + public Test() {} // Dummy constructor public unsafe Test(int* u) {} // 0x1034DD10-0x1034DD10 // Methods diff --git a/Il2CppTests/TestExpectedResults/GameAssembly-ExplicitInterfaces-x64.cs b/Il2CppTests/TestExpectedResults/GameAssembly-ExplicitInterfaces-x64.cs index 8583c6e..2d488af 100644 --- a/Il2CppTests/TestExpectedResults/GameAssembly-ExplicitInterfaces-x64.cs +++ b/Il2CppTests/TestExpectedResults/GameAssembly-ExplicitInterfaces-x64.cs @@ -96,7 +96,7 @@ namespace Il2CppTests.TestSources void Paint(); } - internal class Test : IControl, ISurface // TypeDefIndex: 1813 + internal class Test : Il2CppTests.TestSources.IControl, Il2CppTests.TestSources.ISurface // TypeDefIndex: 1813 { // Constructors public Test() {} // 0x00000001800E2000-0x00000001800E2010 @@ -118,7 +118,7 @@ namespace Il2CppTests.TestSources int P(); } - internal class Middle : ILeft, IRight // TypeDefIndex: 1816 + internal class Middle : Il2CppTests.TestSources.ILeft, Il2CppTests.TestSources.IRight // TypeDefIndex: 1816 { // Properties int ILeft.P { get => default; } // 0x00000001800EA8C0-0x00000001800EA8D0 @@ -136,7 +136,7 @@ namespace Il2CppTests.TestSources void GenericMethod(T t); } - internal class ImplementsGenericInterface : IGeneric> // TypeDefIndex: 1818 + internal class ImplementsGenericInterface : Il2CppTests.TestSources.IGeneric> // TypeDefIndex: 1818 { // Constructors public ImplementsGenericInterface() {} // 0x00000001800E2000-0x00000001800E2010 @@ -151,7 +151,7 @@ namespace Il2CppTests.TestSources bool this[int i] { get => default; } } - internal class ImplementsIndexer : IIndexer // TypeDefIndex: 1820 + internal class ImplementsIndexer : Il2CppTests.TestSources.IIndexer // TypeDefIndex: 1820 { // Properties public bool this[int i] { get => default; } // 0x000000018011A0F0-0x000000018011A100 diff --git a/Il2CppTests/TestExpectedResults/GameAssembly-ExplicitInterfaces-x86.cs b/Il2CppTests/TestExpectedResults/GameAssembly-ExplicitInterfaces-x86.cs index 92b8d00..b32c775 100644 --- a/Il2CppTests/TestExpectedResults/GameAssembly-ExplicitInterfaces-x86.cs +++ b/Il2CppTests/TestExpectedResults/GameAssembly-ExplicitInterfaces-x86.cs @@ -96,7 +96,7 @@ namespace Il2CppTests.TestSources void Paint(); } - internal class Test : IControl, ISurface // TypeDefIndex: 1813 + internal class Test : Il2CppTests.TestSources.IControl, Il2CppTests.TestSources.ISurface // TypeDefIndex: 1813 { // Constructors public Test() {} // 0x100BF000-0x100BF010 @@ -118,7 +118,7 @@ namespace Il2CppTests.TestSources int P(); } - internal class Middle : ILeft, IRight // TypeDefIndex: 1816 + internal class Middle : Il2CppTests.TestSources.ILeft, Il2CppTests.TestSources.IRight // TypeDefIndex: 1816 { // Properties int ILeft.P { get => default; } // 0x100C5600-0x100C5610 @@ -136,7 +136,7 @@ namespace Il2CppTests.TestSources void GenericMethod(T t); } - internal class ImplementsGenericInterface : IGeneric> // TypeDefIndex: 1818 + internal class ImplementsGenericInterface : Il2CppTests.TestSources.IGeneric> // TypeDefIndex: 1818 { // Constructors public ImplementsGenericInterface() {} // 0x100BF000-0x100BF010 @@ -151,7 +151,7 @@ namespace Il2CppTests.TestSources bool this[int i] { get => default; } } - internal class ImplementsIndexer : IIndexer // TypeDefIndex: 1820 + internal class ImplementsIndexer : Il2CppTests.TestSources.IIndexer // TypeDefIndex: 1820 { // Properties public bool this[int i] { get => default; } // 0x100EFBF0-0x100EFC00 diff --git a/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x64.cs b/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x64.cs index c00da78..17def16 100644 --- a/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x64.cs +++ b/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x64.cs @@ -90,7 +90,7 @@ namespace Il2CppTests.TestSources public Base() {} } - public class Derived : Base // TypeDefIndex: 1816 + public class Derived : Il2CppTests.TestSources.Base // TypeDefIndex: 1816 { // Fields public G> F; // 0x00 @@ -250,7 +250,7 @@ namespace Il2CppTests.TestSources public void GenericMethodDefinitionInGenericClass2(T a, U b) {} } - public class CallGenericMethods : GenericClassWithMethods // TypeDefIndex: 1835 + public class CallGenericMethods : Il2CppTests.TestSources.GenericClassWithMethods // TypeDefIndex: 1835 { // Constructors public CallGenericMethods() {} // 0x0000000180408880-0x00000001804088C0 diff --git a/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x86.cs b/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x86.cs index 24edc41..3b9effd 100644 --- a/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x86.cs +++ b/Il2CppTests/TestExpectedResults/GameAssembly-GenericTypes-x86.cs @@ -90,7 +90,7 @@ namespace Il2CppTests.TestSources public Base() {} } - public class Derived : Base // TypeDefIndex: 1816 + public class Derived : Il2CppTests.TestSources.Base // TypeDefIndex: 1816 { // Fields public G> F; // 0x00 @@ -250,7 +250,7 @@ namespace Il2CppTests.TestSources public void GenericMethodDefinitionInGenericClass2(T a, U b) {} } - public class CallGenericMethods : GenericClassWithMethods // TypeDefIndex: 1835 + public class CallGenericMethods : Il2CppTests.TestSources.GenericClassWithMethods // TypeDefIndex: 1835 { // Constructors public CallGenericMethods() {} // 0x1036D450-0x1036D490 diff --git a/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x64.cs b/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x64.cs index 7032098..3640c2e 100644 --- a/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x64.cs +++ b/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x64.cs @@ -110,7 +110,7 @@ namespace Il2CppTests.TestSources public abstract void AbstractMethod(); } - internal class TestOverride : Test // TypeDefIndex: 1814 + internal class TestOverride : Il2CppTests.TestSources.Test // TypeDefIndex: 1814 { // Constructors public TestOverride() {} // 0x00000001800E4000-0x00000001800E4010 @@ -119,7 +119,7 @@ namespace Il2CppTests.TestSources public override void VirtualMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 } - internal class TestHideVirtual : Test // TypeDefIndex: 1815 + internal class TestHideVirtual : Il2CppTests.TestSources.Test // TypeDefIndex: 1815 { // Constructors public TestHideVirtual() {} // 0x00000001800E4000-0x00000001800E4010 @@ -128,7 +128,7 @@ namespace Il2CppTests.TestSources public new void VirtualMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 } - internal class TestHideOverride : TestOverride // TypeDefIndex: 1816 + internal class TestHideOverride : Il2CppTests.TestSources.TestOverride // TypeDefIndex: 1816 { // Constructors public TestHideOverride() {} // 0x00000001800E4000-0x00000001800E4010 @@ -137,7 +137,7 @@ namespace Il2CppTests.TestSources public new void VirtualMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 } - internal class TestOverrideAbstract : TestAbstract // TypeDefIndex: 1817 + internal class TestOverrideAbstract : Il2CppTests.TestSources.TestAbstract // TypeDefIndex: 1817 { // Constructors public TestOverrideAbstract() {} // 0x00000001800E4000-0x00000001800E4010 @@ -146,7 +146,7 @@ namespace Il2CppTests.TestSources public override void AbstractMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 } - internal class TestHideAbstractOverride : TestOverrideAbstract // TypeDefIndex: 1818 + internal class TestHideAbstractOverride : Il2CppTests.TestSources.TestOverrideAbstract // TypeDefIndex: 1818 { // Constructors public TestHideAbstractOverride() {} // 0x00000001800E4000-0x00000001800E4010 @@ -155,7 +155,7 @@ namespace Il2CppTests.TestSources public new void AbstractMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 } - internal class TestHideVirtualAndNewVirtual : Test // TypeDefIndex: 1819 + internal class TestHideVirtualAndNewVirtual : Il2CppTests.TestSources.Test // TypeDefIndex: 1819 { // Constructors public TestHideVirtualAndNewVirtual() {} // 0x00000001800E4000-0x00000001800E4010 @@ -164,7 +164,7 @@ namespace Il2CppTests.TestSources public virtual new void VirtualMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 } - internal class TestHideOverrideAndNewVirtual : TestOverride // TypeDefIndex: 1820 + internal class TestHideOverrideAndNewVirtual : Il2CppTests.TestSources.TestOverride // TypeDefIndex: 1820 { // Constructors public TestHideOverrideAndNewVirtual() {} // 0x00000001800E4000-0x00000001800E4010 @@ -173,7 +173,7 @@ namespace Il2CppTests.TestSources public virtual new void VirtualMethod() {} // 0x00000001800ECD30-0x00000001800ECD40 } - internal abstract class TestAbstractNew : TestOverride // TypeDefIndex: 1821 + internal abstract class TestAbstractNew : Il2CppTests.TestSources.TestOverride // TypeDefIndex: 1821 { // Constructors protected TestAbstractNew() {} // 0x00000001800E4000-0x00000001800E4010 @@ -182,7 +182,7 @@ namespace Il2CppTests.TestSources public abstract new void VirtualMethod(); } - internal class TestNewNonVirtualMethod : Test // TypeDefIndex: 1822 + internal class TestNewNonVirtualMethod : Il2CppTests.TestSources.Test // TypeDefIndex: 1822 { // Constructors public TestNewNonVirtualMethod() {} // 0x00000001800E4000-0x00000001800E4010 diff --git a/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x86.cs b/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x86.cs index 659312b..93c9c24 100644 --- a/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x86.cs +++ b/Il2CppTests/TestExpectedResults/GameAssembly-Methods-x86.cs @@ -110,7 +110,7 @@ namespace Il2CppTests.TestSources public abstract void AbstractMethod(); } - internal class TestOverride : Test // TypeDefIndex: 1814 + internal class TestOverride : Il2CppTests.TestSources.Test // TypeDefIndex: 1814 { // Constructors public TestOverride() {} // 0x100C2000-0x100C2010 @@ -119,7 +119,7 @@ namespace Il2CppTests.TestSources public override void VirtualMethod() {} // 0x100C97A0-0x100C97B0 } - internal class TestHideVirtual : Test // TypeDefIndex: 1815 + internal class TestHideVirtual : Il2CppTests.TestSources.Test // TypeDefIndex: 1815 { // Constructors public TestHideVirtual() {} // 0x100C2000-0x100C2010 @@ -128,7 +128,7 @@ namespace Il2CppTests.TestSources public new void VirtualMethod() {} // 0x100C97A0-0x100C97B0 } - internal class TestHideOverride : TestOverride // TypeDefIndex: 1816 + internal class TestHideOverride : Il2CppTests.TestSources.TestOverride // TypeDefIndex: 1816 { // Constructors public TestHideOverride() {} // 0x100C2000-0x100C2010 @@ -137,7 +137,7 @@ namespace Il2CppTests.TestSources public new void VirtualMethod() {} // 0x100C97A0-0x100C97B0 } - internal class TestOverrideAbstract : TestAbstract // TypeDefIndex: 1817 + internal class TestOverrideAbstract : Il2CppTests.TestSources.TestAbstract // TypeDefIndex: 1817 { // Constructors public TestOverrideAbstract() {} // 0x100C2000-0x100C2010 @@ -146,7 +146,7 @@ namespace Il2CppTests.TestSources public override void AbstractMethod() {} // 0x100C97A0-0x100C97B0 } - internal class TestHideAbstractOverride : TestOverrideAbstract // TypeDefIndex: 1818 + internal class TestHideAbstractOverride : Il2CppTests.TestSources.TestOverrideAbstract // TypeDefIndex: 1818 { // Constructors public TestHideAbstractOverride() {} // 0x100C2000-0x100C2010 @@ -155,7 +155,7 @@ namespace Il2CppTests.TestSources public new void AbstractMethod() {} // 0x100C97A0-0x100C97B0 } - internal class TestHideVirtualAndNewVirtual : Test // TypeDefIndex: 1819 + internal class TestHideVirtualAndNewVirtual : Il2CppTests.TestSources.Test // TypeDefIndex: 1819 { // Constructors public TestHideVirtualAndNewVirtual() {} // 0x100C2000-0x100C2010 @@ -164,7 +164,7 @@ namespace Il2CppTests.TestSources public virtual new void VirtualMethod() {} // 0x100C97A0-0x100C97B0 } - internal class TestHideOverrideAndNewVirtual : TestOverride // TypeDefIndex: 1820 + internal class TestHideOverrideAndNewVirtual : Il2CppTests.TestSources.TestOverride // TypeDefIndex: 1820 { // Constructors public TestHideOverrideAndNewVirtual() {} // 0x100C2000-0x100C2010 @@ -173,7 +173,7 @@ namespace Il2CppTests.TestSources public virtual new void VirtualMethod() {} // 0x100C97A0-0x100C97B0 } - internal abstract class TestAbstractNew : TestOverride // TypeDefIndex: 1821 + internal abstract class TestAbstractNew : Il2CppTests.TestSources.TestOverride // TypeDefIndex: 1821 { // Constructors protected TestAbstractNew() {} // 0x100C2000-0x100C2010 @@ -182,7 +182,7 @@ namespace Il2CppTests.TestSources public abstract new void VirtualMethod(); } - internal class TestNewNonVirtualMethod : Test // TypeDefIndex: 1822 + internal class TestNewNonVirtualMethod : Il2CppTests.TestSources.Test // TypeDefIndex: 1822 { // Constructors public TestNewNonVirtualMethod() {} // 0x100C2000-0x100C2010 diff --git a/Il2CppTests/TestExpectedResults/GameAssembly-References-x64.cs b/Il2CppTests/TestExpectedResults/GameAssembly-References-x64.cs index 586323e..6a1e3f9 100644 --- a/Il2CppTests/TestExpectedResults/GameAssembly-References-x64.cs +++ b/Il2CppTests/TestExpectedResults/GameAssembly-References-x64.cs @@ -97,8 +97,10 @@ namespace Il2CppTests.TestSources public void MethodWithInRefOut(in int a, ref int b, out int c) { c = default; } // 0x00000001803E0E60-0x00000001803E0E70 - public ref float MethodWithRefReturnType() => default; // 0x00000001803E0E70-0x00000001803E0E70 - public ref Test MethodWithGenericAndClassRefs(ref T argGeneric, ref int argValueType, ref Test argClass) => default; + public ref float MethodWithRefReturnType() => ref _refReturnTypeForMethodWithRefReturnType; // 0x00000001803E0E70-0x00000001803E0E70 + private ref float _refReturnTypeForMethodWithRefReturnType; // Dummy field + public ref Test MethodWithGenericAndClassRefs(ref T argGeneric, ref int argValueType, ref Test argClass) => ref _refReturnTypeForMethodWithGenericAndClassRefs; + private ref Test _refReturnTypeForMethodWithGenericAndClassRefs; // Dummy field } [Obsolete] // 0x000000018000CB80-0x000000018000CBB0 diff --git a/Il2CppTests/TestExpectedResults/GameAssembly-References-x86.cs b/Il2CppTests/TestExpectedResults/GameAssembly-References-x86.cs index a79fefd..791283c 100644 --- a/Il2CppTests/TestExpectedResults/GameAssembly-References-x86.cs +++ b/Il2CppTests/TestExpectedResults/GameAssembly-References-x86.cs @@ -97,8 +97,10 @@ namespace Il2CppTests.TestSources public void MethodWithInRefOut(in int a, ref int b, out int c) { c = default; } // 0x1034DA60-0x1034DA70 - public ref float MethodWithRefReturnType() => default; // 0x1034DA70-0x1034DA70 - public ref Test MethodWithGenericAndClassRefs(ref T argGeneric, ref int argValueType, ref Test argClass) => default; + public ref float MethodWithRefReturnType() => ref _refReturnTypeForMethodWithRefReturnType; // 0x1034DA70-0x1034DA70 + private ref float _refReturnTypeForMethodWithRefReturnType; // Dummy field + public ref Test MethodWithGenericAndClassRefs(ref T argGeneric, ref int argValueType, ref Test argClass) => ref _refReturnTypeForMethodWithGenericAndClassRefs; + private ref Test _refReturnTypeForMethodWithGenericAndClassRefs; // Dummy field } [Obsolete] // 0x1000DD10-0x1000DD40 diff --git a/Il2CppTests/TestExpectedResults/GenericTypes.cs b/Il2CppTests/TestExpectedResults/GenericTypes.cs index b4a1171..d9c1bbc 100644 --- a/Il2CppTests/TestExpectedResults/GenericTypes.cs +++ b/Il2CppTests/TestExpectedResults/GenericTypes.cs @@ -90,7 +90,7 @@ namespace Il2CppTests.TestSources public Base() {} } - public class Derived : Base // TypeDefIndex: 1816 + public class Derived : Il2CppTests.TestSources.Base // TypeDefIndex: 1816 { // Fields public G> F; // 0x00 @@ -250,7 +250,7 @@ namespace Il2CppTests.TestSources public void GenericMethodDefinitionInGenericClass2(T a, U b) {} } - public class CallGenericMethods : GenericClassWithMethods // TypeDefIndex: 1835 + public class CallGenericMethods : Il2CppTests.TestSources.GenericClassWithMethods // TypeDefIndex: 1835 { // Constructors public CallGenericMethods() {} // 0x0057B120-0x0057B184 diff --git a/Il2CppTests/TestExpectedResults/Methods.cs b/Il2CppTests/TestExpectedResults/Methods.cs index 0cf24d7..e049292 100644 --- a/Il2CppTests/TestExpectedResults/Methods.cs +++ b/Il2CppTests/TestExpectedResults/Methods.cs @@ -110,7 +110,7 @@ namespace Il2CppTests.TestSources public abstract void AbstractMethod(); } - internal class TestOverride : Test // TypeDefIndex: 1814 + internal class TestOverride : Il2CppTests.TestSources.Test // TypeDefIndex: 1814 { // Constructors public TestOverride() {} // 0x00561238-0x00561240 @@ -119,7 +119,7 @@ namespace Il2CppTests.TestSources public override void VirtualMethod() {} // 0x00561294-0x00561298 } - internal class TestHideVirtual : Test // TypeDefIndex: 1815 + internal class TestHideVirtual : Il2CppTests.TestSources.Test // TypeDefIndex: 1815 { // Constructors public TestHideVirtual() {} // 0x00561270-0x00561278 @@ -128,7 +128,7 @@ namespace Il2CppTests.TestSources public new void VirtualMethod() {} // 0x0056126C-0x00561270 } - internal class TestHideOverride : TestOverride // TypeDefIndex: 1816 + internal class TestHideOverride : Il2CppTests.TestSources.TestOverride // TypeDefIndex: 1816 { // Constructors public TestHideOverride() {} // 0x00561258-0x00561260 @@ -137,7 +137,7 @@ namespace Il2CppTests.TestSources public new void VirtualMethod() {} // 0x00561254-0x00561258 } - internal class TestOverrideAbstract : TestAbstract // TypeDefIndex: 1817 + internal class TestOverrideAbstract : Il2CppTests.TestSources.TestAbstract // TypeDefIndex: 1817 { // Constructors public TestOverrideAbstract() {} // 0x0056124C-0x00561254 @@ -146,7 +146,7 @@ namespace Il2CppTests.TestSources public override void AbstractMethod() {} // 0x00561298-0x00561298 } - internal class TestHideAbstractOverride : TestOverrideAbstract // TypeDefIndex: 1818 + internal class TestHideAbstractOverride : Il2CppTests.TestSources.TestOverrideAbstract // TypeDefIndex: 1818 { // Constructors public TestHideAbstractOverride() {} // 0x00561244-0x0056124C @@ -155,7 +155,7 @@ namespace Il2CppTests.TestSources public new void AbstractMethod() {} // 0x00561240-0x00561244 } - internal class TestHideVirtualAndNewVirtual : Test // TypeDefIndex: 1819 + internal class TestHideVirtualAndNewVirtual : Il2CppTests.TestSources.Test // TypeDefIndex: 1819 { // Constructors public TestHideVirtualAndNewVirtual() {} // 0x0056127C-0x00561284 @@ -164,7 +164,7 @@ namespace Il2CppTests.TestSources public virtual new void VirtualMethod() {} // 0x00561278-0x0056127C } - internal class TestHideOverrideAndNewVirtual : TestOverride // TypeDefIndex: 1820 + internal class TestHideOverrideAndNewVirtual : Il2CppTests.TestSources.TestOverride // TypeDefIndex: 1820 { // Constructors public TestHideOverrideAndNewVirtual() {} // 0x00561264-0x0056126C @@ -173,7 +173,7 @@ namespace Il2CppTests.TestSources public virtual new void VirtualMethod() {} // 0x00561260-0x00561264 } - internal abstract class TestAbstractNew : TestOverride // TypeDefIndex: 1821 + internal abstract class TestAbstractNew : Il2CppTests.TestSources.TestOverride // TypeDefIndex: 1821 { // Constructors protected TestAbstractNew() {} // 0x00561230-0x00561238 @@ -182,7 +182,7 @@ namespace Il2CppTests.TestSources public abstract new void VirtualMethod(); } - internal class TestNewNonVirtualMethod : Test // TypeDefIndex: 1822 + internal class TestNewNonVirtualMethod : Il2CppTests.TestSources.Test // TypeDefIndex: 1822 { // Constructors public TestNewNonVirtualMethod() {} // 0x0056128C-0x00561294 diff --git a/Il2CppTests/TestExpectedResults/References.cs b/Il2CppTests/TestExpectedResults/References.cs index ec72836..1db9fcb 100644 --- a/Il2CppTests/TestExpectedResults/References.cs +++ b/Il2CppTests/TestExpectedResults/References.cs @@ -97,8 +97,10 @@ namespace Il2CppTests.TestSources public void MethodWithInRefOut(in int a, ref int b, out int c) { c = default; } // 0x005610EC-0x005610F8 - public ref float MethodWithRefReturnType() => default; // 0x005610F8-0x00561100 - public ref Test MethodWithGenericAndClassRefs(ref T argGeneric, ref int argValueType, ref Test argClass) => default; + public ref float MethodWithRefReturnType() => ref _refReturnTypeForMethodWithRefReturnType; // 0x005610F8-0x00561100 + private ref float _refReturnTypeForMethodWithRefReturnType; // Dummy field + public ref Test MethodWithGenericAndClassRefs(ref T argGeneric, ref int argValueType, ref Test argClass) => ref _refReturnTypeForMethodWithGenericAndClassRefs; + private ref Test _refReturnTypeForMethodWithGenericAndClassRefs; // Dummy field } [Obsolete] // 0x000A524C-0x000A5284