diff --git a/GFramework.Core.Abstractions/Directory.Build.props b/GFramework.Core.Abstractions/Directory.Build.props index efa07a7..638b238 100644 --- a/GFramework.Core.Abstractions/Directory.Build.props +++ b/GFramework.Core.Abstractions/Directory.Build.props @@ -1,16 +1,12 @@  - + - netstandard2.0;net8.0 + net8.0;net9.0;net10.0 true true - preview + all diff --git a/GFramework.Core.Abstractions/logging/ILogger.cs b/GFramework.Core.Abstractions/logging/ILogger.cs index 44d1929..fcb2db9 100644 --- a/GFramework.Core.Abstractions/logging/ILogger.cs +++ b/GFramework.Core.Abstractions/logging/ILogger.cs @@ -72,7 +72,7 @@ public interface ILogger LogLevel.Warning => IsWarnEnabled(), LogLevel.Error => IsErrorEnabled(), LogLevel.Fatal => IsFatalEnabled(), - _ => throw new ArgumentException("Level [" + level + "] not recognized.") + _ => throw new ArgumentException($"Level [{level}] not recognized.", nameof(level)), }; } diff --git a/GFramework.Core.Abstractions/property/IReadonlyBindableProperty.cs b/GFramework.Core.Abstractions/property/IReadonlyBindableProperty.cs index ee3e9d6..78ee0cf 100644 --- a/GFramework.Core.Abstractions/property/IReadonlyBindableProperty.cs +++ b/GFramework.Core.Abstractions/property/IReadonlyBindableProperty.cs @@ -1,3 +1,4 @@ +using System; using GFramework.Core.Abstractions.events; namespace GFramework.Core.Abstractions.property; diff --git a/GFramework.Core/property/BindableProperty.cs b/GFramework.Core/property/BindableProperty.cs index 4154176..c91e41e 100644 --- a/GFramework.Core/property/BindableProperty.cs +++ b/GFramework.Core/property/BindableProperty.cs @@ -16,7 +16,7 @@ public class BindableProperty(T defaultValue = default!) : IBindableProperty< /// /// 获取或设置属性值比较器,默认使用Equals方法进行比较 /// - public static Func Comparer { get; set; } = (a, b) => a!.Equals(b)!; + public static Func Comparer { get; set; } = (a, b) => a!.Equals(b); /// /// 获取或设置属性值,当值发生变化时会触发注册的回调事件 diff --git a/GFramework.Game/assets/IAssetCatalogSystem.cs b/GFramework.Game/assets/IAssetCatalogSystem.cs index 660eb15..5a0f57b 100644 --- a/GFramework.Game/assets/IAssetCatalogSystem.cs +++ b/GFramework.Game/assets/IAssetCatalogSystem.cs @@ -1,4 +1,4 @@ -using GFramework.Core.system; +using GFramework.Core.Abstractions.system; namespace GFramework.Game.assets; diff --git a/GFramework.Game/assets/IResourceFactorySystem.cs b/GFramework.Game/assets/IResourceFactorySystem.cs index 2ecd778..e35de48 100644 --- a/GFramework.Game/assets/IResourceFactorySystem.cs +++ b/GFramework.Game/assets/IResourceFactorySystem.cs @@ -1,4 +1,4 @@ -using GFramework.Core.system; +using GFramework.Core.Abstractions.system; namespace GFramework.Game.assets; diff --git a/GFramework.Godot.SourceGenerators.Abstractions/Directory.Build.props b/GFramework.Godot.SourceGenerators.Abstractions/Directory.Build.props index 3a9b545..daa5255 100644 --- a/GFramework.Godot.SourceGenerators.Abstractions/Directory.Build.props +++ b/GFramework.Godot.SourceGenerators.Abstractions/Directory.Build.props @@ -1,18 +1,12 @@ - + - netstandard2.0 + net8.0;net9.0;net10.0 true true - preview - - + all diff --git a/GFramework.Godot.SourceGenerators/GFramework.Godot.SourceGenerators.csproj b/GFramework.Godot.SourceGenerators/GFramework.Godot.SourceGenerators.csproj index d0c2e31..c59cbc1 100644 --- a/GFramework.Godot.SourceGenerators/GFramework.Godot.SourceGenerators.csproj +++ b/GFramework.Godot.SourceGenerators/GFramework.Godot.SourceGenerators.csproj @@ -2,7 +2,7 @@ GeWuYou.GFramework.Godot.SourceGenerators - netstandard2.0 + net8.0;net9.0;net10.0 true diff --git a/GFramework.Godot/architecture/IGodotModule.cs b/GFramework.Godot/architecture/IGodotModule.cs index 1b18fa4..01a15b8 100644 --- a/GFramework.Godot/architecture/IGodotModule.cs +++ b/GFramework.Godot/architecture/IGodotModule.cs @@ -1,4 +1,5 @@ -using GFramework.Core.architecture; +using GFramework.Core.Abstractions.architecture; +using GFramework.Core.architecture; using Godot; namespace GFramework.Godot.architecture; diff --git a/GFramework.Godot/assets/AbstractResourceFactorySystem.cs b/GFramework.Godot/assets/AbstractResourceFactorySystem.cs index 982b645..321155e 100644 --- a/GFramework.Godot/assets/AbstractResourceFactorySystem.cs +++ b/GFramework.Godot/assets/AbstractResourceFactorySystem.cs @@ -1,7 +1,6 @@ -using GFramework.Core.architecture; +using GFramework.Core.Abstractions.architecture; using GFramework.Core.system; using GFramework.Game.assets; -using GFramework.Godot.system; using Godot; namespace GFramework.Godot.assets; diff --git a/GFramework.Godot/assets/IResourceLoadSystem.cs b/GFramework.Godot/assets/IResourceLoadSystem.cs index 81b3481..65181bb 100644 --- a/GFramework.Godot/assets/IResourceLoadSystem.cs +++ b/GFramework.Godot/assets/IResourceLoadSystem.cs @@ -1,8 +1,8 @@ -using GFramework.Core.system; +using GFramework.Core.Abstractions.system; using GFramework.Game.assets; using Godot; -namespace GFramework.Godot.system; +namespace GFramework.Godot.assets; /// /// 资源加载系统接口,提供资源和场景的加载、实例化、预加载等功能 diff --git a/GFramework.Godot/assets/ResourceLoadSystem.cs b/GFramework.Godot/assets/ResourceLoadSystem.cs index 1bf0917..7a90b37 100644 --- a/GFramework.Godot/assets/ResourceLoadSystem.cs +++ b/GFramework.Godot/assets/ResourceLoadSystem.cs @@ -1,5 +1,6 @@ using GFramework.Core.system; using GFramework.Game.assets; +using GFramework.Godot.assets; using Godot; namespace GFramework.Godot.system; diff --git a/GFramework.Godot/system/AbstractAudioManagerSystem.cs b/GFramework.Godot/system/AbstractAudioManagerSystem.cs index 514a870..92b55f9 100644 --- a/GFramework.Godot/system/AbstractAudioManagerSystem.cs +++ b/GFramework.Godot/system/AbstractAudioManagerSystem.cs @@ -1,5 +1,6 @@ using GFramework.Core.system; using GFramework.Game.assets; +using GFramework.Godot.assets; using Godot; namespace GFramework.Godot.system; diff --git a/GFramework.Godot/system/IAudioManagerSystem.cs b/GFramework.Godot/system/IAudioManagerSystem.cs index e9c9c35..209297c 100644 --- a/GFramework.Godot/system/IAudioManagerSystem.cs +++ b/GFramework.Godot/system/IAudioManagerSystem.cs @@ -1,4 +1,4 @@ -using GFramework.Core.system; +using GFramework.Core.Abstractions.system; using Godot; namespace GFramework.Godot.system; diff --git a/GFramework.SourceGenerators.Abstractions/Directory.Build.props b/GFramework.SourceGenerators.Abstractions/Directory.Build.props index 82f43af..daa5255 100644 --- a/GFramework.SourceGenerators.Abstractions/Directory.Build.props +++ b/GFramework.SourceGenerators.Abstractions/Directory.Build.props @@ -1,16 +1,12 @@ - + - netstandard2.0 + net8.0;net9.0;net10.0 true true - preview + all diff --git a/GFramework.SourceGenerators.Common/Directory.Build.props b/GFramework.SourceGenerators.Common/Directory.Build.props index 82f43af..daa5255 100644 --- a/GFramework.SourceGenerators.Common/Directory.Build.props +++ b/GFramework.SourceGenerators.Common/Directory.Build.props @@ -1,16 +1,12 @@ - + - netstandard2.0 + net8.0;net9.0;net10.0 true true - preview + all diff --git a/GFramework.SourceGenerators/GFramework.SourceGenerators.csproj b/GFramework.SourceGenerators/GFramework.SourceGenerators.csproj index e43c807..888a09e 100644 --- a/GFramework.SourceGenerators/GFramework.SourceGenerators.csproj +++ b/GFramework.SourceGenerators/GFramework.SourceGenerators.csproj @@ -2,7 +2,7 @@ GeWuYou.GFramework.SourceGenerators - netstandard2.0 + net8.0;net9.0;net10.0 true diff --git a/GFramework.SourceGenerators/rule/ContextAwareGenerator.cs b/GFramework.SourceGenerators/rule/ContextAwareGenerator.cs index 90a885e..0d0ed06 100644 --- a/GFramework.SourceGenerators/rule/ContextAwareGenerator.cs +++ b/GFramework.SourceGenerators/rule/ContextAwareGenerator.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using System.Text; +using GFramework.Core.Abstractions.rule; using GFramework.SourceGenerators.Abstractions.rule; using GFramework.SourceGenerators.Common.generator; using GFramework.SourceGenerators.diagnostics;