Merge branch 'main' into tk

chore(release): 2.0.9

.github/workflows/ci.yml

@@ -32,5 +32,4 @@ jobs:
           prerelease: false
       - 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
+      - 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

CHANGELOG.md

@@ -2,10 +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.0 (2023-12-14)
-
-
-### Features
-
-* ++ ([e41652d](https://github.com/nsnail/NSExt/commit/e41652d553beda7a2eb1600da4795e07f4260330))
-* 增加一些扩展方法 ([1f26d0f](https://github.com/nsnail/NSExt/commit/1f26d0f28098f7ee98a9a5482096aecd53b85e04))
+### [2.0.10](https://github.com/nsnail/NSExt/compare/v2.0.9...v2.0.10) (2023-12-14)

Directory.Build.props

@@ -21,6 +21,7 @@
         <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,13 +13,14 @@ 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
@@ -27,14 +28,15 @@ 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
@@ -56,6 +58,7 @@ 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/nuget.package.props

@@ -0,0 +1,20 @@
+<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.0.0",
+  "version": "2.0.10",
   "devDependencies": {
     "cz-git": "^1.7.1",
     "commitizen": "^4.3.0",

scripts/1.git.pull.request.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
-./git.rc.ps1
+./3.git.recreate.branch.ps1

scripts/2.git.release.ps1

@@ -0,0 +1,23 @@
+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]
+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
+git pull
+git branch -D release

scripts/code.clean.ps1

@@ -1,4 +1,4 @@
-dotnet jb cleanupcode --no-build --include = $( $( git status --porcelain | Where-Object { $_ -match "^\s*[MA]" } | ForEach-Object { $_.TrimStart(" M").TrimStart(" A") } ) -join ";" ) ../NSExt.sln
+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/resharper.full.ps1

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

src/backend/NSExt/NSExt.csproj

@@ -1,30 +1,15 @@
 <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>