From 99b0f289809d83b1ac99a946632d6e3c71ee45b1 Mon Sep 17 00:00:00 2001 From: sunnamed434 Date: Sat, 20 Jul 2024 17:17:24 +0300 Subject: [PATCH] Bump AsmResolver.DotNet to 6.0.0-beta.1 --- .../Echo.Platforms.AsmResolver.csproj | 2 +- .../Echo.Platforms.AsmResolver/Emulation/CliMarshaller.cs | 4 ++-- .../Emulation/Dispatch/Arrays/LdElemHandler.cs | 2 -- .../Emulation/Dispatch/Arrays/StElemHandler.cs | 2 -- .../Emulation/Dispatch/CilDispatchResult.cs | 2 +- .../Emulation/Dispatch/ControlFlow/RetHandler.cs | 1 - .../Emulation/Dispatch/Misc/ConvHandler.cs | 4 ++-- .../Emulation/Dispatch/ObjectModel/BoxHandler.cs | 1 - .../Emulation/Dispatch/ObjectModel/CallHandlerBase.cs | 1 - .../Emulation/Dispatch/ObjectModel/CastClassHandler.cs | 2 +- .../Dispatch/ObjectModel/CastOpCodeHandlerBase.cs | 1 - .../Emulation/Dispatch/ObjectModel/IsInstHandler.cs | 2 +- .../Emulation/Dispatch/ObjectModel/NewObjHandler.cs | 2 +- .../Emulation/Dispatch/ObjectModel/UnboxAnyHandler.cs | 2 +- .../Emulation/Dispatch/ObjectModel/UnboxHandler.cs | 2 +- .../Emulation/Dispatch/ObjectModel/UnboxHandlerBase.cs | 2 +- .../Emulation/Dispatch/Pointers/InitObjHandler.cs | 2 -- .../Emulation/Dispatch/Pointers/LdIndHandler.cs | 2 -- .../Emulation/Dispatch/Pointers/StIndHandler.cs | 2 -- .../Emulation/Dispatch/Variables/LdArgHandler.cs | 1 - .../Emulation/Dispatch/Variables/LdLocHandler.cs | 1 - .../Emulation/Dispatch/Variables/StArgHandler.cs | 1 - .../Emulation/Dispatch/Variables/StLocHandler.cs | 2 -- .../Emulation/DotNetBitVectorSpanExtensions.cs | 2 +- .../Emulation/Heap/ManagedObjectHeap.cs | 4 ++-- .../Emulation/Heap/ObjectMapMemory.cs | 2 +- .../Emulation/Invocation/ReturnDefaultInvoker.cs | 1 - .../Emulation/Invocation/StringAllocator.cs | 4 ++-- .../Emulation/ObjectHandle.DebugProxy.cs | 4 ++-- .../Echo.Platforms.AsmResolver/Emulation/ObjectHandle.cs | 2 +- .../Echo.Platforms.AsmResolver/Emulation/PELoader.cs | 2 +- .../Emulation/Stack/CallFrame.cs | 1 - .../Emulation/Stack/EvaluationStack.cs | 2 +- .../Echo.Platforms.AsmResolver/Emulation/ValueFactory.cs | 5 ++--- .../Emulation/CilVirtualMachineTest.cs | 3 +-- .../Emulation/Dispatch/CilDispatcherTest.cs | 2 +- .../Emulation/Dispatch/CilOpCodeHandlerTestBase.cs | 2 +- .../Emulation/Dispatch/ControlFlow/RetHandlerTest.cs | 2 +- .../Emulation/Dispatch/ObjectModel/CallHandlerTest.cs | 3 +-- .../Emulation/Dispatch/ObjectModel/CallVirtHandlerTest.cs | 3 --- .../Emulation/Dispatch/ObjectModel/CastHandlerTest.cs | 1 - .../Emulation/Dispatch/ObjectModel/LdFldHandlerTest.cs | 2 +- .../Emulation/Dispatch/ObjectModel/LdFldaHandlerTest.cs | 2 +- .../Emulation/Dispatch/ObjectModel/LdsFldHandlerTest.cs | 3 +-- .../Emulation/Dispatch/ObjectModel/LdsFldaHandlerTest.cs | 2 +- .../Emulation/Dispatch/ObjectModel/SizeOfHandlerTest.cs | 2 +- .../Emulation/Dispatch/ObjectModel/StFldHandlerTest.cs | 2 +- .../Emulation/Dispatch/ObjectModel/StsFldHandlerTest.cs | 2 +- .../Emulation/Dispatch/Variables/ArgumentsTest.cs | 3 +-- .../Emulation/Dispatch/Variables/LocalsTest.cs | 3 +-- .../Emulation/Heap/StaticFieldStorageTest.cs | 3 +-- .../Emulation/Invocation/StringAllocatorTest.cs | 2 +- .../Emulation/Stack/ExceptionHandlerStackTest.cs | 3 +-- .../StateTransitionResolverTest.cs | 2 +- .../StaticFlowGraphTest.cs | 7 +------ .../StaticSuccessorResolverTest.cs | 2 +- 56 files changed, 45 insertions(+), 83 deletions(-) diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Echo.Platforms.AsmResolver.csproj b/src/Platforms/Echo.Platforms.AsmResolver/Echo.Platforms.AsmResolver.csproj index 617da511..10d48f75 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Echo.Platforms.AsmResolver.csproj +++ b/src/Platforms/Echo.Platforms.AsmResolver/Echo.Platforms.AsmResolver.csproj @@ -24,7 +24,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/CliMarshaller.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/CliMarshaller.cs index 14c9b556..0d7a9941 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/CliMarshaller.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/CliMarshaller.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; 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 Echo.Memory; using Echo.Platforms.AsmResolver.Emulation.Stack; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Arrays/LdElemHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Arrays/LdElemHandler.cs index 094c03ee..0cec281f 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Arrays/LdElemHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Arrays/LdElemHandler.cs @@ -1,9 +1,7 @@ using System; using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.PE.DotNet.Cil; -using Echo.Memory; namespace Echo.Platforms.AsmResolver.Emulation.Dispatch.Arrays { diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Arrays/StElemHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Arrays/StElemHandler.cs index a19efc86..0cf4d40a 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Arrays/StElemHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Arrays/StElemHandler.cs @@ -1,9 +1,7 @@ using System; using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.PE.DotNet.Cil; -using Echo.Memory; namespace Echo.Platforms.AsmResolver.Emulation.Dispatch.Arrays { diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/CilDispatchResult.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/CilDispatchResult.cs index 832a23a1..bd235962 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/CilDispatchResult.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/CilDispatchResult.cs @@ -1,7 +1,7 @@ using System; using System.Diagnostics; using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; namespace Echo.Platforms.AsmResolver.Emulation.Dispatch { diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ControlFlow/RetHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ControlFlow/RetHandler.cs index c0ad0fc7..900fd91a 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ControlFlow/RetHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ControlFlow/RetHandler.cs @@ -1,4 +1,3 @@ -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; using Echo.Memory; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Misc/ConvHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Misc/ConvHandler.cs index def40b56..b122f680 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Misc/ConvHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Misc/ConvHandler.cs @@ -1,7 +1,7 @@ using System; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Memory; using Echo.Platforms.AsmResolver.Emulation.Stack; using static AsmResolver.PE.DotNet.Cil.CilCode; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/BoxHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/BoxHandler.cs index 6b937f65..4816a882 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/BoxHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/BoxHandler.cs @@ -1,5 +1,4 @@ using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; using Echo.Platforms.AsmResolver.Emulation.Stack; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/CallHandlerBase.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/CallHandlerBase.cs index 1ee0f256..c4f66964 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/CallHandlerBase.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/CallHandlerBase.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.PE.DotNet.Cil; using Echo.Memory; using Echo.Platforms.AsmResolver.Emulation.Invocation; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/CastClassHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/CastClassHandler.cs index edebe220..35052f24 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/CastClassHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/CastClassHandler.cs @@ -1,4 +1,4 @@ -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; using Echo.Platforms.AsmResolver.Emulation.Stack; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/CastOpCodeHandlerBase.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/CastOpCodeHandlerBase.cs index c664089b..3fb70890 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/CastOpCodeHandlerBase.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/CastOpCodeHandlerBase.cs @@ -1,6 +1,5 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.PE.DotNet.Cil; using Echo.Platforms.AsmResolver.Emulation.Stack; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/IsInstHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/IsInstHandler.cs index 94ea050e..3113cccf 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/IsInstHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/IsInstHandler.cs @@ -1,4 +1,4 @@ -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; using Echo.Platforms.AsmResolver.Emulation.Stack; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/NewObjHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/NewObjHandler.cs index ac31b489..f93e0837 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/NewObjHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/NewObjHandler.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; using Echo.Memory; using Echo.Platforms.AsmResolver.Emulation.Dispatch.ControlFlow; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/UnboxAnyHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/UnboxAnyHandler.cs index 4a0844b8..4b10cf35 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/UnboxAnyHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/UnboxAnyHandler.cs @@ -1,4 +1,4 @@ -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; using Echo.Platforms.AsmResolver.Emulation.Stack; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/UnboxHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/UnboxHandler.cs index 92eed011..90c08fda 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/UnboxHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/UnboxHandler.cs @@ -1,4 +1,4 @@ -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; using Echo.Platforms.AsmResolver.Emulation.Stack; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/UnboxHandlerBase.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/UnboxHandlerBase.cs index 860ddc77..d2e606bc 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/UnboxHandlerBase.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/UnboxHandlerBase.cs @@ -1,4 +1,4 @@ -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using Echo.Platforms.AsmResolver.Emulation.Stack; namespace Echo.Platforms.AsmResolver.Emulation.Dispatch.ObjectModel diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Pointers/InitObjHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Pointers/InitObjHandler.cs index 3b006ba6..6b1ac573 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Pointers/InitObjHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Pointers/InitObjHandler.cs @@ -1,8 +1,6 @@ using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; -using Echo.Memory; namespace Echo.Platforms.AsmResolver.Emulation.Dispatch.Pointers { diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Pointers/LdIndHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Pointers/LdIndHandler.cs index 1f7f588a..50056b95 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Pointers/LdIndHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Pointers/LdIndHandler.cs @@ -1,9 +1,7 @@ using System; using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.PE.DotNet.Cil; -using Echo.Memory; namespace Echo.Platforms.AsmResolver.Emulation.Dispatch.Pointers { diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Pointers/StIndHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Pointers/StIndHandler.cs index 36e9955d..c4e4e1fd 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Pointers/StIndHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Pointers/StIndHandler.cs @@ -1,9 +1,7 @@ using System; using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.PE.DotNet.Cil; -using Echo.Memory; namespace Echo.Platforms.AsmResolver.Emulation.Dispatch.Pointers { diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/LdArgHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/LdArgHandler.cs index 96efaf94..8384be09 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/LdArgHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/LdArgHandler.cs @@ -1,5 +1,4 @@ using AsmResolver.DotNet.Code.Cil; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/LdLocHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/LdLocHandler.cs index 69b552e5..f4a2db6d 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/LdLocHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/LdLocHandler.cs @@ -1,5 +1,4 @@ using AsmResolver.DotNet.Code.Cil; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/StArgHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/StArgHandler.cs index 06ec07eb..e6dad30d 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/StArgHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/StArgHandler.cs @@ -1,5 +1,4 @@ using AsmResolver.DotNet.Code.Cil; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/StLocHandler.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/StLocHandler.cs index 57beac10..0b53c051 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/StLocHandler.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/Variables/StLocHandler.cs @@ -1,8 +1,6 @@ using AsmResolver.DotNet.Code.Cil; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.DotNet; namespace Echo.Platforms.AsmResolver.Emulation.Dispatch.Variables { diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/DotNetBitVectorSpanExtensions.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/DotNetBitVectorSpanExtensions.cs index 93341f41..8ee2c9a6 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/DotNetBitVectorSpanExtensions.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/DotNetBitVectorSpanExtensions.cs @@ -1,6 +1,6 @@ using System; using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using Echo.Memory; namespace Echo.Platforms.AsmResolver.Emulation diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Heap/ManagedObjectHeap.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Heap/ManagedObjectHeap.cs index dc4dfd2c..a0388d38 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Heap/ManagedObjectHeap.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Heap/ManagedObjectHeap.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Runtime.InteropServices; 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 Echo.Memory; using Echo.Memory.Heap; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Heap/ObjectMapMemory.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Heap/ObjectMapMemory.cs index 2bcdfea9..48127262 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Heap/ObjectMapMemory.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Heap/ObjectMapMemory.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using AsmResolver.DotNet; using AsmResolver.DotNet.Memory; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using Echo.Memory; namespace Echo.Platforms.AsmResolver.Emulation.Heap diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Invocation/ReturnDefaultInvoker.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Invocation/ReturnDefaultInvoker.cs index 4385ae9f..2e2b54cb 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Invocation/ReturnDefaultInvoker.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Invocation/ReturnDefaultInvoker.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using AsmResolver.DotNet; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; using Echo.Memory; using Echo.Platforms.AsmResolver.Emulation.Dispatch; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Invocation/StringAllocator.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Invocation/StringAllocator.cs index a308e198..21fdcd1f 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Invocation/StringAllocator.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Invocation/StringAllocator.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; 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 Echo.Memory; using Echo.Platforms.AsmResolver.Emulation.Dispatch; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/ObjectHandle.DebugProxy.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/ObjectHandle.DebugProxy.cs index 51f725cc..95ceba6c 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/ObjectHandle.DebugProxy.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/ObjectHandle.DebugProxy.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using AsmResolver.DotNet.Signatures.Types; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.DotNet.Signatures; +using AsmResolver.PE.DotNet.Metadata.Tables; namespace Echo.Platforms.AsmResolver.Emulation; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/ObjectHandle.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/ObjectHandle.cs index 751de066..9ce92cec 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/ObjectHandle.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/ObjectHandle.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; using AsmResolver.DotNet; using AsmResolver.DotNet.Memory; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using Echo.Memory; namespace Echo.Platforms.AsmResolver.Emulation diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/PELoader.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/PELoader.cs index 4b733ae4..5e72ec35 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/PELoader.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/PELoader.cs @@ -50,7 +50,7 @@ public long MapModule(ModuleDefinition module) /// /// The file to map. /// The new base address of the PE file. - public long MapPE(IPEFile file) + public long MapPE(PEFile file) { long baseAddress = _currentAddress; diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Stack/CallFrame.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Stack/CallFrame.cs index 1e68ca5d..7a90e979 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Stack/CallFrame.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Stack/CallFrame.cs @@ -5,7 +5,6 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using Echo.Memory; namespace Echo.Platforms.AsmResolver.Emulation.Stack diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Stack/EvaluationStack.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Stack/EvaluationStack.cs index e44a0f88..60a149d6 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Stack/EvaluationStack.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/Stack/EvaluationStack.cs @@ -1,4 +1,4 @@ -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using Echo.Memory; namespace Echo.Platforms.AsmResolver.Emulation.Stack diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/ValueFactory.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/ValueFactory.cs index 746da0fb..6f4d15c2 100644 --- a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/ValueFactory.cs +++ b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/ValueFactory.cs @@ -5,8 +5,7 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Memory; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Memory; using Echo.Platforms.AsmResolver.Emulation.Runtime; @@ -156,7 +155,7 @@ public ClrMockMemory ClrMockMemory } /// - /// Gets a reference to the type. + /// Gets a reference to the type. /// public ITypeDescriptor DecimalType { diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/CilVirtualMachineTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/CilVirtualMachineTest.cs index 450986c8..02b8c0c6 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/CilVirtualMachineTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/CilVirtualMachineTest.cs @@ -6,7 +6,6 @@ using AsmResolver.DotNet; using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.PE.DotNet.Cil; using Echo.Memory; using Echo.Platforms.AsmResolver.Emulation; @@ -18,7 +17,7 @@ using Xunit.Abstractions; using Xunit.Sdk; using static AsmResolver.PE.DotNet.Cil.CilOpCodes; -using MethodAttributes = AsmResolver.PE.DotNet.Metadata.Tables.Rows.MethodAttributes; +using MethodAttributes = AsmResolver.PE.DotNet.Metadata.Tables.MethodAttributes; using MethodDefinition = AsmResolver.DotNet.MethodDefinition; using TestClass = Mocks.TestClass; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/CilDispatcherTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/CilDispatcherTest.cs index 29a6b101..b16d435f 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/CilDispatcherTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/CilDispatcherTest.cs @@ -3,7 +3,7 @@ using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Platforms.AsmResolver.Emulation; using Echo.Platforms.AsmResolver.Emulation.Dispatch; using Echo.Platforms.AsmResolver.Tests.Mock; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/CilOpCodeHandlerTestBase.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/CilOpCodeHandlerTestBase.cs index 67533130..d61d0e35 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/CilOpCodeHandlerTestBase.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/CilOpCodeHandlerTestBase.cs @@ -3,7 +3,7 @@ using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Platforms.AsmResolver.Emulation; using Echo.Platforms.AsmResolver.Emulation.Dispatch; using Echo.Platforms.AsmResolver.Tests.Mock; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ControlFlow/RetHandlerTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ControlFlow/RetHandlerTest.cs index 4f3e73eb..bf32655c 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ControlFlow/RetHandlerTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ControlFlow/RetHandlerTest.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 AsmResolver.PE.DotNet.Cil; using Echo.Platforms.AsmResolver.Emulation.Stack; using Echo.Platforms.AsmResolver.Tests.Mock; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CallHandlerTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CallHandlerTest.cs index 6c0367b6..caae217b 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CallHandlerTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CallHandlerTest.cs @@ -2,9 +2,8 @@ using System.Linq; using AsmResolver.DotNet; 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 Echo.Memory; using Echo.Platforms.AsmResolver.Emulation; using Echo.Platforms.AsmResolver.Emulation.Dispatch; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CallVirtHandlerTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CallVirtHandlerTest.cs index 383c1986..ea18336e 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CallVirtHandlerTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CallVirtHandlerTest.cs @@ -1,11 +1,8 @@ using System.Collections.Generic; using System.Linq; 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 Echo.Memory; using Echo.Platforms.AsmResolver.Emulation; using Echo.Platforms.AsmResolver.Emulation.Dispatch; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CastHandlerTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CastHandlerTest.cs index d9949267..ce1ec321 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CastHandlerTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CastHandlerTest.cs @@ -2,7 +2,6 @@ using System.Linq; using AsmResolver.DotNet; using AsmResolver.DotNet.Signatures; -using AsmResolver.DotNet.Signatures.Types; using AsmResolver.PE.DotNet.Cil; using Echo.Platforms.AsmResolver.Emulation; using Echo.Platforms.AsmResolver.Emulation.Stack; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdFldHandlerTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdFldHandlerTest.cs index 43d92506..5fda94fd 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdFldHandlerTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdFldHandlerTest.cs @@ -3,7 +3,7 @@ using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Platforms.AsmResolver.Emulation; using Echo.Platforms.AsmResolver.Emulation.Stack; using Echo.Platforms.AsmResolver.Tests.Mock; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdFldaHandlerTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdFldaHandlerTest.cs index 0f8626ea..04fbf83c 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdFldaHandlerTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdFldaHandlerTest.cs @@ -3,7 +3,7 @@ using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Platforms.AsmResolver.Emulation; using Echo.Platforms.AsmResolver.Emulation.Stack; using Echo.Platforms.AsmResolver.Tests.Mock; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdsFldHandlerTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdsFldHandlerTest.cs index ed29e93c..34856da9 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdsFldHandlerTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdsFldHandlerTest.cs @@ -4,9 +4,8 @@ using AsmResolver; using AsmResolver.DotNet; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Platforms.AsmResolver.Emulation; -using Echo.Platforms.AsmResolver.Emulation.Stack; using Echo.Platforms.AsmResolver.Tests.Mock; using Mocks; using Xunit; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdsFldaHandlerTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdsFldaHandlerTest.cs index bbf686f9..9ceda0a5 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdsFldaHandlerTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdsFldaHandlerTest.cs @@ -1,6 +1,6 @@ using AsmResolver.DotNet; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Platforms.AsmResolver.Tests.Mock; using Xunit; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/SizeOfHandlerTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/SizeOfHandlerTest.cs index 4e867aef..21fb7e3f 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/SizeOfHandlerTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/SizeOfHandlerTest.cs @@ -2,7 +2,7 @@ using System.Linq; using AsmResolver.DotNet; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Platforms.AsmResolver.Tests.Mock; using Mocks; using Xunit; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/StFldHandlerTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/StFldHandlerTest.cs index 53a4a1ca..bfc8a9b5 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/StFldHandlerTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/StFldHandlerTest.cs @@ -3,7 +3,7 @@ using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Platforms.AsmResolver.Emulation; using Echo.Platforms.AsmResolver.Emulation.Stack; using Echo.Platforms.AsmResolver.Tests.Mock; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/StsFldHandlerTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/StsFldHandlerTest.cs index e103be8b..0d10100b 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/StsFldHandlerTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/StsFldHandlerTest.cs @@ -1,6 +1,6 @@ using AsmResolver.DotNet; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Platforms.AsmResolver.Emulation.Stack; using Echo.Platforms.AsmResolver.Tests.Mock; using Xunit; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/Variables/ArgumentsTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/Variables/ArgumentsTest.cs index 12ba25b5..879659c2 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/Variables/ArgumentsTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/Variables/ArgumentsTest.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 Echo.Memory; using Echo.Platforms.AsmResolver.Emulation.Stack; using Echo.Platforms.AsmResolver.Tests.Mock; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/Variables/LocalsTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/Variables/LocalsTest.cs index 81cdf290..42d9268f 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/Variables/LocalsTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/Variables/LocalsTest.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 Echo.Memory; using Echo.Platforms.AsmResolver.Emulation.Stack; using Echo.Platforms.AsmResolver.Tests.Mock; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Heap/StaticFieldStorageTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Heap/StaticFieldStorageTest.cs index d3eddeaf..11e21990 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Heap/StaticFieldStorageTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Heap/StaticFieldStorageTest.cs @@ -1,7 +1,6 @@ using AsmResolver.DotNet; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Platforms.AsmResolver.Emulation; -using Echo.Platforms.AsmResolver.Emulation.Heap; using Echo.Platforms.AsmResolver.Emulation.Runtime; using Echo.Platforms.AsmResolver.Tests.Mock; using Xunit; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Invocation/StringAllocatorTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Invocation/StringAllocatorTest.cs index 7a0a405f..84d82d54 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Invocation/StringAllocatorTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Invocation/StringAllocatorTest.cs @@ -2,7 +2,7 @@ using System.Text; using System.Threading; using AsmResolver.DotNet; -using AsmResolver.DotNet.Signatures.Types; +using AsmResolver.DotNet.Signatures; using Echo.Memory; using Echo.Platforms.AsmResolver.Emulation; using Echo.Platforms.AsmResolver.Emulation.Dispatch; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Stack/ExceptionHandlerStackTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Stack/ExceptionHandlerStackTest.cs index e425407b..5de5585c 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Stack/ExceptionHandlerStackTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Stack/ExceptionHandlerStackTest.cs @@ -1,12 +1,11 @@ using System; using System.IO; -using System.Linq; using System.Net; using AsmResolver.DotNet; using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Platforms.AsmResolver.Emulation; using Echo.Platforms.AsmResolver.Emulation.Stack; using Echo.Platforms.AsmResolver.Tests.Mock; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/StateTransitionResolverTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/StateTransitionResolverTest.cs index c4f419c2..e311ad89 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/StateTransitionResolverTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/StateTransitionResolverTest.cs @@ -4,7 +4,7 @@ using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Platforms.AsmResolver.Tests.Mock; using Mocks; using Xunit; diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/StaticFlowGraphTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/StaticFlowGraphTest.cs index 432b084b..4b2d4441 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/StaticFlowGraphTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/StaticFlowGraphTest.cs @@ -1,15 +1,10 @@ -using System.IO; -using System.Linq; using AsmResolver.DotNet; using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; -using Echo.ControlFlow.Analysis.Domination; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.ControlFlow.Regions; -using Echo.Graphing.Serialization.Dot; using Echo.Platforms.AsmResolver.Tests.Mock; -using Mocks; using Xunit; namespace Echo.Platforms.AsmResolver.Tests diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/StaticSuccessorResolverTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/StaticSuccessorResolverTest.cs index 04f2826e..74434695 100644 --- a/test/Platforms/Echo.Platforms.AsmResolver.Tests/StaticSuccessorResolverTest.cs +++ b/test/Platforms/Echo.Platforms.AsmResolver.Tests/StaticSuccessorResolverTest.cs @@ -3,7 +3,7 @@ using AsmResolver.DotNet.Code.Cil; using AsmResolver.DotNet.Signatures; using AsmResolver.PE.DotNet.Cil; -using AsmResolver.PE.DotNet.Metadata.Tables.Rows; +using AsmResolver.PE.DotNet.Metadata.Tables; using Echo.Platforms.AsmResolver.Tests.Mock; using Mocks; using Xunit;