From 65dcb0c5647484b02767ac9fbcdb397a820d59f6 Mon Sep 17 00:00:00 2001 From: Syntriax Date: Tue, 5 Aug 2025 19:48:49 +0300 Subject: [PATCH] BREAKING CHANGE: moved yaml serialization from Engine.Serialization to Engine.Integration --- .gitmodules | 4 ++-- .../Converters/Abstract/IEngineTypeYamlConverter.cs | 0 .../Converters/BehaviourControllerConverter.cs | 0 .../Converters/BehaviourConverter.cs | 0 .../Converters/EngineTypeYamlConverterBase.cs | 0 .../Converters/Primitives/AABBConverter.cs | 0 .../Converters/Primitives/CircleConverter.cs | 0 .../Converters/Primitives/ColorHSVConverter.cs | 0 .../Converters/Primitives/ColorRGBAConverter.cs | 0 .../Converters/Primitives/ColorRGBConverter.cs | 0 .../Converters/Primitives/Line2DConverter.cs | 0 .../Converters/Primitives/Line2DEquationConverter.cs | 0 .../Converters/Primitives/Projection1DConverter.cs | 0 .../Converters/Primitives/QuaternionConverter.cs | 0 .../Converters/Primitives/Shape2DConverter.cs | 0 .../Converters/Primitives/TriangleConverter.cs | 0 .../Converters/Primitives/Vector2DConverter.cs | 0 .../Converters/Primitives/Vector3DConverter.cs | 0 .../Converters/SerializedClassConverter.cs | 0 .../Converters/StateEnableConverter.cs | 0 .../Converters/TypeContainerConverter.cs | 0 .../Converters/UniverseConverter.cs | 0 .../Converters/UniverseObjectConverter.cs | 0 .../Engine.Integration.Yaml.csproj | 4 ++-- .../SerializerInProgressException.cs | 0 .../Engine.Integration.Yaml}/YamlSerializer.cs | 0 Engine.Integration/YamlDotNet | 1 + Engine.Serializers/YamlDotNet | 1 - Engine.sln | 9 +++------ 29 files changed, 8 insertions(+), 11 deletions(-) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/Abstract/IEngineTypeYamlConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/BehaviourControllerConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/BehaviourConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/EngineTypeYamlConverterBase.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/Primitives/AABBConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/Primitives/CircleConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/Primitives/ColorHSVConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/Primitives/ColorRGBAConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/Primitives/ColorRGBConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/Primitives/Line2DConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/Primitives/Line2DEquationConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/Primitives/Projection1DConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/Primitives/QuaternionConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/Primitives/Shape2DConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/Primitives/TriangleConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/Primitives/Vector2DConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/Primitives/Vector3DConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/SerializedClassConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/StateEnableConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/TypeContainerConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/UniverseConverter.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/Converters/UniverseObjectConverter.cs (100%) rename Engine.Serializers/Engine.Serializers.Yaml/Engine.Serializers.Yaml.csproj => Engine.Integration/Engine.Integration.Yaml/Engine.Integration.Yaml.csproj (76%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/SerializerInProgressException.cs (100%) rename {Engine.Serializers/Engine.Serializers.Yaml => Engine.Integration/Engine.Integration.Yaml}/YamlSerializer.cs (100%) create mode 160000 Engine.Integration/YamlDotNet delete mode 160000 Engine.Serializers/YamlDotNet diff --git a/.gitmodules b/.gitmodules index 5b155fd..269915b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "Engine.Serializers/YamlDotNet"] - path = Engine.Serializers/YamlDotNet +[submodule "Engine.Integration/YamlDotNet"] + path = Engine.Integration/YamlDotNet url = git@github.com:Syntriax/YamlDotNet.git diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/Abstract/IEngineTypeYamlConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/Abstract/IEngineTypeYamlConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/Abstract/IEngineTypeYamlConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/Abstract/IEngineTypeYamlConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/BehaviourControllerConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/BehaviourControllerConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/BehaviourControllerConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/BehaviourControllerConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/BehaviourConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/BehaviourConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/BehaviourConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/BehaviourConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/EngineTypeYamlConverterBase.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/EngineTypeYamlConverterBase.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/EngineTypeYamlConverterBase.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/EngineTypeYamlConverterBase.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/AABBConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/AABBConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/AABBConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/AABBConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/CircleConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/CircleConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/CircleConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/CircleConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/ColorHSVConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/ColorHSVConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/ColorHSVConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/ColorHSVConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/ColorRGBAConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/ColorRGBAConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/ColorRGBAConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/ColorRGBAConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/ColorRGBConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/ColorRGBConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/ColorRGBConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/ColorRGBConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/Line2DConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/Line2DConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/Line2DConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/Line2DConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/Line2DEquationConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/Line2DEquationConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/Line2DEquationConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/Line2DEquationConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/Projection1DConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/Projection1DConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/Projection1DConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/Projection1DConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/QuaternionConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/QuaternionConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/QuaternionConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/QuaternionConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/Shape2DConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/Shape2DConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/Shape2DConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/Shape2DConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/TriangleConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/TriangleConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/TriangleConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/TriangleConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/Vector2DConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/Vector2DConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/Vector2DConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/Vector2DConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/Vector3DConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/Vector3DConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/Primitives/Vector3DConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/Primitives/Vector3DConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/SerializedClassConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/SerializedClassConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/SerializedClassConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/SerializedClassConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/StateEnableConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/StateEnableConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/StateEnableConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/StateEnableConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/TypeContainerConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/TypeContainerConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/TypeContainerConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/TypeContainerConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/UniverseConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/UniverseConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/UniverseConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/UniverseConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Converters/UniverseObjectConverter.cs b/Engine.Integration/Engine.Integration.Yaml/Converters/UniverseObjectConverter.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/Converters/UniverseObjectConverter.cs rename to Engine.Integration/Engine.Integration.Yaml/Converters/UniverseObjectConverter.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/Engine.Serializers.Yaml.csproj b/Engine.Integration/Engine.Integration.Yaml/Engine.Integration.Yaml.csproj similarity index 76% rename from Engine.Serializers/Engine.Serializers.Yaml/Engine.Serializers.Yaml.csproj rename to Engine.Integration/Engine.Integration.Yaml/Engine.Integration.Yaml.csproj index 59ce055..4878b8e 100644 --- a/Engine.Serializers/Engine.Serializers.Yaml/Engine.Serializers.Yaml.csproj +++ b/Engine.Integration/Engine.Integration.Yaml/Engine.Integration.Yaml.csproj @@ -4,8 +4,8 @@ net9.0 disable enable - Engine.Serializers.Yaml - Engine.Serializers.Yaml + Engine.Integration.Yaml + Engine.Integration.Yaml diff --git a/Engine.Serializers/Engine.Serializers.Yaml/SerializerInProgressException.cs b/Engine.Integration/Engine.Integration.Yaml/SerializerInProgressException.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/SerializerInProgressException.cs rename to Engine.Integration/Engine.Integration.Yaml/SerializerInProgressException.cs diff --git a/Engine.Serializers/Engine.Serializers.Yaml/YamlSerializer.cs b/Engine.Integration/Engine.Integration.Yaml/YamlSerializer.cs similarity index 100% rename from Engine.Serializers/Engine.Serializers.Yaml/YamlSerializer.cs rename to Engine.Integration/Engine.Integration.Yaml/YamlSerializer.cs diff --git a/Engine.Integration/YamlDotNet b/Engine.Integration/YamlDotNet new file mode 160000 index 0000000..b8ac2a9 --- /dev/null +++ b/Engine.Integration/YamlDotNet @@ -0,0 +1 @@ +Subproject commit b8ac2a98ffcc12434eff6c6abb75b38ad1b1ab04 diff --git a/Engine.Serializers/YamlDotNet b/Engine.Serializers/YamlDotNet deleted file mode 160000 index 62048d7..0000000 --- a/Engine.Serializers/YamlDotNet +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 62048d7abe5b233570d59c7d8043c21a4def2cb6 diff --git a/Engine.sln b/Engine.sln index b81932e..59b17e5 100644 --- a/Engine.sln +++ b/Engine.sln @@ -11,18 +11,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Systems", "Engine.Sy EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine", "Engine\Engine.csproj", "{58AE79C1-9203-44AE-8022-AA180F0A71DC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine.Serializers", "Engine.Serializers", "{F88E129A-9A47-4D27-96EE-6EC02F79594B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine.Integration", "Engine.Integration", "{F88E129A-9A47-4D27-96EE-6EC02F79594B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Serializers.Yaml", "Engine.Serializers\Engine.Serializers.Yaml\Engine.Serializers.Yaml.csproj", "{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Integration.Yaml", "Engine.Integration\Engine.Integration.Yaml\Engine.Integration.Yaml.csproj", "{E9D1CDC3-5BFF-4C87-AFEB-6CE372709176}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YamlDotNet", "Engine.Serializers\YamlDotNet\YamlDotNet\YamlDotNet.csproj", "{3D852C92-BC14-4893-AEF2-50612DAFCD8F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YamlDotNet", "Engine.Integration\YamlDotNet\YamlDotNet\YamlDotNet.csproj", "{3D852C92-BC14-4893-AEF2-50612DAFCD8F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration", "Integration", "{823D4020-332D-2C13-F261-6F510F11A57E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Integration.MonoGame", "Engine.Integration\Engine.Integration.MonoGame\Engine.Integration.MonoGame.csproj", "{C3438D33-0879-44E4-9DF0-D29F5621C44C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine.Integration", "Engine.Integration", "{3122C4BF-14AF-E0C0-27A2-43B3E062692D}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Integration.LiteNetLib", "Engine.Integration\Engine.Integration.LiteNetLib\Engine.Integration.LiteNetLib.csproj", "{121A7C66-1691-4DA5-B070-A681A83779AC}" EndProject Global @@ -139,6 +137,5 @@ Global {E9D1CDC3-5BFF-4C87-AFEB-6CE372709176} = {F88E129A-9A47-4D27-96EE-6EC02F79594B} {3D852C92-BC14-4893-AEF2-50612DAFCD8F} = {F88E129A-9A47-4D27-96EE-6EC02F79594B} {C3438D33-0879-44E4-9DF0-D29F5621C44C} = {823D4020-332D-2C13-F261-6F510F11A57E} - {121A7C66-1691-4DA5-B070-A681A83779AC} = {3122C4BF-14AF-E0C0-27A2-43B3E062692D} EndGlobalSection EndGlobal