Merge branch 'development' into 'rel/major'

重命名

See merge request liermao/microservice-autodevopspipelines!33

devops/PipeLines/Functions.sh

@@ -58,15 +58,15 @@ function GetCiCdSettings()
 
 function GetMajor()
 {
-    declare m=($(grep -oP '(?<=VersionMajor>)[^<]+' "devops/version.props"))
+    declare m=($(grep -oP '(?<=Major>)[^<]+' "./devops/version.props"))
 	eval $1=${m}
 }
 
 function GetVersion()
 {
-    declare major=($(grep -oP '(?<=VersionMajor>)[^<]+' "./devops/version.props"))
-	declare minor=($(grep -oP '(?<=VersionMinor>)[^<]+' "./devops/version.props"))
-	declare patch=($(grep -oP '(?<=VersionPatch>)[^<]+' "./devops/version.props"))
+    declare major=($(grep -oP '(?<=Major>)[^<]+' "./devops/version.props"))
+	declare minor=($(grep -oP '(?<=Minor>)[^<]+' "./devops/version.props"))
+	declare patch=($(grep -oP '(?<=Patch>)[^<]+' "./devops/version.props"))
 	eval $1="${major}.${minor}.${patch}"
 }