perf: ⚡ nuget update

tk · nsnail · commit 83deb735d0d4 · 2025-05-20T18:40:03.000+08:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -22,7 +22,9 @@
         <Product>NetAdmin</Product>
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/nsnail/NetAdmin.git</RepositoryUrl>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework Condition="'$(OS)' != 'Windows_NT'">net9.0</TargetFramework>
+        <TargetFramework Condition="'$(OS)' == 'Windows_NT'">net9.0-windows</TargetFramework>
+        <UseWindowsForms Condition="'$(OS)' == 'Windows_NT'">true</UseWindowsForms>
         <Title>$(AssemblyName)</Title>
     </PropertyGroup>
     <ItemGroup>
diff --git a/README.md b/README.md
@@ -20,6 +20,7 @@ docker run -p 8080:8080 nsnail/netadmin
 ## 构建步骤
 
 所涉软件均推荐下载zip/tar版本，解压即用，一键删除，不会污染系统环境：
+
 ```shell
 # 1. 检查 dotnet sdk 版本 >=9.0.0
 dotnet --list-sdks
diff --git a/build/code.quality.props b/build/code.quality.props
@@ -15,15 +15,15 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.2-alpha">
+        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Roslynator.Analyzers" Version="4.13.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.9.0.115408">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.10.0.116381">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/build/copy.pkg.xml.comment.files.targets b/build/copy.pkg.xml.comment.files.targets
@@ -3,8 +3,8 @@
         <ItemGroup>
             <PackageReferenceFiles
                 Condition="%(PackageReference.CopyToOutputDirectory) != ''"
-                Include="$(NugetPackageRoot)\%(PackageReference.Identity)\%(PackageReference.Version)\%(PackageReference.CopyToOutputDirectory)" />
+                Include="$(NugetPackageRoot)\%(PackageReference.Identity)\%(PackageReference.Version)\%(PackageReference.CopyToOutputDirectory)"/>
         </ItemGroup>
-        <Copy SourceFiles="@(PackageReferenceFiles)" DestinationFolder="$(OutDir)" />
+        <Copy SourceFiles="@(PackageReferenceFiles)" DestinationFolder="$(OutDir)"/>
     </Target>
 </Project>
diff --git a/build/prebuild.targets b/build/prebuild.targets
@@ -1,12 +1,12 @@
 <Project>
     <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-        <Exec Command="dotnet tool restore" StdOutEncoding="utf-8" />
+        <Exec Command="dotnet tool restore" StdOutEncoding="utf-8"/>
         <Exec Condition="!Exists('$(SolutionDir)/assets/res/Ln.resx')" WorkingDirectory="$(SolutionDir)/scripts"
               Command="dotnet t4 ./gen.resx.tt -o ../assets/res/Ln.resx"
-              StdOutEncoding="utf-8" />
+              StdOutEncoding="utf-8"/>
         <Exec Condition="!Exists('$(SolutionDir)/dist/backend/$(ProjectName)/Ln.cs')"
               WorkingDirectory="$(SolutionDir)/scripts"
               Command="dotnet t4 ./gen.cs.tt -o ../dist/backend/$(ProjectName)/Ln.cs"
-              StdOutEncoding="utf-8" />
+              StdOutEncoding="utf-8"/>
     </Target>
 </Project>
diff --git a/nuget.config b/nuget.config
@@ -2,6 +2,6 @@
 
 <configuration>
     <packageSources>
-        <add key="nuget.cdn.azure.cn" value="https://nuget.cdn.azure.cn/v3/index.json" />
+        <add key="nuget.cdn.azure.cn" value="https://nuget.cdn.azure.cn/v3/index.json"/>
     </packageSources>
 </configuration>
diff --git a/scripts/4.git.del.obsolete.tags.ps1 b/scripts/4.git.del.obsolete.tags.ps1
@@ -1,4 +1,4 @@
 #!/usr/bin/env pwsh
 
 git push origin :refs/tags/$(git tag -l "*-*")
-git tag -d $(git tag -l "*-*")
+git tag -d $( git tag -l "*-*" )
diff --git a/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs b/src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs
@@ -98,8 +98,8 @@ protected Task<List<TEntity>> UpdateReturnListAsync(     //
         TEntity                         newValue             //
       , List<string>                    includeFields = null //
       , List<string>                    excludeFields = null //
-      , Expression<Func<TEntity, bool>> whereExp      = null //
-      , string                          whereSql      = null //
+      , Expression<Func<TEntity, bool>> whereExp = null //
+      , string                          whereSql = null //
       , bool                            ignoreVersion = false)
     {
         // 默认匹配主键
diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Extensions/ISelectExtensions.cs b/src/backend/NetAdmin/NetAdmin.Domain/Extensions/ISelectExtensions.cs
@@ -26,7 +26,7 @@ public static ISelect<T1> WithNoLockNoWait<T1>(this ISelect<T1> me)
         where T1 : class
     {
         return me
-                #if DBTYPE_SQLSERVER
+            #if DBTYPE_SQLSERVER
                 .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait)
             #endif
             ;
@@ -40,7 +40,7 @@ public static ISelect<T1, T2> WithNoLockNoWait<T1, T2>(this ISelect<T1, T2> me)
         where T2 : class
     {
         return me
-                #if DBTYPE_SQLSERVER
+            #if DBTYPE_SQLSERVER
                 .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait)
             #endif
             ;
@@ -55,7 +55,7 @@ public static ISelect<T1, T2, T3> WithNoLockNoWait<T1, T2, T3>(this ISelect<T1,
         where T3 : class
     {
         return me
-                #if DBTYPE_SQLSERVER
+            #if DBTYPE_SQLSERVER
                 .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait)
             #endif
             ;
@@ -71,7 +71,7 @@ public static ISelect<T1, T2, T3, T4> WithNoLockNoWait<T1, T2, T3, T4>(this ISel
         where T4 : class
     {
         return me
-                #if DBTYPE_SQLSERVER
+            #if DBTYPE_SQLSERVER
                 .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait)
             #endif
             ;
@@ -88,7 +88,7 @@ public static ISelect<T1, T2, T3, T4, T5> WithNoLockNoWait<T1, T2, T3, T4, T5>(t
         where T5 : class
     {
         return me
-                #if DBTYPE_SQLSERVER
+            #if DBTYPE_SQLSERVER
                 .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait)
             #endif
             ;
@@ -106,7 +106,7 @@ public static ISelect<T1, T2, T3, T4, T5, T6> WithNoLockNoWait<T1, T2, T3, T4, T
         where T6 : class
     {
         return me
-                #if DBTYPE_SQLSERVER
+            #if DBTYPE_SQLSERVER
                 .WithLock(SqlServerLock.NoLock | SqlServerLock.NoWait)
             #endif
             ;
diff --git a/src/backend/NetAdmin/NetAdmin.Domain/NetAdmin.Domain.csproj b/src/backend/NetAdmin/NetAdmin.Domain/NetAdmin.Domain.csproj
@@ -5,7 +5,7 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="CronExpressionDescriptor" Version="2.41.0"/>
-        <PackageReference Include="Cronos" Version="0.10.0"/>
+        <PackageReference Include="Cronos" Version="0.11.0"/>
         <PackageReference Include="NetAdmin.CsvHelper" Version="1.0.0"/>
         <PackageReference Include="Yitter.IdGenerator" Version="1.0.14"/>
     </ItemGroup>
diff --git a/src/backend/NetAdmin/NetAdmin.Host/Startup.cs b/src/backend/NetAdmin/NetAdmin.Host/Startup.cs
@@ -1,5 +1,9 @@
 using Spectre.Console;
 using Spectre.Console.Cli;
+#if WINDOWS
+using Color = Spectre.Console.Color;
+using Panel = Spectre.Console.Panel;
+#endif
 
 namespace NetAdmin.Host;
 
diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Constant/Chars.cs b/src/backend/NetAdmin/NetAdmin.Infrastructure/Constant/Chars.cs
@@ -15,9 +15,9 @@ public static class Chars
     public const string FLG_CONTEXT_USER_ID                            = nameof(FLG_CONTEXT_USER_ID);
     public const string FLG_CONTEXT_USER_INFO                          = nameof(FLG_CONTEXT_USER_INFO);
     public const string FLG_CRON_PER_SECS                              = "* * * * * *";
+    public const string FLG_DB_EXCEPTION_IDX                           = "idx_";
     public const string FLG_DB_EXCEPTION_PRIMARY_KEY_CONFLICT          = "PRIMARY KEY";
     public const string FLG_DB_EXCEPTION_UNIQUE_CONSTRAINT_CONFLICT    = "UNIQUE constraint";
-    public const string FLG_DB_EXCEPTION_IDX                           = "idx_";
     public const string FLG_DB_FIELD_TYPE_NVARCHAR                     = "nvarchar";
     public const string FLG_DB_FIELD_TYPE_NVARCHAR_1022                = "nvarchar(1022)";
     public const string FLG_DB_FIELD_TYPE_NVARCHAR_127                 = "nvarchar(127)";
diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/CountryCodes.cs b/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/CountryCodes.cs
@@ -330,7 +330,7 @@ public enum CountryCodes
                      "United States", "USA", "Vereinigte Staaten von Amerika", "États-Unis", "Estados Unidos", "アメリカ合衆国", "Verenigde Staten"
                    , "Соединенные Штаты Америки", "美国"
                  ], IsPreferred = true
-         ,       Timezones = [
+            ,       Timezones = [
                      "America/Adak,-1000", "America/Anchorage,-0900", "America/Boise,-0700", "America/Chicago,-0600", "America/Denver,-0700"
                    , "America/Detroit,-0500", "America/Indiana/Indianapolis,-0500", "America/Indiana/Knox,-0600", "America/Indiana/Marengo,-0500"
                    , "America/Indiana/Petersburg,-0500", "America/Indiana/Tell_City,-0600", "America/Indiana/Vevay,-0500"
diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Utils/CaptchaImageHelper.cs b/src/backend/NetAdmin/NetAdmin.Infrastructure/Utils/CaptchaImageHelper.cs
@@ -4,6 +4,11 @@
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
+#if WINDOWS
+using Image = SixLabors.ImageSharp.Image;
+using Point = SixLabors.ImageSharp.Point;
+using Size = SixLabors.ImageSharp.Size;
+#endif
 
 namespace NetAdmin.Infrastructure.Utils;
 
diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs
@@ -1,6 +1,8 @@
 using NetAdmin.Domain.Dto.Sys.Captcha;
-using SixLabors.ImageSharp;
 using Yitter.IdGenerator;
+#if WINDOWS
+using Size = SixLabors.ImageSharp.Size;
+#endif
 
 namespace NetAdmin.SysComponent.Application.Services.Sys;
 
diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicCatalogService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicCatalogService.cs
@@ -77,7 +77,7 @@ public async Task<QueryDicCatalogRsp> EditAsync(EditDicCatalogReq req)
         return
             #if DBTYPE_SQLSERVER
             (await UpdateReturnListAsync(req).ConfigureAwait(false)).FirstOrDefault()?.Adapt<QueryDicCatalogRsp>();
-        #else
+            #else
             await UpdateAsync(req).ConfigureAwait(false) > 0 ? await GetAsync(new QueryDicCatalogReq { Id = req.Id }).ConfigureAwait(false) : null;
         #endif
     }
diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DocCatalogService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DocCatalogService.cs
@@ -78,7 +78,7 @@ public async Task<QueryDocCatalogRsp> EditAsync(EditDocCatalogReq req)
         return
             #if DBTYPE_SQLSERVER
             (await UpdateReturnListAsync(req).ConfigureAwait(false)).FirstOrDefault()?.Adapt<QueryDocCatalogRsp>();
-        #else
+            #else
             await UpdateAsync(req).ConfigureAwait(false) > 0 ? await GetAsync(new QueryDocCatalogReq { Id = req.Id }).ConfigureAwait(false) : null;
         #endif
     }
diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs
@@ -87,7 +87,7 @@ public async Task<QueryUserProfileRsp> EditAsync(EditUserProfileReq req)
         return
             #if DBTYPE_SQLSERVER
             (await UpdateReturnListAsync(req.Adapt<Sys_UserProfile>()).ConfigureAwait(false)).FirstOrDefault()?.Adapt<QueryUserProfileRsp>();
-        #else
+            #else
             await UpdateAsync(req.Adapt<Sys_UserProfile>()).ConfigureAwait(false) > 0
                 ? await GetAsync(new QueryUserProfileReq { Id = req.Id }).ConfigureAwait(false)
                 : null;
@@ -136,13 +136,12 @@ public async Task<PagedQueryRsp<QueryUserProfileRsp>> PagedQueryAsync(PagedQuery
                          .ConfigureAwait(false);
 
         return new PagedQueryRsp<QueryUserProfileRsp>(req.Page, req.PageSize, total
-                                                    , list.ConvertAll(
-                                                          x => x.a.Adapt<QueryUserProfileRsp>() with {
-                                                                   NationArea = x.b.Adapt<QueryDicContentRsp>()
-                                                                 , CompanyArea = x.c.Adapt<QueryDicContentRsp>()
-                                                                 , HomeArea = x.d.Adapt<QueryDicContentRsp>()
-                                                                 , EmergencyContactArea = x.e.Adapt<QueryDicContentRsp>()
-                                                               }));
+                                                    , list.ConvertAll(x => x.a.Adapt<QueryUserProfileRsp>() with {
+                                                                               NationArea = x.b.Adapt<QueryDicContentRsp>()
+                                                                             , CompanyArea = x.c.Adapt<QueryDicContentRsp>()
+                                                                             , HomeArea = x.d.Adapt<QueryDicContentRsp>()
+                                                                             , EmergencyContactArea = x.e.Adapt<QueryDicContentRsp>()
+                                                                           }));
     }
 
     /// <inheritdoc />
diff --git a/src/backend/UnitTests/UnitTests.csproj b/src/backend/UnitTests/UnitTests.csproj
@@ -4,6 +4,6 @@
         <ProjectReference Include="../NetAdmin/NetAdmin.Tests/NetAdmin.Tests.csproj"/>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0-preview-25107-01"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0"/>
     </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static ISelect<T1> WithNoLockNoWait<T1>(this ISelect<T1> me)`
`26`	`26`	`where T1 : class`
`27`	`27`	`{`
`28`	`28`	`return me`
`29`		`- #if DBTYPE_SQLSERVER`
	`29`	`+ #if DBTYPE_SQLSERVER`
`30`	`30`	`.WithLock(SqlServerLock.NoLock \| SqlServerLock.NoWait)`
`31`	`31`	`#endif`
`32`	`32`	`;`
`@@ -40,7 +40,7 @@ public static ISelect<T1, T2> WithNoLockNoWait<T1, T2>(this ISelect<T1, T2> me)`
`40`	`40`	`where T2 : class`
`41`	`41`	`{`
`42`	`42`	`return me`
`43`		`- #if DBTYPE_SQLSERVER`
	`43`	`+ #if DBTYPE_SQLSERVER`
`44`	`44`	`.WithLock(SqlServerLock.NoLock \| SqlServerLock.NoWait)`
`45`	`45`	`#endif`
`46`	`46`	`;`
`@@ -55,7 +55,7 @@ public static ISelect<T1, T2, T3> WithNoLockNoWait<T1, T2, T3>(this ISelect<T1,`
`55`	`55`	`where T3 : class`
`56`	`56`	`{`
`57`	`57`	`return me`
`58`		`- #if DBTYPE_SQLSERVER`
	`58`	`+ #if DBTYPE_SQLSERVER`
`59`	`59`	`.WithLock(SqlServerLock.NoLock \| SqlServerLock.NoWait)`
`60`	`60`	`#endif`
`61`	`61`	`;`
`@@ -71,7 +71,7 @@ public static ISelect<T1, T2, T3, T4> WithNoLockNoWait<T1, T2, T3, T4>(this ISel`
`71`	`71`	`where T4 : class`
`72`	`72`	`{`
`73`	`73`	`return me`
`74`		`- #if DBTYPE_SQLSERVER`
	`74`	`+ #if DBTYPE_SQLSERVER`
`75`	`75`	`.WithLock(SqlServerLock.NoLock \| SqlServerLock.NoWait)`
`76`	`76`	`#endif`
`77`	`77`	`;`
`@@ -88,7 +88,7 @@ public static ISelect<T1, T2, T3, T4, T5> WithNoLockNoWait<T1, T2, T3, T4, T5>(t`
`88`	`88`	`where T5 : class`
`89`	`89`	`{`
`90`	`90`	`return me`
`91`		`- #if DBTYPE_SQLSERVER`
	`91`	`+ #if DBTYPE_SQLSERVER`
`92`	`92`	`.WithLock(SqlServerLock.NoLock \| SqlServerLock.NoWait)`
`93`	`93`	`#endif`
`94`	`94`	`;`
`@@ -106,7 +106,7 @@ public static ISelect<T1, T2, T3, T4, T5, T6> WithNoLockNoWait<T1, T2, T3, T4, T`
`106`	`106`	`where T6 : class`
`107`	`107`	`{`
`108`	`108`	`return me`
`109`		`- #if DBTYPE_SQLSERVER`
	`109`	`+ #if DBTYPE_SQLSERVER`
`110`	`110`	`.WithLock(SqlServerLock.NoLock \| SqlServerLock.NoWait)`
`111`	`111`	`#endif`
`112`	`112`	`;`