diff --git a/build/code.quality.props b/build/code.quality.props index 36771df7..996cdb67 100644 --- a/build/code.quality.props +++ b/build/code.quality.props @@ -15,15 +15,15 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/package.json b/package.json index 13fabcd2..af132c45 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "devDependencies": { "cz-git": "^1.11.0", "commitizen": "^4.3.1", - "prettier": "^3.4.2", + "prettier": "^3.5.0", "standard-version": "^9.5.0" }, "config": { diff --git a/scripts/1.git.pull.request.ps1 b/scripts/1.git.pull.request.ps1 index 2ef8123b..770214ce 100644 --- a/scripts/1.git.pull.request.ps1 +++ b/scripts/1.git.pull.request.ps1 @@ -1,3 +1,5 @@ +#!/usr/bin/env pwsh + $branch = $( git branch --show-current ) git add ../ $skipFormat = Read-Host "输入 n 跳过代码整理" diff --git a/scripts/2.git.release.ps1 b/scripts/2.git.release.ps1 index 09ff4de9..9d5b9faf 100644 --- a/scripts/2.git.release.ps1 +++ b/scripts/2.git.release.ps1 @@ -1,3 +1,5 @@ +#!/usr/bin/env pwsh + cd .. $types = @{ '1' = @('major', '主版本') diff --git a/scripts/3.git.recreate.branch.ps1 b/scripts/3.git.recreate.branch.ps1 index 2a668109..31efc472 100644 --- a/scripts/3.git.recreate.branch.ps1 +++ b/scripts/3.git.recreate.branch.ps1 @@ -1,3 +1,5 @@ +#!/usr/bin/env pwsh + $branch = $( git branch --show-current ) git checkout main git pull diff --git a/scripts/4.git.del.obsolete.tags.ps1 b/scripts/4.git.del.obsolete.tags.ps1 index db65409e..07be9670 100644 --- a/scripts/4.git.del.obsolete.tags.ps1 +++ b/scripts/4.git.del.obsolete.tags.ps1 @@ -1,2 +1,4 @@ +#!/usr/bin/env pwsh + git push origin :refs/tags/$(git tag -l "*-*") git tag -d $(git tag -l "*-*") \ No newline at end of file diff --git a/scripts/5.git.update.submodule.ps1 b/scripts/5.git.update.submodule.ps1 index b07399a8..95d6eee4 100644 --- a/scripts/5.git.update.submodule.ps1 +++ b/scripts/5.git.update.submodule.ps1 @@ -1,3 +1,5 @@ +#!/usr/bin/env pwsh + git submodule update --progress --init --recursive --force --remote -- "../refs/Gurion" git submodule update --progress --init --recursive --force --remote -- "../refs/NetAdmin.FreeSql" git submodule update --progress --init --recursive --force --remote -- "../refs/ns-ext" \ No newline at end of file diff --git a/scripts/code.clean.ps1 b/scripts/code.clean.ps1 index e7524814..1cbccd14 100644 --- a/scripts/code.clean.ps1 +++ b/scripts/code.clean.ps1 @@ -1,3 +1,5 @@ +#!/usr/bin/env pwsh + npm --prefix ../src/frontend/admin run prettier jb cleanupcode --no-build --include=$($(git status --porcelain | Where-Object { $_ -match "^\s*[MA]" } | ForEach-Object { $_.TrimStart(" M").TrimStart(" A") }) -join ";") ../NetAdmin.sln dot rbom -w -e refs -e .git -e node_modules ../ diff --git a/scripts/install.as.tpl.ps1 b/scripts/install.as.tpl.ps1 index ad933ddc..19b465ce 100644 --- a/scripts/install.as.tpl.ps1 +++ b/scripts/install.as.tpl.ps1 @@ -1,2 +1,4 @@ +#!/usr/bin/env pwsh + dotnet new uninstall ../ dotnet new --install ../ \ No newline at end of file diff --git a/scripts/resharper.full.ps1 b/scripts/resharper.full.ps1 index 55b6f553..4644a2e7 100644 --- a/scripts/resharper.full.ps1 +++ b/scripts/resharper.full.ps1 @@ -1 +1,3 @@ +#!/usr/bin/env pwsh + jb cleanupcode --no-build ../NetAdmin.sln \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.Host/Middlewares/EnvironmentInfoMiddleware.cs b/src/backend/NetAdmin/NetAdmin.Host/Middlewares/EnvironmentInfoMiddleware.cs index f918042d..a350a619 100644 --- a/src/backend/NetAdmin/NetAdmin.Host/Middlewares/EnvironmentInfoMiddleware.cs +++ b/src/backend/NetAdmin/NetAdmin.Host/Middlewares/EnvironmentInfoMiddleware.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Host.Middlewares; +namespace NetAdmin.Host.Middlewares; /// /// 输出环境信息到 http header diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj index 8742fe84..d671d5be 100644 --- a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj +++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj @@ -6,10 +6,10 @@ - + - + diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Schedule/IJob.cs b/src/backend/NetAdmin/NetAdmin.Infrastructure/Schedule/IJob.cs index 88b2fbf8..a2a7325f 100644 --- a/src/backend/NetAdmin/NetAdmin.Infrastructure/Schedule/IJob.cs +++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/Schedule/IJob.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Infrastructure.Schedule; +namespace NetAdmin.Infrastructure.Schedule; /// /// 作业处理程序 diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Schedule/JobConfigAttribute.cs b/src/backend/NetAdmin/NetAdmin.Infrastructure/Schedule/JobConfigAttribute.cs index dc1673cb..98d218f2 100644 --- a/src/backend/NetAdmin/NetAdmin.Infrastructure/Schedule/JobConfigAttribute.cs +++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/Schedule/JobConfigAttribute.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.Infrastructure.Schedule; +namespace NetAdmin.Infrastructure.Schedule; /// /// 作业配置 diff --git a/src/backend/NetAdmin/NetAdmin.Tests/NetAdmin.Tests.csproj b/src/backend/NetAdmin/NetAdmin.Tests/NetAdmin.Tests.csproj index bd14367e..b6d18a33 100644 --- a/src/backend/NetAdmin/NetAdmin.Tests/NetAdmin.Tests.csproj +++ b/src/backend/NetAdmin/NetAdmin.Tests/NetAdmin.Tests.csproj @@ -3,13 +3,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/backend/UnitTests/UnitTests.csproj b/src/backend/UnitTests/UnitTests.csproj index b62d5578..cea0b2c7 100644 --- a/src/backend/UnitTests/UnitTests.csproj +++ b/src/backend/UnitTests/UnitTests.csproj @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/src/frontend/admin/package.json b/src/frontend/admin/package.json index 3159de5c..5be422c7 100644 --- a/src/frontend/admin/package.json +++ b/src/frontend/admin/package.json @@ -10,12 +10,12 @@ }, "dependencies": { "@element-plus/icons-vue": "2.3.1", - "ace-builds": "1.37.4", - "aieditor": "1.3.4", + "ace-builds": "1.38.0", + "aieditor": "1.3.5", "axios": "1.7.9", "crypto-js": "4.2.0", "echarts": "5.6.0", - "element-plus": "2.9.3", + "element-plus": "2.9.4", "json-bigint": "1.0.0", "markdown-it": "14.1.0", "markdown-it-emoji": "3.0.0", @@ -23,7 +23,7 @@ "sortablejs": "1.15.6", "vkbeautify": "0.99.3", "vue": "3.5.13", - "vue-i18n": "11.0.1", + "vue-i18n": "11.1.1", "vue-router": "4.5.0", "vue3-ace-editor": "2.2.4", "vue3-json-viewer": "2.2.2", @@ -32,11 +32,11 @@ }, "devDependencies": { "@vitejs/plugin-vue": "5.2.1", - "prettier": "3.4.2", + "prettier": "3.5.0", "prettier-plugin-organize-attributes": "1.0.0", - "sass": "1.83.1", - "terser": "5.37.0", - "vite": "6.0.7" + "sass": "1.84.0", + "terser": "5.38.2", + "vite": "6.1.0" }, "browserslist": [ "> 1%",