Merge branch 'development' into 'rel/major'

Development

See merge request liermao/microservice-autodevopspipelines!19

devops/PipeLines/Creation/001_CI.sh

@@ -47,10 +47,9 @@ function CI()
 GetServices services
 for service in ${services}
 do
-    GetServicePrefix ${service} servicePrefix
-	IsPublishableOf ${servicePrefix} isPublishable
-	GetServiceName "${servicePrefix}" serviceName
-	CI "${servicePrefix}" "./src/${servicePrefix}/${serviceName}.csproj"
+	IsPublishableOf ${service} isPublishable
+	GetServiceName "${service}" serviceName
+	CI "${service}" "./src/${service}/${serviceName}.csproj"
 done
 
 echo ""

devops/PipeLines/Functions.sh

@@ -4,7 +4,7 @@ set -e
 
 function GetServices()
 {
-    declare svcs=($(ls -l ./src/Services | awk 'NR>1'))
+    declare svcs=($(ls ./src/Services|xargs -d '/' echo))
 	eval $1="${svcs}"
 }
 
@@ -15,13 +15,6 @@ function GetServiceName()
 	eval $2="${name}"
 }
 
-function GetServicePrefix()
-{
-    declare service=$1
-	declare prefix=($(echo ${service} | awk '{print $9}')) 
-	eval $2="${prefix}"
-}
-
 function GetAppName()
 {
     declare name=($(grep -oP '(?<=AppName>)[^<]+' "./devops/app.props"))