Skip to content

Commit

Permalink
♻️ Misc
Browse files Browse the repository at this point in the history
  • Loading branch information
AigioL committed Nov 20, 2023
1 parent 11d7170 commit f177871
Show file tree
Hide file tree
Showing 25 changed files with 104 additions and 20 deletions.
8 changes: 4 additions & 4 deletions BD.Common8.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
namespace BD.Common8.Essentials.Services.Implementation;

#pragma warning disable SA1600 // Elements should be documented

/// <summary>
/// 提供 Avalonia 剪贴板服务实现
/// </summary>
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<IsSourceGeneratorProject>true</IsSourceGeneratorProject>
<IsGlobalUsingsMSBuildProjectName>true</IsGlobalUsingsMSBuildProjectName>
<!--<Version>8.yy.1MMdd.1hhmm</Version>-->
<Version>8.23.11115.10028</Version>
<Version>8.23.11102.11336</Version>
<FileVersion>$(Version)</FileVersion>
<AssemblyVersion>$(Version)</AssemblyVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<IsSourceGeneratorProject>true</IsSourceGeneratorProject>
<IsGlobalUsingsMSBuildProjectName>true</IsGlobalUsingsMSBuildProjectName>
<!--<Version>8.yy.1MMdd.1hhmm</Version>-->
<Version>8.23.11115.10028</Version>
<Version>8.23.11102.11336</Version>
<FileVersion>$(Version)</FileVersion>
<AssemblyVersion>$(Version)</AssemblyVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>$(SourceGenerator_TargetFramework)</TargetFramework>
<IsSourceGeneratorProject>true</IsSourceGeneratorProject>
<!--<Version>8.yy.1MMdd.1hhmm</Version>-->
<Version>8.23.11115.10028</Version>
<Version>8.23.11102.11336</Version>
<FileVersion>$(Version)</FileVersion>
<AssemblyVersion>$(Version)</AssemblyVersion>
<LinkResXGeneratedCodeAttribute>true</LinkResXGeneratedCodeAttribute>
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<ImplicitUsings>true</ImplicitUsings>
<!--<Version>8.yy.1MMdd.1hhmm</Version>-->
<Version>8.23.11115.10028</Version>
<Version>8.23.11102.11336</Version>
<PackageIconUrl>https://avatars.githubusercontent.com/u/79355691</PackageIconUrl>
<RepositoryType>git</RepositoryType>
<Company>江苏蒸汽凡星科技有限公司</Company>
Expand Down
3 changes: 2 additions & 1 deletion src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<!-- NuGet 错误 NU1011 PackageVersion 项不能包含浮动版本。 -->
<ItemGroup>
<PackageVersion Include="AngleSharp" Version="1.0.6" />
<PackageVersion Include="ApprovalTests" Version="5.9.0" />
<PackageVersion Include="Avalonia" Version="11.0.5" />
<PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.0.5" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.5" />
Expand All @@ -10,9 +11,9 @@
<PackageVersion Include="Avalonia.Native" Version="11.0.5" />
<PackageVersion Include="Avalonia.ReactiveUI" Version="11.0.5" />
<PackageVersion Include="Avalonia.Skia" Version="11.0.5" />
<PackageVersion Include="Avalonia.Themes.Simple" Version="11.0.5" />
<PackageVersion Include="Avalonia.Win32" Version="11.0.5" />
<PackageVersion Include="Avalonia.X11" Version="11.0.5" />
<PackageVersion Include="Avalonia.Themes.Simple" Version="11.0.5" />
<PackageVersion Include="Avalonia.Xaml.Behaviors" Version="11.0.2" />
<PackageVersion Include="Avalonia.Xaml.Interactivity" Version="11.0.2" />
<PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.2.1" />
Expand Down
25 changes: 23 additions & 2 deletions src/Sdk/BD.Common8.Sdk.targets
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project TreatAsLocalProperty="$(TreatAsLocalProperty);IsPackable;IsTestProject;IsSourceGeneratorProject;IsGlobalUsingsCommon8Bcl;IsGlobalUsingsMSBuildProjectName;IsCommon8Project;UseCommon8Bcl;UseAspNetCore;UseProjectUtils;UseSourceGeneratorResx;UseMicrosoftIdentityModelTokens;UseEFCore;LinkResXGeneratedCodeAttribute;UseAvalonia;UseRedis;UseNLog;UseCommon8Essentials;UseCommon8Repositories;UseCommon8OrmEFCore;UseCommon8RepositoriesEFCore;UseCommon8Primitives;UseCommon8AspNetCore;UseCommon8AspNetCoreIdentity;UseCommon8AspNetCoreIdentityBackManage;UseCommon8PrimitivesApiResponse;UseCommon8PrimitivesPersonalDataPhoneNumber;UseCommon8PrimitivesPersonalDataBirthDate;UseCommon8PrimitivesDistrict;UseCommon8PrimitivesApiRsp;UseSQLitePCL;UseCommon8Security;UseSystemCommandLine;UseCommon8HttpClientFactory;UseCommon8Crawler">
<Project TreatAsLocalProperty="$(TreatAsLocalProperty);IsPackable;IsTestProject;IsSourceGeneratorProject;IsGlobalUsingsCommon8Bcl;IsGlobalUsingsMSBuildProjectName;IsCommon8Project;UseCommon8Bcl;UseAspNetCore;UseProjectUtils;UseSourceGeneratorResx;UseMicrosoftIdentityModelTokens;UseEFCore;LinkResXGeneratedCodeAttribute;UseAvalonia;UseRedis;UseNLog;UseCommon8Essentials;UseCommon8Repositories;UseCommon8OrmEFCore;UseCommon8RepositoriesEFCore;UseCommon8Primitives;UseCommon8AspNetCore;UseCommon8AspNetCoreIdentity;UseCommon8AspNetCoreIdentityBackManage;UseCommon8PrimitivesApiResponse;UseCommon8PrimitivesPersonalDataPhoneNumber;UseCommon8PrimitivesPersonalDataBirthDate;UseCommon8PrimitivesDistrict;UseCommon8PrimitivesApiRsp;UseSQLitePCL;UseCommon8Security;UseSystemCommandLine;UseCommon8HttpClientFactory;UseCommon8Crawler;UseReactiveUI;UseReactiveUIFody;UseFluentAvalonia">

<!-- MSBuild 保留属性和已知属性 https://learn.microsoft.com/zh-cn/visualstudio/msbuild/msbuild-reserved-and-well-known-properties?view=vs-2022 -->

Expand Down Expand Up @@ -41,7 +41,7 @@

<ItemGroup Condition="$(IsGlobalUsingsMSBuildProjectName) == 'true'">
<Compile Include="$(MSBuildProjectDirectory)\..\Shared\GlobalUsings.$(MSBuildProjectName).cs">
<LinkBase>Properties\GlobalUsings</LinkBase>
<LinkBase>Properties</LinkBase>
</Compile>
</ItemGroup>

Expand Down Expand Up @@ -250,4 +250,25 @@
<ProjectReference Include="$(MSBuildThisFileDirectory)..\BD.Common8.Crawler\BD.Common8.Crawler.csproj" />
</ItemGroup>

<ItemGroup Condition="$(UseReactiveUI) == 'true' OR $(UseReactiveUIFody) == 'true'">
<Compile Include="$(MSBuildThisFileDirectory)..\Shared\GlobalUsings.ReactiveUI.cs">
<LinkBase>Properties\GlobalUsings</LinkBase>
</Compile>
<PackageReference Include="ReactiveUI" />
</ItemGroup>

<ItemGroup Condition="$(UseReactiveUIFody) == 'true'">
<Compile Include="$(MSBuildThisFileDirectory)..\Shared\GlobalUsings.UseReactiveUIFody.cs">
<LinkBase>Properties\GlobalUsings</LinkBase>
</Compile>
<PackageReference Include="ReactiveUI.Fody" />
</ItemGroup>

<ItemGroup Condition="$(UseFluentAvalonia) == 'true'">
<Compile Include="$(MSBuildThisFileDirectory)..\Shared\GlobalUsings.FluentAvaloniaUI.cs">
<LinkBase>Properties\GlobalUsings</LinkBase>
</Compile>
<PackageReference Include="FluentAvaloniaUI" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
10 changes: 10 additions & 0 deletions src/Shared/GlobalUsings.Avalonia.Xaml.Interactivity.cs
Original file line number Diff line number Diff line change
@@ -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;
10 changes: 10 additions & 0 deletions src/Shared/GlobalUsings.Avalonia.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
17 changes: 17 additions & 0 deletions src/Shared/GlobalUsings.FluentAvaloniaUI.cs
Original file line number Diff line number Diff line change
@@ -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;
9 changes: 9 additions & 0 deletions src/Shared/GlobalUsings.ReactiveUI.Fody.cs
Original file line number Diff line number Diff line change
@@ -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;
10 changes: 10 additions & 0 deletions src/Shared/GlobalUsings.ReactiveUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
9 changes: 9 additions & 0 deletions src/Shared/GlobalUsings.Tools.Build.cs
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace BD.Common8.Tools.Build.Commands.Abstractions;
namespace Tools.Build.Commands.Abstractions;

/// <summary>
/// 命令行业务接口
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace BD.Common8.Tools.Build.Commands;
namespace Tools.Build.Commands;

/// <summary>
/// 构建当前仓库源代码命令
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

/// <summary>
/// 推送 NuGet 包命令
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit f177871

Please sign in to comment.