chore(release): 2.0.0

.github/workflows/ci.yml

@@ -33,3 +33,4 @@ jobs:
       - id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}
       - run: dotnet nuget push ./dist/backend/NSExt/bin/Release/NSExt.${{ steps.get_version.outputs.VERSION }}.nupkg --skip-duplicate --api-key ${{ secrets.NUGET_TOKEN }} --source https://api.nuget.org/v3/index.json
+      - run: dotnet nuget push ./dist/backend/NSExt/bin/Release/NSExt.${{ steps.get_version.outputs.VERSION }}.snupkg --skip-duplicate --api-key ${{ secrets.NUGET_TOKEN }} --source https://api.nuget.org/v3/index.json

CHANGELOG.md

@@ -2,13 +2,10 @@
 
 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.1.0](https://github.com/nsnail/NSExt/compare/v2.0.11...v2.1.0) (2024-03-01)
+## 2.0.0 (2023-12-14)
 
 
 ### Features
 
-* ✨ 异步累加器函数 ([ddf07fc](https://github.com/nsnail/NSExt/commit/ddf07fce5732e576db1512f870196c20f7b297e2))
+* ++ ([e41652d](https://github.com/nsnail/NSExt/commit/e41652d553beda7a2eb1600da4795e07f4260330))
-
+* 增加一些扩展方法 ([1f26d0f](https://github.com/nsnail/NSExt/commit/1f26d0f28098f7ee98a9a5482096aecd53b85e04))
-### [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)

Directory.Build.props

@@ -21,7 +21,6 @@
         <Product>NSExt</Product>
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/nsnail/NSExt.git</RepositoryUrl>
-        <RootNamespace>NSExt</RootNamespace>
         <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <Title>$(AssemblyName)</Title>
     </PropertyGroup>

NSExt.sln

@@ -13,14 +13,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{5198A03D-0
 		.editorconfig = .editorconfig
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
-		CHANGELOG.md = CHANGELOG.md
 		Directory.Build.props = Directory.Build.props
 		dotnet-tools.json = dotnet-tools.json
 		global.json = global.json
 		key.snk = key.snk
 		LICENSE = LICENSE
 		NSExt.sln.DotSettings = NSExt.sln.DotSettings
-		nuget.config = nuget.config
+		NuGet.Config = NuGet.Config
 		package.json = package.json
 		README.md = README.md
 		README.zh-CN.md = README.zh-CN.md
@@ -28,15 +27,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{5198A03D-0
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BB0B25C9-0901-4923-913F-00F9A6B352A5}"
 	ProjectSection(SolutionItems) = preProject
-		1.git.pull.request.ps1 = scripts/1.git.pull.request.ps1
-		2.git.release.ps1 = scripts/2.git.release.ps1
-		3.git.recreate.branch.ps1 = scripts/3.git.recreate.branch.ps1
 		clean.ln.csx = scripts/clean.ln.csx
 		code.clean.csx = scripts/code.clean.csx
 		code.clean.ps1 = scripts/code.clean.ps1
 		gen.cs.tt = scripts/gen.cs.tt
 		gen.ln.cmd = scripts/gen.ln.cmd
 		gen.resx.tt = scripts/gen.resx.tt
+		git.pr.ps1 = scripts/git.pr.ps1
+		git.rc.ps1 = scripts/git.rc.ps1
 		image.optimize.csx = scripts/image.optimize.csx
 		install.as.tpl.ps1 = scripts/install.as.tpl.ps1
 		rename.csx = scripts/rename.csx
@@ -58,7 +56,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8E4C93BA
 		code.quality.props = build/code.quality.props
 		copy.pkg.xml.comment.files.targets = build/copy.pkg.xml.comment.files.targets
 		minver.targets = build/minver.targets
-		nuget.package.props = build/nuget.package.props
 		prebuild.targets = build/prebuild.targets
 		stylecop.analyzers.ruleset = build/stylecop.analyzers.ruleset
 	EndProjectSection

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>

build/nuget.package.props

@@ -1,20 +0,0 @@
-<Project>
-    <PropertyGroup>
-        <AssemblyOriginatorKeyFile>../../../key.snk</AssemblyOriginatorKeyFile>
-        <DelaySign>false</DelaySign>
-        <EmbedAllSources>true</EmbedAllSources>
-        <IncludeSymbols>true</IncludeSymbols>
-        <IsPackable>true</IsPackable>
-        <PackageIcon>logo.png</PackageIcon>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
-        <PackageTags>extensions</PackageTags>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <SignAssembly>true</SignAssembly>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    </PropertyGroup>
-    <ItemGroup>
-        <None Include="../../../assets/logo.png" Pack="true" PackagePath="/"/>
-        <None Include="../../../README.md" Pack="true" PackagePath="/"/>
-    </ItemGroup>
-</Project>

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.1.0",
+  "version": "2.0.0",
   "devDependencies": {
     "cz-git": "^1.7.1",
     "commitizen": "^4.3.0",

scripts/2.git.release.ps1

@@ -1,28 +0,0 @@
-cd ..
-$types = @{
-    '1' = @('major', '主版本')
-    '2' = @('minor', '此版本')
-    '3' = @('patch', '修订版本')
-}
-$prefix = ''
-while ($null -eq $types[$prefix])
-{
-    $prefix = Read-Host "请选择版本类型`n" $( & { param($i) $i | ForEach-Object { "$_ : $( $types[$_][0] )（$( $types[$_][1] )）`n" } } $types.Keys | Sort-Object )
-}
-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
-Start-Process -FilePath "https://github.com/nsnail/NSExt/compare/main...release"
-Write-Host "按『Enter』回到主分支，『Ctrl+C』退出"
-Pause
-git checkout main
-git pull
-git branch -D release

scripts/code.clean.ps1

@@ -1,4 +1,4 @@
-jb cleanupcode --no-build --include = $( $( git status --porcelain | Where-Object { $_ -match "^\s*[MA]" } | ForEach-Object { $_.TrimStart(" M").TrimStart(" A") } ) -join ";" ) ../NSExt.sln
+dotnet jb cleanupcode --no-build --include = $( $( git status --porcelain | Where-Object { $_ -match "^\s*[MA]" } | ForEach-Object { $_.TrimStart(" M").TrimStart(" A") } ) -join ";" ) ../NSExt.sln
 dot rbom -w -e refs -e .git -e node_modules ../
 dot trim -w -e refs -e .git -e node_modules ../
 dot tolf -w -e refs -e .git -e node_modules ../

scripts/git.pr.ps1

@@ -8,4 +8,4 @@ git push --set-upstream origin $branch
 Start-Process -FilePath "https://github.com/nsnail/NSExt/compare/main...$branch"
 Write-Host "按『Enter』重建分支，『Ctrl+C』退出"
 Pause
-./3.git.recreate.branch.ps1
+./git.rc.ps1

scripts/resharper.full.ps1

@@ -1 +1 @@
-jb cleanupcode --no-build ../NSExt.sln
+dotnet jb cleanupcode --no-build ../NSExt.sln

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" Version="2.6.3"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+        <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
     }
 }

src/backend/NSExt/NSExt.csproj

@@ -1,15 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
+        <AssemblyOriginatorKeyFile>../../../key.snk</AssemblyOriginatorKeyFile>
+        <DelaySign>false</DelaySign>
+        <EmbedAllSources>true</EmbedAllSources>
+        <EmbedUntrackedSource>true</EmbedUntrackedSource>
+        <IncludeSymbols>true</IncludeSymbols>
+        <IsPackable>true</IsPackable>
+        <PackageIcon>logo.png</PackageIcon>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://github.com/nsnail/NSExt.git</PackageProjectUrl>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <PackageTags>extensions</PackageTags>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <RootNamespace>NSExt</RootNamespace>
+        <SignAssembly>true</SignAssembly>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     </PropertyGroup>
     <Import Project="$(SolutionDir)/build/code.quality.props"/>
-    <Import Project="$(SolutionDir)/build/nuget.package.props"/>
     <Import Project="$(SolutionDir)/build/copy.pkg.xml.comment.files.targets"/>
     <Import Project="$(SolutionDir)/build/prebuild.targets"/>
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
     </ItemGroup>
     <ItemGroup>
+        <None Include="../../../assets/logo.png" Pack="true" PackagePath="/"/>
+        <None Include="../../../README.md" Pack="true" PackagePath="/"/>
         <None Update="*.json">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>