Merge branch 'release/2.1.23' of serset/Sers into master

.github/workflows/action-ki_multibranch.yml

@@ -36,18 +36,19 @@ jobs:
         run: |
            set -e
            echo start build
-           export APPNAME="Sers"
+
            export DOCKER_ImagePrefix="serset/"
            export DOCKER_USERNAME="${{ secrets.DOCKER_USERNAME  }}"
            export DOCKER_PASSWORD="${{ secrets.DOCKER_PASSWORD }}"
            export NUGET_SERVER="${{ secrets.NUGET_SERVER  }}"
            export NUGET_KEY="${{ secrets.NUGET_KEY }}"
-           export GIT_SSH_SECRET="${{ secrets.GIT_SSH_SECRET }}"
+           export WebDav_BaseUrl="${{ secrets.WebDav_BaseUrl }}"
+           export WebDav_User="${{ secrets.WebDav_User }}"
            cd ./Publish/DevOps2/github-bash
            bash startup.bash
            echo build succeed!
            
-           echo "appName=Sers" >> $GITHUB_ENV
+           # echo "appName=${APPNAME}" >> $GITHUB_ENV
            
            
       - name: release_create

Publish/DevOps2/build-bash/30.nuget-pack.sh

@@ -38,7 +38,7 @@ do
 	dotnet build --configuration Release
 	dotnet pack --configuration Release --output '/root/code/$nugetPath'
 done
-" 
+"
 
 
  

Publish/DevOps2/build-bash/40.Station-publish.sh

@@ -14,7 +14,7 @@ if [ ! $NUGET_PATH ]; then NUGET_PATH=$basePath/Publish/release/.nuget; fi
 
 
 #----------------------------------------------
-echo "40.Station-publish.sh find projects and build"
+echo "#40.Station-publish.sh -> find projects and build"
 
 
 
@@ -27,16 +27,23 @@ serset/dotnet:sdk-6.0 \
 bash -c "
 set -e
 
+if grep '<publish>' -r --include *.csproj /root/code; then
+	echo '#40.Station-publish.sh -> got projects need to be built'
+else
+	echo '#40.Station-publish.sh -> skip for no project needs to be built'
+	exit 0
+fi
+
 echo '#1 get netVersion'
-netVersion=\$(grep '<TargetFramework>' \$(grep '<publish>' -rl --include *.csproj /root/code | head -n 1) | grep -oP '>(.*)<' | tr -d '<>')
+export netVersion=\$(grep '<TargetFramework>' \$(grep '<publish>' -rl --include *.csproj /root/code | head -n 1) | grep -oP '>(.*)<' | tr -d '<>')
 echo netVersion: \$netVersion
 
 
-basePath=/root/code
-publishPath=\$basePath/Publish/release/release/Station\(\$netVersion\)
+export basePath=/root/code
+export publishPath=\$basePath/Publish/release/release/Station\(\$netVersion\)
 mkdir -p \$publishPath
 
-echo '#2 publish Station'
+echo '#2 publish station'
 cd \$basePath
 for file in \$(grep -a '<publish>' . -rl --include *.csproj)
 do
@@ -57,22 +64,28 @@ do
 done
 
 
-echo '#3 copy ReleaseFile'
-\cp -rf \$basePath/Publish/ReleaseFile/Station/. \"\$publishPath\"
+#3 copy station release files
+if [ -d \"\$basePath/Publish/ReleaseFile/Station\" ]; then
+	echo '#3 copy station release files'
+	\cp -rf \$basePath/Publish/ReleaseFile/Station/. \"\$publishPath\"
+fi
+
+
+#4 copy extra release files
+bashFile=\"\$basePath/Publish/DevOps2/environment/build-bash__40.Station-publish__#4_copyExtraReleaseFiles.sh\"
+if [ -f \"\$bashFile\" ]; then
+	echo '#4 copy extra release files'
+	sh \"\$bashFile\"
+fi
 
 
-echo '#4 copy ServiceCenter'
-mkdir -p \"\$basePath/Publish/release/release/ServiceCenter(\$netVersion)\"
-\cp -rf \$publishPath/ServiceCenter/. \"\$basePath/Publish/release/release/ServiceCenter(\$netVersion)/ServiceCenter\"
-\cp -rf \"\$publishPath/01.ServiceCenter.bat\" \"\$basePath/Publish/release/release/ServiceCenter(\$netVersion)\"
-\cp -rf \"\$publishPath/01.Start-4580.bat\" \"\$basePath/Publish/release/release/ServiceCenter(\$netVersion)\"
 
 
 "
 
 
 
-echo 'publish succeed!'
+echo '#40.Station-publish.sh -> success!'
 
 
 

Publish/DevOps2/build-bash/41.extra-publish.sh

@@ -0,0 +1,23 @@
+set -e
+
+
+#---------------------------------------------------------------------
+# args
+args_="
+
+export basePath=/root/temp/svn
+export NUGET_PATH=$basePath/Publish/release/.nuget
+
+# "
+
+
+#---------------------------------------------------------------------
+#41.extra-publish.sh
+bashFile="$basePath/Publish/DevOps2/environment/build-bash__41.extra-publish.sh"
+if [ -f "$bashFile" ]; then
+	echo '#41.extra-publish.sh'
+	sh "$bashFile"
+fi
+
+
+

Publish/DevOps2/build-bash/50.docker-image-create.sh → Publish/DevOps2/build-bash/50.docker-image-copy.sh

@@ -11,17 +11,22 @@ export basePath=/root/temp/svn
 
  
 #---------------------------------------------------------------------
-echo "#1 copy docker-image from ReleaseFile"
+#1 copy docker image from ReleaseFile
 
 publishPath="$basePath/Publish/release/release/Station(net6.0)"
 dockerPath=$basePath/Publish/release/release/docker-image
 
 
-\cp -rf "$basePath/Publish/ReleaseFile/docker-image/." "$dockerPath"
+if [ -d "$basePath/Publish/ReleaseFile/docker-image" ]; then
+	echo "50.docker-image-copy.sh -> #1 copy docker image from ReleaseFile"
+	\cp -rf "$basePath/Publish/ReleaseFile/docker-image/." "$dockerPath"
+fi
+
+
 
 
 #---------------------------------------------------------------------
-echo "#2 copy station"
+echo "50.docker-image-copy.sh -> #2 copy station"
 for file in $(find $basePath -name *.csproj -exec grep '<docker>' -l {} \;)
 do
 	cd $basePath
@@ -35,8 +40,7 @@ do
 done
 
 
-echo "#3 copy 单体压测"
-\cp -rf "$basePath/Publish/release/release/StressTest/单体压测net6.0/ServiceCenter/." "$dockerPath/sers-demo-sersall/app"
+
 
 
 

Publish/DevOps2/build-bash/51.docker-deploy-copy.sh

@@ -11,28 +11,17 @@ export basePath=/root/temp/svn
 
  
 #---------------------------------------------------------------------
-#(x.2)
+#2
 publishPath="$basePath/Publish/release/release/Station(net6.0)"
-deployPath=$basePath/Publish/release/release/docker-deploy
+deployPath="$basePath/Publish/release/release/docker-deploy"
 
 
 
 #----------------------------------------------
-echo "(x.3)copy dir"
-\cp -rf "$basePath/Publish/ReleaseFile/docker-deploy/." "$deployPath"
-
-
-
-#---------------------------------------------------------------------
-echo "(x.4)copy station"
-
-\cp -rf "$publishPath/ServiceCenter/appsettings.json" "$deployPath/sers"
-\cp -rf "$publishPath/Gateway/appsettings.json" "$deployPath/sers-gateway"
-\cp -rf "$publishPath/Gover/appsettings.json" "$deployPath/sers-gover"
-\cp -rf "$publishPath/Demo/appsettings.json" "$deployPath/sers-demo"
-\cp -rf "$publishPath/Robot/appsettings.json" "$deployPath/sers-demo-robot"
-\cp -rf "$basePath/Publish/release/release/StressTest/单体压测net6.0/ServiceCenter/appsettings.json" "$deployPath/sers-demo-sersall"
-
-
+#3 copy dir
+if [ -d "$basePath/Publish/ReleaseFile/docker-deploy" ]; then
+	echo "51.docker-deploy-copy.sh -> copy dir"
+	\cp -rf "$basePath/Publish/ReleaseFile/docker-deploy/." "$deployPath"
+fi
 
 

Publish/DevOps2/build-bash/52.docker-extra-copy.sh

@@ -0,0 +1,23 @@
+set -e
+
+
+#---------------------------------------------------------------------
+# args
+args_="
+
+export basePath=/root/temp/svn
+export NUGET_PATH=$basePath/Publish/release/.nuget
+
+# "
+
+
+#---------------------------------------------------------------------
+#52.docker-extra-copy.sh
+bashFile="$basePath/Publish/DevOps2/environment/build-bash__52.docker-extra-copy.sh"
+if [ -f "$bashFile" ]; then
+	echo '#52.docker-extra-copy.sh'
+	sh "$bashFile"
+fi
+
+
+

Publish/DevOps2/build-cmd/30.nuget-pack.bat

@@ -1,23 +1,23 @@
 @echo off
 
-::(x.1)获取basePath
+::1 get basePath
 set curPath=%cd%
 cd /d "%~dp0"
 cd /d ../../..
 set basePath=%cd%
 set nugetPath=%basePath%/Publish/release/release/nuget
 
-::(x.2)查找所有需要发布nuget的项目并发布
+::2 find nuget projects and pack
 for /f "delims=" %%f in ('findstr /M /s /i "<pack>nuget</pack>" *.csproj') do (
 	echo pack %basePath%\%%f\..
 	cd /d "%basePath%\%%f\.."
 	dotnet build --configuration Release
 	dotnet pack --configuration Release --output "%nugetPath%"
-	@if errorlevel 1 (echo . & echo .  & echo 出错，请排查！& pause) 
+	@if errorlevel 1 (echo . & echo .  & echo error & pause) 
 )
 
 
-echo %~n0.bat 执行成功！
+echo %~n0.bat success
 
 
 cd /d "%curPath%"

Publish/DevOps2/build-cmd/40.Station-publish(net5.0).bat

@@ -1,18 +1,18 @@
 @echo off
 
 
-::(x.1)初始化
+:: #1 init
 set netVersion=net5.0
 
 
-::(x.2)修改要发布项目的netcore版本号
+:: #2 change netcore version
 VsTool.exe replace -r --path "../../.." --file "App.Gateway.csproj|App.Gover.Gateway.csproj|App.ServiceCenter.csproj|Did.SersLoader.Demo.csproj|App.Robot.Station.csproj" --old "<TargetFramework>net6.0</TargetFramework>" --new "<TargetFramework>%netVersion%</TargetFramework>"
 
 
 
 
 
-::(x.3)发布项目
+:: #3 publish
 call "40.Station-publish.bat"
 
 
@@ -20,12 +20,12 @@ call "40.Station-publish.bat"
 
 
 
-::(x.4)还原项目的版本号
+:: #4 revert netcore version
 VsTool.exe replace -r --path "../../.." --file "App.Gateway.csproj|App.Gover.Gateway.csproj|App.ServiceCenter.csproj|Did.SersLoader.Demo.csproj|App.Robot.Station.csproj" --old "<TargetFramework>%netVersion%</TargetFramework>" --new "<TargetFramework>net6.0</TargetFramework>"
 
 
 
 
 
-echo %~n0.bat 执行成功！
+echo %~n0.bat success
 cd /d "%curPath%"

Publish/DevOps2/build-cmd/40.Station-publish(netcoreapp2.1).bat

@@ -1,18 +1,18 @@
 @echo off
 
 
-::(x.1)初始化
+:: #1 init
 set netVersion=netcoreapp2.1
 
 
-::(x.2)修改要发布项目的netcore版本号
+:: #2 change netcore version
 VsTool.exe replace -r --path "../../.." --file "App.Gateway.csproj|App.Gover.Gateway.csproj|App.ServiceCenter.csproj|Did.SersLoader.Demo.csproj|App.Robot.Station.csproj" --old "<TargetFramework>net6.0</TargetFramework>" --new "<TargetFramework>%netVersion%</TargetFramework>"
 
 
 
 
 
-::(x.3)发布项目
+:: #3 publish
 call "40.Station-publish.bat"
 
 
@@ -20,12 +20,12 @@ call "40.Station-publish.bat"
 
 
 
-::(x.4)还原项目的版本号
+:: #4 revert netcore version
 VsTool.exe replace -r --path "../../.." --file "App.Gateway.csproj|App.Gover.Gateway.csproj|App.ServiceCenter.csproj|Did.SersLoader.Demo.csproj|App.Robot.Station.csproj" --old "<TargetFramework>%netVersion%</TargetFramework>" --new "<TargetFramework>net6.0</TargetFramework>"
 
 
 
 
 
-echo %~n0.bat 执行成功！
+echo %~n0.bat success
 cd /d "%curPath%"

Publish/DevOps2/build-cmd/40.Station-publish.bat

@@ -1,17 +1,17 @@
 @echo off
 
-::启用变量延迟
+::enable delayed arguments
 setlocal EnableDelayedExpansion
 
 
-::(x.1)获取basePath
+:: #1 get basePath
 set curPath=%cd%
 cd /d "%~dp0"
 cd /d ../../..
 set basePath=%cd%
 
 
-::(x.2)获取netVersion
+:: #2 get netVersion
 set netVersion=net6.0
 for /f "tokens=3 delims=><" %%a in ('type %basePath%\dotnet\ServiceCenter\App.ServiceCenter\App.ServiceCenter.csproj^|findstr "<TargetFramework>.*TargetFramework"') do set netVersion=%%a
 
@@ -22,7 +22,7 @@ echo dotnet version: %netVersion%
 
 
 
-::(x.3)查找所有需要发布的项目并发布
+:: #3 find projects and publish
 for /f "delims=" %%f in ('findstr /M /s /i "<publish>" *.csproj') do (
 	::get name
 	for /f "tokens=3 delims=><" %%a in ('type "%basePath%\%%f"^|findstr "<publish>.*publish"') do set name=%%a
@@ -32,7 +32,7 @@ for /f "delims=" %%f in ('findstr /M /s /i "<publish>" *.csproj') do (
 	cd /d "%basePath%\%%f\.."
 	dotnet build --configuration Release
 	dotnet publish --configuration Release --output "%publishPath%\!name!"
-	@if errorlevel 1 (echo . & echo .  & echo 出错，请排查！& pause) 
+	@if errorlevel 1 (echo . & echo .  & echo error & pause) 
 
 	::copy xml
 	xcopy  "bin\Release\%netVersion%\*.xml" "%publishPath%\!name!" /i /r /y
@@ -40,12 +40,12 @@ for /f "delims=" %%f in ('findstr /M /s /i "<publish>" *.csproj') do (
 
 
 
-::(x.4)copy dir
+:: #4 copy dir
 xcopy "%basePath%\Publish\ReleaseFile\Station" "%publishPath%" /e /i /r /y
 
 
 
-::(x.5)copy ServiceCenter
+:: #5 copy ServiceCenter
 xcopy "%publishPath%\ServiceCenter" "%basePath%\Publish\release\release\ServiceCenter(%netVersion%)\ServiceCenter" /e /i /r /y
 xcopy "%publishPath%\01.ServiceCenter.bat" "%basePath%\Publish\release\release\ServiceCenter(%netVersion%)"
 xcopy "%publishPath%\01.Start-4580.bat" "%basePath%\Publish\release\release\ServiceCenter(%netVersion%)"
@@ -53,6 +53,5 @@ xcopy "%publishPath%\01.Start-4580.bat" "%basePath%\Publish\release\release\Serv
 
 
 
-echo %~n0.bat 执行成功！
-
+echo %~n0.bat success
 cd /d "%curPath%"

Publish/DevOps2/build-cmd/41.StressTest-publish.bat

@@ -1,11 +1,11 @@
 @echo off
 
-::启用变量延迟
+::enable delayed arguments
 setlocal EnableDelayedExpansion
 
 
 
-::(x.1)获取basePath
+:: #1 get 获取basePath
 set curPath=%cd%
 cd /d "%~dp0"
 cd /d ../../..
@@ -13,7 +13,7 @@ set basePath=%cd%
 
 
 
-::(x.2)
+:: #2
 set publishPath=%basePath%/Publish/release/release/StressTest
 
 
@@ -21,19 +21,19 @@ set publishPath=%basePath%/Publish/release/release/StressTest
 
 
 echo ------------------------------------------------------------------
-echo "(x.3)发布CL压测"
+echo "#3 publish CL stressTest"
 
 ::Client
 cd /d "%basePath%\dotnet\Library\Sers\Sers.CL\Test\CommunicationManage\CmClient"
 dotnet build --configuration Release
 dotnet publish --configuration Release --output "%publishPath%\CL压测net6.0\CmClient"
-@if errorlevel 1 (echo . & echo .  & echo 出错，请排查！& pause) 
+@if errorlevel 1 (echo . & echo .  & echo error & pause) 
 
 ::Server
 cd /d "%basePath%\dotnet\Library\Sers\Sers.CL\Test\CommunicationManage\CmServer"
 dotnet build --configuration Release
 dotnet publish --configuration Release --output "%publishPath%\CL压测net6.0\CmServer"
-@if errorlevel 1 (echo . & echo .  & echo 出错，请排查！& pause) 
+@if errorlevel 1 (echo . & echo .  & echo error & pause) 
 
 
 ::copy bat
@@ -43,7 +43,7 @@ xcopy  "%basePath%\Publish\ReleaseFile\StressTest\CL压
 
 
 echo ------------------------------------------------------------------
-::(x.4)发布Sers压测
+:: #4 publish Sers stressTest
 for %%i in (net6.0) do (  
 	set netVersion=%%i
 	set appPath=%basePath%/Publish/release/release/Station^(!netVersion!^)
@@ -90,8 +90,7 @@ for %%i in (net6.0) do (
  
 
 
-echo %~n0.bat 执行成功！
-
+echo %~n0.bat success
 cd /d "%curPath%"
 
 

Publish/DevOps2/build-cmd/50.docker-image-create.bat

@@ -4,23 +4,23 @@
 echo %~n0.bat start...
 
 
-::(x.1)获取basePath
+:: #1 get basePath
 set curPath=%cd%
 cd /d "%~dp0"
 cd /d ../../..
 set basePath=%cd%
 
-::(x.2)
+:: #2
 set publishPath=%basePath%/Publish/release/release/Station(net6.0)
 set dockerPath=%basePath%/Publish/release/release/docker-image
 rd /s /q "%dockerPath%"
 
 
-::(x.3)copy dir
+:: #3 copy dir
 xcopy "%basePath%/Publish/ReleaseFile/docker-image" "%dockerPath%" /e /i /r /y
 
 
-::(x.4)copy station 
+:: #4 copy station 
 xcopy  "%publishPath%/ServiceCenter" "%dockerPath%/sers/app" /e /i /r /y
 xcopy  "%publishPath%/Gateway" "%dockerPath%/sers-gateway/app" /e /i /r /y
 xcopy  "%publishPath%/Gover" "%dockerPath%/sers-gover/app" /e /i /r /y
@@ -32,6 +32,5 @@ xcopy  "%basePath%/Publish/release/release/压测/单体压测net6.0/ServiceCent
 
 
 
-echo %~n0.bat 执行成功！
-
+echo %~n0.bat success
 cd /d "%curPath%"

Publish/DevOps2/build-cmd/51.docker-deploy-copy.bat

@@ -4,24 +4,24 @@
 echo %~n0.bat start...
 
 
-::(x.1)获取basePath
+::#1 get basePath
 set curPath=%cd%
 cd /d "%~dp0"
 cd /d ..\..\..
 set basePath=%cd%
 
 
-::(x.2)
+:: #2
 set publishPath=%basePath%\Publish\release\release\Station(net6.0)
 set dockerPath=%basePath%\Publish\release\release\docker-deploy
 rd /s /q "%dockerPath%"
 
 
-::(x.3)copy dir
+:: #3 copy dir
 xcopy "%basePath%\Publish\ReleaseFile\docker-deploy" "%dockerPath%" /e /i /r /y
 
 
-::(x.4)copy station 
+:: #4 copy station 
 xcopy "%publishPath%\ServiceCenter\appsettings.json" "%dockerPath%\sers"
 xcopy "%publishPath%\Gateway\appsettings.json" "%dockerPath%\sers-gateway"
 xcopy "%publishPath%\Gover\appsettings.json" "%dockerPath%\sers-gover"
@@ -32,6 +32,5 @@ xcopy "%basePath%\Publish\release\release\压测\单体压测net6.0\ServiceCente
 
 
 
-echo %~n0.bat 执行成功！
-
+echo %~n0.bat success
 cd /d "%curPath%"

Publish/DevOps2/build-cmd/清理-所有.bat → Publish/DevOps2/build-cmd/Clean-All.bat

@@ -1,9 +1,9 @@
-VsTool.exe delete --path "..\..\.." --file "*.suo|*.user" --directory "obj|bin|.vs|packages"
-
-
-rd /s/q ..\..\release
-
-
-echo %~n0.bat Ö´Ðгɹ¦£¡
-
+VsTool.exe delete --path "..\..\.." --file "*.suo|*.user" --directory "obj|bin|.vs|packages"
+
+
+rd /s/q ..\..\release
+
+
+echo %~n0.bat success
+
 pause

Publish/DevOps2/build-cmd/清理-发布文件.bat → Publish/DevOps2/build-cmd/Clean-ReleaseFiles.bat

@@ -1 +1 @@
-rd /s/q ..\..\release
+rd /s/q ..\..\release

Publish/DevOps2/build-cmd/一键发布.bat → Publish/DevOps2/build-cmd/OneKey Release.bat

@@ -1,21 +1,21 @@
-
-echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
-call "30.nuget-pack.bat"
-
-echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
-call "40.Station-publish.bat"
-call "40.Station-publish(netcoreapp2.1).bat"
-call "40.Station-publish(net6.0).bat"
-
-call "41.StressTest-publish.bat"
-
-echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
-call "50.docker-image-create.bat"
-call "51.docker-deploy-copy.bat"
-
-echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
-
-
-echo %~n0.bat Ö´Ðгɹ¦£¡
-
+
+echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
+call "30.nuget-pack.bat"
+
+echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
+call "40.Station-publish.bat"
+call "40.Station-publish(netcoreapp2.1).bat"
+call "40.Station-publish(net6.0).bat"
+
+call "41.StressTest-publish.bat"
+
+echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
+call "50.docker-image-create.bat"
+call "51.docker-deploy-copy.bat"
+
+echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
+
+
+echo %~n0.bat success
+
 pause

Publish/DevOps2/build-cmd/三级版本号-改为下一temp版.bat → Publish/DevOps2/build-cmd/Version-To-NextTemp.bat

@@ -1,46 +1,46 @@
-@echo off
-
-::(x.1)get csproj
-for /f "delims=" %%a in ('findstr /M /s /i /r "<pack> <publish>" "..\..\..\*.csproj"') do set "csproj=%%~a"
-::echo %csproj%
-
-::(x.2)get version
-for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
-
-:: set version=2.1.3
-:: echo  %version%
-
-
-::(x.3)get v1 v2 v3
-for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
-
-:: v1 v2 v3
-for /f "tokens=1 delims=." %%i in ("%numVersion%") do set v1=%%i
-for /f "tokens=2 delims=." %%i in ("%numVersion%") do set v2=%%i
-for /f "tokens=3 delims=." %%i in ("%numVersion%") do set v3=%%i
-
-
-::(x.4)newVersion
-set /a v3=1+%v3%
-set newVersion=%v1%.%v2%.%v3%-temp
-:: echo %newVersion%
-
-
- 
-::(x.5)调用工具 替换csproj文件中的版本号
-echo 自动修改版本号 [%version%]-^>[%newVersion%]
-echo.
-
-VsTool.exe replace -r --path "..\..\.." --file "*.csproj" --old "<Version>%version%</Version>" --new "<Version>%newVersion%</Version>"
-VsTool.exe replace -r --path "..\..\.." --file "packages.config" --old "%version%" --new "%newVersion%"
-
-
-::(x.6)调用工具 替换docker镜像命令中的版本号
-VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.md" --old "%version%" --new "%newVersion%"
-
-
-echo.
-echo.
-echo.
-echo 已经成功修改版本号 [%version%]-^>[%newVersion%]
+@echo off
+
+:: #1 get csproj
+for /f "delims=" %%a in ('findstr /M /s /i /r "<pack> <publish>" "..\..\..\*.csproj"') do set "csproj=%%~a"
+::echo %csproj%
+
+:: #2 get version
+for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
+
+:: set version=2.1.3
+:: echo  %version%
+
+
+:: #3 get v1 v2 v3
+for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
+
+:: v1 v2 v3
+for /f "tokens=1 delims=." %%i in ("%numVersion%") do set v1=%%i
+for /f "tokens=2 delims=." %%i in ("%numVersion%") do set v2=%%i
+for /f "tokens=3 delims=." %%i in ("%numVersion%") do set v3=%%i
+
+
+:: #4 newVersion
+set /a v3=1+%v3%
+set newVersion=%v1%.%v2%.%v3%-temp
+:: echo %newVersion%
+
+
+ 
+:: #5 replace version in csproj
+echo replace verion [%version%]-^>[%newVersion%]
+echo.
+
+VsTool.exe replace -r --path "..\..\.." --file "*.csproj" --old "<Version>%version%</Version>" --new "<Version>%newVersion%</Version>"
+VsTool.exe replace -r --path "..\..\.." --file "packages.config" --old "%version%" --new "%newVersion%"
+
+
+:: #6 replace version in docker image file
+VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.md" --old "%version%" --new "%newVersion%"
+
+
+echo.
+echo.
+echo.
+echo replace version success [%version%]-^>[%newVersion%]
 pause

Publish/DevOps2/build-cmd/三级版本号-改为preview版.bat → Publish/DevOps2/build-cmd/Version-To-Preview.bat

@@ -1,46 +1,46 @@
-@echo off
-
-::(x.1)get csproj
-for /f "delims=" %%a in ('findstr /M /s /i /r "<pack> <publish>" "..\..\..\*.csproj"') do set "csproj=%%~a"
-::echo %csproj%
-
-::(x.2)get version
-for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
-
-:: set version=2.1.3
-:: echo  %version%
-
-
-::(x.3)get v1 v2 v3
-for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
-
-:: v1 v2 v3
-for /f "tokens=1 delims=." %%i in ("%numVersion%") do set v1=%%i
-for /f "tokens=2 delims=." %%i in ("%numVersion%") do set v2=%%i
-for /f "tokens=3 delims=." %%i in ("%numVersion%") do set v3=%%i
-
-
-::(x.4)newVersion
-:: set /a v3=1+%v3%
-set newVersion=%v1%.%v2%.%v3%-preview
-:: echo %newVersion%
-
-
- 
-::(x.5)调用工具 替换csproj文件中的版本号
-echo 自动修改版本号 [%version%]-^>[%newVersion%]
-echo.
-
-VsTool.exe replace -r --path "..\..\.." --file "*.csproj" --old "<Version>%version%</Version>" --new "<Version>%newVersion%</Version>"
-VsTool.exe replace -r --path "..\..\.." --file "packages.config" --old "%version%" --new "%newVersion%"
-
-
-::(x.6)调用工具 替换docker镜像命令中的版本号
-VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.md" --old "%version%" --new "%newVersion%"
-
-
-echo.
-echo.
-echo.
-echo 已经成功修改版本号 [%version%]-^>[%newVersion%]
+@echo off
+
+:: #1 get csproj
+for /f "delims=" %%a in ('findstr /M /s /i /r "<pack> <publish>" "..\..\..\*.csproj"') do set "csproj=%%~a"
+::echo %csproj%
+
+:: #2 get version
+for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
+
+:: set version=2.1.3
+:: echo  %version%
+
+
+:: #3 get v1 v2 v3
+for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
+
+:: v1 v2 v3
+for /f "tokens=1 delims=." %%i in ("%numVersion%") do set v1=%%i
+for /f "tokens=2 delims=." %%i in ("%numVersion%") do set v2=%%i
+for /f "tokens=3 delims=." %%i in ("%numVersion%") do set v3=%%i
+
+
+:: #4 newVersion
+:: set /a v3=1+%v3%
+set newVersion=%v1%.%v2%.%v3%-preview
+:: echo %newVersion%
+
+
+ 
+:: #5 replace version in csproj
+echo 自动修改版本号 [%version%]-^>[%newVersion%]
+echo.
+
+VsTool.exe replace -r --path "..\..\.." --file "*.csproj" --old "<Version>%version%</Version>" --new "<Version>%newVersion%</Version>"
+VsTool.exe replace -r --path "..\..\.." --file "packages.config" --old "%version%" --new "%newVersion%"
+
+
+:: #6 replace version in docker image file
+VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.md" --old "%version%" --new "%newVersion%"
+
+
+echo.
+echo.
+echo.
+echo replace version success [%version%]-^>[%newVersion%]
 pause

Publish/DevOps2/build-cmd/三级版本号-改为release版.bat → Publish/DevOps2/build-cmd/Version-To-Release.bat

@@ -1,43 +1,43 @@
-@echo off
-
-::(x.1)get csproj
-for /f "delims=" %%a in ('findstr /M /s /i /r "<pack> <publish>" "..\..\..\*.csproj"') do set "csproj=%%~a"
-::echo %csproj%
-
-::(x.2)get version
-for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
-
-:: set version=2.1.3
-:: echo  %version%
-
-
-::(x.3)get v1 v2 v3
-for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
-
-:: v1 v2 v3
-for /f "tokens=1 delims=." %%i in ("%numVersion%") do set v1=%%i
-for /f "tokens=2 delims=." %%i in ("%numVersion%") do set v2=%%i
-for /f "tokens=3 delims=." %%i in ("%numVersion%") do set v3=%%i
-
-
-::(x.4)newVersion
-:: set /a v3=1+%v3%
-set newVersion=%v1%.%v2%.%v3%
-:: echo %newVersion%
-echo [%version%]-^>[%newVersion%]
-
- 
-::(x.5)调用工具 替换csproj文件中的版本号
-VsTool.exe replace -r --path "..\..\.." --file "*.csproj" --old "<Version>%version%</Version>" --new "<Version>%newVersion%</Version>"
-VsTool.exe replace -r --path "..\..\.." --file "packages.config" --old "%version%" --new "%newVersion%"
-
-
-::(x.6)调用工具 替换docker镜像命令中的版本号
-VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.md" --old "%version%" --new "%newVersion%"
-
-
-echo.
-echo.
-echo.
-echo 已经成功修改版本号 [%version%]-^>[%newVersion%]
+@echo off
+
+:: #1 get csproj
+for /f "delims=" %%a in ('findstr /M /s /i /r "<pack> <publish>" "..\..\..\*.csproj"') do set "csproj=%%~a"
+::echo %csproj%
+
+:: #2 get version
+for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
+
+:: set version=2.1.3
+:: echo  %version%
+
+
+:: #3 get v1 v2 v3
+for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
+
+:: v1 v2 v3
+for /f "tokens=1 delims=." %%i in ("%numVersion%") do set v1=%%i
+for /f "tokens=2 delims=." %%i in ("%numVersion%") do set v2=%%i
+for /f "tokens=3 delims=." %%i in ("%numVersion%") do set v3=%%i
+
+
+:: #4 newVersion
+:: set /a v3=1+%v3%
+set newVersion=%v1%.%v2%.%v3%
+:: echo %newVersion%
+echo [%version%]-^>[%newVersion%]
+
+ 
+:: #5 replace version in csproj
+VsTool.exe replace -r --path "..\..\.." --file "*.csproj" --old "<Version>%version%</Version>" --new "<Version>%newVersion%</Version>"
+VsTool.exe replace -r --path "..\..\.." --file "packages.config" --old "%version%" --new "%newVersion%"
+
+
+:: #6 replace version in docker image file
+VsTool.exe replace -r --path "..\..\..\Publish\ReleaseFile\docker-image" --file "*.md" --old "%version%" --new "%newVersion%"
+
+
+echo.
+echo.
+echo.
+echo replace version success [%version%]-^>[%newVersion%]
 pause

Publish/DevOps2/build-cmd/三级版本号-getVersion.bat → Publish/DevOps2/build-cmd/Version-getVersion.bat

@@ -1,32 +1,32 @@
-@echo off
-
-::»ñÈ¡µ±Ç°°æ±¾ºÅ
-
-
-::(x.1)get csproj
-for /f "delims=" %%a in ('findstr /M /s /i /r "<pack> <publish>" "..\..\..\*.csproj"') do set "csproj=%%~a"
-echo %csproj%
-
-::(x.2)get version
-for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
-
-:: set version=2.1.3
-:: echo  %version%
-
-
-::(x.3)get v1 v2 v3
-for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
-
-:: v1 v2 v3
-for /f "tokens=1 delims=." %%i in ("%numVersion%") do set v1=%%i
-for /f "tokens=2 delims=." %%i in ("%numVersion%") do set v2=%%i
-for /f "tokens=3 delims=." %%i in ("%numVersion%") do set v3=%%i
-
-
-::(x.4)newVersion
-::set /a v3=1+%v3%
-set  newVersion=%v1%.%v2%.%v3%-preview
-echo [%version%]-^>[%newVersion%]
-
-
+@echo off
+
+:: get current version
+
+
+:: #1 get csproj
+for /f "delims=" %%a in ('findstr /M /s /i /r "<pack> <publish>" "..\..\..\*.csproj"') do set "csproj=%%~a"
+echo %csproj%
+
+:: #2 get version
+for /f "tokens=3 delims=><" %%a in ('type %csproj%^|findstr "<Version>.*Version"') do set version=%%a
+
+:: set version=2.1.3
+:: echo  %version%
+
+
+:: #3 get v1 v2 v3
+for /f "tokens=1 delims=-" %%i in ("%version%") do set numVersion=%%i
+
+:: v1 v2 v3
+for /f "tokens=1 delims=." %%i in ("%numVersion%") do set v1=%%i
+for /f "tokens=2 delims=." %%i in ("%numVersion%") do set v2=%%i
+for /f "tokens=3 delims=." %%i in ("%numVersion%") do set v3=%%i
+
+
+:: #4 newVersion
+::set /a v3=1+%v3%
+set  newVersion=%v1%.%v2%.%v3%-preview
+echo [%version%]-^>[%newVersion%]
+
+
 pause

Publish/DevOps2/environment/build-bash__40.Station-publish__#4_copyExtraReleaseFiles.sh

@@ -0,0 +1,26 @@
+set -e
+
+#---------------------------------------------------------------------
+# args
+args_="
+
+export basePath=/root/temp/svn
+export netVersion=net6.0
+export publishPath=\"$basePath/Publish/release/release/Station($netVersion)\"
+
+# "
+
+
+
+#----------------------------------------------
+echo '#build-bash__40.Station-publish__#4_copyExtraReleaseFiles.sh'
+
+mkdir -p "$basePath/Publish/release/release/ServiceCenter($netVersion)"
+cp -rf "$publishPath/ServiceCenter/." "$basePath/Publish/release/release/ServiceCenter($netVersion)/ServiceCenter"
+cp -rf "$publishPath/01.ServiceCenter.bat" "$basePath/Publish/release/release/ServiceCenter($netVersion)"
+cp -rf "$publishPath/01.Start-4580.bat" "$basePath/Publish/release/release/ServiceCenter($netVersion)"
+
+
+
+
+

Publish/DevOps2/build-bash/41.StressTest-publish.sh → Publish/DevOps2/environment/build-bash__41.extra-publish.sh

@@ -2,7 +2,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-# 参数
+# args
 args_="
 
 export basePath=/root/temp/svn
@@ -14,7 +14,8 @@ if [ ! $NUGET_PATH ]; then NUGET_PATH=$basePath/Publish/release/.nuget; fi
 
 
 #---------------------------------------------------------------------
-echo '41.StressTest-publish.sh  #1 发布CL压测'
+echo '#build-bash__41.extra-publish.sh'
+echo '  -> #1 发布CL压测'
 
 publishPath=$basePath/Publish/release/release/StressTest
 mkdir -p $publishPath
@@ -47,7 +48,8 @@ echo 'copy bat'
 
 
 #---------------------------------------------------------------------
-echo '41.StressTest-publish.sh  #2 发布Sers压测'
+echo '#build-bash__41.extra-publish.sh'
+echo '  -> #2 发布Sers压测'
 
 # for netVersion in net6.0 netcoreapp2.1
 for netVersion in net6.0

Publish/DevOps2/environment/build-bash__52.docker-extra-copy.sh

@@ -0,0 +1,42 @@
+set -e
+
+
+#---------------------------------------------------------------------
+# args
+
+args_="
+
+export basePath=/root/temp/svn
+export NUGET_PATH=$basePath/Publish/release/.nuget
+
+# "
+
+
+#---------------------------------------------------------------------
+echo '#build-bash__52.docker-extra-copy.sh'
+echo '  -> #1 copy image files'
+
+dockerPath="$basePath/Publish/release/release/docker-image"
+
+echo "copy 单体压测"
+\cp -rf "$basePath/Publish/release/release/StressTest/单体压测net6.0/ServiceCenter/." "$dockerPath/sers-demo-sersall/app"
+
+
+
+
+#---------------------------------------------------------------------
+echo '#build-bash__52.docker-extra-copy.sh'
+echo '  -> #2 copy deploy files'
+
+
+publishPath="$basePath/Publish/release/release/Station(net6.0)"
+deployPath="$basePath/Publish/release/release/docker-deploy"
+ 
+echo "copy station"
+
+\cp -rf "$publishPath/ServiceCenter/appsettings.json" "$deployPath/sers"
+\cp -rf "$publishPath/Gateway/appsettings.json" "$deployPath/sers-gateway"
+\cp -rf "$publishPath/Gover/appsettings.json" "$deployPath/sers-gover"
+\cp -rf "$publishPath/Demo/appsettings.json" "$deployPath/sers-demo"
+\cp -rf "$publishPath/Robot/appsettings.json" "$deployPath/sers-demo-robot"
+\cp -rf "$basePath/Publish/release/release/StressTest/单体压测net6.0/ServiceCenter/appsettings.json" "$deployPath/sers-demo-sersall"

Publish/DevOps2/environment/env.envName.txt

@@ -0,0 +1 @@
+ki

Publish/DevOps2/environment/github-bash__publish-multiple-netcore-version.txt

@@ -0,0 +1,5 @@
+
+if this file exists, 
+will publish multiple netcore version 
+like net5.0 netcoreapp3.1 netcoreapp3.0 netcoreapp2.2 netcoreapp2.1
+in github actions 

Publish/DevOps2/environment/readme.md

@@ -0,0 +1,23 @@
+
+
+
+# build-bash
+extra steps when building, all sh files could be remove if not needed.
+
+
+
+
+
+
+
+
+
+# github-bash__publish-multiple-netcore-version.txt
+if this file exists, 
+will publish multiple netcore version 
+like net5.0 netcoreapp3.1 netcoreapp3.0 netcoreapp2.2 netcoreapp2.1
+in github actions 
+
+
+
+

Publish/DevOps2/github-bash/74.github-push-to-webdav.sh

@@ -0,0 +1,30 @@
+set -e
+
+
+#---------------------------------------------------------------------
+# args
+args_="
+
+export basePath=/root/temp/svn
+
+export APPNAME=xxxx
+export appVersion=xxxx
+
+export WebDav_BaseUrl="https://nextcloud.xxx.com/remote.php/dav/files/release/releaseFiles/ki_jenkins"
+export WebDav_User="username:pwd"
+
+# "
+
+
+
+
+
+#----------------------------------------------
+if [ -z "$WebDav_BaseUrl" ]; then
+	echo "github skip pushing release file to WebDav because invalid WebDav endpoint"
+else
+	echo "github push release file to WebDav"
+	bash $basePath/Publish/DevOps2/release-bash/78.push-releaseFiles-to-webdav.bash;
+fi
+
+

Publish/DevOps2/github-bash/75.github-push-to-serset-release.sh

@@ -1,50 +0,0 @@
-set -e
-
-
-#---------------------------------------------------------------------
-# args
-args_="
-
-export basePath=/root/temp/svn
-
-export appVersion=1.0-preview
-
-export APPNAME=xxxxxx
-
-export GIT_SSH_SECRET=xxxxxx
-
-# "
-
-
-
-
-
-#----------------------------------------------
-echo "github-push release file to repo serset/release"
-# releaseFile=$basePath/Publish/release/release-zip
-
-# ssh key
-echo "${GIT_SSH_SECRET}" > $basePath/Publish/release/serset
-chmod 600 $basePath/Publish/release/serset
-
-# push to github
-docker run -i --rm \
--v $basePath/Publish/release:/root/release serset/git-client bash -c "
-set -e
-ssh-agent bash -c \"
-ssh-add /root/release/serset
-ssh -T git@github.com -o StrictHostKeyChecking=no
-git config --global user.email 'serset@yeah.com'
-git config --global user.name 'lith'
-mkdir -p /root/code
-cd /root/code
-git clone git@github.com:serset/release.git /root/code
-mkdir -p /root/code/file/${APPNAME}/${APPNAME}-${appVersion}
-\\cp -rf  /root/release/release-zip/. /root/code/file/${APPNAME}/${APPNAME}-${appVersion}
-git add /root/code/file/${APPNAME}/${APPNAME}-${appVersion}/.
-git commit -m 'auto commit ${appVersion}'
-git push -u origin master \" "
-
-
- 
- 

Publish/DevOps2/github-bash/76.github-push-release.sh

@@ -22,6 +22,7 @@ export APPNAME=xxxxxx
 
 
 
+echo "appName=${APPNAME}" >> $GITHUB_ENV
 
 echo "release_name=${APPNAME}-${appVersion}" >> $GITHUB_ENV
 echo "release_tag=${appVersion}" >> $GITHUB_ENV

Publish/DevOps2/github-bash/startup.bash

@@ -6,7 +6,7 @@ set -e
 # args
 args_="
 
-export APPNAME=xxxxxx
+#export APPNAME=xxxxxx
 
 export DOCKER_USERNAME=serset
 export DOCKER_PASSWORD=xxxxxx
@@ -14,7 +14,8 @@ export DOCKER_PASSWORD=xxxxxx
 export NUGET_SERVER=https://api.nuget.org/v3/index.json
 export NUGET_KEY=xxxxxx
 
-export GIT_SSH_SECRET=xxxxxx
+export WebDav_BaseUrl="https://nextcloud.xxx.com/remote.php/dav/files/release/releaseFiles/ki_jenkins"
+export WebDav_User="username:pwd"
 
 # "
 
@@ -28,13 +29,18 @@ cd $curPath
 
 # export basePath=/root/temp/svn
 
-
+if [ ! $APPNAME ]; then 
+	export APPNAME=$(cat "$basePath/Publish/DevOps2/environment/env.APPNAME.txt" | tr -d '\n')
+	echo "APPNAME: [${APPNAME}]" 
+fi
 
 #---------------------------------------------- 
 echo '#1 build'
 cd $basePath/Publish/DevOps2/build-bash; bash startup.bash;
-cd $basePath/Publish/DevOps2/build-bash; bash 40.Station-publish-multiple.bash;
 
+if [ -f "$basePath/Publish/DevOps2/environment/github-bash__publish-multiple-netcore-version.txt" ]; then
+	cd $basePath/Publish/DevOps2/build-bash; bash 40.Station-publish-multiple.bash;
+fi
 
 #---------------------------------------------- 
 echo '#2 release-bash'

Publish/DevOps2/jenkins-bash/00.svn-checkout.bash

@@ -1,18 +0,0 @@
-
-# args
-args_="
-basePath=/root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers
-export SVN_PATH=svn://svn.ki.lith.cloud/Sers2.1/Sers
-export SVN_USERNAME=jenkins
-export SVN_PASSWORD=xxxxxx
-# "
-
-#2 create dir
-mkdir -p $basePath/code
-chmod 777 $basePath/code
-
-
-
-#3 pull code from svn
-docker run -it --rm -v $basePath/code:/root/svn serset/svn-client svn checkout "$SVN_PATH" /root/svn --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --no-auth-cache
-

Publish/DevOps2/jenkins-bash/01.svn-update.sh

@@ -1,39 +0,0 @@
-set -e
-
-# cd /root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers/code/Publish/DevOps/jenkins-bash; bash 01.svn-update.sh
-
-#---------------------------------------------------------------------
-# args
-args_="
-export SVN_USERNAME=jenkins
-export SVN_PASSWORD=xxxxxx
-# "
-
-
-#---------------------------------------------------------------------
-# cur path
-curPath=$PWD
-
-cd $curPath/../../..
-export basePath=$PWD
-cd $curPath
-
-# export basePath=/root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers/code
-
-
-
-#---------------------------------------------------------------------
-#3 cleanup
-docker run -i --rm -v $basePath:/root/svn serset/svn-client svn cleanup /root/svn --remove-unversioned
-
-
-#4 revert
-docker run -i --rm -v $basePath:/root/svn serset/svn-client svn revert /root/svn -R
-
-
-#5 push latest code
-docker run -i --rm -v $basePath:/root/svn serset/svn-client svn update /root/svn --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --no-auth-cache
-
-
-
-cd $curPath

Publish/DevOps2/jenkins-bash/06.svn-createReleaseBranch.bash

@@ -1,64 +0,0 @@
-set -e
-
-# source 06.svn-createReleaseBranch.bash
-
-
-#---------------------------------------------------------------------
-# args
-args_="
-  export      codePath=/root/docker-cache/jenkins/jenkins_home/workspace/Sers/develop/20/code-with-prod-version
-  export      SVN_PATH=svn://svn.ki.lith.cloud/Sers
-  export      SVN_USERNAME=jenkins
-  export      SVN_PASSWORD=**
-  export      versionSuffix=.158
-# "
-
-# remove spaces
-versionSuffix=${versionSuffix// /}
-
-docker run -i --rm -v $codePath:/root/svn \
--e codePath="$codePath" -e SVN_PATH="$SVN_PATH" -e SVN_USERNAME="$SVN_USERNAME" -e SVN_PASSWORD="$SVN_PASSWORD" -e versionSuffix="$versionSuffix" \
-docker.lith.cloud:8/dockerhub/serset/svn-client bash -c '
-set -e
-
-echo "06.svn-createReleaseBranch.bash"
-echo "06.svn-createReleaseBranch.bash  -->  #1 change version in csproj and commit to develop branch"
-echo "06.svn-createReleaseBranch.bash  -->  #1.1 pull code from develop branch"
-codePath=/root/svn/branch-develop
-mkdir -p $codePath;cd $codePath;
-svn checkout $SVN_PATH/branches/develop $codePath --username $SVN_USERNAME --password $SVN_PASSWORD --no-auth-cache  > /dev/null;
-
-echo "06.svn-createReleaseBranch.bash  -->  #1.2 change version in csproj"
-export versionSuffix=$versionSuffix
-cd $codePath/Publish/DevOps2/build-bash; source 20.change-app-version.bash; 
-echo "appVersion: [$appVersion] -> [$nextAppVersion]"
-export appVersion=$nextAppVersion
-cd $codePath;
-
-echo "06.svn-createReleaseBranch.bash  -->  #1.3 commit to develop branch"
-svn commit $codePath -m "[tag] Sers $appVersion" --username $SVN_USERNAME --password $SVN_PASSWORD --no-auth-cache
-
-
-
-
-echo "06.svn-createReleaseBranch.bash  -->  #2 merge to trunk"
-echo "06.svn-createReleaseBranch.bash  -->  #2.1 pull code from trunk branch"
-codePath=/root/svn/branch-trunk
-mkdir -p $codePath;cd $codePath;
-svn checkout $SVN_PATH/trunk $codePath --username $SVN_USERNAME --password $SVN_PASSWORD --no-auth-cache > /dev/null;
-
-echo "06.svn-createReleaseBranch.bash  -->  #2.2 merge to trunk"
-svn merge $SVN_PATH/branches/develop --username $SVN_USERNAME --password $SVN_PASSWORD --no-auth-cache
-
-echo "06.svn-createReleaseBranch.bash  -->  #2.3 commit to trunk branch"
-svn commit $codePath -m "[trunk] merge from develop:$appVersion" --username $SVN_USERNAME --password $SVN_PASSWORD --no-auth-cache
-
-
-
-echo "06.svn-createReleaseBranch.bash  -->  #3 create tag branch from trunk"
-echo "appVersion: $appVersion"
-svn copy $SVN_PATH/trunk $SVN_PATH/tags/$appVersion -m "[tag] Sers $appVersion" --username $SVN_USERNAME --password $SVN_PASSWORD --no-auth-cache
-
-
-
-'

Publish/DevOps2/jenkins-bash/07.svn-changeToNextTempVersion.bash

@@ -1,39 +0,0 @@
-set -e
-
-# source 07.svn-changeToNextTempVersion.bash
-
-
-#---------------------------------------------------------------------
-# args
-args_="
-  export      codePath=/root/docker-cache/jenkins/jenkins_home/workspace/Sers/develop/20/code-with-prod-version
-  export      SVN_PATH=svn://svn.ki.lith.cloud/Sers
-  export      SVN_USERNAME=jenkins
-  export      SVN_PASSWORD=**
-# "
-
-
-docker run -i --rm -v $codePath:/root/svn \
--e codePath="$codePath" -e SVN_PATH="$SVN_PATH" -e SVN_USERNAME="$SVN_USERNAME" -e SVN_PASSWORD="$SVN_PASSWORD" \
-docker.lith.cloud:8/dockerhub/serset/svn-client bash -c '
-set -e
-
-
-echo "07.svn-changeToNextTempVersion.bash"
-echo "07.svn-changeToNextTempVersion.bash  -->  #1 pull code from develop branch"
-codePath=/root/svn/branch-develop-next
-mkdir -p $codePath;cd $codePath;
-svn checkout $SVN_PATH/branches/develop $codePath --username $SVN_USERNAME --password $SVN_PASSWORD --no-auth-cache
-
-echo "07.svn-changeToNextTempVersion.bash  -->  #2 change version in csproj"
-export versionSuffix="-temp"
-cd $codePath/Publish/DevOps2/build-bash; source 21.change-to-next-version.bash; 
-echo "appVersion: [$appVersion] -> [$nextAppVersion]"
-export appVersion=$nextAppVersion
-cd $codePath;
-
-echo "07.svn-changeToNextTempVersion.bash  -->  #3 commit to develop branch"
-svn commit $codePath -m "[develop] $appVersion" --username $SVN_USERNAME --password $SVN_PASSWORD --no-auth-cache
-
-
-'

Publish/DevOps2/jenkins-bash/CICD.ki.git_Multibranch.deploy.jenkinsfile

@@ -12,29 +12,30 @@ pipeline {
     environment {
         // get APPNAME
         // APPNAME = "Sers"
-        APPNAME = readFile("Publish/DevOps2/jenkins-bash/env.APPNAME.txt")
+        APPNAME = readFile("Publish/DevOps2/environment/env.APPNAME.txt")
 
-        stageName = "ki"
-        versionSuffix = "-${stageName}${env.build_number}"
+        envName = readFile("Publish/DevOps2/environment/env.envName.txt")
+        versionSuffix = "-${envName}${env.build_number}"
 
-        //basePath = "/root/docker-cache/jenkins/jenkins_home/workspace/${APPNAME}/${stageName}/${env.BRANCH_NAME}/${env.build_number}"
+        //basePath = "/root/docker-cache/jenkins/jenkins_home/workspace/${APPNAME}/${envName}/${env.BRANCH_NAME}/${env.build_number}"
         basePath = "${env.WORKSPACE}"
 
-        // set to "  "  if want to skip copy
-        // releasePath = "  "
-        releasePath = "/root/docker-cache/jenkins/jenkins_home/jenkinsReleaseFile/${stageName}/${env.BRANCH_NAME}/${APPNAME}"
-
         NUGET_PATH = "/root/docker-cache/jenkins/jenkins_home/workspace/.nuget"
 
         NUGET_SERVER = "http://nuget.lith.cloud:8"
         //NUGET_KEY = " "
         NUGET_KEY = credentials("nuget_key")
 
-        DOCKER_ImagePrefix = "docker.lith.cloud:8/${stageName}/"
+        DOCKER_ImagePrefix = "docker.lith.cloud:8/${envName}/"
         DOCKER_Buildx = false
         DOCKER_USERNAME = " "
         DOCKER_PASSWORD = " "
 
+        // set to "  "  if want to skip save releaseFiles to WebDav
+        WebDav_BaseUrl = "https://pan.lith.cloud:4/remote.php/dav/files/release/releaseFiles/ki_jenkins"
+        // "username:pwd"
+        WebDav_User = credentials("WebDav_User")
+
         build_crossPlatform = "no"
 
         dind_ssh_account = credentials("dind_ssh_account")
@@ -52,7 +53,6 @@ pipeline {
 
                         echo "-------- APPNAME: [$APPNAME]"
                         echo "-------- basePath: [$basePath]"
-                        echo "-------- releasePath: [$releasePath]"
                         echo "-------- DOCKER_ImagePrefix: [$DOCKER_ImagePrefix]"
                         echo "-------- codePath: [$codePath]"
 
@@ -70,10 +70,10 @@ pipeline {
             steps {
                 script {
                     echo "#2.1 change-app-version"
-                    sshCommand remote: remote, command:  "sh -c 'set -e; export versionSuffix=$versionSuffix;    cd $codePath/Publish/DevOps2/build-bash; source 22.add-suffix-to-app-version.bash;    echo -n \"\$nextAppVersion\" > $codePath/Publish/DevOps2/jenkins-bash/env.appVersion.txt '"
+                    sshCommand remote: remote, command:  "sh -c 'set -e; export versionSuffix=$versionSuffix;    cd $codePath/Publish/DevOps2/build-bash; source 22.add-suffix-to-app-version.bash;    echo -n \"\$nextAppVersion\" > $codePath/Publish/DevOps2/environment/env.appVersion.txt '"
 
                     echo "#2.2 get app version"
-                    env.appVersion = readFile("Publish/DevOps2/jenkins-bash/env.appVersion.txt")
+                    env.appVersion = readFile("Publish/DevOps2/environment/env.appVersion.txt")
                     echo "-------- appVersion: [${env.appVersion}]"
                 }
             }
@@ -106,11 +106,11 @@ pipeline {
             }
         }
 
-        stage('#5 copy release files') {
-            when { expression { env.inputChoice == "yes" && env.releasePath != "  " } }
+        stage('#5 save releaseFiles') {
+            when { expression { env.inputChoice == "yes" && env.WebDav_BaseUrl != "  " } }
             steps {
                 script {
-                    sshCommand remote: remote, command:  "sh -c 'set -e; export versionSuffix=$versionSuffix;    cd $codePath/Publish/DevOps2/build-bash; source 19.get-app-version.bash; export appVersion=\$nextAppVersion;    echo \"copy release files : $codePath/Publish/release/release-zip/. $releasePath/\$appVersion;\"; mkdir -p $releasePath;  \\cp -rf $codePath/Publish/release/release-zip/. $releasePath/\$appVersion;    '"
+                    sshCommand remote: remote, command:  "sh -c 'set -e; export basePath=\"$codePath\"; export APPNAME=$APPNAME; export appVersion=\"$appVersion\";   export WebDav_BaseUrl=\"$WebDav_BaseUrl\"; export WebDav_User=\"$WebDav_User\";    cd $codePath/Publish/DevOps2/release-bash; sh 78.push-releaseFiles-to-webdav.bash;  '"
                 }
             }
         }

Publish/DevOps2/release-bash/71.file-zip.sh

@@ -16,6 +16,11 @@ export APPNAME=xxxxxx
 #----------------------------------------------
 echo "71.file-zip.sh"
 
+if [ ! -d "$basePath/Publish/release/release" ]; then
+    echo '71.file-zip.sh -> skip for no files exist'
+    exit 0
+fi
+
 docker run --rm -i \
 -v $basePath:/root/code \
 serset/filezip bash -c "

Publish/DevOps2/release-bash/72.nuget-push.sh

@@ -13,18 +13,21 @@ export NUGET_KEY=xxxxxxxxxx
 
 # "
 
-
-nugetPath=Publish/release/release/nuget
- 
-
 #----------------------------------------------
 echo "72.nuget-push.sh"
+
+if [ ! -d "$basePath/Publish/release/release/nuget" ]; then
+    echo '71.file-zip.sh -> skip for no nuget files exist'
+    exit 0
+fi
+
+
 docker run -i --rm \
 --env LANG=C.UTF-8 \
 -v $basePath:/root/code \
 serset/dotnet:sdk-6.0 \
 bash -c "
-for file in /root/code/$nugetPath/*.nupkg
+for file in /root/code/Publish/release/release/nuget/*.nupkg
 do
     echo nuget push \$file
     dotnet nuget push \$file -k ${NUGET_KEY} -s ${NUGET_SERVER} --skip-duplicate

Publish/DevOps2/release-bash/73.docker-image-build-push.sh

@@ -24,10 +24,16 @@ export DOCKER_BuildxExtArgs=
 #---------------------------------------------------------------------
 echo "73.docker-image-build-push.sh"
 
+if [ ! -d "$basePath/Publish/release/release/docker-image" ]; then
+    echo '73.docker-image-build-push.sh -> skip for no docker image files exist'
+    exit 0
+fi
+
 if [ "$DOCKER_Buildx" != "false" ]; then
-	sh 75.docker-image-build-push_cross.bash
+    sh 75.docker-image-build-push_cross.bash
 else
-	sh 74.docker-image-build-push_amd64.bash
+    sh 74.docker-image-build-push_amd64.bash
 fi
 
 
+

Publish/DevOps2/release-bash/78.push-releaseFiles-to-webdav.bash

@@ -0,0 +1,47 @@
+set -e
+
+
+#---------------------------------------------------------------------
+# args
+args_="
+
+export basePath=/root/temp/svn
+
+export APPNAME=Vit.Library
+export appVersion=2.2.14
+
+export WebDav_BaseUrl="https://nextcloud.xxx.com/remote.php/dav/files/release/releaseFiles/ki_jenkins"
+export WebDav_User="username:pwd"
+
+# "
+
+
+# will not throw errors if WebDav service is not available
+
+
+#---------------------------------------------------------------------
+echo "78.push-releaseFiles-to-webdav.bash -> #1 create dir"
+
+docker run -i --rm curlimages/curl sh -c "curl -X MKCOL -u \"$WebDav_User\" \"$WebDav_BaseUrl/$APPNAME\" " || true
+docker run -i --rm curlimages/curl sh -c "curl -X MKCOL -u \"$WebDav_User\" \"$WebDav_BaseUrl/$APPNAME/$appVersion\" " || true
+
+#---------------------------------------------------------------------
+echo "78.push-releaseFiles-to-webdav.bash -> #2 push release files"
+
+docker run -i --rm \
+-v "$basePath/Publish/release/release-zip":/releaseFiles \
+curlimages/curl \
+sh -c "
+cd /releaseFiles
+for file in /releaseFiles/*
+do
+    echo ''
+    echo '----------------------------'
+    fileName=\"\${file##*/}\"
+    echo push file: \$fileName
+    curl -X PUT -u \"$WebDav_User\" -T "/releaseFiles/\$fileName" \"$WebDav_BaseUrl/$APPNAME/$appVersion/\$fileName\"
+done
+" || true
+
+#---------------------------------------------------------------------
+echo "78.push-releaseFiles-to-webdav.bash -> #3 success"

README.md

@@ -8,8 +8,8 @@ Sers was a set of cross-platform and cross-language open source micro-service ar
  
 
 | Build | NuGet | Docker |
-|--|--|--|
-|![](https://github.com/serset/Sers/workflows/CI/badge.svg) | [![](https://img.shields.io/nuget/v/Sers.ServiceStation.svg)](https://www.nuget.org/packages/Sers.ServiceStation/) ![](https://img.shields.io/nuget/dt/Sers.ServiceStation.svg)   | ![](https://img.shields.io/docker/v/serset/sers/latest.svg) ![](https://img.shields.io/docker/pulls/serset/sers.svg) ![](https://img.shields.io/docker/image-size/serset/sers/latest.svg)
+| -------- | -------- | -------- |
+|![](https://github.com/serset/Sers/workflows/ki_multibranch/badge.svg) | [![](https://img.shields.io/nuget/v/Sers.ServiceStation.svg)](https://www.nuget.org/packages/Sers.ServiceStation/) ![](https://img.shields.io/nuget/dt/Sers.ServiceStation.svg)   | ![](https://img.shields.io/docker/v/serset/sers/latest.svg) ![](https://img.shields.io/docker/pulls/serset/sers.svg) ![](https://img.shields.io/docker/image-size/serset/sers/latest.svg) |
 
  
 Sers has the following features:  
@@ -25,7 +25,7 @@ Sers has the following features:
 # Station classification
  Sers was a centralized micro-service architecture protocol, which was divided into service center and service station according to identity.
 
-## (x.1)Service Center
+## 1. Service Center
 ServiceCenter provides services such as service registration, service discovery, request distribution (load balancing), API management, service station management, message subscription, etc.
 
 All service sites need to register with this service center. All requests are forwarded through the service center.
@@ -37,7 +37,7 @@ The service governance entry address is http://ip:6022/_gover_/index.html
 The port number is configured in the appsettings.json configuration file.
 
 
-## (x.2)Service Station
+## 2. Service Station
 Service Station provides application layer services.
 
 Service station can have multiple, connected to each other through a service center. When the service station is started, it initiates a service registration request to the service center to register the service.
@@ -48,7 +48,7 @@ The service provided is identified by a URL (Route).
 
 The service station can be attached directly to the service center (dispensing with the communication layer, monomer mode) to provide services. The performance data of 2 million QPS was measured in this mode.
 
-## (x.3)Service Gateway
+## 3. Service Gateway
 The Service Gateway exposes internal services to the outside world over HTTP.
 
 A service gateway is a special service station. The gateway listens for the request using HTTP and forwards the request to the service center. The service gateway is the external gateway to the service.

dotnet/Gateway/App.Gateway/App.Gateway.csproj

@@ -8,7 +8,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
         <PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
     </PropertyGroup>
 

dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Sers.CL.Ipc.NamedPipe.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Sers.CL.Socket.Iocp.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/Sers.CL.Socket.ThreadWait.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/Library/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/Sers.CL.WebSocket.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/Library/Sers/Sers.Core/Sers.Core.Module.Api.ApiEvent.BeforeCallApi.JsonWebToken/Sers.Core.Module.Api.ApiEvent.BeforeCallApi.JsonWebToken.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/Library/Sers/Sers.Core/Sers.Core/Sers.Core.csproj

@@ -7,7 +7,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/Library/Sers/Sers.Gateway/Sers.Gateway/Sers.Gateway.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/Library/Sers/Sers.Hardware/Sers.Hardware/Sers.Hardware.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/Library/Sers/Sers.Serslot/Sers.Serslot/Sers.Serslot.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/Library/Sers/Sers.ServiceStation/Sers.ServiceStation/Sers.ServiceStation.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/Data/PageData.cs

@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using Vit.Core.Util.ComponentModel.Model;
-
-namespace Vit.Core.Util.ComponentModel.Data
-{
-    public class PageData : PageData<object>
-    {
-        public PageData(PageInfo pageInfo = null):base(pageInfo)
-        {            
-        }
-    }
-
-    public class PageData<T> : PageInfo
-    {
-
-        public PageData(PageInfo pageInfo=null)
-        {
-            if (null != pageInfo)
-            {
-                pageSize = pageInfo.pageSize;
-                pageIndex = pageInfo.pageIndex;
-            }
-        }
-
-        /// <summary>
-        /// rows
-        /// </summary>
-        [SsDescription("rows")]
-        public List<T> rows;
-
-
-        /// <summary>
-        /// totalCount
-        /// </summary>
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        [SsExample("1000")]
-        [SsDescription("totalCount")]
-        public int totalCount;
-    }
-}

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/Data/PageInfo.cs

@@ -1,28 +0,0 @@
-using Newtonsoft.Json;
-using Vit.Core.Util.ComponentModel.Model;
-
-namespace Vit.Core.Util.ComponentModel.Data
-{
-    public class PageInfo
-    {
-        /// <summary>
-        /// pageSize
-        /// </summary>
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        [SsExample("10")]
-        [SsDescription("pageSize")]
-        public int pageSize;
-
-        /// <summary>
-        /// pageIndex, starting from 1
-        /// </summary>
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        [SsExample("1")]
-        [SsDescription("pageIndex, starting from 1")]
-        public int pageIndex;     
-       
-    }
-
-
-
-  }

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/Data/SortItem.cs

@@ -1,21 +0,0 @@
-using Vit.Core.Util.ComponentModel.Model;
-
-namespace Vit.Core.Util.ComponentModel.Query
-{
-    public class SortItem
-    {
-        /// <summary>
-        /// field name(can be cascaded). demo "parent.id"
-        /// </summary>
-        [SsExample("id")]
-        [SsDescription("field name(can be cascaded). demo \"parent.id\"")]
-        public string field;
-
-        /// <summary>
-        /// whether is order by ascendin
-        /// </summary>
-        [SsExample("true")]
-        [SsDescription("whether is order by ascending")]
-        public bool asc;
-    }
-}

dotnet/Library/Vit/Vit.Core/Vit.Core/Vit.Core.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.19</Version>
+        <Version>2.1.20</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/Library/Vit/Vit.Net.Http.FormFile/Vit.Net.Http.FormFile.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.19</Version>
+        <Version>2.1.20</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/Library/Vit/Vit.WebHost/Vit.WebHost.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.19</Version>
+        <Version>2.1.20</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/ServiceCenter/App.Gover.Gateway/App.Gover.Gateway.csproj

@@ -8,7 +8,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
         <PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
     </PropertyGroup>
 

dotnet/ServiceCenter/App.ServiceCenter/App.ServiceCenter.csproj

@@ -8,7 +8,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
         <PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
     </PropertyGroup>
 

dotnet/ServiceCenter/Sers.ServiceCenter/Sers.Gover/Sers.Gover.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
     </PropertyGroup>
 
     <PropertyGroup>

dotnet/ServiceStation/Demo/SersLoader/Did.SersLoader.Demo/Did.SersLoader.Demo.csproj

@@ -8,7 +8,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
         <Description>https://github.com/serset/Sers</Description>
     </PropertyGroup>

dotnet/ServiceStation/Demo/StressTest/App.Robot.Station/App.Robot.Station.csproj

@@ -9,7 +9,7 @@
         <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
         <RunPostBuildEvent>Always</RunPostBuildEvent>
-        <Version>2.1.22</Version>
+        <Version>2.1.23</Version>
         <Description>https://github.com/serset/Sers</Description>
     </PropertyGroup>