From eb5ff7937c6cf0a248fe3052eda17389e99ffd83 Mon Sep 17 00:00:00 2001 From: wayne Date: Fri, 24 Nov 2023 21:10:06 +0800 Subject: [PATCH] dotnet 8 --- .vscode/launch.json | 2 +- Run.cmd | 2 +- Run.sh | 4 ++-- src/EasyFrameWork/EasyFrameWork.csproj | 16 ++++++++-------- src/EasyFrameWork/Mvc/Plugin/Loader.cs | 4 ++-- src/ZKEACMS.Animation/ZKEACMS.Animation.csproj | 2 +- src/ZKEACMS.Article/ZKEACMS.Article.csproj | 2 +- .../ZKEACMS.Distribution.csproj | 2 +- .../ZKEACMS.EventAction.csproj | 2 +- .../ZKEACMS.FormGenerator.csproj | 2 +- .../ZKEACMS.GlobalScripts.csproj | 2 +- src/ZKEACMS.Mail/ZKEACMS.Mail.csproj | 2 +- src/ZKEACMS.Message/ZKEACMS.Message.csproj | 2 +- src/ZKEACMS.PinNav/ZKEACMS.PinNav.csproj | 2 +- src/ZKEACMS.Product/ZKEACMS.Product.csproj | 2 +- .../ZKEACMS.Redirection.csproj | 2 +- .../ZKEACMS.SectionWidget.csproj | 2 +- src/ZKEACMS.Shop/ZKEACMS.Shop.csproj | 2 +- src/ZKEACMS.SiteSearch/ZKEACMS.SiteSearch.csproj | 2 +- src/ZKEACMS.Sitemap/ZKEACMS.Sitemap.csproj | 2 +- src/ZKEACMS.SpiderLog/ZKEACMS.SpiderLog.csproj | 2 +- .../ZKEACMS.StyleEditor.csproj | 2 +- src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj | 2 +- .../ZKEACMS.TemplateImporter.csproj | 2 +- src/ZKEACMS.Updater/ZKEACMS.Updater.csproj | 2 +- src/ZKEACMS.WebHost/Run.cmd | 2 +- src/ZKEACMS.WebHost/Run.sh | 2 +- src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj | 6 +++--- src/ZKEACMS/ZKEACMS.csproj | 16 ++++++++-------- .../EasyFrameWork.Test/EasyFrameWork.Test.csproj | 4 ++-- test/ZKEACMS.Test/ZKEACMS.Test.csproj | 6 +++--- tools/LanguageScriptGen/LanguageScriptGen.csproj | 2 +- .../PackWidgetTemplate/PackWidgetTemplate.csproj | 2 +- .../ZKEACMS.Standard/ZKEACMS.Standard.csproj | 2 +- 34 files changed, 55 insertions(+), 55 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index b0015370..d4e58d3c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,7 +9,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder}/src/ZKEACMS.WebHost/bin/Debug/net7.0/ZKEACMS.WebHost.dll", + "program": "${workspaceFolder}/src/ZKEACMS.WebHost/bin/Debug/net8.0/ZKEACMS.WebHost.dll", "args": [], "cwd": "${workspaceFolder}/src/ZKEACMS.WebHost", "console": "internalConsole", diff --git a/Run.cmd b/Run.cmd index bde16a8e..6d71e9fa 100644 --- a/Run.cmd +++ b/Run.cmd @@ -6,7 +6,7 @@ ECHO dotnet core sdk was not find, please install the latest sdk at first. start https://www.microsoft.com/net/download/windows exit ) -if not exist "src/ZKEACMS.WebHost/bin/Debug/net7.0/ZKEACMS.WebHost.dll" ( +if not exist "src/ZKEACMS.WebHost/bin/Debug/net8.0/ZKEACMS.WebHost.dll" ( call Build.cmd ) diff --git a/Run.sh b/Run.sh index 1c20942d..352fbfc2 100644 --- a/Run.sh +++ b/Run.sh @@ -3,10 +3,10 @@ if ! [ -x "$(command -v dotnet)" ]; then echo 'dotnet core sdk was not find, please install the latest sdk at first.' exit 1 fi -file="src/ZKEACMS.WebHost/bin/Debug/net7.0/ZKEACMS.WebHost.dll" +file="src/ZKEACMS.WebHost/bin/Debug/net8.0/ZKEACMS.WebHost.dll" if ! [ -f "$file" ];then dotnet build ZKEACMS.sln fi cd src/ZKEACMS.WebHost echo Starting... -ASPNETCORE_ENVIRONMENT="Development" ASPNETCORE_URLS="http://localhost:5000" dotnet bin/Debug/net7.0/ZKEACMS.WebHost.dll \ No newline at end of file +ASPNETCORE_ENVIRONMENT="Development" ASPNETCORE_URLS="http://localhost:5000" dotnet bin/Debug/net8.0/ZKEACMS.WebHost.dll \ No newline at end of file diff --git a/src/EasyFrameWork/EasyFrameWork.csproj b/src/EasyFrameWork/EasyFrameWork.csproj index 81f3fbda..8ca4db46 100644 --- a/src/EasyFrameWork/EasyFrameWork.csproj +++ b/src/EasyFrameWork/EasyFrameWork.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 EasyFrameWork EasyFrameWork 深圳市纸壳软件科技有限公司 ZKEASOFT @@ -17,16 +17,16 @@ - - + + - - - - + + + + - + diff --git a/src/EasyFrameWork/Mvc/Plugin/Loader.cs b/src/EasyFrameWork/Mvc/Plugin/Loader.cs index 37b25f08..f22e2a75 100644 --- a/src/EasyFrameWork/Mvc/Plugin/Loader.cs +++ b/src/EasyFrameWork/Mvc/Plugin/Loader.cs @@ -20,9 +20,9 @@ public class Loader : IPluginLoader public const string PluginFolder = "Plugins"; private const string PluginInfoFile = "zkea.plugin"; #if DEBUG - private readonly string[] AltDevelopmentPath = new[] { "bin", "Debug", "net7.0" }; + private readonly string[] AltDevelopmentPath = new[] { "bin", "Debug", "net8.0" }; #else - private readonly string[] AltDevelopmentPath = new[] { "bin", "Release", "net7.0" }; + private readonly string[] AltDevelopmentPath = new[] { "bin", "Release", "net8.0" }; #endif private readonly static List Loaders = new List(); private readonly static Dictionary LoadedAssemblies = new Dictionary(); diff --git a/src/ZKEACMS.Animation/ZKEACMS.Animation.csproj b/src/ZKEACMS.Animation/ZKEACMS.Animation.csproj index 4969afb9..71724f98 100644 --- a/src/ZKEACMS.Animation/ZKEACMS.Animation.csproj +++ b/src/ZKEACMS.Animation/ZKEACMS.Animation.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.Animation ZKEACMS.Animation diff --git a/src/ZKEACMS.Article/ZKEACMS.Article.csproj b/src/ZKEACMS.Article/ZKEACMS.Article.csproj index c5737d31..5fc591dc 100644 --- a/src/ZKEACMS.Article/ZKEACMS.Article.csproj +++ b/src/ZKEACMS.Article/ZKEACMS.Article.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.Article ZKEACMS.Article diff --git a/src/ZKEACMS.Distribution/ZKEACMS.Distribution.csproj b/src/ZKEACMS.Distribution/ZKEACMS.Distribution.csproj index eca443c6..124cd6fe 100644 --- a/src/ZKEACMS.Distribution/ZKEACMS.Distribution.csproj +++ b/src/ZKEACMS.Distribution/ZKEACMS.Distribution.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.Distribution ZKEACMS.Distribution diff --git a/src/ZKEACMS.EventAction/ZKEACMS.EventAction.csproj b/src/ZKEACMS.EventAction/ZKEACMS.EventAction.csproj index 833e01a8..204ec984 100644 --- a/src/ZKEACMS.EventAction/ZKEACMS.EventAction.csproj +++ b/src/ZKEACMS.EventAction/ZKEACMS.EventAction.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.EventAction ZKEACMS.EventAction diff --git a/src/ZKEACMS.FormGenerator/ZKEACMS.FormGenerator.csproj b/src/ZKEACMS.FormGenerator/ZKEACMS.FormGenerator.csproj index 14575e66..a5e7f492 100644 --- a/src/ZKEACMS.FormGenerator/ZKEACMS.FormGenerator.csproj +++ b/src/ZKEACMS.FormGenerator/ZKEACMS.FormGenerator.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.FormGenerator ZKEACMS.FormGenerator diff --git a/src/ZKEACMS.GlobalScripts/ZKEACMS.GlobalScripts.csproj b/src/ZKEACMS.GlobalScripts/ZKEACMS.GlobalScripts.csproj index 1e97dd22..a2f73e05 100644 --- a/src/ZKEACMS.GlobalScripts/ZKEACMS.GlobalScripts.csproj +++ b/src/ZKEACMS.GlobalScripts/ZKEACMS.GlobalScripts.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.GlobalScripts ZKEACMS.GlobalScripts diff --git a/src/ZKEACMS.Mail/ZKEACMS.Mail.csproj b/src/ZKEACMS.Mail/ZKEACMS.Mail.csproj index 39e99c7b..4936672f 100644 --- a/src/ZKEACMS.Mail/ZKEACMS.Mail.csproj +++ b/src/ZKEACMS.Mail/ZKEACMS.Mail.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.Mail ZKEACMS.Mail diff --git a/src/ZKEACMS.Message/ZKEACMS.Message.csproj b/src/ZKEACMS.Message/ZKEACMS.Message.csproj index 73da4e64..e034065f 100644 --- a/src/ZKEACMS.Message/ZKEACMS.Message.csproj +++ b/src/ZKEACMS.Message/ZKEACMS.Message.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.Message ZKEACMS.Message diff --git a/src/ZKEACMS.PinNav/ZKEACMS.PinNav.csproj b/src/ZKEACMS.PinNav/ZKEACMS.PinNav.csproj index fc8cb6c9..5301ad67 100644 --- a/src/ZKEACMS.PinNav/ZKEACMS.PinNav.csproj +++ b/src/ZKEACMS.PinNav/ZKEACMS.PinNav.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.PinNav ZKEACMS.PinNav diff --git a/src/ZKEACMS.Product/ZKEACMS.Product.csproj b/src/ZKEACMS.Product/ZKEACMS.Product.csproj index 3df95017..191672fa 100644 --- a/src/ZKEACMS.Product/ZKEACMS.Product.csproj +++ b/src/ZKEACMS.Product/ZKEACMS.Product.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.Product ZKEACMS.Product diff --git a/src/ZKEACMS.Redirection/ZKEACMS.Redirection.csproj b/src/ZKEACMS.Redirection/ZKEACMS.Redirection.csproj index e0580b09..4c1f1e86 100644 --- a/src/ZKEACMS.Redirection/ZKEACMS.Redirection.csproj +++ b/src/ZKEACMS.Redirection/ZKEACMS.Redirection.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.Redirection ZKEACMS.Redirection diff --git a/src/ZKEACMS.SectionWidget/ZKEACMS.SectionWidget.csproj b/src/ZKEACMS.SectionWidget/ZKEACMS.SectionWidget.csproj index 98574cf3..ce547473 100644 --- a/src/ZKEACMS.SectionWidget/ZKEACMS.SectionWidget.csproj +++ b/src/ZKEACMS.SectionWidget/ZKEACMS.SectionWidget.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.SectionWidget ZKEACMS.SectionWidget diff --git a/src/ZKEACMS.Shop/ZKEACMS.Shop.csproj b/src/ZKEACMS.Shop/ZKEACMS.Shop.csproj index a86ac3e4..f86b04ba 100644 --- a/src/ZKEACMS.Shop/ZKEACMS.Shop.csproj +++ b/src/ZKEACMS.Shop/ZKEACMS.Shop.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.Shop ZKEACMS.Shop diff --git a/src/ZKEACMS.SiteSearch/ZKEACMS.SiteSearch.csproj b/src/ZKEACMS.SiteSearch/ZKEACMS.SiteSearch.csproj index 41707d7b..917afaaa 100644 --- a/src/ZKEACMS.SiteSearch/ZKEACMS.SiteSearch.csproj +++ b/src/ZKEACMS.SiteSearch/ZKEACMS.SiteSearch.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.SiteSearch ZKEACMS.SiteSearch diff --git a/src/ZKEACMS.Sitemap/ZKEACMS.Sitemap.csproj b/src/ZKEACMS.Sitemap/ZKEACMS.Sitemap.csproj index d2736edd..9b9d0641 100644 --- a/src/ZKEACMS.Sitemap/ZKEACMS.Sitemap.csproj +++ b/src/ZKEACMS.Sitemap/ZKEACMS.Sitemap.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.Sitemap ZKEACMS.Sitemap diff --git a/src/ZKEACMS.SpiderLog/ZKEACMS.SpiderLog.csproj b/src/ZKEACMS.SpiderLog/ZKEACMS.SpiderLog.csproj index 97b65d17..5062a4ce 100644 --- a/src/ZKEACMS.SpiderLog/ZKEACMS.SpiderLog.csproj +++ b/src/ZKEACMS.SpiderLog/ZKEACMS.SpiderLog.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.SpiderLog ZKEACMS.SpiderLog diff --git a/src/ZKEACMS.StyleEditor/ZKEACMS.StyleEditor.csproj b/src/ZKEACMS.StyleEditor/ZKEACMS.StyleEditor.csproj index 9ca99864..02f3271c 100644 --- a/src/ZKEACMS.StyleEditor/ZKEACMS.StyleEditor.csproj +++ b/src/ZKEACMS.StyleEditor/ZKEACMS.StyleEditor.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.StyleEditor ZKEACMS.StyleEditor diff --git a/src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj b/src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj index f900aa2b..c53776d3 100644 --- a/src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj +++ b/src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.Swagger ZKEACMS.Swagger diff --git a/src/ZKEACMS.TemplateImporter/ZKEACMS.TemplateImporter.csproj b/src/ZKEACMS.TemplateImporter/ZKEACMS.TemplateImporter.csproj index 06e21130..98faa3bf 100644 --- a/src/ZKEACMS.TemplateImporter/ZKEACMS.TemplateImporter.csproj +++ b/src/ZKEACMS.TemplateImporter/ZKEACMS.TemplateImporter.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.TemplateImporter ZKEACMS.TemplateImporter diff --git a/src/ZKEACMS.Updater/ZKEACMS.Updater.csproj b/src/ZKEACMS.Updater/ZKEACMS.Updater.csproj index 5670bc1e..195ea486 100644 --- a/src/ZKEACMS.Updater/ZKEACMS.Updater.csproj +++ b/src/ZKEACMS.Updater/ZKEACMS.Updater.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.Updater ZKEACMS.Updater diff --git a/src/ZKEACMS.WebHost/Run.cmd b/src/ZKEACMS.WebHost/Run.cmd index 505c1476..5f6effec 100644 --- a/src/ZKEACMS.WebHost/Run.cmd +++ b/src/ZKEACMS.WebHost/Run.cmd @@ -2,4 +2,4 @@ echo Starting... set ASPNETCORE_ENVIRONMENT=Development set ASPNETCORE_URLS=http://localhost:5000 -dotnet bin/Debug/net7.0/ZKEACMS.WebHost.dll \ No newline at end of file +dotnet bin/Debug/net8.0/ZKEACMS.WebHost.dll \ No newline at end of file diff --git a/src/ZKEACMS.WebHost/Run.sh b/src/ZKEACMS.WebHost/Run.sh index 6aaf015c..5b4602a0 100644 --- a/src/ZKEACMS.WebHost/Run.sh +++ b/src/ZKEACMS.WebHost/Run.sh @@ -1,2 +1,2 @@ echo Starting... -ASPNETCORE_ENVIRONMENT="Development" ASPNETCORE_URLS="http://localhost:5000" dotnet bin/Debug/net7.0/ZKEACMS.WebHost.dll \ No newline at end of file +ASPNETCORE_ENVIRONMENT="Development" ASPNETCORE_URLS="http://localhost:5000" dotnet bin/Debug/net8.0/ZKEACMS.WebHost.dll \ No newline at end of file diff --git a/src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj b/src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj index 50cfe413..7471fc7d 100644 --- a/src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj +++ b/src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 ZKEACMS.WebHost ZKEACMS.WebHost 深圳市纸壳软件科技有限公司 纸壳CMS @@ -20,8 +20,8 @@ true - - + + diff --git a/src/ZKEACMS/ZKEACMS.csproj b/src/ZKEACMS/ZKEACMS.csproj index 49f78eb8..0e91a622 100644 --- a/src/ZKEACMS/ZKEACMS.csproj +++ b/src/ZKEACMS/ZKEACMS.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 ZKEACMS ZKEACMS 3.9.2 @@ -30,15 +30,15 @@ - + - - - - - + + + + + - + \ No newline at end of file diff --git a/test/EasyFrameWork.Test/EasyFrameWork.Test.csproj b/test/EasyFrameWork.Test/EasyFrameWork.Test.csproj index 43083f4b..e4f3e7a6 100644 --- a/test/EasyFrameWork.Test/EasyFrameWork.Test.csproj +++ b/test/EasyFrameWork.Test/EasyFrameWork.Test.csproj @@ -1,13 +1,13 @@  - net7.0 + net8.0 false - + diff --git a/test/ZKEACMS.Test/ZKEACMS.Test.csproj b/test/ZKEACMS.Test/ZKEACMS.Test.csproj index c1beb448..67146df9 100644 --- a/test/ZKEACMS.Test/ZKEACMS.Test.csproj +++ b/test/ZKEACMS.Test/ZKEACMS.Test.csproj @@ -1,17 +1,17 @@  - net7.0 + net8.0 false - + - + diff --git a/tools/LanguageScriptGen/LanguageScriptGen.csproj b/tools/LanguageScriptGen/LanguageScriptGen.csproj index c940dd79..eea3b6a1 100644 --- a/tools/LanguageScriptGen/LanguageScriptGen.csproj +++ b/tools/LanguageScriptGen/LanguageScriptGen.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 diff --git a/tools/PackWidgetTemplate/PackWidgetTemplate.csproj b/tools/PackWidgetTemplate/PackWidgetTemplate.csproj index 120e38c3..a269962b 100644 --- a/tools/PackWidgetTemplate/PackWidgetTemplate.csproj +++ b/tools/PackWidgetTemplate/PackWidgetTemplate.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 diff --git a/tools/PluginTemplate/TemplateFiles/ZKEACMS.Standard/ZKEACMS.Standard.csproj b/tools/PluginTemplate/TemplateFiles/ZKEACMS.Standard/ZKEACMS.Standard.csproj index 1fe19b3c..70474825 100644 --- a/tools/PluginTemplate/TemplateFiles/ZKEACMS.Standard/ZKEACMS.Standard.csproj +++ b/tools/PluginTemplate/TemplateFiles/ZKEACMS.Standard/ZKEACMS.Standard.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 true ZKEACMS.Standard ZKEACMS.Standard