diff --git a/CHANGELOG.md b/CHANGELOG.md index b7bc174..21e7914 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,4 +8,4 @@ All notable changes to this project will be documented in this file. See [standa ### Features * ++ ([e41652d](https://github.com/nsnail/NSExt/commit/e41652d553beda7a2eb1600da4795e07f4260330)) -* 增加一些扩展方法 ([1f26d0f](https://github.com/nsnail/NSExt/commit/1f26d0f28098f7ee98a9a5482096aecd53b85e04)) +* 增加一些扩展方法 ([1f26d0f](https://github.com/nsnail/NSExt/commit/1f26d0f28098f7ee98a9a5482096aecd53b85e04)) \ No newline at end of file diff --git a/NSExt.sln b/NSExt.sln index b75ef62..cc49f4c 100644 --- a/NSExt.sln +++ b/NSExt.sln @@ -28,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 diff --git a/scripts/git.pr.ps1 b/scripts/1.git.pull.request.ps1 similarity index 91% rename from scripts/git.pr.ps1 rename to scripts/1.git.pull.request.ps1 index 6105d98..58767d1 100644 --- a/scripts/git.pr.ps1 +++ b/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 \ No newline at end of file +./3.git.recreate.branch.ps1 \ No newline at end of file diff --git a/scripts/2.git.release.ps1 b/scripts/2.git.release.ps1 new file mode 100644 index 0000000..b868a4f --- /dev/null +++ b/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 \ No newline at end of file diff --git a/scripts/git.rc.ps1 b/scripts/3.git.recreate.branch.ps1 similarity index 100% rename from scripts/git.rc.ps1 rename to scripts/3.git.recreate.branch.ps1