diff --git a/build/pkg_push.ps1 b/build/pkg_push.ps1 index b1899ab6..a1ec4635 100644 --- a/build/pkg_push.ps1 +++ b/build/pkg_push.ps1 @@ -7,7 +7,7 @@ if ([System.String]::IsNullOrWhiteSpace($apiKey)) { $apiKey = $env:NUGET_KEY } -$sourceUrl = "http://localhost:5000/v3/index.json" +$sourceUrl = "https://api.nuget.org/v3/index.json" Write-Host "buildFolder:" $buildFolder Write-Host "rootFolder:" $rootFolder @@ -47,7 +47,7 @@ Write-Host "dotnet pack -- start" foreach($project in $projects) { $projectFolder = Join-Path $rootFolder $project Write-Host "projectFolder:" $projectFolder -dotnet pack $projectFolder -p:TargetFrameworks=net8.0 --no-build -c Release /p:SourceLinkCreate=true /p:SolutionDir=$rootFolder -o $nuGetOutputFolder; +dotnet pack $projectFolder --no-build -c Release /p:SourceLinkCreate=true /p:SolutionDir=$rootFolder -o $nuGetOutputFolder; } Write-Host "dotnet pack -- end" # pause diff --git a/src/hosts/ZhonTai.Host/ZhonTai.Host.csproj b/src/hosts/ZhonTai.Host/ZhonTai.Host.csproj index 7f600ef5..2e345b0d 100644 --- a/src/hosts/ZhonTai.Host/ZhonTai.Host.csproj +++ b/src/hosts/ZhonTai.Host/ZhonTai.Host.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 中台接口宿主 Linux @@ -21,12 +21,19 @@ - - - - - - + + + + + + + + + + + + + @@ -38,13 +45,6 @@ - - - - - - - PreserveNewest diff --git a/src/platform/Directory.Build.props b/src/platform/Directory.Build.props index 9349228c..245da5f8 100644 --- a/src/platform/Directory.Build.props +++ b/src/platform/Directory.Build.props @@ -1,14 +1,13 @@ - 5.0.2 - Latest + 5.0.3 net7.0;net8.0 true true - true - false + $(MSBuildProjectName).xml + true xiaoxue - xiaoxue + zhontai true snupkg MIT @@ -18,6 +17,8 @@ ZhonTai AdminApi;WebApi;HttpApi; logo.png 1701;1702;1591 - $(MSBuildProjectName).xml + true + false + key.snk \ No newline at end of file diff --git a/src/platform/ZhonTai.Admin/ZhonTai.Admin.csproj b/src/platform/ZhonTai.Admin/ZhonTai.Admin.csproj index ebe87710..7b2f3b56 100644 --- a/src/platform/ZhonTai.Admin/ZhonTai.Admin.csproj +++ b/src/platform/ZhonTai.Admin/ZhonTai.Admin.csproj @@ -12,6 +12,10 @@ + + + + @@ -22,14 +26,13 @@ - + - + - @@ -40,10 +43,20 @@ - + + + + + + + + + + + diff --git a/src/platform/ZhonTai.Admin/key.snk b/src/platform/ZhonTai.Admin/key.snk new file mode 100644 index 00000000..ec947d18 Binary files /dev/null and b/src/platform/ZhonTai.Admin/key.snk differ diff --git a/src/platform/ZhonTai.ApiUI/key.snk b/src/platform/ZhonTai.ApiUI/key.snk new file mode 100644 index 00000000..9f390084 Binary files /dev/null and b/src/platform/ZhonTai.ApiUI/key.snk differ diff --git a/src/platform/ZhonTai.Common/ZhonTai.Common.csproj b/src/platform/ZhonTai.Common/ZhonTai.Common.csproj index 785137e3..75faadd4 100644 --- a/src/platform/ZhonTai.Common/ZhonTai.Common.csproj +++ b/src/platform/ZhonTai.Common/ZhonTai.Common.csproj @@ -13,16 +13,18 @@ - + + + diff --git a/src/platform/ZhonTai.Common/ZhonTai.Common.xml b/src/platform/ZhonTai.Common/ZhonTai.Common.xml index 502ef6b6..0bef9d27 100644 --- a/src/platform/ZhonTai.Common/ZhonTai.Common.xml +++ b/src/platform/ZhonTai.Common/ZhonTai.Common.xml @@ -322,7 +322,9 @@ - Pattern explanation:
+ Pattern:
+ (\\d{3})\\d{4}(\\d{4})
+ Explanation:
○ 1st capture group.
○ Match a Unicode digit exactly 3 times.
@@ -334,7 +336,9 @@ - Pattern explanation:
+ Pattern:
+ (?<=.{2})[^@]+(?=.{2}@)
+ Explanation:
○ Zero-width positive lookbehind.
○ Match a character other than '\n' exactly 2 times right-to-left.
@@ -347,19 +351,21 @@ - Pattern explanation:
+ Pattern:
+ ([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})
+ Explanation:
○ 1st capture group.
- ○ Match '0' through '9' atomically at least 1 and at most 3 times.
+ ○ Match a character in the set [0-9] atomically at least 1 and at most 3 times.
○ Match '.'.
○ 2nd capture group.
- ○ Match '0' through '9' atomically at least 1 and at most 3 times.
+ ○ Match a character in the set [0-9] atomically at least 1 and at most 3 times.
○ Match '.'.
○ 3rd capture group.
- ○ Match '0' through '9' atomically at least 1 and at most 3 times.
+ ○ Match a character in the set [0-9] atomically at least 1 and at most 3 times.
○ Match '.'.
○ 4th capture group.
- ○ Match '0' through '9' atomically at least 1 and at most 3 times.
+ ○ Match a character in the set [0-9] atomically at least 1 and at most 3 times.
 @@ -566,7 +572,9 @@ - Pattern explanation:
+ Pattern:
+ ^(?=.*[a-zA-Z])(?=.*\\d)[a-zA-Z\\d!@#$%^&.*]{6,16}$
+ Explanation:
○ Match if at the beginning of the string.
○ Zero-width positive lookahead.
@@ -808,5 +816,14 @@ Whether is non-infinite. + + Finds the next index of any character that matches a Unicode digit. + + + Supports searching for characters in or not in "\0\u0001\u0002\u0003\u0004\u0005\u0006\a\b\t\n\v\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u007f". + + + Supports searching for characters in or not in "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz". + diff --git a/src/platform/ZhonTai.Common/key.snk b/src/platform/ZhonTai.Common/key.snk new file mode 100644 index 00000000..5f909c08 Binary files /dev/null and b/src/platform/ZhonTai.Common/key.snk differ diff --git a/src/platform/ZhonTai.DynamicApi/key.snk b/src/platform/ZhonTai.DynamicApi/key.snk new file mode 100644 index 00000000..3b7e3162 Binary files /dev/null and b/src/platform/ZhonTai.DynamicApi/key.snk differ diff --git a/src/tests/ZhonTai.Tests/ZhonTai.Tests.csproj b/src/tests/ZhonTai.Tests/ZhonTai.Tests.csproj index c3a68811..47f2ef12 100644 --- a/src/tests/ZhonTai.Tests/ZhonTai.Tests.csproj +++ b/src/tests/ZhonTai.Tests/ZhonTai.Tests.csproj @@ -4,16 +4,6 @@ 中台测试库 false - - - - - - - - - - @@ -24,6 +14,16 @@ + + + + + + + + + + diff --git a/templates/admin/content/MyApp.sln b/templates/admin/content/MyApp.sln index 6d4542aa..9ea39420 100644 --- a/templates/admin/content/MyApp.sln +++ b/templates/admin/content/MyApp.sln @@ -15,9 +15,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hosts", "hosts", "{0600A063 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4A1F23C8-24A6-4571-B3DE-D27D024A051D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{A6C50476-5236-4FD3-8C29-6449494846C0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02.build", "02.build", "{A6C50476-5236-4FD3-8C29-6449494846C0}" ProjectSection(SolutionItems) = preProject - build\pkg.props = build\pkg.props + src\platform\Directory.Build.props = src\platform\Directory.Build.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01.sln", "01.sln", "{B5DE2B4F-A7DB-433D-8E98-5C352EFAE88B}" + ProjectSection(SolutionItems) = preProject + src\Directory.Build.props = src\Directory.Build.props EndProjectSection EndProject Global diff --git a/templates/admin/content/src/Directory.Build.props b/templates/admin/content/src/Directory.Build.props index f3896c05..b0a99993 100644 --- a/templates/admin/content/src/Directory.Build.props +++ b/templates/admin/content/src/Directory.Build.props @@ -1,3 +1,7 @@ - + + net8.0 + 5.0.3 + 3.2.805 + \ No newline at end of file diff --git a/templates/admin/content/src/hosts/MyApp.Host/MyApp.Host.csproj b/templates/admin/content/src/hosts/MyApp.Host/MyApp.Host.csproj index e65aaa71..3a9a38eb 100644 --- a/templates/admin/content/src/hosts/MyApp.Host/MyApp.Host.csproj +++ b/templates/admin/content/src/hosts/MyApp.Host/MyApp.Host.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 MyApp接口宿主 @@ -17,8 +17,8 @@ - - + + @@ -44,7 +44,7 @@ - + diff --git a/templates/admin/content/build/pkg.props b/templates/admin/content/src/platform/Directory.Build.props similarity index 51% rename from templates/admin/content/build/pkg.props rename to templates/admin/content/src/platform/Directory.Build.props index c9aa09a7..bfb905f2 100644 --- a/templates/admin/content/build/pkg.props +++ b/templates/admin/content/src/platform/Directory.Build.props @@ -1,18 +1,23 @@ - - 3.7.1 - net7.0 - false + + 5.0.0 + net7.0;net8.0 + true true + $(MSBuildProjectName).xml + true xiaoxue zhontai - 3.7.1 - 3.2.700 + true + snupkg MIT https://admin.zhontai.net https://github.com/zhontai/Admin.Core git ZhonTai Admin Api;MVC;WebApi;HttpApi;Api; 1701;1702;1591 + true + false + key.snk \ No newline at end of file diff --git a/templates/admin/content/src/platform/MyApp.Api/MyApp.Api.csproj b/templates/admin/content/src/platform/MyApp.Api/MyApp.Api.csproj index 019d6e03..028c8607 100644 --- a/templates/admin/content/src/platform/MyApp.Api/MyApp.Api.csproj +++ b/templates/admin/content/src/platform/MyApp.Api/MyApp.Api.csproj @@ -1,10 +1,10 @@  MyApp接口库 + false - MyApp.Api.xml 1701;1702;1591 @@ -18,6 +18,10 @@ + + + + diff --git a/templates/admin/content/src/platform/MyApp.Api/key.snk b/templates/admin/content/src/platform/MyApp.Api/key.snk new file mode 100644 index 00000000..b2845237 Binary files /dev/null and b/templates/admin/content/src/platform/MyApp.Api/key.snk differ diff --git a/templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.csproj b/templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.csproj index 5a29abd1..ffee999a 100644 --- a/templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.csproj +++ b/templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.csproj @@ -1,21 +1,29 @@  MyApp测试库 - net7.0 + net8.0 false - - - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + diff --git a/templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.xml b/templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.xml new file mode 100644 index 00000000..f1490cea --- /dev/null +++ b/templates/admin/content/src/tests/MyApp.Tests/MyApp.Tests.xml @@ -0,0 +1,59 @@ + + + + MyApp.Tests + + + + + Api测试基础 + + + + + 测试基础 + + + + + 模块Api测试 + + + + + 模块仓储测试 + + + + + 返回结果 + + + + + + 是否成功标记 + + + + + 状态码 + + + + + 消息 + + + + + 数据 + + + + + 模块服务测试 + + + +