Merge branch 'main' into tk

CHANGELOG.md

@@ -2,6 +2,4 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [2.0.11](https://github.com/nsnail/NSExt/compare/v2.0.10...v2.0.11) (2023-12-15)
-
 ### [2.0.10](https://github.com/nsnail/NSExt/compare/v2.0.9...v2.0.10) (2023-12-14)

build/code.quality.props

@@ -11,19 +11,19 @@
         <WarningsAsErrors>true</WarningsAsErrors>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
+        <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.28">
+        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.1-alpha">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Roslynator.Analyzers" Version="4.11.0">
+        <PackageReference Include="Roslynator.Analyzers" Version="4.7.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="9.20.0.85982">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.11",
+  "version": "2.0.10",
   "devDependencies": {
     "cz-git": "^1.7.1",
     "commitizen": "^4.3.0",
@@ -11,4 +11,4 @@
       "path": "node_modules/cz-git"
     }
   }
-}
+}

scripts/2.git.release.ps1

@@ -13,14 +13,9 @@ git checkout main
 git branch -D release
 git checkout -b release
 ./node_modules/.bin/standard-version -r $types[$prefix][0]
-cd ./scripts
-./code.clean.ps1
-git commit --amend --no-edit -a
-$tag = $(git describe --tags $(git rev-list --tags --max-count=1))
-git tag -d $tag
-git tag $tag
-git push --tags origin release
+git push --follow-tags --force origin release
 Start-Process -FilePath "https://github.com/nsnail/NSExt/compare/main...release"
+cd ./scripts
 Write-Host "按『Enter』回到主分支，『Ctrl+C』退出"
 Pause
 git checkout main

scripts/switcher.nsext.json

@@ -0,0 +1,17 @@
+{
+  "solution": "NSExt.sln",
+  "mappings": {
+    "NSExt": "../refs/ns-ext/src/NSExt/NSExt.csproj"
+  },
+  "restore": [
+    {
+      "name": "NSExt",
+      "packages": [
+        {
+          "packageName": "NSExt",
+          "version": "1.1.0"
+        }
+      ]
+    }
+  ]
+}

scripts/switcher.ps1

@@ -0,0 +1,27 @@
+# https://github.com/RicoSuter/DNT#switch-to-projects
+$targets = @{
+    '1' = 'switch-to-projects'
+    '2' = 'switch-to-packages'
+}
+$key = ''
+while ($null -eq $targets[$key])
+{
+    $key = 读取-Host '请选择：1（切换到项目引用） 2（切换到Nuget包引用）'
+}
+$files = Get-ChildItem Switcher.*.json
+$file = 9999
+while ($null -eq $files[[int]$file - 1])
+{
+    $i = 0
+    Write-Host '请选择要切换的配置文件文件'
+    foreach ($file in $files)
+    {
+        $i++
+        Write-Host $i $file.Name
+    }
+    $file = 读取-Host
+}
+$file = [int]$file - 1
+Copy-Item $files[$file] 'switcher.json' -Force
+dotnet dnt $targets[$key] ../NSExt.sln
+Remove-Item switcher.json

src/backend/NSExt.Tests/NSExt.Tests.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
-        <PackageReference Include="xunit" Version="2.7.0"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+        <PackageReference Include="xunit" Version="2.6.3"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.1">
+        <PackageReference Include="coverlet.collector" Version="6.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

src/backend/NSExt/Attributes/ResourceDescriptionAttribute.cs

@@ -19,7 +19,7 @@ public sealed class ResourceDescriptionAttribute<T> : Attribute
     /// <summary>
     ///     资源名称
     /// </summary>
-    public string ResourceName { get; }
+    public string ResourceName { get; set; }
 
     /// <summary>
     ///     资源对象

src/backend/NSExt/Extensions/EnumerableExtensions.cs

@@ -5,26 +5,6 @@ namespace NSExt.Extensions;
 /// </summary>
 public static class EnumerableExtensions
 {
-    /// <summary>
-    ///     异步累加器函数
-    /// </summary>
-    /// <exception cref="InvalidOperationException">InvalidOperationException</exception>
-    public static async Task<TSource> AggregateAsync<TSource>( //
-        this IEnumerable<TSource> source, Func<TSource, TSource, Task<TSource>> func)
-    {
-        using var e = source.GetEnumerator();
-        if (!e.MoveNext()) {
-            throw new InvalidOperationException("Sequence contains no elements");
-        }
-
-        var result = e.Current;
-        while (e.MoveNext()) {
-            result = await func(result, e.Current).ConfigureAwait(false);
-        }
-
-        return result;
-    }
-
     /// <summary>
     ///     将列表转成分隔符分隔的字符串
     /// </summary>

src/backend/NSExt/Extensions/StreamExtensions.cs

@@ -26,7 +26,7 @@ public static class StreamExtensions
     public static bool IsTextStream(this Stream me)
     {
         #pragma warning disable IDE0300
-        return me.FirstByteIndex([0x00, 0xff]) < 0;
+        return me.FirstByteIndex(new byte[] { 0x00, 0xff }) < 0;
         #pragma warning restore IDE0300
     }
 }