Skip to content

Commit

Permalink
🔖 8.24.10102.10055
Browse files Browse the repository at this point in the history
  • Loading branch information
AigioL committed Jan 1, 2024
1 parent 942bd98 commit 37fa32e
Show file tree
Hide file tree
Showing 148 changed files with 2,085 additions and 2,116 deletions.
17 changes: 10 additions & 7 deletions BD.SteamClient8.sln
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools.Build", "src\Tools.Bu
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools.DocFX", "src\Tools.DocFX\Tools.DocFX.csproj", "{DCF57D81-B75D-4656-96FB-556584F18126}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools.Sort.PackageVersion", "src\Tools.Sort.PackageVersion\Tools.Sort.PackageVersion.csproj", "{A7B9F024-609D-495B-84EE-338AD375893D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1.Reference", "1.Reference", "{C03124F2-9977-4ACC-A9A3-862A18F514A9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common8.SourceGenerator.ResX", "ref\Common\src\BD.Common8.SourceGenerator.ResX\BD.Common8.SourceGenerator.ResX.csproj", "{648923CD-F18C-4B15-A152-D29E71B5FFC4}"
Expand Down Expand Up @@ -94,6 +92,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinAuth", "src\WinAuth\WinA
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common8.Security", "ref\Common\src\BD.Common8.Security\BD.Common8.Security.csproj", "{BF565EF1-8DA5-441F-9241-4F8F0E4E2C8C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Sdk", "0.Sdk", "{F1DE414F-BC79-4F4A-8509-B7E82F1403AC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.SteamClient8.Sdk", "src\Sdk\BD.SteamClient8.Sdk.csproj", "{A4F36A67-96BC-488C-911B-B700EB65F591}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -112,10 +114,6 @@ Global
{DCF57D81-B75D-4656-96FB-556584F18126}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DCF57D81-B75D-4656-96FB-556584F18126}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DCF57D81-B75D-4656-96FB-556584F18126}.Release|Any CPU.Build.0 = Release|Any CPU
{A7B9F024-609D-495B-84EE-338AD375893D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7B9F024-609D-495B-84EE-338AD375893D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7B9F024-609D-495B-84EE-338AD375893D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7B9F024-609D-495B-84EE-338AD375893D}.Release|Any CPU.Build.0 = Release|Any CPU
{648923CD-F18C-4B15-A152-D29E71B5FFC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{648923CD-F18C-4B15-A152-D29E71B5FFC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{648923CD-F18C-4B15-A152-D29E71B5FFC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -196,6 +194,10 @@ Global
{BF565EF1-8DA5-441F-9241-4F8F0E4E2C8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF565EF1-8DA5-441F-9241-4F8F0E4E2C8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BF565EF1-8DA5-441F-9241-4F8F0E4E2C8C}.Release|Any CPU.Build.0 = Release|Any CPU
{A4F36A67-96BC-488C-911B-B700EB65F591}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A4F36A67-96BC-488C-911B-B700EB65F591}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4F36A67-96BC-488C-911B-B700EB65F591}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4F36A67-96BC-488C-911B-B700EB65F591}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -211,7 +213,6 @@ Global
{D43C1445-8222-4223-B59B-08AC9D859F1E} = {0CE5250A-9E2C-43A7-BE3F-763ADE47652E}
{B1059059-F554-4CC4-8C6F-7D8F4AF44B8B} = {DD64E1FB-3493-4661-9E23-7CC6F21F4761}
{DCF57D81-B75D-4656-96FB-556584F18126} = {DD64E1FB-3493-4661-9E23-7CC6F21F4761}
{A7B9F024-609D-495B-84EE-338AD375893D} = {DD64E1FB-3493-4661-9E23-7CC6F21F4761}
{C03124F2-9977-4ACC-A9A3-862A18F514A9} = {9AA2E622-F320-45CA-BF70-9290780FFCC4}
{648923CD-F18C-4B15-A152-D29E71B5FFC4} = {C03124F2-9977-4ACC-A9A3-862A18F514A9}
{4D5A4471-0865-4407-84FA-04350D41E29B} = {C03124F2-9977-4ACC-A9A3-862A18F514A9}
Expand All @@ -233,6 +234,8 @@ Global
{43C1EF31-FDC1-425D-B36D-740AB01A8F30} = {C03124F2-9977-4ACC-A9A3-862A18F514A9}
{B98DC6BD-026C-4AF9-8E5E-CAAE1E348189} = {0CE5250A-9E2C-43A7-BE3F-763ADE47652E}
{BF565EF1-8DA5-441F-9241-4F8F0E4E2C8C} = {C03124F2-9977-4ACC-A9A3-862A18F514A9}
{F1DE414F-BC79-4F4A-8509-B7E82F1403AC} = {49150EE8-13DD-4798-AA83-D7C3B9C8B27F}
{A4F36A67-96BC-488C-911B-B700EB65F591} = {F1DE414F-BC79-4F4A-8509-B7E82F1403AC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2F80A561-CAE0-4797-B779-42B29CA75687}
Expand Down
2 changes: 1 addition & 1 deletion ref/Common
Submodule Common updated 86 files
+5 −0 README.md
+5 −4 api/toc.yml
+1 −1 articles/aes.html
+1 −1 articles/rsa.html
+10 −18 docfx.json
+1 −1 index.md
+2 −2 src/.editorconfig
+22 −0 src/BD.Common8.Bcl/Diagnostics/Process2.cs
+1 −11 src/BD.Common8.Bcl/Extensions/BooleanExtensions.cs
+8 −0 src/BD.Common8.Bcl/OSHelper.cs
+20 −0 src/BD.Common8.Bcl/String2.cs
+6 −7 src/BD.Common8.Http.ClientFactory/Models/WebApiClientSendArgs.cs
+3 −0 src/BD.Common8.Http.ClientFactory/Services/WebApiClientService.cs
+0 −5 src/BD.Common8.Ipc.Client/Helpers/IpcAppConnectionStringHelper.cs
+58 −1 src/BD.Common8.Ipc.Client/Services/IIpcClientService.cs
+5 −5 src/BD.Common8.Ipc.Client/Services/Implementation/IpcClientService.cs
+3 −3 src/BD.Common8.Ipc.Server/Extensions/IpcServiceCollectionServiceExtensions.cs
+6 −6 src/BD.Common8.Ipc.Server/Services/IHubEndpointRouteMapHub.cs
+1 −1 src/BD.Common8.Ipc.Server/Services/IIpcServerService.cs
+98 −72 src/BD.Common8.Ipc.Server/Services/Implementation/IpcServerService.cs
+1 −1 src/BD.Common8.Ipc/Attributes/ServiceContractAttribute.cs
+5 −0 src/BD.Common8.Ipc/Models/IpcAppConnectionString.cs
+2 −2 src/BD.Common8.Settings5/Infrastructure/SettingsCollectionProperty`3.cs
+2 −2 src/BD.Common8.Settings5/Infrastructure/SettingsDictionaryProperty`4.cs
+6 −5 src/BD.Common8.Settings5/Infrastructure/SettingsProperty`2.cs
+161 −42 src/BD.Common8.Settings5/Services/Implementation/SettingsLoadServiceImpl.cs
+1 −0 src/BD.Common8.SourceGenerator.Bcl.Test/Program.cs
+1 −1 src/BD.Common8.SourceGenerator.Bcl/BD.Common8.SourceGenerator.Bcl.csproj
+2 −2 src/BD.Common8.SourceGenerator.Ipc.Client.Test/Program.cs
+1 −1 src/BD.Common8.SourceGenerator.Ipc.Client/BD.Common8.SourceGenerator.Ipc.Client.csproj
+0 −1 src/BD.Common8.SourceGenerator.Ipc.Client/Templates/Abstractions/IpcTemplateBase.cs
+12 −12 src/BD.Common8.SourceGenerator.Ipc.Client/Templates/IpcClientTemplate.cs
+1 −1 src/BD.Common8.SourceGenerator.Ipc.Server/BD.Common8.SourceGenerator.Ipc.Server.csproj
+53 −30 src/BD.Common8.SourceGenerator.Ipc.Server/Templates/IpcServerTemplate.cs
+1 −1 src/BD.Common8.SourceGenerator.ResX/BD.Common8.SourceGenerator.ResX.csproj
+16 −6 src/BD.Common8.SourceGenerator.Shared/Templates/Abstractions/TemplateBase.cs
+1 −0 src/BD.Common8.Toast/Extensions/ServiceCollectionExtensions.cs
+2 −2 src/Directory.Build.props
+13 −10 src/Directory.Packages.props
+16 −10 src/Ipc.Client.Sample.Experimental/Program.cs
+10 −2 src/Ipc.Server.Sample.Experimental/Program.cs
+26 −14 src/Sdk/BD.Common8.AspNetCore.Identity.BackManage.props
+23 −11 src/Sdk/BD.Common8.AspNetCore.Identity.props
+26 −17 src/Sdk/BD.Common8.AspNetCore.props
+17 −5 src/Sdk/BD.Common8.Bcl.props
+18 −6 src/Sdk/BD.Common8.Crawler.props
+24 −12 src/Sdk/BD.Common8.Essentials.Implementation.Avalonia.props
+24 −12 src/Sdk/BD.Common8.Essentials.Implementation.props
+21 −9 src/Sdk/BD.Common8.Essentials.props
+18 −6 src/Sdk/BD.Common8.Http.ClientFactory.Server.props
+19 −7 src/Sdk/BD.Common8.Http.ClientFactory.props
+21 −9 src/Sdk/BD.Common8.Ipc.Client.props
+20 −8 src/Sdk/BD.Common8.Ipc.Server.props
+18 −6 src/Sdk/BD.Common8.Ipc.props
+20 −8 src/Sdk/BD.Common8.Orm.EFCore.props
+19 −7 src/Sdk/BD.Common8.Pinyin.ChnCharInfo.props
+15 −7 src/Sdk/BD.Common8.Pinyin.CoreFoundation.props
+17 −5 src/Sdk/BD.Common8.Pinyin.props
+19 −7 src/Sdk/BD.Common8.Primitives.ApiResponse.props
+21 −5 src/Sdk/BD.Common8.Primitives.ApiRsp.props
+18 −6 src/Sdk/BD.Common8.Primitives.District.props
+18 −6 src/Sdk/BD.Common8.Primitives.Essentials.props
+18 −6 src/Sdk/BD.Common8.Primitives.PersonalData.BirthDate.props
+18 −6 src/Sdk/BD.Common8.Primitives.PersonalData.PhoneNumber.props
+18 −6 src/Sdk/BD.Common8.Primitives.Toast.props
+19 −7 src/Sdk/BD.Common8.Primitives.props
+22 −11 src/Sdk/BD.Common8.Repositories.EFCore.props
+19 −8 src/Sdk/BD.Common8.Repositories.SQLitePCL.props
+19 −7 src/Sdk/BD.Common8.Repositories.props
+10 −3 src/Sdk/BD.Common8.Sdk.targets
+17 −5 src/Sdk/BD.Common8.Security.props
+19 −7 src/Sdk/BD.Common8.Settings5.props
+19 −7 src/Sdk/BD.Common8.SmsSender.props
+18 −6 src/Sdk/BD.Common8.Toast.props
+20 −8 src/Sdk/BD.Common8.UserInput.ModelValidator.props
+1 −0 src/Shared/GlobalUsings.Avalonia.cs
+1 −0 src/Shared/GlobalUsings.Microsoft.Extensions.Logging.cs
+8 −0 src/Shared/GlobalUsings.System.Management.cs
+2 −3 src/Shared/ProjectUtils.cs
+4 −2 src/Tools.Build/Commands/IBuildCommand.cs
+100 −100 src/WebRoot/SignalRTsClient/package-lock.json
+2 −2 templates/default/toc.extension.js
+1 −1 templates/default/toc.json.js
+5 −22 toc.yml
+0 −25 topnav.html
+0 −2 topnav.json
2 changes: 1 addition & 1 deletion ref/ValveKeyValue
6 changes: 3 additions & 3 deletions src/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ dotnet_diagnostic.IDE0010.severity = none
dotnet_diagnostic.IDE0011.severity = none

# IDE0028: 使用集合初始值设定项
dotnet_diagnostic.IDE0028.severity = error
dotnet_diagnostic.IDE0028.severity = none

# IDE0040: 添加可访问性修饰符
dotnet_diagnostic.IDE0040.severity = none
Expand All @@ -263,7 +263,7 @@ dotnet_diagnostic.IDE1006.severity = error
dotnet_diagnostic.SA1400.severity = none

# SA1600: Elements should be documented
dotnet_diagnostic.SA1600.severity = error
dotnet_diagnostic.SA1600.severity = warning

# SA1629: Documentation text should end with a period
dotnet_diagnostic.SA1629.severity = silent
Expand Down Expand Up @@ -500,7 +500,7 @@ s
dotnet_diagnostic.CS1573.severity = error

# CS1591: 已指定 DocumentationFile 编译器选项,但一个或多个构造没有注释
dotnet_diagnostic.CS1591.severity = error
dotnet_diagnostic.CS1591.severity = warning

# SA1112: Closing parenthesis should be on line of opening parenthesis
dotnet_diagnostic.SA1112.severity = silent
Expand Down
44 changes: 3 additions & 41 deletions src/BD.SteamClient8.Impl/BD.SteamClient8.Impl.csproj
Original file line number Diff line number Diff line change
@@ -1,49 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net$(DotNet_Version);net$(DotNet_Version)-android;net$(DotNet_Version)-ios;net$(DotNet_Version)-macos;net$(DotNet_Version)-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net$(DotNet_Version)-windows$(WinSDK_Version)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<UseCommon8Bcl>true</UseCommon8Bcl>
<UseCommon8PrimitivesApiResponse>true</UseCommon8PrimitivesApiResponse>
<UseCommon8PrimitivesApiRsp>true</UseCommon8PrimitivesApiRsp>
<UseCommon8Crawler>true</UseCommon8Crawler>
<UseCommon8PrimitivesToast>true</UseCommon8PrimitivesToast>
<UseReactiveUI>true</UseReactiveUI>
<UseCommon8Toast>true</UseCommon8Toast>
<UseCommon8HttpClientFactory>true</UseCommon8HttpClientFactory>
<IsGlobalUsingsMSBuildProjectName>true</IsGlobalUsingsMSBuildProjectName>
</PropertyGroup>
<Import Project="$(MSBuildThisFileDirectory)..\Sdk\$(MSBuildProjectName).props" />

<Import Project="$(MSBuildThisFileDirectory)..\Sdk\TFM_NETX_WITH_ALL.props" />

<PropertyGroup Condition="'$(Configuration)'=='Release'">
<IsPackable>true</IsPackable>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\Shared\GlobalUsings.SteamAchievementManager.cs">
<LinkBase>Properties\GlobalUsings</LinkBase>
</Compile>
<Compile Include="..\Shared\GlobalUsings.ValveKeyValue.cs">
<LinkBase>Properties\GlobalUsings</LinkBase>
</Compile>
<Compile Include="..\Shared\GlobalUsings.BD.SteamClient8.cs">
<LinkBase>Properties\GlobalUsings</LinkBase>
</Compile>
<Compile Include="..\Shared\GlobalUsings.BD.SteamClient8.Primitives.cs">
<LinkBase>Properties\GlobalUsings</LinkBase>
</Compile>
<Compile Include="..\Shared\GlobalUsings.BD.SteamClient8.Models.cs">
<LinkBase>Properties\GlobalUsings</LinkBase>
</Compile>
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
<!-- Windows Only -->
<PackageReference Include="System.Management" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\BD.SteamClient8\BD.SteamClient8.csproj" />
</ItemGroup>

</Project>
100 changes: 0 additions & 100 deletions src/BD.SteamClient8.Impl/Extensions/ArchitectureEnumExtensions.cs

This file was deleted.

86 changes: 43 additions & 43 deletions src/BD.SteamClient8.Impl/Extensions/CommonImageSourceExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
namespace BD.SteamClient8.Impl.Extensions;
//namespace BD.SteamClient8.Impl.Extensions;

/// <summary>
/// 提供 <see cref="CommonImageSource"/> 扩展
/// </summary>
public static class CommonImageSourceExtensions
{
/// <summary>
/// 获取 <see cref="CommonImageSource"/> 对象
/// </summary>
/// <param name="requestUri">图片的请求地址</param>
/// <param name="isPolly">是否进行 Polly 重试</param>
/// <param name="cache">是否使用缓存</param>
/// <param name="cacheFirst">是否优先使用缓存</param>
/// <param name="category">HTTP 请求的优先级别</param>
/// <param name="isCircle">是否将图片剪裁为圆形</param>
/// <param name="config">对 CommonImageSource 对象的配置委托</param>
/// <param name="cancellationToken">取消操作的取消标记</param>
/// <returns>异步返回 <see cref="CommonImageSource"/> 对象,如果获取失败则返回 <see langword="null"/></returns>
public static async Task<CommonImageSource?> GetAsync(
string requestUri,
bool isPolly = true,
bool cache = false,
bool cacheFirst = false,
HttpHandlerCategory category = HttpHandlerCategory.UserInitiated,
bool isCircle = false,
Action<CommonImageSource>? config = null,
CancellationToken cancellationToken = default)
{
var imageHttpClientService = Ioc.Get_Nullable<IImageHttpClientService>();
if (imageHttpClientService == default)
return default;
///// <summary>
///// 提供 <see cref="CommonImageSource"/> 扩展
///// </summary>
//public static class CommonImageSourceExtensions
//{
// /// <summary>
// /// 获取 <see cref="CommonImageSource"/> 对象
// /// </summary>
// /// <param name="requestUri">图片的请求地址</param>
// /// <param name="isPolly">是否进行 Polly 重试</param>
// /// <param name="cache">是否使用缓存</param>
// /// <param name="cacheFirst">是否优先使用缓存</param>
// /// <param name="category">HTTP 请求的优先级别</param>
// /// <param name="isCircle">是否将图片剪裁为圆形</param>
// /// <param name="config">对 CommonImageSource 对象的配置委托</param>
// /// <param name="cancellationToken">取消操作的取消标记</param>
// /// <returns>异步返回 <see cref="CommonImageSource"/> 对象,如果获取失败则返回 <see langword="null"/></returns>
// public static async Task<CommonImageSource?> GetAsync(
// string requestUri,
// bool isPolly = true,
// bool cache = false,
// bool cacheFirst = false,
// HttpHandlerCategory category = HttpHandlerCategory.UserInitiated,
// bool isCircle = false,
// Action<CommonImageSource>? config = null,
// CancellationToken cancellationToken = default)
// {
// var imageHttpClientService = Ioc.Get_Nullable<IImageHttpClientService>();
// if (imageHttpClientService == default)
// return default;

var imageMemoryStream = await imageHttpClientService.GetImageMemoryStreamAsync(requestUri, isPolly, cache, cacheFirst, category, cancellationToken);
if (imageMemoryStream == default)
return default;
// var imageMemoryStream = await imageHttpClientService.GetImageMemoryStreamAsync(requestUri, isPolly, cache, cacheFirst, category, cancellationToken);
// if (imageMemoryStream == default)
// return default;

CommonImageSource? clipStream = imageMemoryStream;
if (clipStream != null)
{
clipStream.Circle = isCircle;
config?.Invoke(clipStream);
}
return clipStream;
}
}
// CommonImageSource? clipStream = imageMemoryStream;
// if (clipStream != null)
// {
// clipStream.Circle = isCircle;
// config?.Invoke(clipStream);
// }
// return clipStream;
// }
//}
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#pragma warning disable IDE0130
// ReSharper disable once CheckNamespace

#pragma warning disable IDE0130 // 命名空间与文件夹结构不匹配
namespace Microsoft.Extensions.DependencyInjection;

public static partial class ServiceCollectionExtensions
Expand Down
5 changes: 3 additions & 2 deletions src/BD.SteamClient8.Impl/Extensions/SteamSessionExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
namespace BD.SteamClient8.Impl.Extensions;
#pragma warning disable IDE0130 // 命名空间与文件夹结构不匹配
namespace BD.SteamClient8.Models;

/// <summary>
/// <see cref="SteamSession"/> 扩展方法
/// </summary>
public static class SteamSessionExtensions
public static partial class SteamSessionExtensions
{
/// <summary>
/// 空引用抛出异常,提示用户登录
Expand Down
Loading

0 comments on commit 37fa32e

Please sign in to comment.