From e204f899baedc828ce39278131c9901e78ddeba2 Mon Sep 17 00:00:00 2001 From: GwWuYou <95328647+GeWuYou@users.noreply.github.com> Date: Wed, 10 Dec 2025 08:51:17 +0800 Subject: [PATCH] =?UTF-8?q?refactor(core):=20=E9=87=8D=E6=9E=84=E6=A1=86?= =?UTF-8?q?=E6=9E=B6=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=E4=B8=BAGFramewor?= =?UTF-8?q?k.Core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将所有framework命名空间下的类迁移至GFramework.Core命名空间 - 更新所有相关using引用从framework到Core - 重命名项目文件夹及文件路径以匹配新的命名空间结构 - 在解决方案中添加GFramework.Core项目引用 - 配置项目依赖关系并移除旧的Generator引用冲突 - 创建独立的GFramework.Core.csproj项目文件支持多目标框架 --- GFramework.Core/GFramework.Core.csproj | 10 ++++++++++ {framework => GFramework.Core}/README.md | 0 .../architecture/Architecture.cs | 16 ++++++++-------- .../architecture/IArchitecture.cs | 14 +++++++------- .../architecture/README.md | 0 .../command/AbstractCommand.cs | 6 +++--- .../command/ICanSendCommand.cs | 4 ++-- .../command/ICommand.cs | 14 +++++++------- {framework => GFramework.Core}/command/README.md | 0 .../controller/IController.cs | 14 +++++++------- .../controller/README.md | 0 .../events/DefaultUnRegister.cs | 2 +- .../events/EasyEvent.cs | 2 +- .../events/EasyEventGeneric.cs | 2 +- .../events/EasyEvents.cs | 2 +- .../events/ICanRegisterEvent.cs | 4 ++-- .../events/ICanSendEvent.cs | 4 ++-- .../events/IEasyEvent.cs | 2 +- .../events/IUnRegister.cs | 2 +- .../events/IUnRegisterList.cs | 2 +- {framework => GFramework.Core}/events/OrEvent.cs | 4 ++-- {framework => GFramework.Core}/events/README.md | 0 .../events/TypeEventSystem.cs | 2 +- .../events/UnRegisterList.cs | 2 +- .../extensions/CanGetExtensions.cs | 8 ++++---- .../extensions/CanRegisterEventExtensions.cs | 4 ++-- .../extensions/CanSendExtensions.cs | 8 ++++---- .../extensions/OrEventExtensions.cs | 4 ++-- .../extensions/README.md | 0 .../extensions/UnRegisterExtension.cs | 0 .../extensions/UnRegisterListExtension.cs | 4 ++-- .../godot/NodeExtensions.cs | 0 .../ioc/IocContainer.cs | 2 +- {framework => GFramework.Core}/ioc/README.md | 0 .../model/AbstractModel.cs | 4 ++-- .../model/ICanGetModel.cs | 4 ++-- {framework => GFramework.Core}/model/IModel.cs | 8 ++++---- {framework => GFramework.Core}/model/README.md | 0 .../property/BindableProperty.cs | 4 ++-- .../property/BindablePropertyUnRegister.cs | 4 ++-- .../property/IBindableProperty.cs | 2 +- .../property/IReadonlyBindableProperty.cs | 4 ++-- .../property/README.md | 0 .../query/AbstractQuery.cs | 4 ++-- .../query/ICanSendQuery.cs | 4 ++-- {framework => GFramework.Core}/query/IQuery.cs | 8 ++++---- {framework => GFramework.Core}/query/README.md | 0 .../rule/IBelongToArchitecture.cs | 4 ++-- .../rule/ICanSetArchitecture.cs | 4 ++-- {framework => GFramework.Core}/rule/README.md | 0 .../system/AbstractSystem.cs | 6 +++--- .../system/ICanGetSystem.cs | 4 ++-- {framework => GFramework.Core}/system/ISystem.cs | 10 +++++----- {framework => GFramework.Core}/system/README.md | 0 .../utility/ICanGetUtility.cs | 4 ++-- .../utility/IUtility.cs | 2 +- {framework => GFramework.Core}/utility/README.md | 0 GFramework.csproj | 8 +++++--- GFramework.sln | 6 ++++++ 59 files changed, 125 insertions(+), 107 deletions(-) create mode 100644 GFramework.Core/GFramework.Core.csproj rename {framework => GFramework.Core}/README.md (100%) rename {framework => GFramework.Core}/architecture/Architecture.cs (97%) rename {framework => GFramework.Core}/architecture/IArchitecture.cs (93%) rename {framework => GFramework.Core}/architecture/README.md (100%) rename {framework => GFramework.Core}/command/AbstractCommand.cs (95%) rename {framework => GFramework.Core}/command/ICanSendCommand.cs (77%) rename {framework => GFramework.Core}/command/ICommand.cs (83%) rename {framework => GFramework.Core}/command/README.md (100%) rename {framework => GFramework.Core}/controller/IController.cs (63%) rename {framework => GFramework.Core}/controller/README.md (100%) rename {framework => GFramework.Core}/events/DefaultUnRegister.cs (92%) rename {framework => GFramework.Core}/events/EasyEvent.cs (95%) rename {framework => GFramework.Core}/events/EasyEventGeneric.cs (99%) rename {framework => GFramework.Core}/events/EasyEvents.cs (98%) rename {framework => GFramework.Core}/events/ICanRegisterEvent.cs (83%) rename {framework => GFramework.Core}/events/ICanSendEvent.cs (80%) rename {framework => GFramework.Core}/events/IEasyEvent.cs (89%) rename {framework => GFramework.Core}/events/IUnRegister.cs (81%) rename {framework => GFramework.Core}/events/IUnRegisterList.cs (86%) rename {framework => GFramework.Core}/events/OrEvent.cs (95%) rename {framework => GFramework.Core}/events/README.md (100%) rename {framework => GFramework.Core}/events/TypeEventSystem.cs (93%) rename {framework => GFramework.Core}/events/UnRegisterList.cs (96%) rename {framework => GFramework.Core}/extensions/CanGetExtensions.cs (92%) rename {framework => GFramework.Core}/extensions/CanRegisterEventExtensions.cs (93%) rename {framework => GFramework.Core}/extensions/CanSendExtensions.cs (95%) rename {framework => GFramework.Core}/extensions/OrEventExtensions.cs (88%) rename {framework => GFramework.Core}/extensions/README.md (100%) rename {framework => GFramework.Core}/extensions/UnRegisterExtension.cs (100%) rename {framework => GFramework.Core}/extensions/UnRegisterListExtension.cs (92%) rename {framework => GFramework.Core}/godot/NodeExtensions.cs (100%) rename {framework => GFramework.Core}/ioc/IocContainer.cs (96%) rename {framework => GFramework.Core}/ioc/README.md (100%) rename {framework => GFramework.Core}/model/AbstractModel.cs (92%) rename {framework => GFramework.Core}/model/ICanGetModel.cs (77%) rename {framework => GFramework.Core}/model/IModel.cs (63%) rename {framework => GFramework.Core}/model/README.md (100%) rename {framework => GFramework.Core}/property/BindableProperty.cs (98%) rename {framework => GFramework.Core}/property/BindablePropertyUnRegister.cs (94%) rename {framework => GFramework.Core}/property/IBindableProperty.cs (93%) rename {framework => GFramework.Core}/property/IReadonlyBindableProperty.cs (93%) rename {framework => GFramework.Core}/property/README.md (100%) rename {framework => GFramework.Core}/query/AbstractQuery.cs (92%) rename {framework => GFramework.Core}/query/ICanSendQuery.cs (77%) rename {framework => GFramework.Core}/query/IQuery.cs (75%) rename {framework => GFramework.Core}/query/README.md (100%) rename {framework => GFramework.Core}/rule/IBelongToArchitecture.cs (85%) rename {framework => GFramework.Core}/rule/ICanSetArchitecture.cs (79%) rename {framework => GFramework.Core}/rule/README.md (100%) rename {framework => GFramework.Core}/system/AbstractSystem.cs (89%) rename {framework => GFramework.Core}/system/ICanGetSystem.cs (79%) rename {framework => GFramework.Core}/system/ISystem.cs (71%) rename {framework => GFramework.Core}/system/README.md (100%) rename {framework => GFramework.Core}/utility/ICanGetUtility.cs (76%) rename {framework => GFramework.Core}/utility/IUtility.cs (82%) rename {framework => GFramework.Core}/utility/README.md (100%) diff --git a/GFramework.Core/GFramework.Core.csproj b/GFramework.Core/GFramework.Core.csproj new file mode 100644 index 0000000..e2b8a21 --- /dev/null +++ b/GFramework.Core/GFramework.Core.csproj @@ -0,0 +1,10 @@ + + + + GeWuYou.GFramework.Core + net9.0;net8.0 + enable + enable + + + diff --git a/framework/README.md b/GFramework.Core/README.md similarity index 100% rename from framework/README.md rename to GFramework.Core/README.md diff --git a/framework/architecture/Architecture.cs b/GFramework.Core/architecture/Architecture.cs similarity index 97% rename from framework/architecture/Architecture.cs rename to GFramework.Core/architecture/Architecture.cs index 77b8aac..9ca82e4 100644 --- a/framework/architecture/Architecture.cs +++ b/GFramework.Core/architecture/Architecture.cs @@ -1,12 +1,12 @@ -using GFramework.framework.command; -using GFramework.framework.events; -using GFramework.framework.ioc; -using GFramework.framework.model; -using GFramework.framework.query; -using GFramework.framework.system; -using GFramework.framework.utility; +using GFramework.Core.command; +using GFramework.Core.events; +using GFramework.Core.ioc; +using GFramework.Core.model; +using GFramework.Core.query; +using GFramework.Core.system; +using GFramework.Core.utility; -namespace GFramework.framework.architecture; +namespace GFramework.Core.architecture; /// /// 架构基类，提供系统、模型、工具等组件的注册与管理功能。 diff --git a/framework/architecture/IArchitecture.cs b/GFramework.Core/architecture/IArchitecture.cs similarity index 93% rename from framework/architecture/IArchitecture.cs rename to GFramework.Core/architecture/IArchitecture.cs index 0b2ee8c..642d677 100644 --- a/framework/architecture/IArchitecture.cs +++ b/GFramework.Core/architecture/IArchitecture.cs @@ -1,11 +1,11 @@ -using GFramework.framework.command; -using GFramework.framework.events; -using GFramework.framework.model; -using GFramework.framework.query; -using GFramework.framework.system; -using GFramework.framework.utility; +using GFramework.Core.command; +using GFramework.Core.events; +using GFramework.Core.model; +using GFramework.Core.query; +using GFramework.Core.system; +using GFramework.Core.utility; -namespace GFramework.framework.architecture; +namespace GFramework.Core.architecture; /// /// 架构接口，定义了应用程序架构的核心功能，包括系统、模型、工具的注册和获取， diff --git a/framework/architecture/README.md b/GFramework.Core/architecture/README.md similarity index 100% rename from framework/architecture/README.md rename to GFramework.Core/architecture/README.md diff --git a/framework/command/AbstractCommand.cs b/GFramework.Core/command/AbstractCommand.cs similarity index 95% rename from framework/command/AbstractCommand.cs rename to GFramework.Core/command/AbstractCommand.cs index ef01313..36c86fa 100644 --- a/framework/command/AbstractCommand.cs +++ b/GFramework.Core/command/AbstractCommand.cs @@ -1,7 +1,7 @@ -using GFramework.framework.architecture; -using GFramework.framework.rule; +using GFramework.Core.architecture; +using GFramework.Core.rule; -namespace GFramework.framework.command; +namespace GFramework.Core.command; /// /// 抽象命令类，实现 ICommand 接口，为具体命令提供基础架构支持 diff --git a/framework/command/ICanSendCommand.cs b/GFramework.Core/command/ICanSendCommand.cs similarity index 77% rename from framework/command/ICanSendCommand.cs rename to GFramework.Core/command/ICanSendCommand.cs index 8df3169..f863581 100644 --- a/framework/command/ICanSendCommand.cs +++ b/GFramework.Core/command/ICanSendCommand.cs @@ -1,6 +1,6 @@ -using GFramework.framework.rule; +using GFramework.Core.rule; -namespace GFramework.framework.command; +namespace GFramework.Core.command; /// /// 定义一个可以发送命令的接口，继承自IBelongToArchitecture接口。 diff --git a/framework/command/ICommand.cs b/GFramework.Core/command/ICommand.cs similarity index 83% rename from framework/command/ICommand.cs rename to GFramework.Core/command/ICommand.cs index e5ae761..b0ec155 100644 --- a/framework/command/ICommand.cs +++ b/GFramework.Core/command/ICommand.cs @@ -1,11 +1,11 @@ -using GFramework.framework.events; -using GFramework.framework.model; -using GFramework.framework.query; -using GFramework.framework.rule; -using GFramework.framework.system; -using GFramework.framework.utility; +using GFramework.Core.events; +using GFramework.Core.model; +using GFramework.Core.query; +using GFramework.Core.rule; +using GFramework.Core.system; +using GFramework.Core.utility; -namespace GFramework.framework.command; +namespace GFramework.Core.command; /// /// 命令接口，定义了无返回值命令的基本契约 diff --git a/framework/command/README.md b/GFramework.Core/command/README.md similarity index 100% rename from framework/command/README.md rename to GFramework.Core/command/README.md diff --git a/framework/controller/IController.cs b/GFramework.Core/controller/IController.cs similarity index 63% rename from framework/controller/IController.cs rename to GFramework.Core/controller/IController.cs index 8dfebd4..3b5e9c6 100644 --- a/framework/controller/IController.cs +++ b/GFramework.Core/controller/IController.cs @@ -1,11 +1,11 @@ -using GFramework.framework.command; -using GFramework.framework.events; -using GFramework.framework.model; -using GFramework.framework.query; -using GFramework.framework.system; -using GFramework.framework.utility; +using GFramework.Core.command; +using GFramework.Core.events; +using GFramework.Core.model; +using GFramework.Core.query; +using GFramework.Core.system; +using GFramework.Core.utility; -namespace GFramework.framework.controller; +namespace GFramework.Core.controller; /// /// 控制器接口，定义了控制器需要实现的所有功能契约 diff --git a/framework/controller/README.md b/GFramework.Core/controller/README.md similarity index 100% rename from framework/controller/README.md rename to GFramework.Core/controller/README.md diff --git a/framework/events/DefaultUnRegister.cs b/GFramework.Core/events/DefaultUnRegister.cs similarity index 92% rename from framework/events/DefaultUnRegister.cs rename to GFramework.Core/events/DefaultUnRegister.cs index f6b4f58..e71da4a 100644 --- a/framework/events/DefaultUnRegister.cs +++ b/GFramework.Core/events/DefaultUnRegister.cs @@ -1,4 +1,4 @@ -namespace GFramework.framework.events; +namespace GFramework.Core.events; /// diff --git a/framework/events/EasyEvent.cs b/GFramework.Core/events/EasyEvent.cs similarity index 95% rename from framework/events/EasyEvent.cs rename to GFramework.Core/events/EasyEvent.cs index cf53642..f2a446f 100644 --- a/framework/events/EasyEvent.cs +++ b/GFramework.Core/events/EasyEvent.cs @@ -1,4 +1,4 @@ -namespace GFramework.framework.events; +namespace GFramework.Core.events; /// /// 简单事件类，用于注册、注销和触发无参事件回调 diff --git a/framework/events/EasyEventGeneric.cs b/GFramework.Core/events/EasyEventGeneric.cs similarity index 99% rename from framework/events/EasyEventGeneric.cs rename to GFramework.Core/events/EasyEventGeneric.cs index d75ab97..4f7d17c 100644 --- a/framework/events/EasyEventGeneric.cs +++ b/GFramework.Core/events/EasyEventGeneric.cs @@ -1,4 +1,4 @@ -namespace GFramework.framework.events; +namespace GFramework.Core.events; /// /// 泛型事件类，支持一个泛型参数 T 的事件注册、注销与触发。 diff --git a/framework/events/EasyEvents.cs b/GFramework.Core/events/EasyEvents.cs similarity index 98% rename from framework/events/EasyEvents.cs rename to GFramework.Core/events/EasyEvents.cs index 6fd74a8..6d2b00e 100644 --- a/framework/events/EasyEvents.cs +++ b/GFramework.Core/events/EasyEvents.cs @@ -1,4 +1,4 @@ -namespace GFramework.framework.events; +namespace GFramework.Core.events; /// /// EasyEvents事件管理器类，用于全局事件的注册、获取和管理 diff --git a/framework/events/ICanRegisterEvent.cs b/GFramework.Core/events/ICanRegisterEvent.cs similarity index 83% rename from framework/events/ICanRegisterEvent.cs rename to GFramework.Core/events/ICanRegisterEvent.cs index aa40ee5..f3fc0e5 100644 --- a/framework/events/ICanRegisterEvent.cs +++ b/GFramework.Core/events/ICanRegisterEvent.cs @@ -1,6 +1,6 @@ -using GFramework.framework.rule; +using GFramework.Core.rule; -namespace GFramework.framework.events; +namespace GFramework.Core.events; /// /// 定义一个可以注册事件的接口，继承自IBelongToArchitecture接口。 diff --git a/framework/events/ICanSendEvent.cs b/GFramework.Core/events/ICanSendEvent.cs similarity index 80% rename from framework/events/ICanSendEvent.cs rename to GFramework.Core/events/ICanSendEvent.cs index d2744e8..26a0b86 100644 --- a/framework/events/ICanSendEvent.cs +++ b/GFramework.Core/events/ICanSendEvent.cs @@ -1,6 +1,6 @@ -using GFramework.framework.rule; +using GFramework.Core.rule; -namespace GFramework.framework.events; +namespace GFramework.Core.events; /// /// 定义一个可以发送事件的接口，继承自IBelongToArchitecture接口。 diff --git a/framework/events/IEasyEvent.cs b/GFramework.Core/events/IEasyEvent.cs similarity index 89% rename from framework/events/IEasyEvent.cs rename to GFramework.Core/events/IEasyEvent.cs index 34e7a78..1fdac52 100644 --- a/framework/events/IEasyEvent.cs +++ b/GFramework.Core/events/IEasyEvent.cs @@ -1,4 +1,4 @@ -namespace GFramework.framework.events; +namespace GFramework.Core.events; /// /// 事件接口，定义了事件注册的基本功能 diff --git a/framework/events/IUnRegister.cs b/GFramework.Core/events/IUnRegister.cs similarity index 81% rename from framework/events/IUnRegister.cs rename to GFramework.Core/events/IUnRegister.cs index 13575b9..3498702 100644 --- a/framework/events/IUnRegister.cs +++ b/GFramework.Core/events/IUnRegister.cs @@ -1,4 +1,4 @@ -namespace GFramework.framework.events; +namespace GFramework.Core.events; /// /// 提供注销功能的接口 diff --git a/framework/events/IUnRegisterList.cs b/GFramework.Core/events/IUnRegisterList.cs similarity index 86% rename from framework/events/IUnRegisterList.cs rename to GFramework.Core/events/IUnRegisterList.cs index 3f15959..35869b4 100644 --- a/framework/events/IUnRegisterList.cs +++ b/GFramework.Core/events/IUnRegisterList.cs @@ -1,4 +1,4 @@ -namespace GFramework.framework.events; +namespace GFramework.Core.events; /// /// 提供统一注销功能的接口，用于管理需要注销的对象列表 diff --git a/framework/events/OrEvent.cs b/GFramework.Core/events/OrEvent.cs similarity index 95% rename from framework/events/OrEvent.cs rename to GFramework.Core/events/OrEvent.cs index 07a587f..db46a8a 100644 --- a/framework/events/OrEvent.cs +++ b/GFramework.Core/events/OrEvent.cs @@ -1,6 +1,6 @@ -using GFramework.framework.extensions; +using GFramework.Core.extensions; -namespace GFramework.framework.events; +namespace GFramework.Core.events; /// /// OrEvent类用于实现事件的或逻辑组合，当任意一个注册的事件触发时，都会触发OrEvent本身 diff --git a/framework/events/README.md b/GFramework.Core/events/README.md similarity index 100% rename from framework/events/README.md rename to GFramework.Core/events/README.md diff --git a/framework/events/TypeEventSystem.cs b/GFramework.Core/events/TypeEventSystem.cs similarity index 93% rename from framework/events/TypeEventSystem.cs rename to GFramework.Core/events/TypeEventSystem.cs index 4be8834..287a83c 100644 --- a/framework/events/TypeEventSystem.cs +++ b/GFramework.Core/events/TypeEventSystem.cs @@ -1,4 +1,4 @@ -namespace GFramework.framework.events; +namespace GFramework.Core.events; /// /// TypeEventSystem diff --git a/framework/events/UnRegisterList.cs b/GFramework.Core/events/UnRegisterList.cs similarity index 96% rename from framework/events/UnRegisterList.cs rename to GFramework.Core/events/UnRegisterList.cs index 855db26..f5c4b8c 100644 --- a/framework/events/UnRegisterList.cs +++ b/GFramework.Core/events/UnRegisterList.cs @@ -1,4 +1,4 @@ -namespace GFramework.framework.events; +namespace GFramework.Core.events; /// diff --git a/framework/extensions/CanGetExtensions.cs b/GFramework.Core/extensions/CanGetExtensions.cs similarity index 92% rename from framework/extensions/CanGetExtensions.cs rename to GFramework.Core/extensions/CanGetExtensions.cs index 03bace6..de0d448 100644 --- a/framework/extensions/CanGetExtensions.cs +++ b/GFramework.Core/extensions/CanGetExtensions.cs @@ -1,8 +1,8 @@ -using GFramework.framework.model; -using GFramework.framework.system; -using GFramework.framework.utility; +using GFramework.Core.model; +using GFramework.Core.system; +using GFramework.Core.utility; -namespace GFramework.framework.extensions; +namespace GFramework.Core.extensions; /// /// 提供获取模型对象扩展方法的静态类 diff --git a/framework/extensions/CanRegisterEventExtensions.cs b/GFramework.Core/extensions/CanRegisterEventExtensions.cs similarity index 93% rename from framework/extensions/CanRegisterEventExtensions.cs rename to GFramework.Core/extensions/CanRegisterEventExtensions.cs index 3e73a79..b3a13d6 100644 --- a/framework/extensions/CanRegisterEventExtensions.cs +++ b/GFramework.Core/extensions/CanRegisterEventExtensions.cs @@ -1,6 +1,6 @@ -using GFramework.framework.events; +using GFramework.Core.events; -namespace GFramework.framework.extensions; +namespace GFramework.Core.extensions; /// /// 事件注册扩展类，提供ICanRegisterEvent接口的扩展方法用于注册和注销事件 diff --git a/framework/extensions/CanSendExtensions.cs b/GFramework.Core/extensions/CanSendExtensions.cs similarity index 95% rename from framework/extensions/CanSendExtensions.cs rename to GFramework.Core/extensions/CanSendExtensions.cs index a5ff398..2e4b78b 100644 --- a/framework/extensions/CanSendExtensions.cs +++ b/GFramework.Core/extensions/CanSendExtensions.cs @@ -1,8 +1,8 @@ -using GFramework.framework.command; -using GFramework.framework.events; -using GFramework.framework.query; +using GFramework.Core.command; +using GFramework.Core.events; +using GFramework.Core.query; -namespace GFramework.framework.extensions; +namespace GFramework.Core.extensions; /// /// 提供发送命令功能的扩展类 diff --git a/framework/extensions/OrEventExtensions.cs b/GFramework.Core/extensions/OrEventExtensions.cs similarity index 88% rename from framework/extensions/OrEventExtensions.cs rename to GFramework.Core/extensions/OrEventExtensions.cs index 72d3c9c..b61bdda 100644 --- a/framework/extensions/OrEventExtensions.cs +++ b/GFramework.Core/extensions/OrEventExtensions.cs @@ -1,6 +1,6 @@ -using GFramework.framework.events; +using GFramework.Core.events; -namespace GFramework.framework.extensions; +namespace GFramework.Core.extensions; /// /// 提供Or事件扩展方法的静态类 diff --git a/framework/extensions/README.md b/GFramework.Core/extensions/README.md similarity index 100% rename from framework/extensions/README.md rename to GFramework.Core/extensions/README.md diff --git a/framework/extensions/UnRegisterExtension.cs b/GFramework.Core/extensions/UnRegisterExtension.cs similarity index 100% rename from framework/extensions/UnRegisterExtension.cs rename to GFramework.Core/extensions/UnRegisterExtension.cs diff --git a/framework/extensions/UnRegisterListExtension.cs b/GFramework.Core/extensions/UnRegisterListExtension.cs similarity index 92% rename from framework/extensions/UnRegisterListExtension.cs rename to GFramework.Core/extensions/UnRegisterListExtension.cs index 9eb3dd9..c0ef67d 100644 --- a/framework/extensions/UnRegisterListExtension.cs +++ b/GFramework.Core/extensions/UnRegisterListExtension.cs @@ -1,6 +1,6 @@ -using GFramework.framework.events; +using GFramework.Core.events; -namespace GFramework.framework.extensions; +namespace GFramework.Core.extensions; /// diff --git a/framework/godot/NodeExtensions.cs b/GFramework.Core/godot/NodeExtensions.cs similarity index 100% rename from framework/godot/NodeExtensions.cs rename to GFramework.Core/godot/NodeExtensions.cs diff --git a/framework/ioc/IocContainer.cs b/GFramework.Core/ioc/IocContainer.cs similarity index 96% rename from framework/ioc/IocContainer.cs rename to GFramework.Core/ioc/IocContainer.cs index 293e558..fa92113 100644 --- a/framework/ioc/IocContainer.cs +++ b/GFramework.Core/ioc/IocContainer.cs @@ -1,4 +1,4 @@ -namespace GFramework.framework.ioc; +namespace GFramework.Core.ioc; /// /// IOC容器类，用于管理对象的注册和获取 diff --git a/framework/ioc/README.md b/GFramework.Core/ioc/README.md similarity index 100% rename from framework/ioc/README.md rename to GFramework.Core/ioc/README.md diff --git a/framework/model/AbstractModel.cs b/GFramework.Core/model/AbstractModel.cs similarity index 92% rename from framework/model/AbstractModel.cs rename to GFramework.Core/model/AbstractModel.cs index 84f1acb..99ced7a 100644 --- a/framework/model/AbstractModel.cs +++ b/GFramework.Core/model/AbstractModel.cs @@ -1,6 +1,6 @@ -using GFramework.framework.architecture; +using GFramework.Core.architecture; -namespace GFramework.framework.model; +namespace GFramework.Core.model; /// /// 抽象模型基类，实现IModel接口，提供模型的基本架构支持 diff --git a/framework/model/ICanGetModel.cs b/GFramework.Core/model/ICanGetModel.cs similarity index 77% rename from framework/model/ICanGetModel.cs rename to GFramework.Core/model/ICanGetModel.cs index a549b77..b038882 100644 --- a/framework/model/ICanGetModel.cs +++ b/GFramework.Core/model/ICanGetModel.cs @@ -1,6 +1,6 @@ -using GFramework.framework.rule; +using GFramework.Core.rule; -namespace GFramework.framework.model; +namespace GFramework.Core.model; /// /// 定义一个接口，表示可以获取模型的架构组件。 diff --git a/framework/model/IModel.cs b/GFramework.Core/model/IModel.cs similarity index 63% rename from framework/model/IModel.cs rename to GFramework.Core/model/IModel.cs index a7a6478..a657b2b 100644 --- a/framework/model/IModel.cs +++ b/GFramework.Core/model/IModel.cs @@ -1,8 +1,8 @@ -using GFramework.framework.events; -using GFramework.framework.rule; -using GFramework.framework.utility; +using GFramework.Core.events; +using GFramework.Core.rule; +using GFramework.Core.utility; -namespace GFramework.framework.model; +namespace GFramework.Core.model; /// /// 模型接口，定义了模型的基本行为和功能 diff --git a/framework/model/README.md b/GFramework.Core/model/README.md similarity index 100% rename from framework/model/README.md rename to GFramework.Core/model/README.md diff --git a/framework/property/BindableProperty.cs b/GFramework.Core/property/BindableProperty.cs similarity index 98% rename from framework/property/BindableProperty.cs rename to GFramework.Core/property/BindableProperty.cs index 5d591b3..0e4daba 100644 --- a/framework/property/BindableProperty.cs +++ b/GFramework.Core/property/BindableProperty.cs @@ -1,6 +1,6 @@ -using GFramework.framework.events; +using GFramework.Core.events; -namespace GFramework.framework.property; +namespace GFramework.Core.property; /// diff --git a/framework/property/BindablePropertyUnRegister.cs b/GFramework.Core/property/BindablePropertyUnRegister.cs similarity index 94% rename from framework/property/BindablePropertyUnRegister.cs rename to GFramework.Core/property/BindablePropertyUnRegister.cs index 51fb903..7255b4a 100644 --- a/framework/property/BindablePropertyUnRegister.cs +++ b/GFramework.Core/property/BindablePropertyUnRegister.cs @@ -1,6 +1,6 @@ -using GFramework.framework.events; +using GFramework.Core.events; -namespace GFramework.framework.property; +namespace GFramework.Core.property; /// diff --git a/framework/property/IBindableProperty.cs b/GFramework.Core/property/IBindableProperty.cs similarity index 93% rename from framework/property/IBindableProperty.cs rename to GFramework.Core/property/IBindableProperty.cs index c677184..c5a5a6e 100644 --- a/framework/property/IBindableProperty.cs +++ b/GFramework.Core/property/IBindableProperty.cs @@ -1,4 +1,4 @@ -namespace GFramework.framework.property; +namespace GFramework.Core.property; /// /// 可绑定属性接口，继承自只读可绑定属性接口，提供可读写的属性绑定功能 diff --git a/framework/property/IReadonlyBindableProperty.cs b/GFramework.Core/property/IReadonlyBindableProperty.cs similarity index 93% rename from framework/property/IReadonlyBindableProperty.cs rename to GFramework.Core/property/IReadonlyBindableProperty.cs index 1f2a45d..e99793e 100644 --- a/framework/property/IReadonlyBindableProperty.cs +++ b/GFramework.Core/property/IReadonlyBindableProperty.cs @@ -1,6 +1,6 @@ -using GFramework.framework.events; +using GFramework.Core.events; -namespace GFramework.framework.property; +namespace GFramework.Core.property; /// diff --git a/framework/property/README.md b/GFramework.Core/property/README.md similarity index 100% rename from framework/property/README.md rename to GFramework.Core/property/README.md diff --git a/framework/query/AbstractQuery.cs b/GFramework.Core/query/AbstractQuery.cs similarity index 92% rename from framework/query/AbstractQuery.cs rename to GFramework.Core/query/AbstractQuery.cs index ab73f7b..2eba9f6 100644 --- a/framework/query/AbstractQuery.cs +++ b/GFramework.Core/query/AbstractQuery.cs @@ -1,6 +1,6 @@ -using GFramework.framework.architecture; +using GFramework.Core.architecture; -namespace GFramework.framework.query; +namespace GFramework.Core.query; /// /// 抽象查询类，提供查询操作的基础实现 diff --git a/framework/query/ICanSendQuery.cs b/GFramework.Core/query/ICanSendQuery.cs similarity index 77% rename from framework/query/ICanSendQuery.cs rename to GFramework.Core/query/ICanSendQuery.cs index 1664b9e..291bdae 100644 --- a/framework/query/ICanSendQuery.cs +++ b/GFramework.Core/query/ICanSendQuery.cs @@ -1,6 +1,6 @@ -using GFramework.framework.rule; +using GFramework.Core.rule; -namespace GFramework.framework.query; +namespace GFramework.Core.query; /// /// 定义一个可以发送查询的接口契约 diff --git a/framework/query/IQuery.cs b/GFramework.Core/query/IQuery.cs similarity index 75% rename from framework/query/IQuery.cs rename to GFramework.Core/query/IQuery.cs index 28f8d74..5170de5 100644 --- a/framework/query/IQuery.cs +++ b/GFramework.Core/query/IQuery.cs @@ -1,8 +1,8 @@ -using GFramework.framework.model; -using GFramework.framework.rule; -using GFramework.framework.system; +using GFramework.Core.model; +using GFramework.Core.rule; +using GFramework.Core.system; -namespace GFramework.framework.query; +namespace GFramework.Core.query; /// diff --git a/framework/query/README.md b/GFramework.Core/query/README.md similarity index 100% rename from framework/query/README.md rename to GFramework.Core/query/README.md diff --git a/framework/rule/IBelongToArchitecture.cs b/GFramework.Core/rule/IBelongToArchitecture.cs similarity index 85% rename from framework/rule/IBelongToArchitecture.cs rename to GFramework.Core/rule/IBelongToArchitecture.cs index 274ef55..1c69927 100644 --- a/framework/rule/IBelongToArchitecture.cs +++ b/GFramework.Core/rule/IBelongToArchitecture.cs @@ -1,6 +1,6 @@ -using GFramework.framework.architecture; +using GFramework.Core.architecture; -namespace GFramework.framework.rule; +namespace GFramework.Core.rule; /// diff --git a/framework/rule/ICanSetArchitecture.cs b/GFramework.Core/rule/ICanSetArchitecture.cs similarity index 79% rename from framework/rule/ICanSetArchitecture.cs rename to GFramework.Core/rule/ICanSetArchitecture.cs index dcc2250..977311c 100644 --- a/framework/rule/ICanSetArchitecture.cs +++ b/GFramework.Core/rule/ICanSetArchitecture.cs @@ -1,6 +1,6 @@ -using GFramework.framework.architecture; +using GFramework.Core.architecture; -namespace GFramework.framework.rule; +namespace GFramework.Core.rule; /// /// 定义一个接口，用于设置架构实例 diff --git a/framework/rule/README.md b/GFramework.Core/rule/README.md similarity index 100% rename from framework/rule/README.md rename to GFramework.Core/rule/README.md diff --git a/framework/system/AbstractSystem.cs b/GFramework.Core/system/AbstractSystem.cs similarity index 89% rename from framework/system/AbstractSystem.cs rename to GFramework.Core/system/AbstractSystem.cs index 8ad9245..bbc68a9 100644 --- a/framework/system/AbstractSystem.cs +++ b/GFramework.Core/system/AbstractSystem.cs @@ -1,7 +1,7 @@ -using GFramework.framework.architecture; -using GFramework.framework.rule; +using GFramework.Core.architecture; +using GFramework.Core.rule; -namespace GFramework.framework.system; +namespace GFramework.Core.system; /// /// 抽象系统基类，实现系统接口的基本功能 diff --git a/framework/system/ICanGetSystem.cs b/GFramework.Core/system/ICanGetSystem.cs similarity index 79% rename from framework/system/ICanGetSystem.cs rename to GFramework.Core/system/ICanGetSystem.cs index f9557d4..ddbd00e 100644 --- a/framework/system/ICanGetSystem.cs +++ b/GFramework.Core/system/ICanGetSystem.cs @@ -1,6 +1,6 @@ -using GFramework.framework.rule; +using GFramework.Core.rule; -namespace GFramework.framework.system; +namespace GFramework.Core.system; /// /// 定义一个接口，表示可以获取系统的对象。 diff --git a/framework/system/ISystem.cs b/GFramework.Core/system/ISystem.cs similarity index 71% rename from framework/system/ISystem.cs rename to GFramework.Core/system/ISystem.cs index 7dcbabc..45a3a3e 100644 --- a/framework/system/ISystem.cs +++ b/GFramework.Core/system/ISystem.cs @@ -1,9 +1,9 @@ -using GFramework.framework.events; -using GFramework.framework.model; -using GFramework.framework.rule; -using GFramework.framework.utility; +using GFramework.Core.events; +using GFramework.Core.model; +using GFramework.Core.rule; +using GFramework.Core.utility; -namespace GFramework.framework.system; +namespace GFramework.Core.system; /// /// 系统接口，定义了系统的基本行为和功能 diff --git a/framework/system/README.md b/GFramework.Core/system/README.md similarity index 100% rename from framework/system/README.md rename to GFramework.Core/system/README.md diff --git a/framework/utility/ICanGetUtility.cs b/GFramework.Core/utility/ICanGetUtility.cs similarity index 76% rename from framework/utility/ICanGetUtility.cs rename to GFramework.Core/utility/ICanGetUtility.cs index 2a54708..2dc1c03 100644 --- a/framework/utility/ICanGetUtility.cs +++ b/GFramework.Core/utility/ICanGetUtility.cs @@ -1,6 +1,6 @@ -using GFramework.framework.rule; +using GFramework.Core.rule; -namespace GFramework.framework.utility; +namespace GFramework.Core.utility; /// /// 定义一个接口，表示可以获取工具类的对象 diff --git a/framework/utility/IUtility.cs b/GFramework.Core/utility/IUtility.cs similarity index 82% rename from framework/utility/IUtility.cs rename to GFramework.Core/utility/IUtility.cs index a644a31..90366eb 100644 --- a/framework/utility/IUtility.cs +++ b/GFramework.Core/utility/IUtility.cs @@ -1,4 +1,4 @@ -namespace GFramework.framework.utility; +namespace GFramework.Core.utility; /// /// IUtility接口定义了通用工具类的基本契约 diff --git a/framework/utility/README.md b/GFramework.Core/utility/README.md similarity index 100% rename from framework/utility/README.md rename to GFramework.Core/utility/README.md diff --git a/GFramework.csproj b/GFramework.csproj index df9c63e..ca9033c 100644 --- a/GFramework.csproj +++ b/GFramework.csproj @@ -27,24 +27,26 @@ + + + - + + \ No newline at end of file diff --git a/GFramework.sln b/GFramework.sln index c2b50d7..e5505f5 100644 --- a/GFramework.sln +++ b/GFramework.sln @@ -6,6 +6,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFramework.Generator", "GFr EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFramework.Generator.Attributes", "GFramework.Generator.Attributes\GFramework.Generator.Attributes.csproj", "{84C5C3C9-5620-4924-BA04-92F813F2B70F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFramework.Core", "GFramework.Core\GFramework.Core.csproj", "{A6D5854D-79EA-487A-9ED9-396E6A1F8031}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -24,5 +26,9 @@ Global {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Debug|Any CPU.Build.0 = Debug|Any CPU {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Release|Any CPU.ActiveCfg = Release|Any CPU {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Release|Any CPU.Build.0 = Release|Any CPU + {A6D5854D-79EA-487A-9ED9-396E6A1F8031}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A6D5854D-79EA-487A-9ED9-396E6A1F8031}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A6D5854D-79EA-487A-9ED9-396E6A1F8031}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A6D5854D-79EA-487A-9ED9-396E6A1F8031}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal