diff --git a/Cosmos.sln b/Cosmos.sln index ea1ba9b34..7b204e1aa 100644 --- a/Cosmos.sln +++ b/Cosmos.sln @@ -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} diff --git a/Kernel.sln b/Kernel.sln index 15bb28fbf..cf2c9e323 100644 --- a/Kernel.sln +++ b/Kernel.sln @@ -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} diff --git a/source/Cosmos.Build.Builder/CosmosTask.cs b/source/Cosmos.Build.Builder/CosmosTask.cs index 91030a53a..b1caba03f 100644 --- a/source/Cosmos.Build.Builder/CosmosTask.cs +++ b/source/Cosmos.Build.Builder/CosmosTask.cs @@ -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); diff --git a/source/Cosmos.Core.Common/Cosmos.Core.Common.csproj b/source/Cosmos.Core.Common/Cosmos.Core.Common.csproj deleted file mode 100644 index 36d4818dc..000000000 --- a/source/Cosmos.Core.Common/Cosmos.Core.Common.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netstandard1.5 - True - True - ..\..\Cosmos.snk - Cosmos - Cosmos - - - - - - - - - diff --git a/source/Cosmos.Core.Common/Properties/AssemblyInfo.cs b/source/Cosmos.Core.Common/Properties/AssemblyInfo.cs deleted file mode 100644 index 1bc771e09..000000000 --- a/source/Cosmos.Core.Common/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using Cosmos.Common; - -[assembly: Ring(Ring.Core)] diff --git a/source/Cosmos.Core.Memory/Cosmos.Core.Memory.csproj b/source/Cosmos.Core.Memory/Cosmos.Core.Memory.csproj index 707598cbf..1d9d26095 100644 --- a/source/Cosmos.Core.Memory/Cosmos.Core.Memory.csproj +++ b/source/Cosmos.Core.Memory/Cosmos.Core.Memory.csproj @@ -11,7 +11,6 @@ - diff --git a/source/Cosmos.Core/Cosmos.Core.csproj b/source/Cosmos.Core/Cosmos.Core.csproj index d2d3abb7a..737d71eac 100644 --- a/source/Cosmos.Core/Cosmos.Core.csproj +++ b/source/Cosmos.Core/Cosmos.Core.csproj @@ -1,4 +1,4 @@ - + netstandard1.5 @@ -11,7 +11,6 @@ - diff --git a/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj b/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj index d0ddf85db..5d1ef435e 100644 --- a/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj +++ b/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj @@ -1,4 +1,4 @@ - + netstandard1.5 @@ -16,7 +16,6 @@ - diff --git a/source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj b/source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj index 02fc590e4..64478437b 100644 --- a/source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj +++ b/source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj @@ -1,4 +1,4 @@ - + netstandard1.5 @@ -15,7 +15,6 @@ - diff --git a/source/Cosmos.HAL/Cosmos.HAL.csproj b/source/Cosmos.HAL/Cosmos.HAL.csproj index 3441eadeb..ed44fdfe7 100644 --- a/source/Cosmos.HAL/Cosmos.HAL.csproj +++ b/source/Cosmos.HAL/Cosmos.HAL.csproj @@ -1,4 +1,4 @@ - + netstandard1.5 @@ -10,7 +10,6 @@ -