From 92ab366223e8f1dcdde05c0d7aa99bfeb281bc16 Mon Sep 17 00:00:00 2001 From: Kudzu Date: Thu, 22 Jun 2017 11:39:22 -0400 Subject: [PATCH] Kernel sln work --- Build/ReadMe.txt | 8 + Kernel.sln | 224 ++---------------- Solutions - Readme.txt | 25 +- .../Cosmos.Kernel.Tests.Fat.csproj | 7 +- .../Cosmos.Kernel.Tests.IO.csproj | 7 +- .../Cosmos.Core.Plugs.Asm.csproj | 1 + 6 files changed, 50 insertions(+), 222 deletions(-) create mode 100644 Build/ReadMe.txt diff --git a/Build/ReadMe.txt b/Build/ReadMe.txt new file mode 100644 index 000000000..c645eb2ec --- /dev/null +++ b/Build/ReadMe.txt @@ -0,0 +1,8 @@ +Bin +-Often may appear to be a copy of VSIP but is used to provide bin refs to projs in SLN files. +-Separate from VSIP to allow updating without worry about locks caused by VS in VSIP. Allows +files to be updated independently for running and without need to update VS just because a +common file is locked. + +VSIP +-Bin outpout of Builder for VS to use for VSIP etc diff --git a/Kernel.sln b/Kernel.sln index 17e68d13a..e7b2cd002 100644 --- a/Kernel.sln +++ b/Kernel.sln @@ -37,59 +37,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2 System", "2 System", "{02 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{170A7DE2-E899-4E92-A12B-E68876C9B2A5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debug", "Debug", "{65532163-618F-41F2-B39C-6F6022483158}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler", "Compiler", "{ECEA7778-E786-4317-90B9-A2D4427CB91C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kernel", "Kernel", "{29EEC029-6A2B-478A-B6E5-D63A91388ABA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test Runner", "Test Runner", "{0E67EFE8-5944-4F6C-8B47-C5E06D4C79F5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unit Tests", "Unit Tests", "{52D81759-C7CC-427F-8C96-89CA10C914B5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BoxingTests", "Tests\BoxingTests\BoxingTests.csproj", "{39D2CC10-CD6B-4BC3-B42C-CA26004D38EB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.TestRunner", "Tests\Cosmos.TestRunner\Cosmos.TestRunner.csproj", "{63C45839-60B2-41BC-973E-C2EF11F33E34}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.TestRunner.Core", "Tests\Cosmos.TestRunner.Core\Cosmos.TestRunner.Core.csproj", "{EDDF5700-D198-491B-B94C-D63916F8BA70}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.TestRunner.TestController", "Tests\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj", "{3402C6D1-4F86-42C4-881E-DA69FD851CD9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Compiler.Tests.Bcl", "Tests\Cosmos.Compiler.Tests.Bcl\Cosmos.Compiler.Tests.Bcl.csproj", "{8CB21203-0659-473A-8C7E-D5B178F00041}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Compiler.Tests.Encryption", "Tests\Cosmos.Compiler.Tests.Encryption\Cosmos.Compiler.Tests.Encryption.csproj", "{8F2B0616-46D1-4BC2-95EE-AB9533E676D0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Compiler.Tests.Interfaces", "Tests\Cosmos.Compiler.Tests.Interfaces\Cosmos.Compiler.Tests.Interfaces.csproj", "{E78BE459-4E5F-4830-911A-9E23B9981410}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Compiler.Tests.Exceptions", "Tests\Cosmos.Compiler.Tests.Exceptions\Cosmos.Compiler.Tests.Exceptions.csproj", "{73BB6747-106D-44EE-BE78-21238A7510C1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Kernel.Tests.Fat", "Tests\Cosmos.Kernel.Tests.Fat\Cosmos.Kernel.Tests.Fat.csproj", "{6575A354-AB4D-4BD1-989C-DAD9E725E5EB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Compiler.Tests.LinqTests", "Tests\Cosmos.Compiler.Tests.LinqTests\Cosmos.Compiler.Tests.LinqTests.csproj", "{A53DB67C-4369-4712-9AE3-80801165B634}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VGACompilerCrash", "Tests\VGACompilerCrash\VGACompilerCrash.csproj", "{EA3500C5-A83A-4570-9B42-71D06A1D890F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleStructsAndArraysTest", "Tests\SimpleStructsAndArraysTest\SimpleStructsAndArraysTest.csproj", "{AD34EE2D-9665-402E-A349-554330D1A970}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Compiler.Tests.MethodTests", "Tests\Cosmos.Compiler.Tests.MethodTests\Cosmos.Compiler.Tests.MethodTests.csproj", "{D42E1F90-D9D5-4882-9103-758840382574}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Kernel.Tests.IO", "Tests\Cosmos.Kernel.Tests.IO\Cosmos.Kernel.Tests.IO.csproj", "{1B72C465-A0F6-4865-836B-2334E3F3376F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Compiler.Tests.SimpleWriteLine", "Tests\Cosmos.Compiler.Tests.SimpleWriteLine\Cosmos.Compiler.Tests.SimpleWriteLine.csproj", "{FBF70A52-95FC-4715-BFC4-4B509BF107D1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Compiler.Tests.SingleEchoTest", "Tests\Cosmos.Compiler.Tests.SingleEchoTest\Cosmos.Compiler.Tests.SingleEchoTest.csproj", "{361F9108-91F2-4C9F-BE90-12732DF72B8D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FD6DCBF5-6451-4CA0-BD5D-5637BC846929}" ProjectSection(SolutionItems) = preProject nuget.config = nuget.config EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.TestRunner.UI", "Tests\Cosmos.TestRunner.UI\Cosmos.TestRunner.UI.csproj", "{0B20C26F-CA92-4D88-8211-EC7B0A261337}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.TestRunner.UnitTest", "Tests\Cosmos.TestRunner.UnitTest\Cosmos.TestRunner.UnitTest.csproj", "{6D59FC7A-6F27-4140-BA41-F89126490C4C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicTest", "Tests\GraphicTest\GraphicTest.csproj", "{FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{B56A6119-1B8F-44E4-9446-291E52F47D4C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Guess", "Guess", "{5FF9BF2A-5162-4F12-82B6-1693AD776636}" @@ -106,6 +62,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos Graphic Subsystem", EndProject Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "Cosmos Graphic SubsystemBoot", "Demos\Cosmos Graphic Subsystem\Cosmos Graphic SubsystemBoot.Cosmos", "{79D68062-46C5-466D-9289-C033F7348485}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU.Plugs", "source\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj", "{D719AF9B-E623-421B-BF38-AEC29452A3B4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -203,70 +161,6 @@ Global {9431FF1F-AD75-4A1E-B38A-46E0F109411D}.Release|Any CPU.Build.0 = Release|Any CPU {9431FF1F-AD75-4A1E-B38A-46E0F109411D}.Release|x86.ActiveCfg = Release|Any CPU {9431FF1F-AD75-4A1E-B38A-46E0F109411D}.Release|x86.Build.0 = Release|Any CPU - {39D2CC10-CD6B-4BC3-B42C-CA26004D38EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39D2CC10-CD6B-4BC3-B42C-CA26004D38EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39D2CC10-CD6B-4BC3-B42C-CA26004D38EB}.Debug|x86.ActiveCfg = Debug|Any CPU - {39D2CC10-CD6B-4BC3-B42C-CA26004D38EB}.Debug|x86.Build.0 = Debug|Any CPU - {39D2CC10-CD6B-4BC3-B42C-CA26004D38EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39D2CC10-CD6B-4BC3-B42C-CA26004D38EB}.Release|Any CPU.Build.0 = Release|Any CPU - {39D2CC10-CD6B-4BC3-B42C-CA26004D38EB}.Release|x86.ActiveCfg = Release|Any CPU - {39D2CC10-CD6B-4BC3-B42C-CA26004D38EB}.Release|x86.Build.0 = Release|Any CPU - {63C45839-60B2-41BC-973E-C2EF11F33E34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63C45839-60B2-41BC-973E-C2EF11F33E34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63C45839-60B2-41BC-973E-C2EF11F33E34}.Debug|x86.ActiveCfg = Debug|Any CPU - {63C45839-60B2-41BC-973E-C2EF11F33E34}.Debug|x86.Build.0 = Debug|Any CPU - {63C45839-60B2-41BC-973E-C2EF11F33E34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63C45839-60B2-41BC-973E-C2EF11F33E34}.Release|Any CPU.Build.0 = Release|Any CPU - {63C45839-60B2-41BC-973E-C2EF11F33E34}.Release|x86.ActiveCfg = Release|Any CPU - {63C45839-60B2-41BC-973E-C2EF11F33E34}.Release|x86.Build.0 = Release|Any CPU - {EDDF5700-D198-491B-B94C-D63916F8BA70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EDDF5700-D198-491B-B94C-D63916F8BA70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EDDF5700-D198-491B-B94C-D63916F8BA70}.Debug|x86.ActiveCfg = Debug|Any CPU - {EDDF5700-D198-491B-B94C-D63916F8BA70}.Debug|x86.Build.0 = Debug|Any CPU - {EDDF5700-D198-491B-B94C-D63916F8BA70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EDDF5700-D198-491B-B94C-D63916F8BA70}.Release|Any CPU.Build.0 = Release|Any CPU - {EDDF5700-D198-491B-B94C-D63916F8BA70}.Release|x86.ActiveCfg = Release|Any CPU - {EDDF5700-D198-491B-B94C-D63916F8BA70}.Release|x86.Build.0 = Release|Any CPU - {3402C6D1-4F86-42C4-881E-DA69FD851CD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3402C6D1-4F86-42C4-881E-DA69FD851CD9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3402C6D1-4F86-42C4-881E-DA69FD851CD9}.Debug|x86.ActiveCfg = Debug|Any CPU - {3402C6D1-4F86-42C4-881E-DA69FD851CD9}.Debug|x86.Build.0 = Debug|Any CPU - {3402C6D1-4F86-42C4-881E-DA69FD851CD9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3402C6D1-4F86-42C4-881E-DA69FD851CD9}.Release|Any CPU.Build.0 = Release|Any CPU - {3402C6D1-4F86-42C4-881E-DA69FD851CD9}.Release|x86.ActiveCfg = Release|Any CPU - {3402C6D1-4F86-42C4-881E-DA69FD851CD9}.Release|x86.Build.0 = Release|Any CPU - {8CB21203-0659-473A-8C7E-D5B178F00041}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CB21203-0659-473A-8C7E-D5B178F00041}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CB21203-0659-473A-8C7E-D5B178F00041}.Debug|x86.ActiveCfg = Debug|Any CPU - {8CB21203-0659-473A-8C7E-D5B178F00041}.Debug|x86.Build.0 = Debug|Any CPU - {8CB21203-0659-473A-8C7E-D5B178F00041}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CB21203-0659-473A-8C7E-D5B178F00041}.Release|Any CPU.Build.0 = Release|Any CPU - {8CB21203-0659-473A-8C7E-D5B178F00041}.Release|x86.ActiveCfg = Release|Any CPU - {8CB21203-0659-473A-8C7E-D5B178F00041}.Release|x86.Build.0 = Release|Any CPU - {8F2B0616-46D1-4BC2-95EE-AB9533E676D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F2B0616-46D1-4BC2-95EE-AB9533E676D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F2B0616-46D1-4BC2-95EE-AB9533E676D0}.Debug|x86.ActiveCfg = Debug|Any CPU - {8F2B0616-46D1-4BC2-95EE-AB9533E676D0}.Debug|x86.Build.0 = Debug|Any CPU - {8F2B0616-46D1-4BC2-95EE-AB9533E676D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F2B0616-46D1-4BC2-95EE-AB9533E676D0}.Release|Any CPU.Build.0 = Release|Any CPU - {8F2B0616-46D1-4BC2-95EE-AB9533E676D0}.Release|x86.ActiveCfg = Release|Any CPU - {8F2B0616-46D1-4BC2-95EE-AB9533E676D0}.Release|x86.Build.0 = Release|Any CPU - {E78BE459-4E5F-4830-911A-9E23B9981410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E78BE459-4E5F-4830-911A-9E23B9981410}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E78BE459-4E5F-4830-911A-9E23B9981410}.Debug|x86.ActiveCfg = Debug|Any CPU - {E78BE459-4E5F-4830-911A-9E23B9981410}.Debug|x86.Build.0 = Debug|Any CPU - {E78BE459-4E5F-4830-911A-9E23B9981410}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E78BE459-4E5F-4830-911A-9E23B9981410}.Release|Any CPU.Build.0 = Release|Any CPU - {E78BE459-4E5F-4830-911A-9E23B9981410}.Release|x86.ActiveCfg = Release|Any CPU - {E78BE459-4E5F-4830-911A-9E23B9981410}.Release|x86.Build.0 = Release|Any CPU - {73BB6747-106D-44EE-BE78-21238A7510C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73BB6747-106D-44EE-BE78-21238A7510C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73BB6747-106D-44EE-BE78-21238A7510C1}.Debug|x86.ActiveCfg = Debug|Any CPU - {73BB6747-106D-44EE-BE78-21238A7510C1}.Debug|x86.Build.0 = Debug|Any CPU - {73BB6747-106D-44EE-BE78-21238A7510C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73BB6747-106D-44EE-BE78-21238A7510C1}.Release|Any CPU.Build.0 = Release|Any CPU - {73BB6747-106D-44EE-BE78-21238A7510C1}.Release|x86.ActiveCfg = Release|Any CPU - {73BB6747-106D-44EE-BE78-21238A7510C1}.Release|x86.Build.0 = Release|Any CPU {6575A354-AB4D-4BD1-989C-DAD9E725E5EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6575A354-AB4D-4BD1-989C-DAD9E725E5EB}.Debug|Any CPU.Build.0 = Debug|Any CPU {6575A354-AB4D-4BD1-989C-DAD9E725E5EB}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -275,38 +169,6 @@ Global {6575A354-AB4D-4BD1-989C-DAD9E725E5EB}.Release|Any CPU.Build.0 = Release|Any CPU {6575A354-AB4D-4BD1-989C-DAD9E725E5EB}.Release|x86.ActiveCfg = Release|Any CPU {6575A354-AB4D-4BD1-989C-DAD9E725E5EB}.Release|x86.Build.0 = Release|Any CPU - {A53DB67C-4369-4712-9AE3-80801165B634}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A53DB67C-4369-4712-9AE3-80801165B634}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A53DB67C-4369-4712-9AE3-80801165B634}.Debug|x86.ActiveCfg = Debug|Any CPU - {A53DB67C-4369-4712-9AE3-80801165B634}.Debug|x86.Build.0 = Debug|Any CPU - {A53DB67C-4369-4712-9AE3-80801165B634}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A53DB67C-4369-4712-9AE3-80801165B634}.Release|Any CPU.Build.0 = Release|Any CPU - {A53DB67C-4369-4712-9AE3-80801165B634}.Release|x86.ActiveCfg = Release|Any CPU - {A53DB67C-4369-4712-9AE3-80801165B634}.Release|x86.Build.0 = Release|Any CPU - {EA3500C5-A83A-4570-9B42-71D06A1D890F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA3500C5-A83A-4570-9B42-71D06A1D890F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA3500C5-A83A-4570-9B42-71D06A1D890F}.Debug|x86.ActiveCfg = Debug|Any CPU - {EA3500C5-A83A-4570-9B42-71D06A1D890F}.Debug|x86.Build.0 = Debug|Any CPU - {EA3500C5-A83A-4570-9B42-71D06A1D890F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA3500C5-A83A-4570-9B42-71D06A1D890F}.Release|Any CPU.Build.0 = Release|Any CPU - {EA3500C5-A83A-4570-9B42-71D06A1D890F}.Release|x86.ActiveCfg = Release|Any CPU - {EA3500C5-A83A-4570-9B42-71D06A1D890F}.Release|x86.Build.0 = Release|Any CPU - {AD34EE2D-9665-402E-A349-554330D1A970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD34EE2D-9665-402E-A349-554330D1A970}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD34EE2D-9665-402E-A349-554330D1A970}.Debug|x86.ActiveCfg = Debug|Any CPU - {AD34EE2D-9665-402E-A349-554330D1A970}.Debug|x86.Build.0 = Debug|Any CPU - {AD34EE2D-9665-402E-A349-554330D1A970}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD34EE2D-9665-402E-A349-554330D1A970}.Release|Any CPU.Build.0 = Release|Any CPU - {AD34EE2D-9665-402E-A349-554330D1A970}.Release|x86.ActiveCfg = Release|Any CPU - {AD34EE2D-9665-402E-A349-554330D1A970}.Release|x86.Build.0 = Release|Any CPU - {D42E1F90-D9D5-4882-9103-758840382574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D42E1F90-D9D5-4882-9103-758840382574}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D42E1F90-D9D5-4882-9103-758840382574}.Debug|x86.ActiveCfg = Debug|Any CPU - {D42E1F90-D9D5-4882-9103-758840382574}.Debug|x86.Build.0 = Debug|Any CPU - {D42E1F90-D9D5-4882-9103-758840382574}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D42E1F90-D9D5-4882-9103-758840382574}.Release|Any CPU.Build.0 = Release|Any CPU - {D42E1F90-D9D5-4882-9103-758840382574}.Release|x86.ActiveCfg = Release|Any CPU - {D42E1F90-D9D5-4882-9103-758840382574}.Release|x86.Build.0 = Release|Any CPU {1B72C465-A0F6-4865-836B-2334E3F3376F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1B72C465-A0F6-4865-836B-2334E3F3376F}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B72C465-A0F6-4865-836B-2334E3F3376F}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -315,46 +177,6 @@ Global {1B72C465-A0F6-4865-836B-2334E3F3376F}.Release|Any CPU.Build.0 = Release|Any CPU {1B72C465-A0F6-4865-836B-2334E3F3376F}.Release|x86.ActiveCfg = Release|Any CPU {1B72C465-A0F6-4865-836B-2334E3F3376F}.Release|x86.Build.0 = Release|Any CPU - {FBF70A52-95FC-4715-BFC4-4B509BF107D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBF70A52-95FC-4715-BFC4-4B509BF107D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBF70A52-95FC-4715-BFC4-4B509BF107D1}.Debug|x86.ActiveCfg = Debug|Any CPU - {FBF70A52-95FC-4715-BFC4-4B509BF107D1}.Debug|x86.Build.0 = Debug|Any CPU - {FBF70A52-95FC-4715-BFC4-4B509BF107D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBF70A52-95FC-4715-BFC4-4B509BF107D1}.Release|Any CPU.Build.0 = Release|Any CPU - {FBF70A52-95FC-4715-BFC4-4B509BF107D1}.Release|x86.ActiveCfg = Release|Any CPU - {FBF70A52-95FC-4715-BFC4-4B509BF107D1}.Release|x86.Build.0 = Release|Any CPU - {361F9108-91F2-4C9F-BE90-12732DF72B8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {361F9108-91F2-4C9F-BE90-12732DF72B8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {361F9108-91F2-4C9F-BE90-12732DF72B8D}.Debug|x86.ActiveCfg = Debug|Any CPU - {361F9108-91F2-4C9F-BE90-12732DF72B8D}.Debug|x86.Build.0 = Debug|Any CPU - {361F9108-91F2-4C9F-BE90-12732DF72B8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {361F9108-91F2-4C9F-BE90-12732DF72B8D}.Release|Any CPU.Build.0 = Release|Any CPU - {361F9108-91F2-4C9F-BE90-12732DF72B8D}.Release|x86.ActiveCfg = Release|Any CPU - {361F9108-91F2-4C9F-BE90-12732DF72B8D}.Release|x86.Build.0 = Release|Any CPU - {0B20C26F-CA92-4D88-8211-EC7B0A261337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B20C26F-CA92-4D88-8211-EC7B0A261337}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B20C26F-CA92-4D88-8211-EC7B0A261337}.Debug|x86.ActiveCfg = Debug|Any CPU - {0B20C26F-CA92-4D88-8211-EC7B0A261337}.Debug|x86.Build.0 = Debug|Any CPU - {0B20C26F-CA92-4D88-8211-EC7B0A261337}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B20C26F-CA92-4D88-8211-EC7B0A261337}.Release|Any CPU.Build.0 = Release|Any CPU - {0B20C26F-CA92-4D88-8211-EC7B0A261337}.Release|x86.ActiveCfg = Release|Any CPU - {0B20C26F-CA92-4D88-8211-EC7B0A261337}.Release|x86.Build.0 = Release|Any CPU - {6D59FC7A-6F27-4140-BA41-F89126490C4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D59FC7A-6F27-4140-BA41-F89126490C4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D59FC7A-6F27-4140-BA41-F89126490C4C}.Debug|x86.ActiveCfg = Debug|Any CPU - {6D59FC7A-6F27-4140-BA41-F89126490C4C}.Debug|x86.Build.0 = Debug|Any CPU - {6D59FC7A-6F27-4140-BA41-F89126490C4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D59FC7A-6F27-4140-BA41-F89126490C4C}.Release|Any CPU.Build.0 = Release|Any CPU - {6D59FC7A-6F27-4140-BA41-F89126490C4C}.Release|x86.ActiveCfg = Release|Any CPU - {6D59FC7A-6F27-4140-BA41-F89126490C4C}.Release|x86.Build.0 = Release|Any CPU - {FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}.Debug|x86.ActiveCfg = Debug|Any CPU - {FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}.Debug|x86.Build.0 = Debug|Any CPU - {FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}.Release|Any CPU.Build.0 = Release|Any CPU - {FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}.Release|x86.ActiveCfg = Release|Any CPU - {FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}.Release|x86.Build.0 = Release|Any CPU {E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Debug|Any CPU.Build.0 = Debug|Any CPU {E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -393,13 +215,21 @@ Global {79D68062-46C5-466D-9289-C033F7348485}.Release|Any CPU.Build.0 = Release|Any CPU {79D68062-46C5-466D-9289-C033F7348485}.Release|x86.ActiveCfg = Release|Any CPU {79D68062-46C5-466D-9289-C033F7348485}.Release|x86.Build.0 = Release|Any CPU + {D719AF9B-E623-421B-BF38-AEC29452A3B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D719AF9B-E623-421B-BF38-AEC29452A3B4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D719AF9B-E623-421B-BF38-AEC29452A3B4}.Debug|x86.ActiveCfg = Debug|Any CPU + {D719AF9B-E623-421B-BF38-AEC29452A3B4}.Debug|x86.Build.0 = Debug|Any CPU + {D719AF9B-E623-421B-BF38-AEC29452A3B4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D719AF9B-E623-421B-BF38-AEC29452A3B4}.Release|Any CPU.Build.0 = Release|Any CPU + {D719AF9B-E623-421B-BF38-AEC29452A3B4}.Release|x86.ActiveCfg = Release|Any CPU + {D719AF9B-E623-421B-BF38-AEC29452A3B4}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {1425715D-1C93-44C7-8BB5-F124F195A41A} = {D651C346-95CF-4AE9-B309-DB2A1A512811} - {9F5F046A-1BB1-4208-ADBE-C9417F2A8A48} = {65532163-618F-41F2-B39C-6F6022483158} + {9F5F046A-1BB1-4208-ADBE-C9417F2A8A48} = {170A7DE2-E899-4E92-A12B-E68876C9B2A5} {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} @@ -407,42 +237,20 @@ Global {C4540C54-5A2E-4300-BDD7-0D1B44B78C36} = {04B18FFC-8EA0-4E9F-9E1B-478527B19AFA} {1132E689-18B0-4D87-94E8-934D4802C540} = {04B18FFC-8EA0-4E9F-9E1B-478527B19AFA} {3C186D37-21C3-417C-95F1-19BE538AF88A} = {04B18FFC-8EA0-4E9F-9E1B-478527B19AFA} - {7E450662-B34C-49B0-A826-F45AD3A18891} = {65532163-618F-41F2-B39C-6F6022483158} + {7E450662-B34C-49B0-A826-F45AD3A18891} = {170A7DE2-E899-4E92-A12B-E68876C9B2A5} {9431FF1F-AD75-4A1E-B38A-46E0F109411D} = {0259702E-9575-4852-A641-5F9714A9C740} {04B18FFC-8EA0-4E9F-9E1B-478527B19AFA} = {9A923E6F-FF63-4F02-A4EA-C2D44F9323FD} {D651C346-95CF-4AE9-B309-DB2A1A512811} = {9A923E6F-FF63-4F02-A4EA-C2D44F9323FD} {0259702E-9575-4852-A641-5F9714A9C740} = {9A923E6F-FF63-4F02-A4EA-C2D44F9323FD} - {170A7DE2-E899-4E92-A12B-E68876C9B2A5} = {9A923E6F-FF63-4F02-A4EA-C2D44F9323FD} - {65532163-618F-41F2-B39C-6F6022483158} = {9A923E6F-FF63-4F02-A4EA-C2D44F9323FD} - {ECEA7778-E786-4317-90B9-A2D4427CB91C} = {1A46752C-98F3-4DE3-B1FB-EDCE22E8AF73} - {29EEC029-6A2B-478A-B6E5-D63A91388ABA} = {1A46752C-98F3-4DE3-B1FB-EDCE22E8AF73} - {0E67EFE8-5944-4F6C-8B47-C5E06D4C79F5} = {1A46752C-98F3-4DE3-B1FB-EDCE22E8AF73} - {52D81759-C7CC-427F-8C96-89CA10C914B5} = {1A46752C-98F3-4DE3-B1FB-EDCE22E8AF73} - {39D2CC10-CD6B-4BC3-B42C-CA26004D38EB} = {ECEA7778-E786-4317-90B9-A2D4427CB91C} - {63C45839-60B2-41BC-973E-C2EF11F33E34} = {0E67EFE8-5944-4F6C-8B47-C5E06D4C79F5} - {EDDF5700-D198-491B-B94C-D63916F8BA70} = {0E67EFE8-5944-4F6C-8B47-C5E06D4C79F5} - {3402C6D1-4F86-42C4-881E-DA69FD851CD9} = {0E67EFE8-5944-4F6C-8B47-C5E06D4C79F5} - {8CB21203-0659-473A-8C7E-D5B178F00041} = {ECEA7778-E786-4317-90B9-A2D4427CB91C} - {8F2B0616-46D1-4BC2-95EE-AB9533E676D0} = {ECEA7778-E786-4317-90B9-A2D4427CB91C} - {E78BE459-4E5F-4830-911A-9E23B9981410} = {ECEA7778-E786-4317-90B9-A2D4427CB91C} - {73BB6747-106D-44EE-BE78-21238A7510C1} = {ECEA7778-E786-4317-90B9-A2D4427CB91C} - {6575A354-AB4D-4BD1-989C-DAD9E725E5EB} = {29EEC029-6A2B-478A-B6E5-D63A91388ABA} - {A53DB67C-4369-4712-9AE3-80801165B634} = {ECEA7778-E786-4317-90B9-A2D4427CB91C} - {EA3500C5-A83A-4570-9B42-71D06A1D890F} = {ECEA7778-E786-4317-90B9-A2D4427CB91C} - {AD34EE2D-9665-402E-A349-554330D1A970} = {ECEA7778-E786-4317-90B9-A2D4427CB91C} - {D42E1F90-D9D5-4882-9103-758840382574} = {ECEA7778-E786-4317-90B9-A2D4427CB91C} - {1B72C465-A0F6-4865-836B-2334E3F3376F} = {29EEC029-6A2B-478A-B6E5-D63A91388ABA} - {FBF70A52-95FC-4715-BFC4-4B509BF107D1} = {ECEA7778-E786-4317-90B9-A2D4427CB91C} - {361F9108-91F2-4C9F-BE90-12732DF72B8D} = {ECEA7778-E786-4317-90B9-A2D4427CB91C} - {0B20C26F-CA92-4D88-8211-EC7B0A261337} = {0E67EFE8-5944-4F6C-8B47-C5E06D4C79F5} - {6D59FC7A-6F27-4140-BA41-F89126490C4C} = {0E67EFE8-5944-4F6C-8B47-C5E06D4C79F5} - {FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B} = {ECEA7778-E786-4317-90B9-A2D4427CB91C} + {6575A354-AB4D-4BD1-989C-DAD9E725E5EB} = {1A46752C-98F3-4DE3-B1FB-EDCE22E8AF73} + {1B72C465-A0F6-4865-836B-2334E3F3376F} = {1A46752C-98F3-4DE3-B1FB-EDCE22E8AF73} {5FF9BF2A-5162-4F12-82B6-1693AD776636} = {B56A6119-1B8F-44E4-9446-291E52F47D4C} {E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD} = {5FF9BF2A-5162-4F12-82B6-1693AD776636} {77DD08F5-0751-4EFC-B222-78F9F06E1F7C} = {5FF9BF2A-5162-4F12-82B6-1693AD776636} - {408E5ACC-EA9A-41E8-AA95-514C5F47BD34} = {52D81759-C7CC-427F-8C96-89CA10C914B5} + {408E5ACC-EA9A-41E8-AA95-514C5F47BD34} = {1A46752C-98F3-4DE3-B1FB-EDCE22E8AF73} {A9D558E8-B0C7-4FF6-99D8-CB2BC6FEB7C7} = {B56A6119-1B8F-44E4-9446-291E52F47D4C} {49F2C01D-D2C5-4564-810B-1AE92236C5C1} = {A9D558E8-B0C7-4FF6-99D8-CB2BC6FEB7C7} {79D68062-46C5-466D-9289-C033F7348485} = {A9D558E8-B0C7-4FF6-99D8-CB2BC6FEB7C7} + {D719AF9B-E623-421B-BF38-AEC29452A3B4} = {170A7DE2-E899-4E92-A12B-E68876C9B2A5} EndGlobalSection EndGlobal diff --git a/Solutions - Readme.txt b/Solutions - Readme.txt index e5c50fb25..f0eb510df 100644 --- a/Solutions - Readme.txt +++ b/Solutions - Readme.txt @@ -2,26 +2,27 @@ Solution File ReadMe -------------------------------------------- Cosmos - -Old monolithic solution. -Will be removed after all smaller parts split out. - -Use of this solution is necessary for some users until all parts are split out. +-Old monolithic solution. +-Will be removed after all smaller parts split out. +-Use of this solution is necessary for some users until all parts are split out. -------------------------------------------- Build - -Used by the build process (Builder). -Not meant for direct end user use. -Do not change unless you know what you are doing. +-Used by the build process (Builder). +-Not meant for direct end user use. +-Do not change unless you know what you are doing. -------------------------------------------- Kernel - -Kernel, Demos (not  User), Tests - +-Kernel, Demos (not  User), Tests +*Modify tests to use TestRunner as a debug launch action - or change refs to bin ref -------------------------------------------- + +Notes +-Update build to use bin dir, and post build actions too. A bat which can be called like CT. +-Cosmos.TestRunner.* needs in some project, was removed from Kernel. + -------------------------------------------- Builder diff --git a/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.csproj b/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.csproj index d95b7d5eb..2dd8223ff 100644 --- a/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.csproj +++ b/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.csproj @@ -11,7 +11,12 @@ - + + + + + ..\..\Build\bin\Cosmos.TestRunner.TestController.dll + diff --git a/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.csproj b/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.csproj index 86a34a835..e38ba57e3 100644 --- a/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.csproj +++ b/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.csproj @@ -11,7 +11,12 @@ - + + + + + ..\..\Build\bin\Cosmos.TestRunner.TestController.dll + diff --git a/source/Cosmos.Core.Plugs.Asm/Cosmos.Core.Plugs.Asm.csproj b/source/Cosmos.Core.Plugs.Asm/Cosmos.Core.Plugs.Asm.csproj index c7141a243..e70cc6c69 100644 --- a/source/Cosmos.Core.Plugs.Asm/Cosmos.Core.Plugs.Asm.csproj +++ b/source/Cosmos.Core.Plugs.Asm/Cosmos.Core.Plugs.Asm.csproj @@ -13,6 +13,7 @@ +