From 836fdc27e13deb5088d3ce899bd9519c54c78571 Mon Sep 17 00:00:00 2001 From: wayne Date: Fri, 6 Sep 2024 21:20:34 +0800 Subject: [PATCH 1/3] Update packages --- src/EasyFrameWork/EasyFrameWork.csproj | 2 +- src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj | 2 +- src/ZKEACMS/ZKEACMS.csproj | 2 +- test/EasyFrameWork.Test/EasyFrameWork.Test.csproj | 2 +- test/ZKEACMS.Test/ZKEACMS.Test.csproj | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/EasyFrameWork/EasyFrameWork.csproj b/src/EasyFrameWork/EasyFrameWork.csproj index ba502369..1482e763 100644 --- a/src/EasyFrameWork/EasyFrameWork.csproj +++ b/src/EasyFrameWork/EasyFrameWork.csproj @@ -27,6 +27,6 @@ - + diff --git a/src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj b/src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj index e1ea3bcc..82142fbb 100644 --- a/src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj +++ b/src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj @@ -16,7 +16,7 @@ - + false runtime diff --git a/src/ZKEACMS/ZKEACMS.csproj b/src/ZKEACMS/ZKEACMS.csproj index 0b1a2666..e9012aae 100644 --- a/src/ZKEACMS/ZKEACMS.csproj +++ b/src/ZKEACMS/ZKEACMS.csproj @@ -28,7 +28,7 @@ - + diff --git a/test/EasyFrameWork.Test/EasyFrameWork.Test.csproj b/test/EasyFrameWork.Test/EasyFrameWork.Test.csproj index dec3e82a..0209285b 100644 --- a/test/EasyFrameWork.Test/EasyFrameWork.Test.csproj +++ b/test/EasyFrameWork.Test/EasyFrameWork.Test.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/ZKEACMS.Test/ZKEACMS.Test.csproj b/test/ZKEACMS.Test/ZKEACMS.Test.csproj index ad5a282c..271694cb 100644 --- a/test/ZKEACMS.Test/ZKEACMS.Test.csproj +++ b/test/ZKEACMS.Test/ZKEACMS.Test.csproj @@ -7,12 +7,12 @@ - - + + - + From 8526d45fa3c2f4304ba6a70a71052003aa70b817 Mon Sep 17 00:00:00 2001 From: wayne Date: Sat, 7 Sep 2024 18:01:12 +0800 Subject: [PATCH 2/3] Update dockerignore --- .dockerignore | 167 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 163 insertions(+), 4 deletions(-) diff --git a/.dockerignore b/.dockerignore index d07a334e..9aac5587 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,8 +1,167 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results + +[Dd]ebug/ +[Rr]elease/ +x64/ +build/ +[Bb]in/ +[Oo]bj/ + +# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets +!packages/*/build/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.log +*.scc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.Publish.xml +*.pubxml + +# NuGet Packages Directory +## TODO: If you have NuGet Package Restore enabled, uncomment the next line +#packages/ + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.[Pp]ublish.xml +*.pfx +*.publishsettings + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +App_Data/*.mdf +App_Data/*.ldf + +# ========================= +# Windows detritus +# ========================= + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Mac crap +.DS_Store .git .svn .vs -.vscode -bin -obj +*.mdf +*.ldf +src/ZKEACMS.WebHost/wwwroot/UpLoad +src/ZKEACMS.WebHost/wwwroot/Logs +Database/App_Data node_modules -Release \ No newline at end of file +*.userprefs +/*.userprefs + +# ZKEACMS App Data +App_Data/ +*.db +/src/ZKEACMS.WebHost/Temp From b56bb727d443a99e14027edfe56e2614a4590fd7 Mon Sep 17 00:00:00 2001 From: wayne Date: Wed, 11 Sep 2024 20:12:49 +0800 Subject: [PATCH 3/3] 4.0.1 --- src/ZKEACMS/ZKEACMS.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ZKEACMS/ZKEACMS.csproj b/src/ZKEACMS/ZKEACMS.csproj index e9012aae..65261d94 100644 --- a/src/ZKEACMS/ZKEACMS.csproj +++ b/src/ZKEACMS/ZKEACMS.csproj @@ -10,8 +10,8 @@ git CMS 深圳市纸壳软件有限公司 ZKEASOFT - 4.0 - 4.0 + 4.0.1 + 4.0.1 DEBUG;TRACE