diff --git a/Build.sln b/Build.sln index 4aa25fcdb3..791d2be6d2 100644 --- a/Build.sln +++ b/Build.sln @@ -103,7 +103,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test Runner", "Test Runner" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.TestRunner.TestController", "Tests\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj", "{2EEC1BF8-758F-4D9D-B063-8CF005468B24}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RingCheck", "source\RingCheck\RingCheck.csproj", "{0EE3DF1C-44E6-4669-88AA-D8D2612DA817}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheRingMaster", "source\TheRingMaster\TheRingMaster.csproj", "{0EE3DF1C-44E6-4669-88AA-D8D2612DA817}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{3C4B0261-3B1D-4503-97F1-AC0252D500E6}" EndProject diff --git a/IL2CPU.sln b/IL2CPU.sln index 6f142776b3..16a72e77b4 100644 --- a/IL2CPU.sln +++ b/IL2CPU.sln @@ -32,7 +32,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core.DebugStub", "so EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Kernel", "source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj", "{EDE13333-B2E6-4E04-B995-209B8BDFA9D4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RingCheck", "source\RingCheck\RingCheck.csproj", "{CCC115FA-1E7E-4013-95C2-B43FCCF27DFF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheRingMaster", "source\TheRingMaster\TheRingMaster.csproj", "{CCC115FA-1E7E-4013-95C2-B43FCCF27DFF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Test.sln b/Test.sln index 6bcc51fd2f..0658758f3f 100644 --- a/Test.sln +++ b/Test.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26724.1 +VisualStudioVersion = 15.0.26730.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assembler", "Assembler", "{BBB4022B-CC17-4A35-8881-65657260442F}" EndProject @@ -154,6 +154,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU_Plugs", "source\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU_Asm", "source\Kernel-X86\10-CPU\Cosmos.CPU_Asm\Cosmos.CPU_Asm.csproj", "{0C7C9F9D-6498-45E8-B77B-FF4D381C3297}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheRingMaster", "source\TheRingMaster\TheRingMaster.csproj", "{3DD192AF-2D72-449F-936C-ED8734225B18}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -523,22 +525,6 @@ Global {16ECD6DE-6F65-4A5C-8B49-A29782D9D057}.Release|Any CPU.Build.0 = Release|Any CPU {16ECD6DE-6F65-4A5C-8B49-A29782D9D057}.Release|x86.ActiveCfg = Release|Any CPU {16ECD6DE-6F65-4A5C-8B49-A29782D9D057}.Release|x86.Build.0 = Release|Any CPU - {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Debug|x86.ActiveCfg = Debug|Any CPU - {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Debug|x86.Build.0 = Debug|Any CPU - {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Release|Any CPU.Build.0 = Release|Any CPU - {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Release|x86.ActiveCfg = Release|Any CPU - {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Release|x86.Build.0 = Release|Any CPU - {9E58E949-7B71-45ED-9610-11DA287EE933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E58E949-7B71-45ED-9610-11DA287EE933}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E58E949-7B71-45ED-9610-11DA287EE933}.Debug|x86.ActiveCfg = Debug|Any CPU - {9E58E949-7B71-45ED-9610-11DA287EE933}.Debug|x86.Build.0 = Debug|Any CPU - {9E58E949-7B71-45ED-9610-11DA287EE933}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E58E949-7B71-45ED-9610-11DA287EE933}.Release|Any CPU.Build.0 = Release|Any CPU - {9E58E949-7B71-45ED-9610-11DA287EE933}.Release|x86.ActiveCfg = Release|Any CPU - {9E58E949-7B71-45ED-9610-11DA287EE933}.Release|x86.Build.0 = Release|Any CPU {F588033A-6B7D-4ABF-96C4-73D8B2271A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F588033A-6B7D-4ABF-96C4-73D8B2271A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU {F588033A-6B7D-4ABF-96C4-73D8B2271A6B}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -547,6 +533,22 @@ Global {F588033A-6B7D-4ABF-96C4-73D8B2271A6B}.Release|Any CPU.Build.0 = Release|Any CPU {F588033A-6B7D-4ABF-96C4-73D8B2271A6B}.Release|x86.ActiveCfg = Release|Any CPU {F588033A-6B7D-4ABF-96C4-73D8B2271A6B}.Release|x86.Build.0 = Release|Any CPU + {9E58E949-7B71-45ED-9610-11DA287EE933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9E58E949-7B71-45ED-9610-11DA287EE933}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9E58E949-7B71-45ED-9610-11DA287EE933}.Debug|x86.ActiveCfg = Debug|Any CPU + {9E58E949-7B71-45ED-9610-11DA287EE933}.Debug|x86.Build.0 = Debug|Any CPU + {9E58E949-7B71-45ED-9610-11DA287EE933}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9E58E949-7B71-45ED-9610-11DA287EE933}.Release|Any CPU.Build.0 = Release|Any CPU + {9E58E949-7B71-45ED-9610-11DA287EE933}.Release|x86.ActiveCfg = Release|Any CPU + {9E58E949-7B71-45ED-9610-11DA287EE933}.Release|x86.Build.0 = Release|Any CPU + {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Debug|x86.ActiveCfg = Debug|Any CPU + {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Debug|x86.Build.0 = Debug|Any CPU + {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Release|Any CPU.Build.0 = Release|Any CPU + {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Release|x86.ActiveCfg = Release|Any CPU + {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C}.Release|x86.Build.0 = Release|Any CPU {756ECECD-B213-42F0-BF58-4A91B4C47FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {756ECECD-B213-42F0-BF58-4A91B4C47FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU {756ECECD-B213-42F0-BF58-4A91B4C47FAA}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -571,6 +573,14 @@ Global {0C7C9F9D-6498-45E8-B77B-FF4D381C3297}.Release|Any CPU.Build.0 = Release|Any CPU {0C7C9F9D-6498-45E8-B77B-FF4D381C3297}.Release|x86.ActiveCfg = Release|Any CPU {0C7C9F9D-6498-45E8-B77B-FF4D381C3297}.Release|x86.Build.0 = Release|Any CPU + {3DD192AF-2D72-449F-936C-ED8734225B18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DD192AF-2D72-449F-936C-ED8734225B18}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3DD192AF-2D72-449F-936C-ED8734225B18}.Debug|x86.ActiveCfg = Debug|Any CPU + {3DD192AF-2D72-449F-936C-ED8734225B18}.Debug|x86.Build.0 = Debug|Any CPU + {3DD192AF-2D72-449F-936C-ED8734225B18}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3DD192AF-2D72-449F-936C-ED8734225B18}.Release|Any CPU.Build.0 = Release|Any CPU + {3DD192AF-2D72-449F-936C-ED8734225B18}.Release|x86.ActiveCfg = Release|Any CPU + {3DD192AF-2D72-449F-936C-ED8734225B18}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -633,16 +643,17 @@ Global {DE38917F-969B-486C-AF83-C59E5E52400A} = {99192440-2DD7-4E71-B730-D44A73F46533} {02FF94AF-6BA3-49ED-A027-A63F591C310D} = {99192440-2DD7-4E71-B730-D44A73F46533} {DD3367EF-D6B9-405C-AEB0-5E724C48F87D} = {99192440-2DD7-4E71-B730-D44A73F46533} + {1FC213DE-5033-40E1-9C16-5F1A0CDC9693} = {99192440-2DD7-4E71-B730-D44A73F46533} {4D219A6D-4528-4622-AF29-96F830C4D076} = {29B893F7-6C0F-4710-A60E-7FB3498BCA63} {6CBABA8D-4207-4E1E-8122-63DB51D25F18} = {B4CB7BF5-CADF-4056-9C09-EAAC50BC76C0} {16ECD6DE-6F65-4A5C-8B49-A29782D9D057} = {E4299234-8323-43F6-B684-350A1232746B} - {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C} = {DD3367EF-D6B9-405C-AEB0-5E724C48F87D} - {9E58E949-7B71-45ED-9610-11DA287EE933} = {02FF94AF-6BA3-49ED-A027-A63F591C310D} {F588033A-6B7D-4ABF-96C4-73D8B2271A6B} = {DE38917F-969B-486C-AF83-C59E5E52400A} + {9E58E949-7B71-45ED-9610-11DA287EE933} = {02FF94AF-6BA3-49ED-A027-A63F591C310D} + {34AFAD8A-EBF0-4278-A99F-A33CA0094E7C} = {DD3367EF-D6B9-405C-AEB0-5E724C48F87D} {756ECECD-B213-42F0-BF58-4A91B4C47FAA} = {1FC213DE-5033-40E1-9C16-5F1A0CDC9693} {C000BFB2-DFDE-4B1E-BDA6-988B30370C7A} = {1FC213DE-5033-40E1-9C16-5F1A0CDC9693} {0C7C9F9D-6498-45E8-B77B-FF4D381C3297} = {29B893F7-6C0F-4710-A60E-7FB3498BCA63} - {1FC213DE-5033-40E1-9C16-5F1A0CDC9693} = {99192440-2DD7-4E71-B730-D44A73F46533} + {3DD192AF-2D72-449F-936C-ED8734225B18} = {C286932C-3F6D-47F0-BEEF-26843D1BB11B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4418C803-277E-448F-A0A0-52788FA215AD} diff --git a/source/Cosmos.Build.MSBuild/Cosmos.targets b/source/Cosmos.Build.MSBuild/Cosmos.targets index 48de31617a..931595d1dd 100644 --- a/source/Cosmos.Build.MSBuild/Cosmos.targets +++ b/source/Cosmos.Build.MSBuild/Cosmos.targets @@ -37,13 +37,13 @@ - - - - - - - + + + + + + + @@ -55,20 +55,20 @@ - - + + - - + + - + diff --git a/source/Cosmos.Build.MSBuild/RingCheck.cs b/source/Cosmos.Build.MSBuild/TheRingMaster.cs similarity index 100% rename from source/Cosmos.Build.MSBuild/RingCheck.cs rename to source/Cosmos.Build.MSBuild/TheRingMaster.cs diff --git a/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Cosmos.Platform.PC.csproj b/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Cosmos.Platform.PC.csproj index b8d136b4dd..eb1a163654 100644 --- a/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Cosmos.Platform.PC.csproj +++ b/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Cosmos.Platform.PC.csproj @@ -2,6 +2,10 @@ netstandard1.5 + True + Cosmos.snk + Cosmos + Cosmos diff --git a/source/Kernel-X86/30-HAL/Cosmos.HAL/Cosmos.HAL.csproj b/source/Kernel-X86/30-HAL/Cosmos.HAL/Cosmos.HAL.csproj index 2d7cec9443..1da9301b1b 100644 --- a/source/Kernel-X86/30-HAL/Cosmos.HAL/Cosmos.HAL.csproj +++ b/source/Kernel-X86/30-HAL/Cosmos.HAL/Cosmos.HAL.csproj @@ -2,6 +2,10 @@ netstandard1.5 + True + Cosmos.snk + Cosmos + Cosmos diff --git a/source/Kernel-X86/40-System/Cosmos.System/Cosmos.System.csproj b/source/Kernel-X86/40-System/Cosmos.System/Cosmos.System.csproj index b44d4a6ca4..8e9a7d4fee 100644 --- a/source/Kernel-X86/40-System/Cosmos.System/Cosmos.System.csproj +++ b/source/Kernel-X86/40-System/Cosmos.System/Cosmos.System.csproj @@ -2,6 +2,10 @@ netstandard1.5 + True + Cosmos.snk + Cosmos + Cosmos diff --git a/source/Kernel-X86/90-Shared/Cosmos.Shared/Cosmos.Shared.csproj b/source/Kernel-X86/90-Shared/Cosmos.Shared/Cosmos.Shared.csproj index 22361d48cb..9a45910f10 100644 --- a/source/Kernel-X86/90-Shared/Cosmos.Shared/Cosmos.Shared.csproj +++ b/source/Kernel-X86/90-Shared/Cosmos.Shared/Cosmos.Shared.csproj @@ -2,6 +2,10 @@ netstandard1.5 + True + Cosmos.snk + Cosmos + Cosmos \ No newline at end of file diff --git a/source/RingCheck/Program.cs b/source/TheRingMaster/Program.cs similarity index 72% rename from source/RingCheck/Program.cs rename to source/TheRingMaster/Program.cs index 183173dd53..bb5b52f437 100644 --- a/source/RingCheck/Program.cs +++ b/source/TheRingMaster/Program.cs @@ -1,7 +1,7 @@ using System; using System.Text; -namespace RingCheck +namespace TheRingMaster { class Program { @@ -9,7 +9,7 @@ static void Main(string[] args) { if (args.Length != 1) { - Console.WriteLine("Usage: ringcheck "); + Console.WriteLine("Usage: theringmaster "); return; } diff --git a/source/RingCheck/RingCheck.csproj b/source/TheRingMaster/TheRingMaster.csproj similarity index 100% rename from source/RingCheck/RingCheck.csproj rename to source/TheRingMaster/TheRingMaster.csproj