g3

Kutyus · Jul 30, 2017 · 65f96f8 · 65f96f8
1 parent aa67985
commit 65f96f8
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 32 deletions.
diff --git a/Cosmos.sln b/Cosmos.sln
@@ -181,23 +181,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "80 System", "80 System", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "90 Application", "90 Application", "{B7D2F094-E6D8-43F0-9767-05D44D67F4EE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU", "source\Kernel\Cosmos.CPU\Cosmos.CPU.csproj", "{F52D0F4C-C11F-4E1C-AE7C-65351AF1D4B0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU", "source\Kernel-X86\00-CPU\Cosmos.CPU\Cosmos.CPU.csproj", "{F52D0F4C-C11F-4E1C-AE7C-65351AF1D4B0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Platform", "source\Kernel\Cosmos.Platform\Cosmos.Platform.csproj", "{F027A41F-32AF-47E8-894C-51CAF7079BEE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Platform", "source\Kernel-X86\10-Platform\Cosmos.Platform\Cosmos.Platform.csproj", "{F027A41F-32AF-47E8-894C-51CAF7079BEE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.HAL", "source\Kernel\Cosmos.HAL\Cosmos.HAL.csproj", "{EB682871-15A5-479C-8577-7890B6BC9DBB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.HAL", "source\Kernel-X86\20-HAL\Cosmos.HAL\Cosmos.HAL.csproj", "{EB682871-15A5-479C-8577-7890B6BC9DBB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System", "source\Kernel\80-System\Cosmos.System\Cosmos.System.csproj", "{C8E4085A-BECE-4F66-A66F-0734FC5D7DA6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System", "source\Kernel-X86\80-System\Cosmos.System\Cosmos.System.csproj", "{C8E4085A-BECE-4F66-A66F-0734FC5D7DA6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System_Plugs", "source\Kernel\Cosmos.System_Plugs\Cosmos.System3_Plugs.csproj", "{9B607855-13D6-4714-8D12-A2B6B0C66E67}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System_Plugs", "source\Kernel-X86\Cosmos.System_Plugs\Cosmos.System3_Plugs.csproj", "{9B607855-13D6-4714-8D12-A2B6B0C66E67}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GuessKernelGen3", "Demos\GuessG3\GuessKernelGen3.csproj", "{9E58E949-7B71-45ED-9610-11DA287EE933}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "source\Kernel\ConsoleApp1\Test.csproj", "{BE6476D7-19F6-459B-878E-38C5754EEA97}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "source\Kernel-X86\ConsoleApp1\Test.csproj", "{BE6476D7-19F6-459B-878E-38C5754EEA97}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "99 Shared", "99 Shared", "{17E3D4A9-7790-43C2-9E4B-B6BB2ECEC7C5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Shared", "source\Kernel\Cosmos.Shared\Cosmos.Shared.csproj", "{6652628A-5912-43A8-BAC6-5F9AD72AA0DC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Shared", "source\Kernel-X86\99-Shared\Cosmos.Shared\Cosmos.Shared.csproj", "{6652628A-5912-43A8-BAC6-5F9AD72AA0DC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Kernel.sln b/Kernel.sln
@@ -46,11 +46,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core.DebugStub", "so
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kernel G3", "Kernel G3", "{00F0CA9C-51B2-4E99-B4D9-DD24D488D3FC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Shared", "source\Kernel-X86\99-Shared\Cosmos.Shared\Cosmos.Shared.csproj", "{4DCF5D4A-29C3-4D14-82E8-B13C55A93F31}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Shared", "source\Kernel-X86\99-Shared\99-Shared\Cosmos.Shared\Cosmos.Shared.csproj", "{4DCF5D4A-29C3-4D14-82E8-B13C55A93F31}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU", "source\Kernel-X86\00-CPU\Cosmos.CPU\Cosmos.CPU.csproj", "{FC65D765-990D-4F00-B240-8DD17FA91EA9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU", "source\Kernel-X86\00-CPU\00-CPU\Cosmos.CPU\Cosmos.CPU.csproj", "{FC65D765-990D-4F00-B240-8DD17FA91EA9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Platform", "source\Kernel-X86\10-Platform\Cosmos.Platform\Cosmos.Platform.csproj", "{63843265-D889-47D2-883E-595289C99F42}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Platform", "source\Kernel-X86\10-Platform\10-Platform\Cosmos.Platform\Cosmos.Platform.csproj", "{63843265-D889-47D2-883E-595289C99F42}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System", "source\Kernel-X86\80-System\Cosmos.System\Cosmos.System.csproj", "{F8BF6943-B69D-4549-9C16-75146616E19C}"
 EndProject
@@ -70,7 +70,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Assembler", "source\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Common", "source\XSharp.Common\XSharp.Common.csproj", "{F785B091-7E4D-4D2E-A310-B18690623F74}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.HAL", "source\Kernel-X86\20-HAL\Cosmos.HAL\Cosmos.HAL.csproj", "{3F8EDE0E-61BD-4D01-95F5-4A5A17F6221E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.HAL", "source\Kernel-X86\20-HAL\20-HAL\Cosmos.HAL\Cosmos.HAL.csproj", "{3F8EDE0E-61BD-4D01-95F5-4A5A17F6221E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU", "source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj", "{47F9D446-ACD4-489A-AD6D-A46A19247E2F}"
 EndProject

diff --git a/Test.sln b/Test.sln
@@ -134,23 +134,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "90 Application", "90 Applic
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "99 Shared", "99 Shared", "{DD3367EF-D6B9-405C-AEB0-5E724C48F87D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU", "source\Kernel\Cosmos.CPU\Cosmos.CPU.csproj", "{4D219A6D-4528-4622-AF29-96F830C4D076}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU", "source\Kernel-X86\00-CPU\Cosmos.CPU\Cosmos.CPU.csproj", "{4D219A6D-4528-4622-AF29-96F830C4D076}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Platform", "source\Kernel\Cosmos.Platform\Cosmos.Platform.csproj", "{6CBABA8D-4207-4E1E-8122-63DB51D25F18}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Platform", "source\Kernel-X86\10-Platform\Cosmos.Platform\Cosmos.Platform.csproj", "{6CBABA8D-4207-4E1E-8122-63DB51D25F18}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.HAL", "source\Kernel\Cosmos.HAL\Cosmos.HAL.csproj", "{16ECD6DE-6F65-4A5C-8B49-A29782D9D057}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.HAL", "source\Kernel-X86\20-HAL\Cosmos.HAL\Cosmos.HAL.csproj", "{16ECD6DE-6F65-4A5C-8B49-A29782D9D057}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Shared", "source\Kernel\Cosmos.Shared\Cosmos.Shared.csproj", "{34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Shared", "source\Kernel-X86\99-Shared\Cosmos.Shared\Cosmos.Shared.csproj", "{34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GuessKernelGen3", "Demos\GuessG3\GuessKernelGen3.csproj", "{9E58E949-7B71-45ED-9610-11DA287EE933}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GuessKernelGen3", "source\Kernel-X86\90-Application\GuessKernelGen3.csproj", "{9E58E949-7B71-45ED-9610-11DA287EE933}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System", "source\Kernel\80-System\Cosmos.System\Cosmos.System.csproj", "{F588033A-6B7D-4ABF-96C4-73D8B2271A6B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System", "source\Kernel-X86\80-System\Cosmos.System\Cosmos.System.csproj", "{F588033A-6B7D-4ABF-96C4-73D8B2271A6B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System_Plugs", "source\Kernel\80-System\Cosmos.System_Plugs\Cosmos.System_Plugs.csproj", "{756ECECD-B213-42F0-BF58-4A91B4C47FAA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System_Plugs", "source\Kernel-X86\80-System\Cosmos.System_Plugs\Cosmos.System_Plugs.csproj", "{756ECECD-B213-42F0-BF58-4A91B4C47FAA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU_Plugs", "source\Kernel\00-CPU\Cosmos.CPU_Plugs\Cosmos.CPU_Plugs.csproj", "{C000BFB2-DFDE-4B1E-BDA6-988B30370C7A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU_Plugs", "source\Kernel-X86\00-CPU\Cosmos.CPU_Plugs\Cosmos.CPU_Plugs.csproj", "{C000BFB2-DFDE-4B1E-BDA6-988B30370C7A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU_Asm", "source\Kernel\00-CPU\Cosmos.CPU_Asm\Cosmos.CPU_Asm.csproj", "{0C7C9F9D-6498-45E8-B77B-FF4D381C3297}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU_Asm", "source\Kernel-X86\00-CPU\Cosmos.CPU_Asm\Cosmos.CPU_Asm.csproj", "{0C7C9F9D-6498-45E8-B77B-FF4D381C3297}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj b/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj
@@ -13,7 +13,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\Demos\GuessG3\GuessKernelGen3.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.Assembler\Cosmos.Assembler.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.Build.Common\Cosmos.Build.Common.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.Core_Asm\Cosmos.Core_Asm.csproj" />
@@ -27,8 +26,9 @@
         <ProjectReference Include="..\..\source\Cosmos.System2_Plugs\Cosmos.System2_Plugs.csproj" />
         <ProjectReference Include="..\..\source\Kernel-X86\00-CPU\Cosmos.CPU_Asm\Cosmos.CPU_Asm.csproj" />
         <ProjectReference Include="..\..\source\Kernel-X86\00-CPU\Cosmos.CPU_Plugs\Cosmos.CPU_Plugs.csproj" />
+        <ProjectReference Include="..\..\source\Kernel-X86\10-Platform\Cosmos.Platform\Cosmos.Platform.csproj" />
         <ProjectReference Include="..\..\source\Kernel-X86\80-System\Cosmos.System_Plugs\Cosmos.System_Plugs.csproj" />
-        <ProjectReference Include="..\..\source\Kernel-X86\Cosmos.Platform\Cosmos.Platform.csproj" />
+        <ProjectReference Include="..\..\source\Kernel-X86\90-Application\GuessKernelGen3.csproj" />
         <ProjectReference Include="..\BoxingTests\BoxingTests.csproj" />
         <ProjectReference Include="..\Cosmos.Compiler.Tests.Bcl\Cosmos.Compiler.Tests.Bcl.csproj" />
         <ProjectReference Include="..\Cosmos.Compiler.Tests.Encryption\Cosmos.Compiler.Tests.Encryption.csproj" />

diff --git a/source/Kernel-X86/20-HAL/Cosmos.HAL/Cosmos.HAL.csproj b/source/Kernel-X86/20-HAL/Cosmos.HAL/Cosmos.HAL.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Cosmos.Shared\Cosmos.Shared.csproj" />
+    <ProjectReference Include="..\..\99-Shared\Cosmos.Shared\Cosmos.Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/source/Kernel-X86/80-System/Cosmos.System_Plugs/Cosmos.System_Plugs.csproj b/source/Kernel-X86/80-System/Cosmos.System_Plugs/Cosmos.System_Plugs.csproj
@@ -9,10 +9,6 @@
         <RootNamespace>Cosmos.System_Plugs</RootNamespace>
     </PropertyGroup>
 
-    <ItemGroup>
-      <Folder Include="Properties\" />
-    </ItemGroup>
-
     <ItemGroup>
       <ProjectReference Include="..\..\..\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />
     </ItemGroup>

diff --git a/source/Kernel-X86/90-Application/GuessKernelGen3.csproj b/source/Kernel-X86/90-Application/GuessKernelGen3.csproj
@@ -10,13 +10,8 @@
   </ItemGroup>
 
   <ItemGroup>
-<<<<<<< HEAD
     <ProjectReference Include="..\00-CPU\Cosmos.CPU\Cosmos.CPU.csproj" />
     <ProjectReference Include="..\80-System\Cosmos.System\Cosmos.System.csproj" />
-=======
-    <ProjectReference Include="..\..\source\Kernel-X86\80-System\Cosmos.System\Cosmos.System.csproj" />
-    <ProjectReference Include="..\..\source\Kernel-X86\Cosmos.CPU\Cosmos.CPU.csproj" />
->>>>>>> 5e02740c76808c69d0752d1f9ae3fa6439efeed8
   </ItemGroup>
 
 </Project>