dotnet/Doc/DevOps/github/30.nuget-pack.sh

@@ -7,16 +7,13 @@ set -e
 #(x.1)参数
 args_="
 
-export codePath=/root/temp/svn
-
-export NUGET_SERVER=https://api.nuget.org/v3/index.json
-export NUGET_KEY=xxxxxxxxxx
+export codePath=/root/temp/svn/dotnet
 
 # "
 
  
  
-export nugetPath=dotnet/Doc/Publish/nuget
+nugetPath=Doc/Publish/nuget
 
  
 

dotnet/Doc/DevOps/github/31.nuget-push.sh

@@ -6,17 +6,15 @@ set -e
 #(x.1)参数
 args_="
 
-export codePath=/root/temp/svn
+export codePath=/root/temp/svn/dotnet
 
 export NUGET_SERVER=https://api.nuget.org/v3/index.json
 export NUGET_KEY=xxxxxxxxxx
 
 # "
 
- 
- 
-export nugetPath=dotnet/Doc/Publish/nuget
 
+nugetPath=Doc/Publish/nuget
  
 
 #----------------------------------------------

dotnet/Doc/DevOps/github/70.docker-build.sh

@@ -5,7 +5,7 @@ set -e
 #(x.1)参数
 args_="
 
-export codePath=/root/docker/jenkins/workspace/sqler/svn
+export codePath=/root/temp/svn/dotnet
 
 export version=`grep '<Version>' ${codePath} -r --include *.csproj | grep -oP '>(.*)<' | tr -d '<>'`
 
@@ -15,7 +15,6 @@ export DOCKER_PASSWORD=xxx
 # "
 
  
-publishPath=${codePath}/dotnet/Doc/Publish
 netVersion=net6.0
 
 #---------------------------------------------------------------------

dotnet/Doc/DevOps/github/90.release-build.sh

@@ -5,7 +5,7 @@ set -e
 #(x.1)参数
 args_="
 
-export codePath=/root/docker/jenkins/workspace/sqler/svn 
+export codePath=/root/temp/svn/dotnet
 
 export version=`grep '<Version>' ${codePath} -r --include *.csproj | grep -oP '>(.*)<' | tr -d '<>'`
 
@@ -23,27 +23,27 @@ export name=Sers
 #----------------------------------------------
 echo "(x.2.1)发布文件-创建文件夹及内容"
 
-mkdir -p $codePath/Doc/Publish/Sers$version
+mkdir -p $codePath/Doc/Publish/release
 
  
 
 echo 1.创建 nuget-Sers
-/cp -rf  $codePath/Doc/Publish/nuget $codePath/Doc/Publish/Sers$version/nuget-Sers
+/cp -rf  $codePath/Doc/Publish/nuget $codePath/Doc/Publish/release/nuget
 
 echo 2.创建 SersPublish
-/cp -rf  $codePath/Doc/Publish/SersPublish $codePath/Doc/Publish/Sers$version/SersPublish
+/cp -rf  $codePath/Doc/Publish/SersPublish $codePath/Doc/Publish/release/SersPublish
 
 echo 3.创建 CL压测
-/cp -rf  $codePath/Doc/Publish/CL压测 $codePath/Doc/Publish/Sers$version/CL压测
+/cp -rf  $codePath/Doc/Publish/CL压测 $codePath/Doc/Publish/release/CL压测
 
 echo 4.创建 Sers压测
-/cp -rf  $codePath/Doc/Publish/Sers压测 $codePath/Doc/Publish/Sers$version/Sers压测
+/cp -rf  $codePath/Doc/Publish/Sers压测 $codePath/Doc/Publish/release/Sers压测
 
 echo 5.创建 docker制作镜像Sers
-/cp -rf  $codePath/Doc/Publish/SersDocker/docker制作镜像Sers $codePath/Doc/Publish/Sers$version/docker制作镜像Sers
+/cp -rf  $codePath/Doc/Publish/SersDocker/docker制作镜像Sers $codePath/Doc/Publish/release/docker制作镜像Sers
 
 echo 6.创建 docker部署Sers
-/cp -rf  $codePath/Doc/Publish/SersDocker/docker部署Sers $codePath/Doc/Publish/Sers$version/docker部署Sers
+/cp -rf  $codePath/Doc/Publish/SersDocker/docker部署Sers $codePath/Doc/Publish/release/docker部署Sers
 
 
 
@@ -51,7 +51,7 @@ echo 6.创建 docker部署Sers
 echo "(x.2.3)发布文件-压缩" 
 docker run --rm -i \
 -v $codePath/Publish:/root/file \
-serset/filezip dotnet FileZip.dll zip -i /root/file/Doc/Publish/Sers$version -o /root/file/Doc/Publish/${name}-${version}.zip
+serset/filezip dotnet FileZip.dll zip -i /root/file/Doc/Publish/release -o /root/file/Doc/Publish/${name}-${version}.zip
 
 
 

dotnet/Doc/DevOps/github/startup.sh

@@ -9,9 +9,8 @@ export codePath=$PWD
 cd $curWorkDir
 
 
-
-export name=sqler
-export projectPath=Sqler
+# export codePath=/root/temp/svn/dotnet
+export name=Sers
 
 #export DOCKER_USERNAME=serset
 #export DOCKER_PASSWORD=xxx

dotnet/Doc/cmd/Sers压缩包-创建.bat

@@ -8,33 +8,33 @@ echo ["%version%"]
 
 cd /d ..\Publish
  
-mkdir Publish\Sers%version%
+mkdir release
+mkdir release/Sers-%version%
 
 
-
-echo 1.´´½¨ nuget-Sers
-xcopy "nuget" "Publish/Sers%version%/nuget-Sers" /e /i /r /y 
+echo 1.´´½¨ nuget
+xcopy "nuget" "release/Sers-%version%/nuget" /e /i /r /y 
 
 echo 2.´´½¨ SersPublish
-xcopy "SersPublish" "Publish/Sers%version%/SersPublish" /e /i /r /y
+xcopy "SersPublish" "release/Sers-%version%/SersPublish" /e /i /r /y
 
 echo 3.´´½¨ CLѹ²â
-xcopy "CLѹ²â" "Publish/Sers%version%/CLѹ²â" /e /i /r /y
+xcopy "CLѹ²â" "release/Sers-%version%/CLѹ²â" /e /i /r /y
 
 echo 4.´´½¨ Sersѹ²â
-xcopy "Sersѹ²â" "Publish/Sers%version%/Sersѹ²â" /e /i /r /y
+xcopy "Sersѹ²â" "release/Sers-%version%/Sersѹ²â" /e /i /r /y
 
 echo 5.´´½¨ dockerÖÆ×÷¾µÏñSers
-xcopy "SersDocker/dockerÖÆ×÷¾µÏñSers" "Publish/Sers%version%/dockerÖÆ×÷¾µÏñSers" /e /i /r /y
+xcopy "SersDocker/dockerÖÆ×÷¾µÏñSers" "release/Sers-%version%/dockerÖÆ×÷¾µÏñSers" /e /i /r /y
 
 echo 6.´´½¨ docker²¿ÊðSers
-xcopy "SersDocker/docker²¿ÊðSers" "Publish/Sers%version%/docker²¿ÊðSers" /e /i /r /y
+xcopy "SersDocker/docker²¿ÊðSers" "release/Sers-%version%/docker²¿ÊðSers" /e /i /r /y
  
 
 
 
-echo 7.´´½¨ Sers%version%.zip
-dotnet ../cmd/FileZip/FileZip.dll zip -i "Publish/Sers%version%" -o "Publish/Sers-%version%.zip" 
+echo 7.´´½¨ Sers-%version%.zip
+dotnet ../cmd/FileZip/FileZip.dll zip -i "release/Sers-%version%" -o "release/Sers-%version%.zip" 
 
 
 cd /d ..\cmd

dotnet/Doc/cmd/清理-发布文件.bat

@@ -3,7 +3,4 @@ rd /s/q ..\Publish\SersPublish
 rd /s/q ..\Publish\CLѹ��
 rd /s/q ..\Publish\Sersѹ��
 rd /s/q ..\Publish\SersDocker
-rd /s/q ..\Publish\Publish
-
-
- 
+rd /s/q ..\Publish\release

dotnet/Doc/cmd/清理-所有.bat

@@ -2,8 +2,6 @@ VsTool.exe delete --path "..\.." --file "*.suo|*.user" --directory "obj|bin|.vs|
 
 
 call "清理-发布文件.bat"
- 
-::rd /s/q 生成压缩包\Publish
 
 echo succeed
 echo succeed