Merge pull request #142 from sunnamed434/master

Bump AsmResolver.DotNet to 6.0.0-beta.1
Washi1337 · Jul 28, 2024 · 538cdad · 538cdad
2 parents 687c1fe + 99b0f28
commit 538cdad
Show file tree

Hide file tree

Showing 56 changed files with 45 additions and 83 deletions.
diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Echo.Platforms.AsmResolver.csproj b/src/Platforms/Echo.Platforms.AsmResolver/Echo.Platforms.AsmResolver.csproj
@@ -24,7 +24,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="AsmResolver.DotNet" Version="5.5.1" />
+      <PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.1" />
       <PackageReference Include="Nullable" Version="1.3.1">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...tforms/Echo.Platforms.AsmResolver/Emulation/Dispatch/ObjectModel/CastOpCodeHandlerBase.cs b/...tforms/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -50,7 +50,7 @@ public long MapModule(ModuleDefinition module)
         /// </summary>
         /// <param name="file">The file to map.</param>
         /// <returns>The new base address of the PE file.</returns>
-        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
@@ -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
@@ -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
@@ -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
         }
 
         /// <summary>
-        /// Gets a reference to the <see cref="Decimal"/> type. 
+        /// Gets a reference to the <see cref="decimal"/> type. 
         /// </summary>
         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
@@ -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
@@ -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/...Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/CilOpCodeHandlerTestBase.cs b/...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/...atforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ControlFlow/RetHandlerTest.cs b/...atforms/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/...tforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CallHandlerTest.cs b/...tforms/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/...ms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CallVirtHandlerTest.cs b/...ms/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/...tforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/CastHandlerTest.cs b/...tforms/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/...forms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdFldHandlerTest.cs b/...forms/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/...orms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdFldaHandlerTest.cs b/...orms/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/...orms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdsFldHandlerTest.cs b/...orms/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/...rms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/ObjectModel/LdsFldaHandlerTest.cs b/...rms/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;