XSharp.Common --> XSharp

ElveStudio · Aug 11, 2017 · d9cf2cc · d9cf2cc
1 parent 021de7c
commit d9cf2cc
Show file tree

Hide file tree

Showing 44 changed files with 47 additions and 47 deletions.
diff --git a/Build.sln b/Build.sln
@@ -74,7 +74,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core", "source\Cosmo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.HAL2", "source\Cosmos.HAL2\Cosmos.HAL2.csproj", "{DE4F000A-B65C-4395-B066-891B7423E9EC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Common", "..\XSharp\source\XSharp.Common\XSharp.Common.csproj", "{12B1AAA1-14DE-4B85-8C33-B32EA3A95B82}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp", "..\XSharp\source\XSharp\XSharp.csproj", "{12B1AAA1-14DE-4B85-8C33-B32EA3A95B82}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core_Plugs", "source\Cosmos.Core_Plugs\Cosmos.Core_Plugs.csproj", "{89DB6325-2C81-467D-BE8A-C4AEBB6540A5}"
 EndProject

diff --git a/IDE.sln b/IDE.sln
@@ -35,7 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Visual Studio", "Visual Stu
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XSharp", "XSharp", "{E9CD521E-C386-466D-B5F7-A5EB19A61625}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Common", "..\XSharp\source\XSharp.Common\XSharp.Common.csproj", "{72EB557A-8A2D-4B0F-823E-C70A791831B5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp", "..\XSharp\source\XSharp\XSharp.csproj", "{72EB557A-8A2D-4B0F-823E-C70A791831B5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NASM", "Tools\NASM\NASM.csproj", "{A2E6978B-FE78-433C-8A17-624579B393DF}"
 EndProject

diff --git a/IL2CPU.sln b/IL2CPU.sln
@@ -14,7 +14,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU.API", "..\IL2
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XSharp", "XSharp", "{E9CD521E-C386-466D-B5F7-A5EB19A61625}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Common", "..\XSharp\source\XSharp.Common\XSharp.Common.csproj", "{72EB557A-8A2D-4B0F-823E-C70A791831B5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp", "..\XSharp\source\XSharp\XSharp.csproj", "{72EB557A-8A2D-4B0F-823E-C70A791831B5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU", "..\IL2CPU\source\IL2CPU\IL2CPU.csproj", "{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}"
 EndProject

diff --git a/Kernel.sln b/Kernel.sln
@@ -64,7 +64,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "50 Application", "50 Applic
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Assembler", "..\XSharp\source\XSharp.Assembler\XSharp.Assembler.csproj", "{F0860B7D-3FF7-4E2A-AC10-18E87ADD62A3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Common", "..\XSharp\source\XSharp.Common\XSharp.Common.csproj", "{F785B091-7E4D-4D2E-A310-B18690623F74}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp", "..\XSharp\source\XSharp\XSharp.csproj", "{F785B091-7E4D-4D2E-A310-B18690623F74}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.HAL", "source\Kernel-X86\30-HAL\Cosmos.HAL\Cosmos.HAL.csproj", "{3F8EDE0E-61BD-4D01-95F5-4A5A17F6221E}"
 EndProject

diff --git a/Test.sln b/Test.sln
@@ -46,7 +46,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{CFE37077
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XSharp", "XSharp", "{E9CD521E-C386-466D-B5F7-A5EB19A61625}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Common", "..\XSharp\source\XSharp.Common\XSharp.Common.csproj", "{72EB557A-8A2D-4B0F-823E-C70A791831B5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp", "..\XSharp\source\XSharp\XSharp.csproj", "{72EB557A-8A2D-4B0F-823E-C70A791831B5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core_Plugs", "source\Cosmos.Core_Plugs\Cosmos.Core_Plugs.csproj", "{1132E689-18B0-4D87-94E8-934D4802C540}"
 EndProject

diff --git a/source/Cosmos.Core_Asm/Array/ArrayGetLengthAsm.cs b/source/Cosmos.Core_Asm/Array/ArrayGetLengthAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.Core_Asm
 {

diff --git a/source/Cosmos.Core_Asm/Array/ArrayInternalCopyAsm.cs b/source/Cosmos.Core_Asm/Array/ArrayInternalCopyAsm.cs
@@ -1,6 +1,6 @@
 using XSharp.Assembler;
 using Cosmos.IL2CPU.API;
-using XSharp.Common;
+using XSharp;
 using CPUx86 = XSharp.Assembler.x86;
 
 namespace Cosmos.Core_Asm

diff --git a/source/Cosmos.Core_Asm/Buffer/BufferBlockCopyAsm.cs b/source/Cosmos.Core_Asm/Buffer/BufferBlockCopyAsm.cs
@@ -1,6 +1,6 @@
 using XSharp.Assembler;
 using Cosmos.IL2CPU.API;
-using XSharp.Common;
+using XSharp;
 using CPUx86 = XSharp.Assembler.x86;
 
 namespace Cosmos.Core_Asm

diff --git a/source/Cosmos.Core_Asm/CPU/CPUDisableINTsAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUDisableINTsAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.Core_Asm
 {

diff --git a/source/Cosmos.Core_Asm/CPU/CPUEnableINTsAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUEnableINTsAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.Core_Asm
 {

diff --git a/source/Cosmos.Core_Asm/CPU/CPUGetAmountOfRAMAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUGetAmountOfRAMAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.Core_Asm
 {

diff --git a/source/Cosmos.Core_Asm/CPU/CPUGetEndOfKernelAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUGetEndOfKernelAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.Core_Asm
 {

diff --git a/source/Cosmos.Core_Asm/CPU/CPUHaltAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUHaltAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.Core_Asm
 {

diff --git a/source/Cosmos.Core_Asm/CPU/CPUInitFloatAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUInitFloatAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.Core_Asm
 {

diff --git a/source/Cosmos.Core_Asm/CPU/CPUInitSSEAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUInitSSEAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.Core_Asm
 {

diff --git a/source/Cosmos.Core_Asm/CPU/CPUUpdateIDTAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUUpdateIDTAsm.cs
@@ -4,8 +4,8 @@
 using XSharp.Assembler;
 using XSharp.Assembler.x86;
 using Cosmos.IL2CPU.API.Attribs;
-using XSharp.Common;
-using static XSharp.Common.XSRegisters;
+using XSharp;
+using static XSharp.XSRegisters;
 
 namespace Cosmos.Core_Asm
 {

diff --git a/source/Cosmos.Core_Asm/CPU/CPUZeroFillAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUZeroFillAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 using x86 = XSharp.Assembler.x86;
 
 namespace Cosmos.Core_Asm

diff --git a/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj b/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj
@@ -19,7 +19,7 @@
     <ProjectReference Include="..\..\..\XSharp\source\XSharp.Assembler\XSharp.Assembler.csproj" />
     <ProjectReference Include="..\Cosmos.Core\Cosmos.Core.csproj" />
     <ProjectReference Include="..\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-    <ProjectReference Include="..\..\..\XSharp\source\XSharp.Common\XSharp.Common.csproj" />
+    <ProjectReference Include="..\..\..\XSharp\source\XSharp\XSharp.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/source/Cosmos.Core_Asm/Delegate/DelegateCtorAsm.cs b/source/Cosmos.Core_Asm/Delegate/DelegateCtorAsm.cs
@@ -2,7 +2,7 @@
 using XSharp.Assembler;
 using Cosmos.IL2CPU;
 using Cosmos.IL2CPU.X86.IL;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.Core_Asm
 {

diff --git a/source/Cosmos.Core_Asm/Delegate/DelegateGetMulticastInvokeAsm.cs b/source/Cosmos.Core_Asm/Delegate/DelegateGetMulticastInvokeAsm.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using XSharp.Assembler;
 using Cosmos.IL2CPU;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.Core_Asm
 {

diff --git a/source/Cosmos.Core_Asm/Delegate/DelegateInvokeAsm.cs b/source/Cosmos.Core_Asm/Delegate/DelegateInvokeAsm.cs
@@ -3,7 +3,7 @@
 using XSharp.Assembler;
 using Cosmos.IL2CPU;
 using Cosmos.IL2CPU.X86.IL;
-using XSharp.Common;
+using XSharp;
 using x86 = XSharp.Assembler.x86;
 
 // ReSharper disable once CheckNamespace

diff --git a/source/Cosmos.Core_Asm/IOPortImpl.cs b/source/Cosmos.Core_Asm/IOPortImpl.cs
@@ -3,7 +3,7 @@
 using Cosmos.Core;
 using Cosmos.IL2CPU.API;
 using Cosmos.IL2CPU.API.Attribs;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.Core_Asm
 {

diff --git a/source/Cosmos.Core_Asm/MemoryOperations/MemoryOperationsFillFastAsm.cs b/source/Cosmos.Core_Asm/MemoryOperations/MemoryOperationsFillFastAsm.cs
@@ -1,7 +1,7 @@
 using XSharp.Assembler;
 using XSharp.Assembler.x86;
-using XSharp.Common;
-using static XSharp.Common.XSRegisters;
+using XSharp;
+using static XSharp.XSRegisters;
 
 namespace Cosmos.Core_Asm.MemoryOperations
 {

diff --git a/source/Cosmos.Core_Asm/ProcessorInformationImpl.cs b/source/Cosmos.Core_Asm/ProcessorInformationImpl.cs
@@ -3,7 +3,7 @@
 using Cosmos.Core;
 using Cosmos.IL2CPU.API;
 using Cosmos.IL2CPU.API.Attribs;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.Core_Asm
 {

diff --git a/source/Cosmos.Core_Asm/RuntimeHelpers/RuntimeHelpersImpl.cs b/source/Cosmos.Core_Asm/RuntimeHelpers/RuntimeHelpersImpl.cs
@@ -1,7 +1,7 @@
 using System;
 using Cosmos.IL2CPU.API;
 using Cosmos.IL2CPU.API.Attribs;
-using XSharp.Common;
+using XSharp;
 using CPUx86 = XSharp.Assembler.x86;
 
 namespace Cosmos.Core_Asm

diff --git a/source/Cosmos.Debug.Kernel.Plugs.Asm/Cosmos.Debug.Kernel.Plugs.Asm.csproj b/source/Cosmos.Debug.Kernel.Plugs.Asm/Cosmos.Debug.Kernel.Plugs.Asm.csproj
@@ -13,7 +13,7 @@
         <ProjectReference Include="..\..\..\IL2CPU\source\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />
         <ProjectReference Include="..\..\..\XSharp\source\XSharp.Assembler\XSharp.Assembler.csproj" />
         <ProjectReference Include="..\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-        <ProjectReference Include="..\..\..\XSharp\source\XSharp.Common\XSharp.Common.csproj" />
+        <ProjectReference Include="..\..\..\XSharp\source\XSharp\XSharp.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/source/Cosmos.Debug.Kernel.Plugs.Asm/DebuggerAsm.cs b/source/Cosmos.Debug.Kernel.Plugs.Asm/DebuggerAsm.cs
@@ -1,7 +1,7 @@
 using XSharp.Assembler;
 using Cosmos.IL2CPU.API;
 using Cosmos.IL2CPU.API.Attribs;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.Debug.Kernel.Plugs.Asm
 {

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Array/ArrayGetLengthAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Array/ArrayGetLengthAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.CPU_Asm
 {

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Array/ArrayInternalCopyAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Array/ArrayInternalCopyAsm.cs
@@ -1,6 +1,6 @@
 using XSharp.Assembler;
 using Cosmos.IL2CPU.API;
-using XSharp.Common;
+using XSharp;
 using CPUx86 = XSharp.Assembler.x86;
 
 namespace Cosmos.CPU_Asm

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUDisableINTsAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUDisableINTsAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.CPU_Asm {
     public class CPUDisableINTsAsm : AssemblerMethod

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUEnableINTsAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUEnableINTsAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.CPU_Asm {
     public class CPUEnableINTsAsm : AssemblerMethod

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUGetAmountOfRAMAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUGetAmountOfRAMAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.CPU_Asm {
     public class CPUGetAmountOfRAMAsm : AssemblerMethod

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUGetEndOfKernelAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUGetEndOfKernelAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.CPU_Asm {
     public class CPUGetEndOfKernelAsm : AssemblerMethod {

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUHaltAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUHaltAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.CPU_Asm {
     public class CPUHaltAsm : AssemblerMethod

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUInitFloatAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUInitFloatAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.CPU_Asm {
     public class CPUInitFloatAsm : AssemblerMethod

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUInitSSEAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUInitSSEAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.CPU_Asm {
     public class CPUInitSSEAsm : AssemblerMethod

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUUpdateIDTAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUUpdateIDTAsm.cs
@@ -5,8 +5,8 @@
 using XSharp.Assembler.x86;
 using Cosmos.CPU.x86;
 using Cosmos.IL2CPU.API.Attribs;
-using XSharp.Common;
-using static XSharp.Common.XSRegisters;
+using XSharp;
+using static XSharp.XSRegisters;
 
 namespace Cosmos.CPU_Asm {
     //TODO: This asm refs Hardware.. should not.. its a higher ring

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUZeroFillAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUZeroFillAsm.cs
@@ -1,5 +1,5 @@
 using XSharp.Assembler;
-using XSharp.Common;
+using XSharp;
 using x86 = XSharp.Assembler.x86;
 
 namespace Cosmos.CPU_Asm

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Cosmos.CPU_Asm.csproj b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Cosmos.CPU_Asm.csproj
@@ -22,7 +22,7 @@
         <ProjectReference PrivateAssets="All" Include="..\..\..\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
         <ProjectReference PrivateAssets="All" Include="..\..\..\..\..\IL2CPU\source\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />
         <ProjectReference PrivateAssets="All" Include="..\..\..\..\..\IL2CPU\source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj" />
-        <ProjectReference PrivateAssets="All" Include="..\..\..\..\..\XSharp\source\XSharp.Common\XSharp.Common.csproj" />
+        <ProjectReference PrivateAssets="All" Include="..\..\..\..\..\XSharp\source\XSharp\XSharp.csproj" />
         <ProjectReference PrivateAssets="All" Include="..\Cosmos.CPU.x86\Cosmos.CPU.x86.csproj" />
     </ItemGroup>
 

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateCtorAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateCtorAsm.cs
@@ -2,7 +2,7 @@
 using XSharp.Assembler;
 using Cosmos.IL2CPU;
 using Cosmos.IL2CPU.X86.IL;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.CPU_Asm {
     public class DelegateCtorAsm : AssemblerMethod {

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateGetMulticastInvokeAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateGetMulticastInvokeAsm.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using XSharp.Assembler;
 using Cosmos.IL2CPU;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.CPU_Asm {
     public class DelegateGetMulticastInvokeAsm : AssemblerMethod {

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateInvokeAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateInvokeAsm.cs
@@ -3,7 +3,7 @@
 using XSharp.Assembler;
 using Cosmos.IL2CPU;
 using Cosmos.IL2CPU.X86.IL;
-using XSharp.Common;
+using XSharp;
 using x86 = XSharp.Assembler.x86;
 
 // ReSharper disable once CheckNamespace

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/IOPortImpl.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/IOPortImpl.cs
@@ -2,7 +2,7 @@
 using XSharp.Assembler;
 using Cosmos.CPU.x86;
 using Cosmos.IL2CPU.API.Attribs;
-using XSharp.Common;
+using XSharp;
 
 namespace Cosmos.CPU_Asm
 {

diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/RuntimeHelpers/RuntimeHelpersImpl.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/RuntimeHelpers/RuntimeHelpersImpl.cs
@@ -1,7 +1,7 @@
 using System;
 using Cosmos.IL2CPU.API;
 using Cosmos.IL2CPU.API.Attribs;
-using XSharp.Common;
+using XSharp;
 using CPUx86 = XSharp.Assembler.x86;
 
 namespace Cosmos.CPU_Asm