Add HSchool.Content project for JSONC definitions, catalog, and map validation. Update solution structure to include new content and tests projects. Enhance school management to support mod packs and map instances, ensuring proper loading and validation. Revise documentation to reflect these changes and update tests for new functionality.
ci / server (push) Failing after 3m36s
ci / client (push) Successful in 13s

This commit is contained in:
Leonid Pershin
2026-08-18 14:35:09 +03:00
parent 37c39a3beb
commit 1bc75244e8
55 changed files with 2289 additions and 59 deletions
+99
View File
@@ -1,3 +1,4 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.2.0
@@ -22,44 +23,140 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HSchool.Protocol.Tests", "t
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HSchool.Simulation.Tests", "tests\HSchool.Simulation.Tests\HSchool.Simulation.Tests.csproj", "{25518ACB-AC00-4DE7-7F61-2756A5F47A38}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HSchool.Content", "src\HSchool.Content\HSchool.Content.csproj", "{1C464147-8717-46FD-8459-9F458A07836D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HSchool.Content.Tests", "tests\HSchool.Content.Tests\HSchool.Content.Tests.csproj", "{C59BD649-ED81-40EE-864D-9C7D5378B956}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C6CF7544-0A45-4E6C-BEBD-B8B2D20772F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C6CF7544-0A45-4E6C-BEBD-B8B2D20772F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C6CF7544-0A45-4E6C-BEBD-B8B2D20772F6}.Debug|x64.ActiveCfg = Debug|Any CPU
{C6CF7544-0A45-4E6C-BEBD-B8B2D20772F6}.Debug|x64.Build.0 = Debug|Any CPU
{C6CF7544-0A45-4E6C-BEBD-B8B2D20772F6}.Debug|x86.ActiveCfg = Debug|Any CPU
{C6CF7544-0A45-4E6C-BEBD-B8B2D20772F6}.Debug|x86.Build.0 = Debug|Any CPU
{C6CF7544-0A45-4E6C-BEBD-B8B2D20772F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C6CF7544-0A45-4E6C-BEBD-B8B2D20772F6}.Release|Any CPU.Build.0 = Release|Any CPU
{C6CF7544-0A45-4E6C-BEBD-B8B2D20772F6}.Release|x64.ActiveCfg = Release|Any CPU
{C6CF7544-0A45-4E6C-BEBD-B8B2D20772F6}.Release|x64.Build.0 = Release|Any CPU
{C6CF7544-0A45-4E6C-BEBD-B8B2D20772F6}.Release|x86.ActiveCfg = Release|Any CPU
{C6CF7544-0A45-4E6C-BEBD-B8B2D20772F6}.Release|x86.Build.0 = Release|Any CPU
{E57D6E25-B562-F9BB-FCDA-2C71AA526B2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E57D6E25-B562-F9BB-FCDA-2C71AA526B2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E57D6E25-B562-F9BB-FCDA-2C71AA526B2C}.Debug|x64.ActiveCfg = Debug|Any CPU
{E57D6E25-B562-F9BB-FCDA-2C71AA526B2C}.Debug|x64.Build.0 = Debug|Any CPU
{E57D6E25-B562-F9BB-FCDA-2C71AA526B2C}.Debug|x86.ActiveCfg = Debug|Any CPU
{E57D6E25-B562-F9BB-FCDA-2C71AA526B2C}.Debug|x86.Build.0 = Debug|Any CPU
{E57D6E25-B562-F9BB-FCDA-2C71AA526B2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E57D6E25-B562-F9BB-FCDA-2C71AA526B2C}.Release|Any CPU.Build.0 = Release|Any CPU
{E57D6E25-B562-F9BB-FCDA-2C71AA526B2C}.Release|x64.ActiveCfg = Release|Any CPU
{E57D6E25-B562-F9BB-FCDA-2C71AA526B2C}.Release|x64.Build.0 = Release|Any CPU
{E57D6E25-B562-F9BB-FCDA-2C71AA526B2C}.Release|x86.ActiveCfg = Release|Any CPU
{E57D6E25-B562-F9BB-FCDA-2C71AA526B2C}.Release|x86.Build.0 = Release|Any CPU
{6AFF81FD-42DB-B804-09F8-AB0B20E97E82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6AFF81FD-42DB-B804-09F8-AB0B20E97E82}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6AFF81FD-42DB-B804-09F8-AB0B20E97E82}.Debug|x64.ActiveCfg = Debug|Any CPU
{6AFF81FD-42DB-B804-09F8-AB0B20E97E82}.Debug|x64.Build.0 = Debug|Any CPU
{6AFF81FD-42DB-B804-09F8-AB0B20E97E82}.Debug|x86.ActiveCfg = Debug|Any CPU
{6AFF81FD-42DB-B804-09F8-AB0B20E97E82}.Debug|x86.Build.0 = Debug|Any CPU
{6AFF81FD-42DB-B804-09F8-AB0B20E97E82}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6AFF81FD-42DB-B804-09F8-AB0B20E97E82}.Release|Any CPU.Build.0 = Release|Any CPU
{6AFF81FD-42DB-B804-09F8-AB0B20E97E82}.Release|x64.ActiveCfg = Release|Any CPU
{6AFF81FD-42DB-B804-09F8-AB0B20E97E82}.Release|x64.Build.0 = Release|Any CPU
{6AFF81FD-42DB-B804-09F8-AB0B20E97E82}.Release|x86.ActiveCfg = Release|Any CPU
{6AFF81FD-42DB-B804-09F8-AB0B20E97E82}.Release|x86.Build.0 = Release|Any CPU
{D5207CA6-5DD2-AF48-3D59-41C95A1F91A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D5207CA6-5DD2-AF48-3D59-41C95A1F91A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D5207CA6-5DD2-AF48-3D59-41C95A1F91A9}.Debug|x64.ActiveCfg = Debug|Any CPU
{D5207CA6-5DD2-AF48-3D59-41C95A1F91A9}.Debug|x64.Build.0 = Debug|Any CPU
{D5207CA6-5DD2-AF48-3D59-41C95A1F91A9}.Debug|x86.ActiveCfg = Debug|Any CPU
{D5207CA6-5DD2-AF48-3D59-41C95A1F91A9}.Debug|x86.Build.0 = Debug|Any CPU
{D5207CA6-5DD2-AF48-3D59-41C95A1F91A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D5207CA6-5DD2-AF48-3D59-41C95A1F91A9}.Release|Any CPU.Build.0 = Release|Any CPU
{D5207CA6-5DD2-AF48-3D59-41C95A1F91A9}.Release|x64.ActiveCfg = Release|Any CPU
{D5207CA6-5DD2-AF48-3D59-41C95A1F91A9}.Release|x64.Build.0 = Release|Any CPU
{D5207CA6-5DD2-AF48-3D59-41C95A1F91A9}.Release|x86.ActiveCfg = Release|Any CPU
{D5207CA6-5DD2-AF48-3D59-41C95A1F91A9}.Release|x86.Build.0 = Release|Any CPU
{06DDC3A1-D2DD-F3E7-8FB5-0A04BBD7B6EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{06DDC3A1-D2DD-F3E7-8FB5-0A04BBD7B6EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{06DDC3A1-D2DD-F3E7-8FB5-0A04BBD7B6EC}.Debug|x64.ActiveCfg = Debug|Any CPU
{06DDC3A1-D2DD-F3E7-8FB5-0A04BBD7B6EC}.Debug|x64.Build.0 = Debug|Any CPU
{06DDC3A1-D2DD-F3E7-8FB5-0A04BBD7B6EC}.Debug|x86.ActiveCfg = Debug|Any CPU
{06DDC3A1-D2DD-F3E7-8FB5-0A04BBD7B6EC}.Debug|x86.Build.0 = Debug|Any CPU
{06DDC3A1-D2DD-F3E7-8FB5-0A04BBD7B6EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{06DDC3A1-D2DD-F3E7-8FB5-0A04BBD7B6EC}.Release|Any CPU.Build.0 = Release|Any CPU
{06DDC3A1-D2DD-F3E7-8FB5-0A04BBD7B6EC}.Release|x64.ActiveCfg = Release|Any CPU
{06DDC3A1-D2DD-F3E7-8FB5-0A04BBD7B6EC}.Release|x64.Build.0 = Release|Any CPU
{06DDC3A1-D2DD-F3E7-8FB5-0A04BBD7B6EC}.Release|x86.ActiveCfg = Release|Any CPU
{06DDC3A1-D2DD-F3E7-8FB5-0A04BBD7B6EC}.Release|x86.Build.0 = Release|Any CPU
{5F583583-FF9A-2935-F4EF-D2CDD8DFC465}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F583583-FF9A-2935-F4EF-D2CDD8DFC465}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F583583-FF9A-2935-F4EF-D2CDD8DFC465}.Debug|x64.ActiveCfg = Debug|Any CPU
{5F583583-FF9A-2935-F4EF-D2CDD8DFC465}.Debug|x64.Build.0 = Debug|Any CPU
{5F583583-FF9A-2935-F4EF-D2CDD8DFC465}.Debug|x86.ActiveCfg = Debug|Any CPU
{5F583583-FF9A-2935-F4EF-D2CDD8DFC465}.Debug|x86.Build.0 = Debug|Any CPU
{5F583583-FF9A-2935-F4EF-D2CDD8DFC465}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5F583583-FF9A-2935-F4EF-D2CDD8DFC465}.Release|Any CPU.Build.0 = Release|Any CPU
{5F583583-FF9A-2935-F4EF-D2CDD8DFC465}.Release|x64.ActiveCfg = Release|Any CPU
{5F583583-FF9A-2935-F4EF-D2CDD8DFC465}.Release|x64.Build.0 = Release|Any CPU
{5F583583-FF9A-2935-F4EF-D2CDD8DFC465}.Release|x86.ActiveCfg = Release|Any CPU
{5F583583-FF9A-2935-F4EF-D2CDD8DFC465}.Release|x86.Build.0 = Release|Any CPU
{962E7F03-8B12-5802-91AA-105EEC2060E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{962E7F03-8B12-5802-91AA-105EEC2060E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{962E7F03-8B12-5802-91AA-105EEC2060E4}.Debug|x64.ActiveCfg = Debug|Any CPU
{962E7F03-8B12-5802-91AA-105EEC2060E4}.Debug|x64.Build.0 = Debug|Any CPU
{962E7F03-8B12-5802-91AA-105EEC2060E4}.Debug|x86.ActiveCfg = Debug|Any CPU
{962E7F03-8B12-5802-91AA-105EEC2060E4}.Debug|x86.Build.0 = Debug|Any CPU
{962E7F03-8B12-5802-91AA-105EEC2060E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{962E7F03-8B12-5802-91AA-105EEC2060E4}.Release|Any CPU.Build.0 = Release|Any CPU
{962E7F03-8B12-5802-91AA-105EEC2060E4}.Release|x64.ActiveCfg = Release|Any CPU
{962E7F03-8B12-5802-91AA-105EEC2060E4}.Release|x64.Build.0 = Release|Any CPU
{962E7F03-8B12-5802-91AA-105EEC2060E4}.Release|x86.ActiveCfg = Release|Any CPU
{962E7F03-8B12-5802-91AA-105EEC2060E4}.Release|x86.Build.0 = Release|Any CPU
{25518ACB-AC00-4DE7-7F61-2756A5F47A38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{25518ACB-AC00-4DE7-7F61-2756A5F47A38}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25518ACB-AC00-4DE7-7F61-2756A5F47A38}.Debug|x64.ActiveCfg = Debug|Any CPU
{25518ACB-AC00-4DE7-7F61-2756A5F47A38}.Debug|x64.Build.0 = Debug|Any CPU
{25518ACB-AC00-4DE7-7F61-2756A5F47A38}.Debug|x86.ActiveCfg = Debug|Any CPU
{25518ACB-AC00-4DE7-7F61-2756A5F47A38}.Debug|x86.Build.0 = Debug|Any CPU
{25518ACB-AC00-4DE7-7F61-2756A5F47A38}.Release|Any CPU.ActiveCfg = Release|Any CPU
{25518ACB-AC00-4DE7-7F61-2756A5F47A38}.Release|Any CPU.Build.0 = Release|Any CPU
{25518ACB-AC00-4DE7-7F61-2756A5F47A38}.Release|x64.ActiveCfg = Release|Any CPU
{25518ACB-AC00-4DE7-7F61-2756A5F47A38}.Release|x64.Build.0 = Release|Any CPU
{25518ACB-AC00-4DE7-7F61-2756A5F47A38}.Release|x86.ActiveCfg = Release|Any CPU
{25518ACB-AC00-4DE7-7F61-2756A5F47A38}.Release|x86.Build.0 = Release|Any CPU
{1C464147-8717-46FD-8459-9F458A07836D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C464147-8717-46FD-8459-9F458A07836D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C464147-8717-46FD-8459-9F458A07836D}.Debug|x64.ActiveCfg = Debug|Any CPU
{1C464147-8717-46FD-8459-9F458A07836D}.Debug|x64.Build.0 = Debug|Any CPU
{1C464147-8717-46FD-8459-9F458A07836D}.Debug|x86.ActiveCfg = Debug|Any CPU
{1C464147-8717-46FD-8459-9F458A07836D}.Debug|x86.Build.0 = Debug|Any CPU
{1C464147-8717-46FD-8459-9F458A07836D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1C464147-8717-46FD-8459-9F458A07836D}.Release|Any CPU.Build.0 = Release|Any CPU
{1C464147-8717-46FD-8459-9F458A07836D}.Release|x64.ActiveCfg = Release|Any CPU
{1C464147-8717-46FD-8459-9F458A07836D}.Release|x64.Build.0 = Release|Any CPU
{1C464147-8717-46FD-8459-9F458A07836D}.Release|x86.ActiveCfg = Release|Any CPU
{1C464147-8717-46FD-8459-9F458A07836D}.Release|x86.Build.0 = Release|Any CPU
{C59BD649-ED81-40EE-864D-9C7D5378B956}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C59BD649-ED81-40EE-864D-9C7D5378B956}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C59BD649-ED81-40EE-864D-9C7D5378B956}.Debug|x64.ActiveCfg = Debug|Any CPU
{C59BD649-ED81-40EE-864D-9C7D5378B956}.Debug|x64.Build.0 = Debug|Any CPU
{C59BD649-ED81-40EE-864D-9C7D5378B956}.Debug|x86.ActiveCfg = Debug|Any CPU
{C59BD649-ED81-40EE-864D-9C7D5378B956}.Debug|x86.Build.0 = Debug|Any CPU
{C59BD649-ED81-40EE-864D-9C7D5378B956}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C59BD649-ED81-40EE-864D-9C7D5378B956}.Release|Any CPU.Build.0 = Release|Any CPU
{C59BD649-ED81-40EE-864D-9C7D5378B956}.Release|x64.ActiveCfg = Release|Any CPU
{C59BD649-ED81-40EE-864D-9C7D5378B956}.Release|x64.Build.0 = Release|Any CPU
{C59BD649-ED81-40EE-864D-9C7D5378B956}.Release|x86.ActiveCfg = Release|Any CPU
{C59BD649-ED81-40EE-864D-9C7D5378B956}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -73,6 +170,8 @@ Global
{5F583583-FF9A-2935-F4EF-D2CDD8DFC465} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
{962E7F03-8B12-5802-91AA-105EEC2060E4} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
{25518ACB-AC00-4DE7-7F61-2756A5F47A38} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
{1C464147-8717-46FD-8459-9F458A07836D} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
{C59BD649-ED81-40EE-864D-9C7D5378B956} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DD14EF4D-167E-4AC7-953A-AF606CC34829}