auto commit 1.6

Author: lith

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

@@ -7,14 +7,9 @@ args_="
 
 export codePath=/root/temp/svn
 
-
-export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${codePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
-
-
-
 # "
 
- 
+
 
 #----------------------------------------------
 echo "(x.2)dotnet-publish"
@@ -26,7 +21,7 @@ mkdir -p $codePath/Publish/release/release/publish
 docker run -i --rm \
 --env LANG=C.UTF-8 \
 -v $codePath:/root/code \
-serset/dotnet:6.0-sdk \
+serset/dotnet:sdk-6.0 \
 bash -c "
 set -e
 

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

@@ -7,7 +7,6 @@ args_="
 
 export codePath=/root/temp/svn
 
-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/startup.bash

@@ -31,12 +31,9 @@ export name=filezip
 #----------------------------------------------
 echo "(x.2)get version" 
 export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${codePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
-# echo $version
-
-
-
-
+echo $version
 
+ 
 
 
 #----------------------------------------------