dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-19 20:39:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge Cosmos.Core.Common

Browse source
This commit is contained in:
Kudzu 2017-07-13 14:38:23 -04:00
parent dea3fdf0ef
commit b4ef31c993
10 changed files with 4 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Cosmos.sln
View file

@ -1,4 +1,3 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
@ -51,8 +50,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Common", "source\Cos
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core", "source\Cosmos.Core\Cosmos.Core.csproj", "{9AF5BD03-8A49-49DC-A56E-3AE8DA6B0FF4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core.Common", "source\Cosmos.Core.Common\Cosmos.Core.Common.csproj", "{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System", "source\Cosmos.System\Cosmos.System.csproj", "{4AC1AFCE-C8CE-484D-AE22-F9EE27008FAF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{CFE37077-B9BD-4430-8DA0-F9F02DFD14C3}"
@ -319,14 +316,6 @@ Global
{9AF5BD03-8A49-49DC-A56E-3AE8DA6B0FF4}.Release|Any CPU.Build.0 = Release|Any CPU
{9AF5BD03-8A49-49DC-A56E-3AE8DA6B0FF4}.Release|x86.ActiveCfg = Release|Any CPU
{9AF5BD03-8A49-49DC-A56E-3AE8DA6B0FF4}.Release|x86.Build.0 = Release|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Debug|x86.ActiveCfg = Debug|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Debug|x86.Build.0 = Debug|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Release|Any CPU.Build.0 = Release|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Release|x86.ActiveCfg = Release|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Release|x86.Build.0 = Release|Any CPU
{4AC1AFCE-C8CE-484D-AE22-F9EE27008FAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4AC1AFCE-C8CE-484D-AE22-F9EE27008FAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4AC1AFCE-C8CE-484D-AE22-F9EE27008FAF}.Debug|x86.ActiveCfg = Debug|Any CPU
@ -691,7 +680,6 @@ Global
{9F5F046A-1BB1-4208-ADBE-C9417F2A8A48} = {65532163-618F-41F2-B39C-6F6022483158}
{09099C80-8262-486A-94A5-492F51B08823} = {170A7DE2-E899-4E92-A12B-E68876C9B2A5}
{9AF5BD03-8A49-49DC-A56E-3AE8DA6B0FF4} = {04B18FFC-8EA0-4E9F-9E1B-478527B19AFA}
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B} = {04B18FFC-8EA0-4E9F-9E1B-478527B19AFA}
{4AC1AFCE-C8CE-484D-AE22-F9EE27008FAF} = {0259702E-9575-4852-A641-5F9714A9C740}
{72EB557A-8A2D-4B0F-823E-C70A791831B5} = {E9CD521E-C386-466D-B5F7-A5EB19A61625}
{C4540C54-5A2E-4300-BDD7-0D1B44B78C36} = {04B18FFC-8EA0-4E9F-9E1B-478527B19AFA}

12
Kernel.sln
View file

@ -1,4 +1,3 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
@ -11,8 +10,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Common", "source\Cos
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core", "source\Cosmos.Core\Cosmos.Core.csproj", "{9AF5BD03-8A49-49DC-A56E-3AE8DA6B0FF4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core.Common", "source\Cosmos.Core.Common\Cosmos.Core.Common.csproj", "{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System", "source\Cosmos.System\Cosmos.System.csproj", "{4AC1AFCE-C8CE-484D-AE22-F9EE27008FAF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core.Memory", "source\Cosmos.Core.Memory\Cosmos.Core.Memory.csproj", "{C4540C54-5A2E-4300-BDD7-0D1B44B78C36}"
@ -82,14 +79,6 @@ Global
{9AF5BD03-8A49-49DC-A56E-3AE8DA6B0FF4}.Release|Any CPU.Build.0 = Release|Any CPU
{9AF5BD03-8A49-49DC-A56E-3AE8DA6B0FF4}.Release|x86.ActiveCfg = Release|Any CPU
{9AF5BD03-8A49-49DC-A56E-3AE8DA6B0FF4}.Release|x86.Build.0 = Release|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Debug|x86.ActiveCfg = Debug|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Debug|x86.Build.0 = Debug|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Release|Any CPU.Build.0 = Release|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Release|x86.ActiveCfg = Release|Any CPU
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B}.Release|x86.Build.0 = Release|Any CPU
{4AC1AFCE-C8CE-484D-AE22-F9EE27008FAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4AC1AFCE-C8CE-484D-AE22-F9EE27008FAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4AC1AFCE-C8CE-484D-AE22-F9EE27008FAF}.Debug|x86.ActiveCfg = Debug|Any CPU
@ -184,7 +173,6 @@ Global
{1425715D-1C93-44C7-8BB5-F124F195A41A} = {D651C346-95CF-4AE9-B309-DB2A1A512811}
{09099C80-8262-486A-94A5-492F51B08823} = {3CD3D9A5-9BC5-4FEB-8D63-4D535C0ABB78}
{9AF5BD03-8A49-49DC-A56E-3AE8DA6B0FF4} = {04B18FFC-8EA0-4E9F-9E1B-478527B19AFA}
{F9C7F437-4DC5-4E34-9843-74EC9DB37F4B} = {04B18FFC-8EA0-4E9F-9E1B-478527B19AFA}
{4AC1AFCE-C8CE-484D-AE22-F9EE27008FAF} = {0259702E-9575-4852-A641-5F9714A9C740}
{C4540C54-5A2E-4300-BDD7-0D1B44B78C36} = {04B18FFC-8EA0-4E9F-9E1B-478527B19AFA}
{1132E689-18B0-4D87-94E8-934D4802C540} = {04B18FFC-8EA0-4E9F-9E1B-478527B19AFA}

1
source/Cosmos.Build.Builder/CosmosTask.cs
View file

@ -305,7 +305,6 @@ namespace Cosmos.Build.Builder {
Section("Pack Kernel");
Pack(Path.Combine(mSourcePath, "Cosmos.Common"), xPackagesDir, xVersion);
Pack(Path.Combine(mSourcePath, "Cosmos.Core"), xPackagesDir, xVersion);
Pack(Path.Combine(mSourcePath, "Cosmos.Core.Common"), xPackagesDir, xVersion);
Pack(Path.Combine(mSourcePath, "Cosmos.Core.Memory"), xPackagesDir, xVersion);
Pack(Path.Combine(mSourcePath, "Cosmos.Core_Plugs"), xPackagesDir, xVersion);
Pack(Path.Combine(mSourcePath, "Cosmos.Core_Asm"), xPackagesDir, xVersion);

18
source/Cosmos.Core.Common/Cosmos.Core.Common.csproj
View file

@ -1,18 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.5</TargetFramework>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Cosmos.snk</AssemblyOriginatorKeyFile>
<Authors>Cosmos</Authors>
<Company>Cosmos</Company>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Cosmos.Common\Cosmos.Common.csproj" />
<ProjectReference Include="..\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
<ProjectReference Include="..\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />
</ItemGroup>
</Project>

3
source/Cosmos.Core.Common/Properties/AssemblyInfo.cs
View file

@ -1,3 +0,0 @@
using Cosmos.Common;
[assembly: Ring(Ring.Core)]

1
source/Cosmos.Core.Memory/Cosmos.Core.Memory.csproj
View file

@ -11,7 +11,6 @@
<ItemGroup>
<ProjectReference Include="..\Cosmos.Common\Cosmos.Common.csproj" />
<ProjectReference Include="..\Cosmos.Core.Common\Cosmos.Core.Common.csproj" />
<ProjectReference Include="..\Cosmos.Core\Cosmos.Core.csproj" />
<ProjectReference Include="..\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
</ItemGroup>

3
source/Cosmos.Core/Cosmos.Core.csproj
View file

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.5</TargetFramework>
@ -11,7 +11,6 @@
<ItemGroup>
<ProjectReference Include="..\Cosmos.Common\Cosmos.Common.csproj" />
<ProjectReference Include="..\Cosmos.Core.Common\Cosmos.Core.Common.csproj" />
<ProjectReference Include="..\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
<ProjectReference Include="..\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />
</ItemGroup>

3
source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj
View file

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.5</TargetFramework>
@ -16,7 +16,6 @@
<ItemGroup>
<ProjectReference Include="..\Cosmos.Assembler\Cosmos.Assembler.csproj" />
<ProjectReference Include="..\Cosmos.Common\Cosmos.Common.csproj" />
<ProjectReference Include="..\Cosmos.Core.Common\Cosmos.Core.Common.csproj" />
<ProjectReference Include="..\Cosmos.Core\Cosmos.Core.csproj" />
<ProjectReference Include="..\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
<ProjectReference Include="..\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />

3
source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj
View file

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.5</TargetFramework>
@ -15,7 +15,6 @@
<ItemGroup>
<ProjectReference Include="..\Cosmos.Common\Cosmos.Common.csproj" />
<ProjectReference Include="..\Cosmos.Core.Common\Cosmos.Core.Common.csproj" />
<ProjectReference Include="..\Cosmos.Core.Memory\Cosmos.Core.Memory.csproj" />
<ProjectReference Include="..\Cosmos.Core\Cosmos.Core.csproj" />
<ProjectReference Include="..\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />

3
source/Cosmos.HAL/Cosmos.HAL.csproj
View file

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.5</TargetFramework>
@ -10,7 +10,6 @@
<ItemGroup>
<ProjectReference Include="..\Cosmos.Common\Cosmos.Common.csproj" />
<ProjectReference Include="..\Cosmos.Core.Common\Cosmos.Core.Common.csproj" />
<ProjectReference Include="..\Cosmos.Core\Cosmos.Core.csproj" />
<ProjectReference Include="..\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
<ProjectReference Include="..\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />