diff --git a/BD.Common8.sln b/BD.Common8.sln
index 696a4fbab..116e465df 100644
--- a/BD.Common8.sln
+++ b/BD.Common8.sln
@@ -82,9 +82,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common8.SourceGenerator.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common8.SourceGenerator.ResX.Test", "src\BD.Common8.SourceGenerator.ResX.Test\BD.Common8.SourceGenerator.ResX.Test.csproj", "{09D1B0E6-8FFB-41FD-A2A3-65A304CBC2A3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common8.Tools.DocFX", "src\BD.Common8.Tools.DocFX\BD.Common8.Tools.DocFX.csproj", "{7845D691-1FF5-4F1C-8D42-B6B7C3845AAB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools.DocFX", "src\Tools.DocFX\Tools.DocFX.csproj", "{7845D691-1FF5-4F1C-8D42-B6B7C3845AAB}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common8.Tools.Sort.PackageVersion", "src\BD.Common8.Tools.Sort.PackageVersion\BD.Common8.Tools.Sort.PackageVersion.csproj", "{D4A61618-B508-45B6-A852-7A6E769C7F50}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools.Sort.PackageVersion", "src\Tools.Sort.PackageVersion\Tools.Sort.PackageVersion.csproj", "{D4A61618-B508-45B6-A852-7A6E769C7F50}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common8.Ipc", "src\BD.Common8.Ipc\BD.Common8.Ipc.csproj", "{521B46C6-609C-4014-8D32-189D98DBBF8D}"
EndProject
@@ -216,14 +216,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common8.SourceGenerator.
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebApi", "WebApi", "{37ADE808-2DCD-4283-A8CA-E14F6DDEAFC0}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common8.Tools.Build", "src\BD.Common8.Tools.Build\BD.Common8.Tools.Build.csproj", "{F38CDAD3-DA81-4A6F-B300-558C5061F994}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools.Build", "src\Tools.Build\Tools.Build.csproj", "{F38CDAD3-DA81-4A6F-B300-558C5061F994}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{1D391794-20EF-4BD0-92BE-C09F1E2F564D}"
ProjectSection(SolutionItems) = preProject
.github\workflows\CI.yml = .github\workflows\CI.yml
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common8.Crawler", "src\BD.Common8.Crawler\BD.Common8.Crawler.csproj", "{3D42F575-E4C2-4507-A08A-85CFC9A899E7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common8.Crawler", "src\BD.Common8.Crawler\BD.Common8.Crawler.csproj", "{3D42F575-E4C2-4507-A08A-85CFC9A899E7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/BD.Common8.Essentials.Implementation.Avalonia/Services/Implementation/AvaloniaClipboardPlatformServiceImpl.cs b/src/BD.Common8.Essentials.Implementation.Avalonia/Services/Implementation/AvaloniaClipboardPlatformServiceImpl.cs
index 5be5ad7ac..06a32fb4c 100644
--- a/src/BD.Common8.Essentials.Implementation.Avalonia/Services/Implementation/AvaloniaClipboardPlatformServiceImpl.cs
+++ b/src/BD.Common8.Essentials.Implementation.Avalonia/Services/Implementation/AvaloniaClipboardPlatformServiceImpl.cs
@@ -1,7 +1,5 @@
namespace BD.Common8.Essentials.Services.Implementation;
-#pragma warning disable SA1600 // Elements should be documented
-
///
/// 提供 Avalonia 剪贴板服务实现
///
@@ -61,7 +59,7 @@ static ValueTask PlatformSetTextLinuxAsync(string text)
if (topLevel != null)
{
var clipboard = topLevel.Clipboard;
- // 不能用 await 等待 Linux 上不知啥原因导致卡死
+ // TODO: 不能用 await 等待 Linux 上不知啥原因导致卡死
clipboard?.SetTextAsync(text);
}
return default;
diff --git a/src/BD.Common8.SourceGenerator.Ipc.Client/BD.Common8.SourceGenerator.Ipc.Client.csproj b/src/BD.Common8.SourceGenerator.Ipc.Client/BD.Common8.SourceGenerator.Ipc.Client.csproj
index 471e5f9ff..4fd6e00eb 100644
--- a/src/BD.Common8.SourceGenerator.Ipc.Client/BD.Common8.SourceGenerator.Ipc.Client.csproj
+++ b/src/BD.Common8.SourceGenerator.Ipc.Client/BD.Common8.SourceGenerator.Ipc.Client.csproj
@@ -6,7 +6,7 @@
true
true
- 8.23.11115.10028
+ 8.23.11102.11336
$(Version)
$(Version)
diff --git a/src/BD.Common8.SourceGenerator.Ipc.Server/BD.Common8.SourceGenerator.Ipc.Server.csproj b/src/BD.Common8.SourceGenerator.Ipc.Server/BD.Common8.SourceGenerator.Ipc.Server.csproj
index f68f9b32c..43620b720 100644
--- a/src/BD.Common8.SourceGenerator.Ipc.Server/BD.Common8.SourceGenerator.Ipc.Server.csproj
+++ b/src/BD.Common8.SourceGenerator.Ipc.Server/BD.Common8.SourceGenerator.Ipc.Server.csproj
@@ -6,7 +6,7 @@
true
true
- 8.23.11115.10028
+ 8.23.11102.11336
$(Version)
$(Version)
diff --git a/src/BD.Common8.SourceGenerator.ResX/BD.Common8.SourceGenerator.ResX.csproj b/src/BD.Common8.SourceGenerator.ResX/BD.Common8.SourceGenerator.ResX.csproj
index 1ce2ab5a3..3348345e3 100644
--- a/src/BD.Common8.SourceGenerator.ResX/BD.Common8.SourceGenerator.ResX.csproj
+++ b/src/BD.Common8.SourceGenerator.ResX/BD.Common8.SourceGenerator.ResX.csproj
@@ -4,7 +4,7 @@
$(SourceGenerator_TargetFramework)
true
- 8.23.11115.10028
+ 8.23.11102.11336
$(Version)
$(Version)
true
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 18e76963f..d0fa5cd49 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -10,7 +10,7 @@
true
true
- 8.23.11115.10028
+ 8.23.11102.11336
https://avatars.githubusercontent.com/u/79355691
git
江苏蒸汽凡星科技有限公司
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index d74071973..33d745e7d 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -2,6 +2,7 @@
+
@@ -10,9 +11,9 @@
+
-
diff --git a/src/Sdk/BD.Common8.Sdk.targets b/src/Sdk/BD.Common8.Sdk.targets
index 646b10fb8..435b13f87 100644
--- a/src/Sdk/BD.Common8.Sdk.targets
+++ b/src/Sdk/BD.Common8.Sdk.targets
@@ -1,4 +1,4 @@
-
+
@@ -41,7 +41,7 @@
- Properties\GlobalUsings
+ Properties
@@ -250,4 +250,25 @@
+
+
+ Properties\GlobalUsings
+
+
+
+
+
+
+ Properties\GlobalUsings
+
+
+
+
+
+
+ Properties\GlobalUsings
+
+
+
+
\ No newline at end of file
diff --git a/src/Shared/GlobalUsings.BD.Common8.Tools.Build.cs b/src/Shared/GlobalUsings.Avalonia.ReactiveUI.cs
similarity index 77%
rename from src/Shared/GlobalUsings.BD.Common8.Tools.Build.cs
rename to src/Shared/GlobalUsings.Avalonia.ReactiveUI.cs
index a66e0d8bc..f0fa7cd5b 100644
--- a/src/Shared/GlobalUsings.BD.Common8.Tools.Build.cs
+++ b/src/Shared/GlobalUsings.Avalonia.ReactiveUI.cs
@@ -5,5 +5,4 @@
#pragma warning disable SA1209 // Using alias directives should be placed after other using directives
#pragma warning disable SA1211 // Using alias directives should be ordered alphabetically by alias name
-global using BD.Common8.Tools.Build.Commands;
-global using BD.Common8.Tools.Build.Commands.Abstractions;
+global using Avalonia.ReactiveUI;
diff --git a/src/Shared/GlobalUsings.Avalonia.Xaml.Interactivity.cs b/src/Shared/GlobalUsings.Avalonia.Xaml.Interactivity.cs
new file mode 100644
index 000000000..5081defa8
--- /dev/null
+++ b/src/Shared/GlobalUsings.Avalonia.Xaml.Interactivity.cs
@@ -0,0 +1,10 @@
+// C# 10 定义全局 using
+
+#pragma warning disable IDE0079 // 请删除不必要的忽略
+#pragma warning disable IDE0005 // 删除不必要的 using 指令
+#pragma warning disable SA1209 // Using alias directives should be placed after other using directives
+#pragma warning disable SA1211 // Using alias directives should be ordered alphabetically by alias name
+
+global using Avalonia.Xaml;
+global using Avalonia.Xaml.Interactions;
+global using Avalonia.Xaml.Interactivity;
diff --git a/src/Shared/GlobalUsings.Avalonia.cs b/src/Shared/GlobalUsings.Avalonia.cs
index c6fe027cd..55a33323e 100644
--- a/src/Shared/GlobalUsings.Avalonia.cs
+++ b/src/Shared/GlobalUsings.Avalonia.cs
@@ -6,23 +6,33 @@
#pragma warning disable SA1211 // Using alias directives should be ordered alphabetically by alias name
global using Avalonia;
+global using Avalonia.Input;
+global using Avalonia.Layout;
+global using Avalonia.Interactivity;
global using Avalonia.Animation;
+global using Avalonia.Animation.Easings;
+global using Avalonia.Styling;
global using Avalonia.Controls;
global using Avalonia.Controls.Primitives;
global using Avalonia.Controls.ApplicationLifetimes;
+global using Avalonia.Data;
global using Avalonia.Data.Converters;
global using Avalonia.Media;
global using Avalonia.Media.Imaging;
+global using Avalonia.Media.Transformation;
global using Avalonia.Threading;
global using Avalonia.Platform;
global using Avalonia.Platform.Storage;
global using Avalonia.Metadata;
global using Avalonia.Rendering.Composition;
+global using Avalonia.Rendering.Composition.Animations;
global using Avalonia.VisualTree;
global using Avalonia.Logging;
global using Avalonia.Markup.Xaml;
+global using AvaColor = Avalonia.Media.Color;
global using AvaSize = Avalonia.Size;
global using AvaPoint = Avalonia.Point;
global using AvaVector = Avalonia.Vector;
global using AvaBitmap = Avalonia.Media.Imaging.Bitmap;
global using AvaApplication = Avalonia.Application;
+global using AvaVisual = Avalonia.Visual;
diff --git a/src/Shared/GlobalUsings.FluentAvaloniaUI.cs b/src/Shared/GlobalUsings.FluentAvaloniaUI.cs
new file mode 100644
index 000000000..11400e43a
--- /dev/null
+++ b/src/Shared/GlobalUsings.FluentAvaloniaUI.cs
@@ -0,0 +1,17 @@
+// C# 10 定义全局 using
+
+#pragma warning disable IDE0079 // 请删除不必要的忽略
+#pragma warning disable IDE0005 // 删除不必要的 using 指令
+#pragma warning disable SA1209 // Using alias directives should be placed after other using directives
+#pragma warning disable SA1211 // Using alias directives should be ordered alphabetically by alias name
+
+global using FluentAvalonia;
+global using FluentAvalonia.Interop;
+global using FluentAvalonia.Styling;
+global using FluentAvalonia.Core;
+global using FluentAvalonia.UI;
+global using FluentAvalonia.UI.Controls;
+global using FluentAvalonia.UI.Windowing;
+global using FluentAvalonia.UI.Media;
+global using FluentAvalonia.UI.Media.Animation;
+global using FluentAvalonia.UI.Navigation;
diff --git a/src/Shared/GlobalUsings.ReactiveUI.Fody.cs b/src/Shared/GlobalUsings.ReactiveUI.Fody.cs
new file mode 100644
index 000000000..bea843825
--- /dev/null
+++ b/src/Shared/GlobalUsings.ReactiveUI.Fody.cs
@@ -0,0 +1,9 @@
+// C# 10 定义全局 using
+
+#pragma warning disable IDE0079 // 请删除不必要的忽略
+#pragma warning disable IDE0005 // 删除不必要的 using 指令
+#pragma warning disable SA1209 // Using alias directives should be placed after other using directives
+#pragma warning disable SA1211 // Using alias directives should be ordered alphabetically by alias name
+
+global using ReactiveUI.Fody;
+global using ReactiveUI.Fody.Helpers;
diff --git a/src/Shared/GlobalUsings.ReactiveUI.cs b/src/Shared/GlobalUsings.ReactiveUI.cs
index afc7d925a..d4f2b95ae 100644
--- a/src/Shared/GlobalUsings.ReactiveUI.cs
+++ b/src/Shared/GlobalUsings.ReactiveUI.cs
@@ -5,6 +5,16 @@
#pragma warning disable SA1209 // Using alias directives should be placed after other using directives
#pragma warning disable SA1211 // Using alias directives should be ordered alphabetically by alias name
+global using DynamicData;
+global using DynamicData.Binding;
+
+global using System.Reactive.Subjects;
+global using System.Reactive.Linq;
+global using System.Reactive.Disposables;
+
global using System.Windows.Input;
+global using CompositeDisposable = System.Reactive.Disposables.CompositeDisposable;
+global using Disposable = System.Reactive.Disposables.Disposable;
+
global using ReactiveUI;
diff --git a/src/Shared/GlobalUsings.Tools.Build.cs b/src/Shared/GlobalUsings.Tools.Build.cs
new file mode 100644
index 000000000..c92fa08ee
--- /dev/null
+++ b/src/Shared/GlobalUsings.Tools.Build.cs
@@ -0,0 +1,9 @@
+// C# 10 定义全局 using
+
+#pragma warning disable IDE0079 // 请删除不必要的忽略
+#pragma warning disable IDE0005 // 删除不必要的 using 指令
+#pragma warning disable SA1209 // Using alias directives should be placed after other using directives
+#pragma warning disable SA1211 // Using alias directives should be ordered alphabetically by alias name
+
+global using Tools.Build.Commands;
+global using Tools.Build.Commands.Abstractions;
diff --git a/src/BD.Common8.Tools.Build/Commands/Abstractions/ICommand.cs b/src/Tools.Build/Commands/Abstractions/ICommand.cs
similarity index 91%
rename from src/BD.Common8.Tools.Build/Commands/Abstractions/ICommand.cs
rename to src/Tools.Build/Commands/Abstractions/ICommand.cs
index 0a5c48e70..10275e49a 100644
--- a/src/BD.Common8.Tools.Build/Commands/Abstractions/ICommand.cs
+++ b/src/Tools.Build/Commands/Abstractions/ICommand.cs
@@ -1,4 +1,4 @@
-namespace BD.Common8.Tools.Build.Commands.Abstractions;
+namespace Tools.Build.Commands.Abstractions;
///
/// 命令行业务接口
diff --git a/src/BD.Common8.Tools.Build/Commands/IBuildCommand.cs b/src/Tools.Build/Commands/IBuildCommand.cs
similarity index 99%
rename from src/BD.Common8.Tools.Build/Commands/IBuildCommand.cs
rename to src/Tools.Build/Commands/IBuildCommand.cs
index cd0cd4adf..e575304f6 100644
--- a/src/BD.Common8.Tools.Build/Commands/IBuildCommand.cs
+++ b/src/Tools.Build/Commands/IBuildCommand.cs
@@ -1,4 +1,4 @@
-namespace BD.Common8.Tools.Build.Commands;
+namespace Tools.Build.Commands;
///
/// 构建当前仓库源代码命令
diff --git a/src/BD.Common8.Tools.Build/Commands/INugetPushCommand.cs b/src/Tools.Build/Commands/INugetPushCommand.cs
similarity index 98%
rename from src/BD.Common8.Tools.Build/Commands/INugetPushCommand.cs
rename to src/Tools.Build/Commands/INugetPushCommand.cs
index ea20c9162..e45b32e97 100644
--- a/src/BD.Common8.Tools.Build/Commands/INugetPushCommand.cs
+++ b/src/Tools.Build/Commands/INugetPushCommand.cs
@@ -1,6 +1,6 @@
-using static BD.Common8.Tools.Build.Commands.IBuildCommand;
+using static Tools.Build.Commands.IBuildCommand;
-namespace BD.Common8.Tools.Build.Commands;
+namespace Tools.Build.Commands;
///
/// 推送 NuGet 包命令
diff --git a/src/BD.Common8.Tools.Build/Program.cs b/src/Tools.Build/Program.cs
similarity index 100%
rename from src/BD.Common8.Tools.Build/Program.cs
rename to src/Tools.Build/Program.cs
diff --git a/src/BD.Common8.Tools.Build/Properties/launchSettings.json b/src/Tools.Build/Properties/launchSettings.json
similarity index 100%
rename from src/BD.Common8.Tools.Build/Properties/launchSettings.json
rename to src/Tools.Build/Properties/launchSettings.json
diff --git a/src/BD.Common8.Tools.Build/BD.Common8.Tools.Build.csproj b/src/Tools.Build/Tools.Build.csproj
similarity index 100%
rename from src/BD.Common8.Tools.Build/BD.Common8.Tools.Build.csproj
rename to src/Tools.Build/Tools.Build.csproj
diff --git a/src/BD.Common8.Tools.DocFX/Program.cs b/src/Tools.DocFX/Program.cs
similarity index 100%
rename from src/BD.Common8.Tools.DocFX/Program.cs
rename to src/Tools.DocFX/Program.cs
diff --git a/src/BD.Common8.Tools.DocFX/BD.Common8.Tools.DocFX.csproj b/src/Tools.DocFX/Tools.DocFX.csproj
similarity index 100%
rename from src/BD.Common8.Tools.DocFX/BD.Common8.Tools.DocFX.csproj
rename to src/Tools.DocFX/Tools.DocFX.csproj
diff --git a/src/BD.Common8.Tools.Sort.PackageVersion/Program.cs b/src/Tools.Sort.PackageVersion/Program.cs
similarity index 100%
rename from src/BD.Common8.Tools.Sort.PackageVersion/Program.cs
rename to src/Tools.Sort.PackageVersion/Program.cs
diff --git a/src/BD.Common8.Tools.Sort.PackageVersion/BD.Common8.Tools.Sort.PackageVersion.csproj b/src/Tools.Sort.PackageVersion/Tools.Sort.PackageVersion.csproj
similarity index 100%
rename from src/BD.Common8.Tools.Sort.PackageVersion/BD.Common8.Tools.Sort.PackageVersion.csproj
rename to src/Tools.Sort.PackageVersion/Tools.Sort.PackageVersion.csproj