auto commit 1.6

Author: lith

Publish/DevOps/github/40.dotnet-publish.sh

@@ -8,7 +8,7 @@ args_="
 export codePath=/root/temp/svn
 
 
-export version=`grep '<Version>' ${codePath} -r --include *.csproj | grep -oP '>(.*)<' | tr -d '<>'`
+export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${codePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 
 
 

Publish/DevOps/github/70.docker-image-create.sh

@@ -7,8 +7,6 @@ args_="
 
 export codePath=/root/temp/svn
 
-export version=`grep '<Version>' "${codePath}" -r --include Sers.Core.csproj | grep -oP '>(.*)<' | tr -d '<>'`
-
 
 # "
 

Publish/DevOps/github/71.docker-image-build.sh

@@ -7,7 +7,7 @@ args_="
 
 export codePath=/root/temp/svn
 
-export version=`grep '<Version>' ${codePath} -r --include *.csproj | grep -oP '>(.*)<' | tr -d '<>'`
+export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${codePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 
 export DOCKER_USERNAME=serset
 export DOCKER_PASSWORD=xxx

Publish/DevOps/github/90.release-build.sh

@@ -7,7 +7,7 @@ args_="
 
 export codePath=/root/temp/svn
 
-export version=`grep '<Version>' ${codePath} -r --include *.csproj | grep -oP '>(.*)<' | tr -d '<>'`
+export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${codePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 
 export name=filezip
 

Publish/DevOps/github/91.release-github.sh

@@ -7,7 +7,7 @@ args_="
 
 export codePath=/root/temp/svn
 
-export version=`grep '<Version>' ${codePath} -r --include *.csproj | grep -oP '>(.*)<' | tr -d '<>'`
+export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${codePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 
 export name=filezip
 

Publish/DevOps/github/startup.bash

@@ -14,7 +14,6 @@ cd $curWorkDir
 # export codePath=/root/temp/svn
 
 export name=filezip
-export projectPath=FileZip
 
 #export DOCKER_USERNAME=serset
 #export DOCKER_PASSWORD=xxx
@@ -31,7 +30,7 @@ export projectPath=FileZip
 
 #----------------------------------------------
 echo "(x.2)get version" 
-export version=`grep '<Version>' ${codePath} -r --include *.csproj | grep -oP '>(.*)<' | tr -d '<>'`
+export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${codePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 # echo $version