<chore>

2025-04-18 23:22:51 +08:00 · 2023-01-19 20:35:34 +08:00 · 2023-01-19 20:35:34 +08:00 · 9384bc0692
commit 9384bc0692
parent 05ca80acda
23 changed files with 225 additions and 237 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -13,15 +13,20 @@ trim_trailing_whitespace = true
 [*.cs]
 dotnet_analyzer_diagnostic.severity = warning
 dotnet_diagnostic.CA1707.severity = none
-dotnet_diagnostic.CA1720.severity = none
+dotnet_diagnostic.CA1716.severity = none
+dotnet_diagnostic.CA1848.severity = none
+dotnet_diagnostic.CA2254.severity = none
 dotnet_diagnostic.CA5350.severity = none
 dotnet_diagnostic.CA5351.severity = none
+dotnet_diagnostic.IDE0005.severity = none
 dotnet_diagnostic.IDE0008.severity = none
+dotnet_diagnostic.IDE0010.severity = none
 dotnet_diagnostic.IDE0017.severity = none
 dotnet_diagnostic.IDE0048.severity = none
 dotnet_diagnostic.IDE0055.severity = none
 dotnet_diagnostic.IDE0058.severity = none
 dotnet_diagnostic.IDE0160.severity = none
+dotnet_diagnostic.SYSLIB1045.severity = none


 # ReSharper properties
--- a/.gitignore
+++ b/.gitignore
@ -29,7 +29,7 @@ x86/
 bld/
 [Bb]in/
 [Oo]bj/
-[Ll]og/
+# [Ll]og/
 [Ll]ogs/

 # Visual Studio 2015/2017 cache/options directory
@ -399,6 +399,6 @@ FodyWeavers.xsd
 .idea/

 # User Define
-build/
+dist/
 nuget.config
 *.[Dd]esigner.cs
--- a/CodeCleanupOnSave.csx
+++ b/CodeCleanupOnSave.csx
@ -1,16 +1,27 @@
+#r "nuget: Newtonsoft.Json, 13.0.0"
+
+using System.Xml;
+using System.IO;
+using Newtonsoft.Json.Linq;
+
 var path = Directory.GetFiles(@".idea", "workspace.xml", SearchOption.AllDirectories).First();
-        const string findStr = """
-&quot;keyToString&quot;: {
-""";
-        const string replaceStr = """
-&quot;keyToString&quot;: {
-    &quot;rider.code.cleanup.on.save&quot;: &quot;true&quot;,
-""";
-        var content = File.ReadAllText(path);
-        if(content.Contains("rider.code.cleanup.on.save")){
-                Console.WriteLine("alreay added");
-                return;
-        }
-        content = content.Replace(findStr, replaceStr);
-        Console.WriteLine(content);
-        File.WriteAllText(path, content);
+XmlDocument xdoc = new XmlDocument();
+using(var fs = File.Open(path, FileMode.Open)){
+    xdoc.Load(fs);
+    fs.Seek(0, SeekOrigin.Begin);
+    var propertiesComponent = xdoc.SelectSingleNode("""//component[@name="PropertiesComponent"]""");
+    var jsonStr = propertiesComponent.InnerText;
+    var jsonObj = JObject.Parse(jsonStr);
+    var keyToStringObj = jsonObj["keyToString"] as JObject;
+    if (keyToStringObj.ContainsKey("rider.code.cleanup.on.save")) return;
+
+    keyToStringObj.Add(new JProperty("rider.code.cleanup.on.save", "true"));
+    var newNode = xdoc.CreateCDataSection(jsonObj.ToString());
+    propertiesComponent.InnerText=string.Empty;
+    propertiesComponent.AppendChild(newNode);
+    var settings = new XmlWriterSettings { Indent = true };
+    using(var writer = XmlWriter.Create(fs, settings)){
+        xdoc.WriteTo(writer);
+    }
+
+}
--- a/CodeQuality.props
+++ b/CodeQuality.props
@ -13,5 +13,9 @@
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
+        <PackageReference Include="NSCodeAnalysis" Version="1.0.1-alpha.0.2">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
    </ItemGroup>
 </Project>
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -1,22 +1,35 @@
 <Project>
    <PropertyGroup>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <BaseOutputPath>../dist</BaseOutputPath>
-        <BaseIntermediateOutputPath>../dist</BaseIntermediateOutputPath>
-        <OutputPath>$(BaseOutputPath)/$(MSBuildProjectName)/bin</OutputPath>
-        <IntermediateOutputPath>$(BaseIntermediateOutputPath)/$(MSBuildProjectName)/obj</IntermediateOutputPath>
-        <MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)/$(MSBuildProjectName)/obj</MSBuildProjectExtensionsPath>
+        <AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
        <Authors>nsnail</Authors>
-        <Product>NSExt</Product>
-        <Copyright>© 2006-2022 nsnail</Copyright>
-        <RepositoryUrl>https://github.com/nsnail/ns-ext.git</RepositoryUrl>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <EmbedUntrackedSource>true</EmbedUntrackedSource>
+        <BaseIntermediateOutputPath>../dist</BaseIntermediateOutputPath>
+        <BaseOutputPath>../dist</BaseOutputPath>
+        <Copyright>© 2006-2023 nsnail</Copyright>
+        <DelaySign>false</DelaySign>
+        <Description>A .NET extension function library</Description>
        <EmbedAllSources>true</EmbedAllSources>
-        <RepositoryType>Git</RepositoryType>
+        <EmbedUntrackedSource>true</EmbedUntrackedSource>
+        <EnableBaseIntermediateOutputPathMismatchWarning>false</EnableBaseIntermediateOutputPathMismatchWarning>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <ImplicitUsings>enable</ImplicitUsings>
        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <IntermediateOutputPath>$(BaseIntermediateOutputPath)/$(MSBuildProjectName)/obj</IntermediateOutputPath>
+        <IsPackable>true</IsPackable>
+        <MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)/$(MSBuildProjectName)/obj</MSBuildProjectExtensionsPath>
+        <OutputPath>$(BaseOutputPath)/$(MSBuildProjectName)/bin</OutputPath>
+        <PackageIcon>logo.png</PackageIcon>
        <PackageLicenseExpression>MIT</PackageLicenseExpression>
        <PackageProjectUrl>https://github.com/nsnail/ns-ext.git</PackageProjectUrl>
+        <PackageTags>extensions</PackageTags>
+        <Product>NSExt</Product>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <RepositoryUrl>https://github.com/nsnail/ns-ext.git</RepositoryUrl>
+        <SignAssembly>true</SignAssembly>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
+        <Title>$(AssemblyName)</Title>
    </PropertyGroup>
 </Project>
--- a/NSExt.sln
+++ b/NSExt.sln
@ -17,14 +17,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{85E669CB-F
 		CodeCleanupOnSave.csx = CodeCleanupOnSave.csx
 		CodeQuality.props = CodeQuality.props
 		Directory.Build.props = Directory.Build.props
-		dot.sln.DotSettings = dot.sln.DotSettings
 		dotnet-tools.json = dotnet-tools.json
 		git-clean.cmd = git-clean.cmd
 		global.json = global.json
 		ImageOptimize.csx = ImageOptimize.csx
 		LICENSE = LICENSE
-		push2nuget.ps1 = push2nuget.ps1
+		NSExt.sln.DotSettings = NSExt.sln.DotSettings
+		NSExt.sln.DotSettings.user = NSExt.sln.DotSettings.user
 		README.md = README.md
+		README.zh-CN.md = README.zh-CN.md
 		stylecop.json = stylecop.json
 		StyleCopAnalyzers.ruleset = StyleCopAnalyzers.ruleset
 	EndProjectSection
--- a/NSExt.sln.DotSettings
+++ b/NSExt.sln.DotSettings
@ -1,4 +1,7 @@
 <wpf:ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xml:space="preserve">
+    <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+    <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+    <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
    <s:Boolean x:Key="/Default/ReSpeller/ReSpellerEnabled/@EntryValue">False</s:Boolean>
    <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
    <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
@ -12,7 +15,6 @@
    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="AA_BB" /&gt;</s:String>
    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-
    <s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;
    &lt;TypePattern&gt;
--- a/StyleCopAnalyzers.ruleset
+++ b/StyleCopAnalyzers.ruleset
@ -13,7 +13,7 @@
        <Rule Id="SA1002" Action="Warning"/>          <!-- Semicolons should be spaced correctly -->
        <Rule Id="SA1003" Action="Warning"/>          <!-- Symbols should be spaced correctly -->
        <Rule Id="SA1004" Action="Warning"/>          <!-- Documentation lines should begin with single space -->
-        <Rule Id="SA1005" Action="None"/>             <!-- Single line comments should begin with single space -->
+        <Rule Id="SA1005" Action="Warning"/>             <!-- Single line comments should begin with single space -->
        <Rule Id="SA1006" Action="Warning"/>          <!-- Preprocessor keywords should not be preceded by space -->
        <Rule Id="SA1007" Action="Warning"/>          <!-- Operator keyword should be followed by space -->
        <Rule Id="SA1008" Action="None"/>             <!-- Opening parenthesis should be spaced correctly -->
@ -73,7 +73,7 @@
        <Rule Id="SA1131" Action="Warning"/>          <!-- Use readable conditions -->
        <Rule Id="SA1132" Action="Warning"/>          <!-- Do not combine fields -->
        <Rule Id="SA1133" Action="Warning"/>          <!-- Do not combine attributes -->
-        <Rule Id="SA1134" Action="None"/>             <!-- Attributes should not share line -->
+        <Rule Id="SA1134" Action="Warning"/>             <!-- Attributes should not share line -->
        <Rule Id="SA1135" Action="Warning"/>          <!-- Using directives should be qualified -->
        <Rule Id="SA1136" Action="Warning"/>          <!-- Enum values should be on separate lines -->
        <Rule Id="SA1137" Action="Warning"/>          <!-- Elements should have the same indentation -->
@ -115,7 +115,7 @@
        <Rule Id="SA1310" Action="None"/>             <!-- Field names should not contain underscore -->
        <Rule Id="SA1311" Action="Warning"/>          <!-- Static readonly fields should begin with upper-case letter -->
        <Rule Id="SA1312" Action="Warning"/>          <!-- Variable names should begin with lower-case letter -->
-        <Rule Id="SA1313" Action="None"/>             <!-- Parameter names should begin with lower-case letter -->
+        <Rule Id="SA1313" Action="Warning"/>             <!-- Parameter names should begin with lower-case letter -->
        <Rule Id="SA1314" Action="Warning"/>          <!-- Type parameter names should begin with T -->
        <Rule Id="SX1309" Action="Warning"/>          <!-- Field names should begin with underscore -->
        <Rule Id="SX1309S" Action="Warning"/>         <!-- Static field names should begin with underscore -->
@ -125,12 +125,12 @@
        <Rule Id="SA1119" Action="Warning"/>          <!-- Statement should not use unnecessary parenthesis -->
        <Rule Id="SA1400" Action="Warning"/>          <!-- Access modifier should be declared -->
        <Rule Id="SA1401" Action="Warning"/>          <!-- Fields should be private -->
-        <Rule Id="SA1402" Action="Warning"/>          <!-- File may only contain a single type -->
+        <Rule Id="SA1402" Action="None"/>          <!-- File may only contain a single type -->
        <Rule Id="SA1403" Action="Warning"/>          <!-- File may only contain a single namespace -->
        <Rule Id="SA1404" Action="Warning"/>          <!-- Code analysis suppression should have justification -->
        <Rule Id="SA1405" Action="Warning"/>          <!-- Debug.Assert should provide message text -->
        <Rule Id="SA1406" Action="Warning"/>          <!-- Debug.Fail should provide message text -->
-        <Rule Id="SA1407" Action="None"/>             <!-- Arithmetic expressions should declare precedence -->
+        <Rule Id="SA1407" Action="Warning"/>             <!-- Arithmetic expressions should declare precedence -->
        <Rule Id="SA1408" Action="Warning"/>          <!-- Conditional expressions should declare precedence -->
        <Rule Id="SA1409" Action="Warning"/>          <!-- Remove unnecessary code -->
        <Rule Id="SA1410" Action="Warning"/>          <!-- Remove delegate parenthesis when possible -->
@ -143,7 +143,7 @@
        <Rule Id="SA1500" Action="None"/>             <!-- Braces for multi-line statements should not share line -->
        <Rule Id="SA1501" Action="Warning"/>          <!-- Statement should not be on a single line -->
        <Rule Id="SA1502" Action="None"/>             <!-- Element should not be on a single line -->
-        <Rule Id="SA1503" Action="None"/>             <!-- Braces should not be omitted -->
+        <Rule Id="SA1503" Action="Warning"/>             <!-- Braces should not be omitted -->
        <Rule Id="SA1504" Action="Warning"/>          <!-- All accessors should be single-line or multi-line -->
        <Rule Id="SA1505" Action="Warning"/>          <!-- Opening braces should not be followed by blank line -->
        <Rule Id="SA1506" Action="Warning"/>          <!-- Element documentation headers should not be followed by blank line -->
@ -173,7 +173,7 @@
        <Rule Id="SA1606" Action="Warning"/>          <!-- Element documentation should have summary text -->
        <Rule Id="SA1607" Action="Warning"/>          <!-- Partial element documentation should have summary text -->
        <Rule Id="SA1608" Action="Warning"/>          <!-- Element documentation should not have default summary -->
-        <Rule Id="SA1609" Action="Warning"/>          <!-- Property documentation should have value -->
+        <Rule Id="SA1609" Action="None"/>          <!-- Property documentation should have value -->
        <Rule Id="SA1610" Action="Warning"/>          <!-- Property documentation should have value text -->
        <Rule Id="SA1611" Action="None"/>             <!-- Element parameters should be documented -->
        <Rule Id="SA1612" Action="Warning"/>          <!-- Element parameter documentation should match element parameters -->
@ -187,13 +187,13 @@
        <Rule Id="SA1620" Action="Warning"/>          <!-- Generic type parameter documentation should match type parameters -->
        <Rule Id="SA1621" Action="Warning"/>          <!-- Generic type parameter documentation should declare parameter name -->
        <Rule Id="SA1622" Action="Warning"/>          <!-- Generic type parameter documentation should have text -->
-        <Rule Id="SA1623" Action="Warning"/>          <!-- Property summary documentation should match accessors -->
+        <Rule Id="SA1623" Action="None"/>          <!-- Property summary documentation should match accessors -->
        <Rule Id="SA1624" Action="Warning"/>          <!-- Property summary documentation should omit accessor with restricted access -->
        <Rule Id="SA1625" Action="Warning"/>          <!-- Element documentation should not be copied and pasted -->
        <Rule Id="SA1626" Action="Warning"/>          <!-- Single-line comments should not use documentation style slashes -->
        <Rule Id="SA1627" Action="Warning"/>          <!-- Documentation text should not be empty -->
        <Rule Id="SA1628" Action="Warning"/>          <!-- Documentation text should begin with a capital letter -->
-        <Rule Id="SA1629" Action="None"/>             <!-- Documentation text should end with a period -->
+        <Rule Id="SA1629" Action="None"/>          <!-- Documentation text should end with a period -->
        <Rule Id="SA1630" Action="Warning"/>          <!-- Documentation text should contain whitespace -->
        <Rule Id="SA1631" Action="Warning"/>          <!-- Documentation should meet character percentage -->
        <Rule Id="SA1632" Action="Warning"/>          <!-- Documentation text should meet minimum character length -->
--- a/build.cake
+++ b/build.cake
@ -1,6 +1,6 @@
 var target = Argument("target", "Default");
 var configuration = Argument("configuration", "Release");
-var pkgOutPath = $"./dist/NSExt/pkg/{configuration}";
+var framework = Argument("framework", "net7.0");

 ////////////////////////////////////////////////////////////////
 // Tasks
@ -8,123 +8,108 @@ var pkgOutPath = $"./dist/NSExt/pkg/{configuration}";
 Task("Clean")
    .Does(context =>
 {
-    context.CleanDirectory(pkgOutPath);
+    context.CleanDirectory("./dist");
 });

 Task("Build")
    .IsDependentOn("Clean")
    .Does(context =>
 {
-    DotNetBuild("./NSExt.sln", new DotNetBuildSettings {
+    DotNetPublish("./src/NSExt.csproj", new DotNetPublishSettings {
        Configuration = configuration,
-        NoIncremental = context.HasArgument("rebuild"),
-        MSBuildSettings = new DotNetMSBuildSettings()
-            .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error)
+        Framework = framework,
    });
 });


-Task("Test")
-    .IsDependentOn("Build")
-    .Does(context =>
-{
-    DotNetTest("./test/Spectre.Console.Tests/Spectre.Console.Tests.csproj", new DotNetTestSettings {
-        Configuration = configuration,
-        NoRestore = true,
-        NoBuild = true,
-    });
+// Task("Test")
+//     .IsDependentOn("Build")
+//     .Does(context =>
+// {
+//     DotNetTest("./test/Spectre.Console.Tests/Spectre.Console.Tests.csproj", new DotNetTestSettings {
+//         Configuration = configuration,
+//         NoRestore = true,
+//         NoBuild = true,
+//     });
+//
+//     DotNetTest("./test/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj", new DotNetTestSettings {
+//         Configuration = configuration,
+//         NoRestore = true,
+//         NoBuild = true,
+//     });
+//
+//     DotNetTest("./test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj", new DotNetTestSettings {
+//         Configuration = configuration,
+//         NoRestore = true,
+//         NoBuild = true,
+//     });
+// });

-    DotNetTest("./test/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj", new DotNetTestSettings {
-        Configuration = configuration,
-        NoRestore = true,
-        NoBuild = true,
-    });

-    DotNetTest("./test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj", new DotNetTestSettings {
-        Configuration = configuration,
-        NoRestore = true,
-        NoBuild = true,
-    });
-});
-
-Task("Package")
-    .IsDependentOn("Build")
-    .Does(context =>
-{
-    context.DotNetPack("./NSExt.sln", new DotNetPackSettings {
-        Configuration = configuration,
-        NoRestore = true,
-        NoBuild = true,
-        OutputDirectory = pkgOutPath,
-        MSBuildSettings = new DotNetMSBuildSettings()
-            .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error)
-    });
-});
-
-Task("Publish-GitHub")
-    .WithCriteria(ctx => BuildSystem.IsRunningOnGitHubActions, "Not running on GitHub Actions")
-    .IsDependentOn("Package")
-    .Does(context =>
-{
-    var apiKey = Argument<string>("github-key", null);
-    if(string.IsNullOrWhiteSpace(apiKey)) {
-        throw new CakeException("No GitHub API key was provided.");
-    }
-
-    // Publish to GitHub Packages
-    var exitCode = 0;
-    foreach(var file in context.GetFiles("./.artifacts/*.nupkg"))
-    {
-        context.Information("Publishing {0}...", file.GetFilename().FullPath);
-        exitCode += StartProcess("dotnet",
-            new ProcessSettings {
-                Arguments = new ProcessArgumentBuilder()
-                    .Append("gpr")
-                    .Append("push")
-                    .AppendQuoted(file.FullPath)
-                    .AppendSwitchSecret("-k", " ", apiKey)
-            }
-        );
-    }
-
-    if(exitCode != 0)
-    {
-        throw new CakeException("Could not push GitHub packages.");
-    }
-});
+// Task("Publish-GitHub")
+//     .WithCriteria(ctx => BuildSystem.IsRunningOnGitHubActions, "Not running on GitHub Actions")
+//     //.IsDependentOn("Package")
+//     .Does(context =>
+// {
+//     var apiKey = Argument<string>("github-key", null);
+//     if(string.IsNullOrWhiteSpace(apiKey)) {
+//         throw new CakeException("No GitHub API key was provided.");
+//     }
+//
+//     // Publish to GitHub Packages
+//     var exitCode = 0;
+//     foreach(var file in context.GetFiles("./.artifacts/*.nupkg"))
+//     {
+//         context.Information("Publishing {0}...", file.GetFilename().FullPath);
+//         exitCode += StartProcess("dotnet",
+//             new ProcessSettings {
+//                 Arguments = new ProcessArgumentBuilder()
+//                     .Append("gpr")
+//                     .Append("push")
+//                     .AppendQuoted(file.FullPath)
+//                     .AppendSwitchSecret("-k", " ", apiKey)
+//             }
+//         );
+//     }
+//
+//     if(exitCode != 0)
+//     {
+//         throw new CakeException("Could not push GitHub packages.");
+//     }
+// });

 Task("Publish-NuGet")
-    // .WithCriteria(ctx => BuildSystem.IsRunningOnGitHubActions, "Not running on GitHub Actions")
-    .IsDependentOn("Package")
-    .Does(context =>
+ //.WithCriteria(ctx => BuildSystem.IsRunningOnGitHubActions, "Not running on GitHub Actions")
+ .IsDependentOn("Build")
+ .Does(context =>
 {
-    var apiKey = Argument<string>("nuget-key", null);
-    if(string.IsNullOrWhiteSpace(apiKey)) {
-        throw new CakeException("No NuGet API key was provided.");
-    }
+ var apiKey = Argument<string>("nuget-key", null);
+ if(string.IsNullOrWhiteSpace(apiKey)) {
+     throw new CakeException("No NuGet API key was provided.");
+ }

-    // Publish to GitHub Packages
-    foreach(var file in context.GetFiles($"{pkgOutPath}/*.*nupkg"))
-    {
-        context.Information("Publishing {0}...", file.GetFilename().FullPath);
-        DotNetNuGetPush(file.FullPath, new DotNetNuGetPushSettings
-        {
-            Source = "https://api.nuget.org/v3/index.json",
-            ApiKey = apiKey,
-            SkipDuplicate = true
-        });
-    }
+ // Publish to GitHub Packages
+ foreach(var file in context.GetFiles("./dist/NSExt/bin/*.*"))
+ {
+     context.Information("Publishing {0}...", file.GetFilename().FullPath);
+     DotNetNuGetPush(file.FullPath, new DotNetNuGetPushSettings
+     {
+         Source = "https://api.nuget.org/v3/index.json",
+         ApiKey = apiKey,
+         SkipDuplicate = true
+     });
+ }
 });

 ////////////////////////////////////////////////////////////////
 // Targets

 Task("Publish")
-    //.IsDependentOn("Publish-GitHub")
+//     .IsDependentOn("Publish-GitHub")
    .IsDependentOn("Publish-NuGet");

 Task("Default")
-    .IsDependentOn("Package");
+    .IsDependentOn("Build");

 ////////////////////////////////////////////////////////////////
 // Execution
--- a/git-clean.cmd
+++ b/git-clean.cmd
@ -1 +1,2 @@
-git reset --hard | git clean -d -fx .
+git reset --hard
+git clean -d -fx .
--- a/key.snk
+++ b/key.snk
--- a/logo.png
+++ b/logo.png
--- a/src/Extensions/ByteExtensions.cs
+++ b/src/Extensions/ByteExtensions.cs
@ -8,7 +8,7 @@ public static class ByteExtensions
    /// <summary>
    ///     base64编码
    /// </summary>
-    /// <param name="me">待编码的字节数组</param>
+    /// <param name="me">me</param>
    /// <returns>编码后的base64字符串</returns>
    public static string Base64(this byte[] me)
    {
@ -18,7 +18,7 @@ public static class ByteExtensions
    /// <summary>
    ///     将字节数组解码成字符串
    /// </summary>
-    /// <param name="me">字节数组</param>
+    /// <param name="me">me</param>
    /// <param name="e">字符串使用的编码方式</param>
    /// <returns>解码后的原始字符串</returns>
    public static string HexDe(this byte[] me, Encoding e)
@ -29,7 +29,7 @@ public static class ByteExtensions
    /// <summary>
    ///     将字节数组解码成字符串
    /// </summary>
-    /// <param name="me">字节数组</param>
+    /// <param name="me">me</param>
    /// <returns>解码后的原始字符串</returns>
    public static string HexDe(this byte[] me)
    {
@ -43,8 +43,8 @@ public static class ByteExtensions
    /// <param name="upperCase">是否大写</param>
    /// <param name="splitShar">字节间分隔符</param>
    /// <param name="splitInterval">分隔符跳跃字节数</param>
-    public static string String(this IEnumerable<byte> me, bool upperCase = true, string splitShar = ""
-                              , int                    splitInterval = 1)
+    public static string Str(this IEnumerable<byte> me, bool upperCase = true, string splitShar = ""
+                           , int                    splitInterval = 1)
    {
        var sb = new StringBuilder();
        var i  = 0;
--- a/src/Extensions/DateTimeExtensions.cs
+++ b/src/Extensions/DateTimeExtensions.cs
@ -13,7 +13,7 @@ public static class DateTimeExtensions
    /// <summary>
    ///     将一个过去时间对象与当前时间相减转换成“xx以前”的字符串, 如2秒以前, 3天以前
    /// </summary>
-    /// <param name="me">时间对象</param>
+    /// <param name="me">me</param>
    /// <returns>字符串</returns>
    public static string TimeAgo(this DateTime me)
    {
@ -26,7 +26,7 @@ public static class DateTimeExtensions
    /// <summary>
    ///     指定时间的世界协调时的unix时间戳形式
    /// </summary>
-    /// <param name="me">指定时间</param>
+    /// <param name="me">me</param>
    /// <returns>unix时间戳</returns>
    public static long TimeUnixUtc(this DateTime me)
    {
--- a/src/Extensions/DbCommandExtensions.cs
+++ b/src/Extensions/DbCommandExtensions.cs
@ -1,7 +1,7 @@
 namespace NSExt.Extensions;

 /// <summary>
-/// DbCommandExtensions
+///     DbCommandExtensions
 /// </summary>
 public static class DbCommandExtensions
 {
@ -10,22 +10,21 @@ public static class DbCommandExtensions
    /// </summary>
    public static string ParameterFormat(this DbCommand me)
    {
-        //var aa = pars.ToDictionary(it => it.ParameterName, it => it.Value);
+        // var aa = pars.ToDictionary(it => it.ParameterName, it => it.Value);
        var sql = me.CommandText;

-        //应逆向替换，否则由于 多个表的过滤器问题导致替换不完整  如 @TenantId1  @TenantId10
+        // 应逆向替换，否则由于 多个表的过滤器问题导致替换不完整  如 @TenantId1  @TenantId10
        for (var i = me.Parameters.Count - 1; i >= 0; i--) {
            #pragma warning disable IDE0072
            sql = me.Parameters[i].DbType switch {
                      #pragma warning restore IDE0072
                      DbType.String or DbType.DateTime or DbType.Date or DbType.Time or DbType.DateTime2
                          or DbType.DateTimeOffset or DbType.Guid or DbType.VarNumeric or DbType.AnsiStringFixedLength
-                          or DbType.AnsiString
-                          or DbType.StringFixedLength =>
-                          sql.Replace(me.Parameters[i].ParameterName, "'" + me.Parameters[i].Value + "'")
-                    , DbType.Boolean => sql.Replace(//
-                        me.Parameters[i].ParameterName
-                                                  , Convert.ToBoolean(me.Parameters[i].Value, CultureInfo.InvariantCulture) ? "1" : "0")
+                          or DbType.AnsiString or DbType.StringFixedLength => sql.Replace( //
+                              me.Parameters[i].ParameterName, "'" + me.Parameters[i].Value + "'")
+                    , DbType.Boolean => sql.Replace( //
+                          me.Parameters[i].ParameterName
+                        , Convert.ToBoolean(me.Parameters[i].Value, CultureInfo.InvariantCulture) ? "1" : "0")
                    , _ => sql.Replace(me.Parameters[i].ParameterName, me.Parameters[i].Value?.ToString())
                  };
        }
--- a/src/Extensions/DecimalExtensions.cs
+++ b/src/Extensions/DecimalExtensions.cs
@ -8,7 +8,7 @@ public static class DecimalExtensions
    /// <summary>
    ///     四舍五入后的近似值
    /// </summary>
-    /// <param name="me">数字</param>
+    /// <param name="me">me</param>
    /// <param name="place">小数点位数</param>
    /// <returns>处理后的值</returns>
    public static decimal Round(this decimal me, int place)
--- a/src/Extensions/EnumerableExtensions.cs
+++ b/src/Extensions/EnumerableExtensions.cs
@ -17,7 +17,7 @@ public static class EnumerableExtensions
    ///     判断对象是否为null或不存在子元素（如果为集合对象）
    /// </summary>
    /// <typeparam name="T">对象类型</typeparam>
-    /// <param name="me">指定对象</param>
+    /// <param name="me">me</param>
    /// <returns>空则返回true</returns>
    public static bool NullOrEmpty<T>(this IEnumerable<T> me)
    {
--- a/src/Extensions/GenericExtensions.cs
+++ b/src/Extensions/GenericExtensions.cs
@ -9,7 +9,7 @@ public static class GenericExtensions
    ///     从指定的对象拷贝属性
    /// </summary>
    /// <typeparam name="T">对象类型</typeparam>
-    /// <param name="me">拷贝目标</param>
+    /// <param name="me">me</param>
    /// <param name="copyObj">拷贝来源</param>
    /// <param name="propNameList">需要处理的属性名</param>
    /// <param name="isIncludeOrExclude">True包含，false排除</param>
--- a/src/Extensions/IntExtensions.cs
+++ b/src/Extensions/IntExtensions.cs
@ -17,7 +17,7 @@ public static class IntExtensions
    /// <summary>
    ///     生成随机数
    /// </summary>
-    /// <param name="me">大于等于[0]，小于[1]</param>
+    /// <param name="me">me</param>
    public static int Rand(this int[] me)
    {
        return new Random(Guid.NewGuid().GetHashCode()).Next(me[0], me[1]);
--- a/src/Extensions/JsonSerializerOptionsExtensions.cs
+++ b/src/Extensions/JsonSerializerOptionsExtensions.cs
@ -1,27 +0,0 @@
-using System.Text.Encodings.Web;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace NSExt.Extensions;
-
-/// <summary>
-///     JsonSerializerOptionsExtensions
-/// </summary>
-public static class JsonSerializerOptionsExtensions
-{
-    /// <summary>
-    ///     NewJsonSerializerOptions
-    /// </summary>
-    public static JsonSerializerOptions NewJsonSerializerOptions(this JsonSerializerOptions _)
-    {
-        return new JsonSerializerOptions {
-                                             ReadCommentHandling         = JsonCommentHandling.Skip
-                                           , AllowTrailingCommas         = true
-                                           , DictionaryKeyPolicy         = JsonNamingPolicy.CamelCase
-                                           , PropertyNamingPolicy        = JsonNamingPolicy.CamelCase
-                                           , Encoder                     = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-                                           , NumberHandling              = JsonNumberHandling.AllowReadingFromString
-                                           , PropertyNameCaseInsensitive = true
-                                         };
-    }
-}
--- a/src/Extensions/ObjectExtensions.cs
+++ b/src/Extensions/ObjectExtensions.cs
@ -10,20 +10,17 @@ public static class ObjectExtensions
    /// <summary>
    ///     将一个对象序列化成json文本
    /// </summary>
-    /// <param name="me">指定对象</param>
-    /// <param name="format">是否格式化</param>
+    /// <param name="me">me</param>
    /// <returns>json文本</returns>
-    public static string Json(this object me, bool format = false)
+    public static string Json(this object me)
    {
-        var defaultOptions = default(JsonSerializerOptions).NewJsonSerializerOptions();
-        defaultOptions.WriteIndented = format;
-        return Json(me, defaultOptions);
+        return JsonSerializer.Serialize(me);
    }

    /// <summary>
    ///     将一个对象序列化成json文本
    /// </summary>
-    /// <param name="me">指定对象</param>
+    /// <param name="me">me</param>
    /// <param name="options">序列化选项</param>
    /// <returns>json文本</returns>
    public static string Json(this object me, JsonSerializerOptions options)
--- a/src/Extensions/StringExtensions.cs
+++ b/src/Extensions/StringExtensions.cs
@ -11,15 +11,13 @@ namespace NSExt.Extensions;
 /// <summary>
 ///     StringExtensions
 /// </summary>
+#pragma warning disable CodeLinesAnalyzer
 public static class StringExtensions
 {
-    private static readonly JsonSerializerOptions _defaultJsonSerializerOptions
-        = default(JsonSerializerOptions).NewJsonSerializerOptions();
-
    /// <summary>
    ///     aes加密
    /// </summary>
-    /// <param name="me">要加密的串</param>
+    /// <param name="me">me</param>
    /// <param name="key">密钥</param>
    public static string Aes(this string me, string key)
    {
@ -36,7 +34,7 @@ public static class StringExtensions
    /// <summary>
    ///     aes解密
    /// </summary>
-    /// <param name="me">要加密的串</param>
+    /// <param name="me">me</param>
    /// <param name="key">密钥</param>
    public static string AesDe(this string me, string key)
    {
@ -53,7 +51,7 @@ public static class StringExtensions
    /// <summary>
    ///     base64编码
    /// </summary>
-    /// <param name="me">待base64编码的字符串</param>
+    /// <param name="me">me</param>
    /// <param name="e">字符串的编码方式</param>
    /// <returns>编码后的base64字符串</returns>
    public static string Base64(this string me, Encoding e)
@ -64,7 +62,7 @@ public static class StringExtensions
    /// <summary>
    ///     base64解码
    /// </summary>
-    /// <param name="me">待解码的字符串</param>
+    /// <param name="me">me</param>
    /// <returns>解码后的原始字节数组</returns>
    public static byte[] Base64De(this string me)
    {
@ -74,7 +72,7 @@ public static class StringExtensions
    /// <summary>
    ///     base64解码
    /// </summary>
-    /// <param name="me">待解码的字符串</param>
+    /// <param name="me">me</param>
    /// <param name="e">字符串的编码方式</param>
    /// <returns>解码后的原始字符串</returns>
    public static string Base64De(this string me, Encoding e)
@ -103,7 +101,7 @@ public static class StringExtensions
    /// <summary>
    ///     将字符串转换成日期对象
    /// </summary>
-    /// <param name="me">待转换字符串</param>
+    /// <param name="me">me</param>
    /// <returns>转换后的日期对象</returns>
    public static DateTime DateTime(this string me)
    {
@ -113,7 +111,7 @@ public static class StringExtensions
    /// <summary>
    ///     将字符串转换成日期对象
    /// </summary>
-    /// <param name="me">待转换字符串</param>
+    /// <param name="me">me</param>
    /// <param name="format">日期格式</param>
    /// <returns>转换后的日期对象</returns>
    public static DateTime DateTimeExact(this string me, string format)
@ -124,7 +122,7 @@ public static class StringExtensions
    /// <summary>
    ///     将字符串转换成日期对象
    /// </summary>
-    /// <param name="me">待转换字符串</param>
+    /// <param name="me">me</param>
    /// <param name="format">日期格式</param>
    /// <param name="def">转换失败时返回的日期对象</param>
    /// <returns>转换后的日期对象</returns>
@ -138,7 +136,7 @@ public static class StringExtensions
    /// <summary>
    ///     将字符串转换成日期对象
    /// </summary>
-    /// <param name="me">待转换字符串</param>
+    /// <param name="me">me</param>
    /// <param name="def">转换失败时返回的日期对象</param>
    /// <returns>转换后的日期对象</returns>
    public static DateTime DateTimeTry(this string me, DateTime def)
@ -149,7 +147,7 @@ public static class StringExtensions
    /// <summary>
    ///     string to decimal
    /// </summary>
-    /// <param name="me">string</param>
+    /// <param name="me">me</param>
    /// <returns>decimal</returns>
    public static decimal Dec(this string me)
    {
@ -159,7 +157,7 @@ public static class StringExtensions
    /// <summary>
    ///     尝试将字符串转为decimal
    /// </summary>
-    /// <param name="me">字符串</param>
+    /// <param name="me">me</param>
    /// <param name="def">转换失败后返回的默认值</param>
    /// <returns>转换后的decimal</returns>
    public static decimal DecTry(this string me, decimal def)
@ -170,7 +168,7 @@ public static class StringExtensions
    /// <summary>
    ///     string to double
    /// </summary>
-    /// <param name="me">string</param>
+    /// <param name="me">me</param>
    /// <returns>Int32</returns>
    public static double Double(this string me)
    {
@ -198,7 +196,7 @@ public static class StringExtensions
    /// <summary>
    ///     string to float
    /// </summary>
-    /// <param name="me">string</param>
+    /// <param name="me">me</param>
    /// <returns>Int32</returns>
    public static float Float(this string me)
    {
@ -208,7 +206,7 @@ public static class StringExtensions
    /// <summary>
    ///     将字符串转为guid
    /// </summary>
-    /// <param name="me">字符串</param>
+    /// <param name="me">me</param>
    public static Guid Guid(this string me)
    {
        return System.Guid.Parse(me);
@ -217,7 +215,7 @@ public static class StringExtensions
    /// <summary>
    ///     将字符串转换成guid
    /// </summary>
-    /// <param name="me">字符串</param>
+    /// <param name="me">me</param>
    /// <param name="def">转换失败的返回值</param>
    public static Guid Guid(this string me, Guid def)
    {
@ -227,7 +225,7 @@ public static class StringExtensions
    /// <summary>
    ///     将字符串转换成字节数组形式
    /// </summary>
-    /// <param name="me">字符串</param>
+    /// <param name="me">me</param>
    /// <param name="e">字符串使用的编码</param>
    /// <returns>字节数组</returns>
    public static byte[] Hex(this string me, Encoding e)
@ -238,7 +236,7 @@ public static class StringExtensions
    /// <summary>
    ///     将字符串转换成字节数组形式
    /// </summary>
-    /// <param name="me">字符串</param>
+    /// <param name="me">me</param>
    /// <returns>字节数组</returns>
    public static byte[] Hex(this string me)
    {
@ -272,7 +270,7 @@ public static class StringExtensions
    /// <summary>
    ///     解码html编码
    /// </summary>
-    /// <param name="me">html编码后的字符串</param>
+    /// <param name="me">me</param>
    /// <returns>解码后的原始字符串</returns>
    public static string HtmlDe(this string me)
    {
@ -282,7 +280,7 @@ public static class StringExtensions
    /// <summary>
    ///     string to Int32
    /// </summary>
-    /// <param name="me">string</param>
+    /// <param name="me">me</param>
    /// <returns>Int32</returns>
    public static int Int32(this string me)
    {
@ -292,7 +290,7 @@ public static class StringExtensions
    /// <summary>
    ///     尝试将字符串转为int32
    /// </summary>
-    /// <param name="me">字符串</param>
+    /// <param name="me">me</param>
    /// <param name="def">转换失败后返回的默认值</param>
    /// <returns>转换后的int32</returns>
    public static int Int32Try(this string me, int def)
@ -303,7 +301,7 @@ public static class StringExtensions
    /// <summary>
    ///     string to Int64
    /// </summary>
-    /// <param name="me">string</param>
+    /// <param name="me">me</param>
    /// <returns>Int64</returns>
    public static long Int64(this string me)
    {
@ -313,7 +311,7 @@ public static class StringExtensions
    /// <summary>
    ///     尝试将字符串转为int64
    /// </summary>
-    /// <param name="me">字符串</param>
+    /// <param name="me">me</param>
    /// <param name="def">转换失败后返回的默认值</param>
    /// <returns>转换后的int64</returns>
    public static long Int64Try(this string me, long def)
@ -332,7 +330,7 @@ public static class StringExtensions
    /// <summary>
    ///     是否base64字符串
    /// </summary>
-    /// <param name="me">字符串</param>
+    /// <param name="me">me</param>
    public static bool IsBase64String(this string me)
    {
        // 一个合法的Base64，有着以下特征：
@ -366,7 +364,7 @@ public static class StringExtensions
    /// <summary>
    ///     对一个手机号进行掩码处理
    /// </summary>
-    /// <param name="me">手机号</param>
+    /// <param name="me">me</param>
    /// <returns>掩码后的手机号</returns>
    public static string MaskMobile(this string me)
    {
@ -376,7 +374,7 @@ public static class StringExtensions
    /// <summary>
    ///     对一个字符串进行md5hash运算
    /// </summary>
-    /// <param name="me">字符串</param>
+    /// <param name="me">me</param>
    /// <param name="e">字符串使用的编码</param>
    /// <returns>hash摘要的16进制文本形式（无连字符小写）</returns>
    public static string Md5(this string me, Encoding e)
@ -389,7 +387,7 @@ public static class StringExtensions
    /// <summary>
    ///     判断字符串是否为null或不存在子元素（如果为集合对象）；如果为空，返回指定的默认值，否则返回字符串本身
    /// </summary>
-    /// <param name="me">指定字符串</param>
+    /// <param name="me">me</param>
    /// <param name="defVal">指定的默认值</param>
    /// <returns>如果为空，返回指定的默认值，否则返回字符串本身</returns>
    public static string NullOrEmpty(this string me, string defVal)
@ -408,30 +406,30 @@ public static class StringExtensions
    /// <summary>
    ///     反序列化一个文件获得指定类型的数据对象
    /// </summary>
-    /// <param name="me">等待反序列化的json文本</param>
+    /// <param name="me">me</param>
    /// <param name="options">序列化选项</param>
    /// <returns>反序列化后生成的对象</returns>
    public static T Object<T>(this string me, JsonSerializerOptions options = null)
    {
-        return JsonSerializer.Deserialize<T>(me, options ?? _defaultJsonSerializerOptions);
+        return JsonSerializer.Deserialize<T>(me, options);
    }

    /// <summary>
    ///     反序列化一个文件获得指定类型的数据对象
    /// </summary>
-    /// <param name="me">等待反序列化的json文本</param>
+    /// <param name="me">me</param>
    /// <param name="type">实际类型</param>
    /// <param name="options">序列化选项</param>
    /// <returns>反序列化后生成的对象</returns>
    public static object Object(this string me, Type type, JsonSerializerOptions options = null)
    {
-        return JsonSerializer.Deserialize(me, type, options ?? _defaultJsonSerializerOptions);
+        return JsonSerializer.Deserialize(me, type, options);
    }

    /// <summary>
    ///     生成密码
    /// </summary>
-    /// <param name="me">密码原文</param>
+    /// <param name="me">me</param>
    /// <returns>密文</returns>
    public static string Pwd(this string me)
    {
@ -441,7 +439,7 @@ public static class StringExtensions
    /// <summary>
    ///     移除字符串中的html标签
    /// </summary>
-    /// <param name="me">字符串</param>
+    /// <param name="me">me</param>
    /// <returns>处理之后的字符串</returns>
    public static string RemoveHtmlTag(this string me)
    {
@ -459,7 +457,7 @@ public static class StringExtensions
    /// <summary>
    ///     对一个字符串进行sha1 hash运算
    /// </summary>
-    /// <param name="me">字符串</param>
+    /// <param name="me">me</param>
    /// <param name="e">字符串使用的编码</param>
    /// <returns>hash摘要的16进制文本形式（无连字符小写）</returns>
    public static string Sha1(this string me, Encoding e)
@ -521,7 +519,7 @@ public static class StringExtensions
    /// <summary>
    ///     url编码
    /// </summary>
-    /// <param name="me">字符串</param>
+    /// <param name="me">me</param>
    /// <returns>url编码后的字符串</returns>
    public static string Url(this string me)
    {
@ -531,7 +529,7 @@ public static class StringExtensions
    /// <summary>
    ///     解码url编码
    /// </summary>
-    /// <param name="me">url编码后的字符串</param>
+    /// <param name="me">me</param>
    /// <returns>解码后的原始字符串</returns>
    public static string UrlDe(this string me)
    {
@ -541,7 +539,7 @@ public static class StringExtensions
    /// <summary>
    ///     MD5 hmac编码
    /// </summary>
-    /// <param name="me">字符串</param>
+    /// <param name="me">me</param>
    /// <param name="key">密钥</param>
    /// <param name="e">字符串使用的编码</param>
    /// <returns>hash摘要的16进制文本形式（无连字符小写）</returns>
@ -552,4 +550,5 @@ public static class StringExtensions
                           .Replace("-", string.Empty)
                           .ToLower(CultureInfo.CurrentCulture);
    }
-}
+}
+#pragma warning restore CodeLinesAnalyzer
--- a/src/NSExt.csproj
+++ b/src/NSExt.csproj
@ -1,17 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    </PropertyGroup>
+    <Import Project="../CodeQuality.props"/>

    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0"/>
        <PackageReference Include="MinVer" Version="4.3.0-beta.1">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
    </ItemGroup>
+    <ItemGroup>
+        <None Include="../logo.png" Pack="true" PackagePath=""/>
+    </ItemGroup>

-    <Import Project="../CodeQuality.props" />
 </Project>