Sync eng/common directory with azure-sdk-tools repository for Tools PR 823

azure-sdk · azure-sdk · commit 6a92dd3c02c2 · 2020-09-02T03:05:25.000Z
diff --git a/eng/common/pipelines/templates/steps/verify-changelog.yml b/eng/common/pipelines/templates/steps/verify-changelog.yml
@@ -5,6 +5,9 @@ parameters:
 - name: ServiceName
   type: string
   default: 'not-specified'
+- name: ServiceDirectory
+  type: string
+  default: ''
 - name: ForRelease
   type: boolean
   default: false
@@ -15,9 +18,7 @@ steps:
       filePath: $(Build.SourcesDirectory)/eng/common/scripts/Verify-ChangeLog.ps1
       arguments: >
         -PackageName ${{ parameters.PackageName }}
-        -ServiceName ${{ parameters.ServiceName }}
-        -RepoRoot $(Build.SourcesDirectory)
-        -RepoName $(Build.Repository.Name)
+        -ServiceDirectory ${{ coalesce(parameters.ServiceDirectory, parameters.ServiceName) }}
         -ForRelease $${{ parameters.ForRelease }}
       pwsh: true
       workingDirectory: $(Pipeline.Workspace)
diff --git a/eng/common/scripts/Package-Properties.ps1 b/eng/common/scripts/Package-Properties.ps1
@@ -1,66 +1,65 @@
 # Helper functions for retireving useful information from azure-sdk-for-* repo
-# Example Use : Import-Module .\eng\common\scripts\modules
 class PackageProps
 {
-    [string]$pkgName
-    [string]$pkgVersion
-    [string]$pkgDirectoryPath
-    [string]$pkgServiceName
-    [string]$pkgReadMePath
-    [string]$pkgChangeLogPath
-    [string]$pkgGroup
-
-    PackageProps([string]$pkgName,[string]$pkgVersion,[string]$pkgDirectoryPath,[string]$pkgServiceName)
+    [string]$Name
+    [string]$Version
+    [string]$DirectoryPath
+    [string]$ServiceDirectory
+    [string]$ReadMePath
+    [string]$ChangeLogPath
+    [string]$Group
+
+    PackageProps([string]$name, [string]$version, [string]$directoryPath, [string]$serviceDirectory)
     {
-        $this.Initialize($pkgName, $pkgVersion, $pkgDirectoryPath, $pkgServiceName)
+        $this.Initialize($name, $version, $directoryPath, $serviceDirectory)
     }
 
-    PackageProps([string]$pkgName,[string]$pkgVersion,[string]$pkgDirectoryPath,[string]$pkgServiceName,[string]$pkgGroup="")
+    PackageProps([string]$name, [string]$version, [string]$directoryPath, [string]$serviceDirectory, [string]$group = "")
     {
-        $this.Initialize($pkgName, $pkgVersion, $pkgDirectoryPath, $pkgServiceName, $pkgGroup)
+        $this.Initialize($name, $version, $directoryPath, $serviceDirectory, $group)
     }
 
     hidden [void]Initialize(
-        [string]$pkgName,
-        [string]$pkgVersion,
-        [string]$pkgDirectoryPath,
-        [string]$pkgServiceName
+        [string]$name,
+        [string]$version,
+        [string]$directoryPath,
+        [string]$serviceDirectory
     )
     {
-        $this.pkgName = $pkgName
-        $this.pkgVersion = $pkgVersion
-        $this.pkgDirectoryPath = $pkgDirectoryPath
-        $this.pkgServiceName = $pkgServiceName
+        $this.Name = $name
+        $this.Version = $version
+        $this.DirectoryPath = $directoryPath
+        $this.ServiceDirectory = $serviceDirectory
 
-        if (Test-Path (Join-Path $pkgDirectoryPath "README.md"))
+        if (Test-Path (Join-Path $directoryPath "README.md"))
         {
-            $this.pkgReadMePath = Join-Path $pkgDirectoryPath "README.md"
+            $this.ReadMePath = Join-Path $directoryPath "README.md"
         } 
         else
         {
-            $this.pkgReadMePath = $null
+            $this.ReadMePath = $null
         }
 
-        if (Test-Path (Join-Path $pkgDirectoryPath "CHANGELOG.md"))
+        if (Test-Path (Join-Path $directoryPath "CHANGELOG.md"))
         {
-            $this.pkgChangeLogPath = Join-Path $pkgDirectoryPath "CHANGELOG.md"
+            $this.ChangeLogPath = Join-Path $directoryPath "CHANGELOG.md"
         } 
         else
         {
-            $this.pkgChangeLogPath = $null
+            $this.ChangeLogPath = $null
         }
     }
 
     hidden [void]Initialize(
-        [string]$pkgName,
-        [string]$pkgVersion,
-        [string]$pkgDirectoryPath,
-        [string]$pkgServiceName,
-        [string]$pkgGroup
+        [string]$name,
+        [string]$version,
+        [string]$directoryPath,
+        [string]$serviceDirectory,
+        [string]$group
     )
     {
-        $this.Initialize($pkgName, $pkgVersion, $pkgDirectoryPath, $pkgServiceName)
-        $this.pkgGroup = $pkgGroup
+        $this.Initialize($name, $version, $directoryPath, $serviceDirectory)
+        $this.Group = $group
     }
 }
 
@@ -72,18 +71,17 @@ function Get-PkgProperties
 {
     Param
     (
-        [Parameter(Mandatory=$true)]
+        [Parameter(Mandatory = $true)]
         [string]$PackageName,
-        [Parameter(Mandatory=$true)]
-        [string]$ServiceName
+        [Parameter(Mandatory = $true)]
+        [string]$ServiceDirectory
     )
 
-    $pkgDirectoryName = $null
     $pkgDirectoryPath = $null
-    $serviceDirectoryPath = Join-Path $RepoRoot "sdk" $ServiceName
+    $serviceDirectoryPath = Join-Path $RepoRoot "sdk" $ServiceDirectory
     if (!(Test-Path $serviceDirectoryPath))
     {
-        Write-Error "Service Directory $ServiceName does not exist"
+        Write-Error "Service Directory $ServiceDirectory does not exist"
         exit 1
     }
 
@@ -92,13 +90,13 @@ function Get-PkgProperties
     foreach ($directory in $directoriesPresent)
     {
         $pkgDirectoryPath = Join-Path $serviceDirectoryPath $directory.Name
-        if ($ExtractPkgProps)
+        if ($GetPackageInfoFromRepoFn)
         {
-            $pkgProps = &$ExtractPkgProps -pkgPath $pkgDirectoryPath -serviceName $ServiceName -pkgName $PackageName
+            $pkgProps = &$GetPackageInfoFromRepoFn -pkgPath $pkgDirectoryPath -serviceDirectory $ServiceDirectory -pkgName $PackageName
         }
         else
         {
-            Write-Error "The function '${ExtractPkgProps}' was not found."
+            Write-Error "The function 'Get-${Language}-PackageInfoFromRepo' was not found."
         }
 
         if ($pkgProps -ne $null)
@@ -112,11 +110,11 @@ function Get-PkgProperties
 # Takes ServiceName and Repo Root Directory
 # Returns important properties for each package in the specified service, or entire repo if the serviceName is not specified
 # Returns an Table of service key to array values of PS Object with properties @ { pkgName, pkgVersion, pkgDirectoryPath, pkgReadMePath, pkgChangeLogPath }
-function Get-AllPkgProperties ([string]$ServiceName=$null)
+function Get-AllPkgProperties ([string]$ServiceDirectory = $null)
 {
     $pkgPropsResult = @()
 
-    if ([string]::IsNullOrEmpty($ServiceName))
+    if ([string]::IsNullOrEmpty($ServiceDirectory))
     {
         $searchDir = Join-Path $RepoRoot "sdk"
         foreach ($dir in (Get-ChildItem $searchDir -Directory))
@@ -128,32 +126,32 @@ function Get-AllPkgProperties ([string]$ServiceName=$null)
                 $activePkgList = Get-PkgListFromYml -ciYmlPath (Join-Path $serviceDir "ci.yml")
                 if ($activePkgList -ne $null)
                 {
-                    $pkgPropsResult = Operate-OnPackages -activePkgList $activePkgList -serviceName $dir.Name -pkgPropsResult $pkgPropsResult
+                    $pkgPropsResult = Operate-OnPackages -activePkgList $activePkgList -ServiceDirectory $dir.Name -pkgPropsResult $pkgPropsResult
                 }
             }
         }
     } 
     else
     {
-        $serviceDir = Join-Path $RepoRoot "sdk" $ServiceName
+        $serviceDir = Join-Path $RepoRoot "sdk" $ServiceDirectory
         if (Test-Path (Join-Path $serviceDir "ci.yml"))
         {
             $activePkgList = Get-PkgListFromYml -ciYmlPath (Join-Path $serviceDir "ci.yml")
             if ($activePkgList -ne $null)
             {
-                $pkgPropsResult = Operate-OnPackages -activePkgList $activePkgList -serviceName $ServiceName -pkgPropsResult $pkgPropsResult
+                $pkgPropsResult = Operate-OnPackages -activePkgList $activePkgList -ServiceDirectory $ServiceDirectory -pkgPropsResult $pkgPropsResult
             }
         }
     }
 
     return $pkgPropsResult
 }
 
-function Operate-OnPackages ($activePkgList, $serviceName, [Array]$pkgPropsResult)
+function Operate-OnPackages ($activePkgList, $ServiceDirectory, [Array]$pkgPropsResult)
 {
     foreach ($pkg in $activePkgList)
     {
-        $pkgProps = Get-PkgProperties -PackageName $pkg["name"] -ServiceName $serviceName
+        $pkgProps = Get-PkgProperties -PackageName $pkg["name"] -ServiceDirectory $ServiceDirectory
         $pkgPropsResult += $pkgProps
     }
     return $pkgPropsResult
@@ -168,11 +166,11 @@ function Get-PkgListFromYml ($ciYmlPath)
     $ciYmlObj = ConvertFrom-Yaml $ciYmlContent -Ordered
     if ($ciYmlObj.Contains("stages"))
     {
-      $artifactsInCI = $ciYmlObj["stages"][0]["parameters"]["Artifacts"]
+        $artifactsInCI = $ciYmlObj["stages"][0]["parameters"]["Artifacts"]
     }
     elseif ($ciYmlObj.Contains("extends")) 
     {
-      $artifactsInCI = $ciYmlObj["extends"]["parameters"]["Artifacts"]
+        $artifactsInCI = $ciYmlObj["extends"]["parameters"]["Artifacts"]
     }
     if ($artifactsInCI -eq $null)
     {
diff --git a/eng/common/scripts/Verify-ChangeLog.ps1 b/eng/common/scripts/Verify-ChangeLog.ps1
@@ -3,17 +3,11 @@ param (
   [String]$ChangeLogLocation,
   [String]$VersionString,
   [string]$PackageName,
-  [string]$ServiceName,
-  [string]$RepoRoot,
-  [ValidateSet("net", "java", "js", "python")]
-  [string]$Language,
-  [string]$RepoName,
+  [string]$ServiceDirectory,
   [boolean]$ForRelease = $False
 )
 
-$ProgressPreference = "SilentlyContinue"
-. (Join-Path $PSScriptRoot SemVer.ps1)
-Import-Module (Join-Path $PSScriptRoot modules ChangeLog-Operations.psm1)
+. (Join-Path $PSScriptRoot common.ps1)
 
 $validChangeLog = $false
 if ($ChangeLogLocation -and $VersionString) 
@@ -22,22 +16,8 @@ if ($ChangeLogLocation -and $VersionString)
 }
 else
 {
-  Import-Module (Join-Path $PSScriptRoot modules Package-Properties.psm1)
-  if ([System.String]::IsNullOrEmpty($Language))
-  {
-    if ($RepoName -match "azure-sdk-for-(?<lang>[^-]+)")
-    {
-      $Language = $matches["lang"]
-    }
-    else
-    {
-      Write-Error "Failed to set Language automatically. Please pass the appropriate Language as a parameter."
-      exit 1
-    }
-  }
-
-  $PackageProp = Get-PkgProperties -PackageName $PackageName -ServiceName $ServiceName -Language $Language -RepoRoot $RepoRoot
-  $validChangeLog = Confirm-ChangeLogEntry -ChangeLogLocation $PackageProp.pkgChangeLogPath -VersionString $PackageProp.pkgVersion -ForRelease $ForRelease
+  $PackageProp = Get-PkgProperties -PackageName $PackageName -ServiceDirectory $ServiceDirectory
+  $validChangeLog = Confirm-ChangeLogEntry -ChangeLogLocation $PackageProp.ChangeLogPath -VersionString $PackageProp.Version -ForRelease $ForRelease
 }
 
 if (!$validChangeLog)
diff --git a/eng/common/scripts/common.ps1 b/eng/common/scripts/common.ps1
@@ -1,25 +1,29 @@
-$global:RepoRoot = Resolve-Path "${PSScriptRoot}..\..\..\.."
-$global:EngDir = Join-Path $global:RepoRoot "eng"
-$global:EngCommonDir = Join-Path $global:EngDir "common"
-$global:EngCommonScriptsDir = Join-Path $global:EngCommonDir "scripts"
-$global:EngScriptsDir = Join-Path $global:EngDir "scripts"
+$RepoRoot = Resolve-Path "${PSScriptRoot}..\..\..\.."
+$EngDir = Join-Path $RepoRoot "eng"
+$EngCommonDir = Join-Path $EngDir "common"
+$EngCommonScriptsDir = Join-Path $EngCommonDir "scripts"
+$EngScriptsDir = Join-Path $EngDir "scripts"
 
 # Import required scripts
-. (Join-Path $global:EngCommonScriptsDir SemVer.ps1)
-. (Join-Path $global:EngCommonScriptsDir Changelog-Operations.ps1)
-. (Join-Path $global:EngCommonScriptsDir Package-Properties.ps1)
+. (Join-Path $EngCommonScriptsDir SemVer.ps1)
+. (Join-Path $EngCommonScriptsDir ChangeLog-Operations.ps1)
+. (Join-Path $EngCommonScriptsDir Package-Properties.ps1)
 
 # Setting expected from common languages settings
-$global:Language = "Unknown"
-$global:PackageRepository = "Unknown"
-$global:packagePattern = "Unknown"
-$global:MetadataUri = "Unknown"
+$Language = "Unknown"
+$PackageRepository = "Unknown"
+$packagePattern = "Unknown"
+$MetadataUri = "Unknown"
 
 # Import common language settings
-$EngScriptsLanguageSettings = Join-path $global:EngScriptsDir "Language-Settings.ps1"
+$EngScriptsLanguageSettings = Join-path $EngScriptsDir "Language-Settings.ps1"
 if (Test-Path $EngScriptsLanguageSettings) {
   . $EngScriptsLanguageSettings
 }
+If ($LanguageShort -eq $null)
+{
+  $LangaugeShort = $Language
+}
 
 # Transformed Functions
 $GetPackageInfoFromRepoFn = "Get-${Language}-PackageInfoFromRepo"

Original file line number	Diff line number	Diff line change
`@@ -1,66 +1,65 @@`
`1`	`1`	`# Helper functions for retireving useful information from azure-sdk-for-* repo`
`2`		`-# Example Use : Import-Module .\eng\common\scripts\modules`
`3`	`2`	`class PackageProps`
`4`	`3`	`{`
`5`		`- [string]$pkgName`
`6`		`- [string]$pkgVersion`
`7`		`- [string]$pkgDirectoryPath`
`8`		`- [string]$pkgServiceName`
`9`		`- [string]$pkgReadMePath`
`10`		`- [string]$pkgChangeLogPath`
`11`		`- [string]$pkgGroup`
`12`		`-`
`13`		`- PackageProps([string]$pkgName,[string]$pkgVersion,[string]$pkgDirectoryPath,[string]$pkgServiceName)`
	`4`	`+ [string]$Name`
	`5`	`+ [string]$Version`
	`6`	`+ [string]$DirectoryPath`
	`7`	`+ [string]$ServiceDirectory`
	`8`	`+ [string]$ReadMePath`
	`9`	`+ [string]$ChangeLogPath`
	`10`	`+ [string]$Group`
	`11`	`+`
	`12`	`+ PackageProps([string]$name, [string]$version, [string]$directoryPath, [string]$serviceDirectory)`
`14`	`13`	`{`
`15`		`- $this.Initialize($pkgName, $pkgVersion, $pkgDirectoryPath, $pkgServiceName)`
	`14`	`+ $this.Initialize($name, $version, $directoryPath, $serviceDirectory)`
`16`	`15`	`}`
`17`	`16`
`18`		`- PackageProps([string]$pkgName,[string]$pkgVersion,[string]$pkgDirectoryPath,[string]$pkgServiceName,[string]$pkgGroup="")`
	`17`	`+ PackageProps([string]$name, [string]$version, [string]$directoryPath, [string]$serviceDirectory, [string]$group = "")`
`19`	`18`	`{`
`20`		`- $this.Initialize($pkgName, $pkgVersion, $pkgDirectoryPath, $pkgServiceName, $pkgGroup)`
	`19`	`+ $this.Initialize($name, $version, $directoryPath, $serviceDirectory, $group)`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`hidden [void]Initialize(`
`24`		`- [string]$pkgName,`
`25`		`- [string]$pkgVersion,`
`26`		`- [string]$pkgDirectoryPath,`
`27`		`- [string]$pkgServiceName`
	`23`	`+ [string]$name,`
	`24`	`+ [string]$version,`
	`25`	`+ [string]$directoryPath,`
	`26`	`+ [string]$serviceDirectory`
`28`	`27`	`)`
`29`	`28`	`{`
`30`		`- $this.pkgName = $pkgName`
`31`		`- $this.pkgVersion = $pkgVersion`
`32`		`- $this.pkgDirectoryPath = $pkgDirectoryPath`
`33`		`- $this.pkgServiceName = $pkgServiceName`
	`29`	`+ $this.Name = $name`
	`30`	`+ $this.Version = $version`
	`31`	`+ $this.DirectoryPath = $directoryPath`
	`32`	`+ $this.ServiceDirectory = $serviceDirectory`
`34`	`33`
`35`		`- if (Test-Path (Join-Path $pkgDirectoryPath "README.md"))`
	`34`	`+ if (Test-Path (Join-Path $directoryPath "README.md"))`
`36`	`35`	`{`
`37`		`- $this.pkgReadMePath = Join-Path $pkgDirectoryPath "README.md"`
	`36`	`+ $this.ReadMePath = Join-Path $directoryPath "README.md"`
`38`	`37`	`}`
`39`	`38`	`else`
`40`	`39`	`{`
`41`		`- $this.pkgReadMePath = $null`
	`40`	`+ $this.ReadMePath = $null`
`42`	`41`	`}`
`43`	`42`
`44`		`- if (Test-Path (Join-Path $pkgDirectoryPath "CHANGELOG.md"))`
	`43`	`+ if (Test-Path (Join-Path $directoryPath "CHANGELOG.md"))`
`45`	`44`	`{`
`46`		`- $this.pkgChangeLogPath = Join-Path $pkgDirectoryPath "CHANGELOG.md"`
	`45`	`+ $this.ChangeLogPath = Join-Path $directoryPath "CHANGELOG.md"`
`47`	`46`	`}`
`48`	`47`	`else`
`49`	`48`	`{`
`50`		`- $this.pkgChangeLogPath = $null`
	`49`	`+ $this.ChangeLogPath = $null`
`51`	`50`	`}`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`hidden [void]Initialize(`
`55`		`- [string]$pkgName,`
`56`		`- [string]$pkgVersion,`
`57`		`- [string]$pkgDirectoryPath,`
`58`		`- [string]$pkgServiceName,`
`59`		`- [string]$pkgGroup`
	`54`	`+ [string]$name,`
	`55`	`+ [string]$version,`
	`56`	`+ [string]$directoryPath,`
	`57`	`+ [string]$serviceDirectory,`
	`58`	`+ [string]$group`
`60`	`59`	`)`
`61`	`60`	`{`
`62`		`- $this.Initialize($pkgName, $pkgVersion, $pkgDirectoryPath, $pkgServiceName)`
`63`		`- $this.pkgGroup = $pkgGroup`
	`61`	`+ $this.Initialize($name, $version, $directoryPath, $serviceDirectory)`
	`62`	`+ $this.Group = $group`
`64`	`63`	`}`
`65`	`64`	`}`
`66`	`65`
`@@ -72,18 +71,17 @@ function Get-PkgProperties`
`72`	`71`	`{`
`73`	`72`	`Param`
`74`	`73`	`(`
`75`		`- [Parameter(Mandatory=$true)]`
	`74`	`+ [Parameter(Mandatory = $true)]`
`76`	`75`	`[string]$PackageName,`
`77`		`- [Parameter(Mandatory=$true)]`
`78`		`- [string]$ServiceName`
	`76`	`+ [Parameter(Mandatory = $true)]`
	`77`	`+ [string]$ServiceDirectory`
`79`	`78`	`)`
`80`	`79`
`81`		`- $pkgDirectoryName = $null`
`82`	`80`	`$pkgDirectoryPath = $null`
`83`		`- $serviceDirectoryPath = Join-Path $RepoRoot "sdk" $ServiceName`
	`81`	`+ $serviceDirectoryPath = Join-Path $RepoRoot "sdk" $ServiceDirectory`
`84`	`82`	`if (!(Test-Path $serviceDirectoryPath))`
`85`	`83`	`{`
`86`		`- Write-Error "Service Directory $ServiceName does not exist"`
	`84`	`+ Write-Error "Service Directory $ServiceDirectory does not exist"`
`87`	`85`	`exit 1`
`88`	`86`	`}`
`89`	`87`
`@@ -92,13 +90,13 @@ function Get-PkgProperties`
`92`	`90`	`foreach ($directory in $directoriesPresent)`
`93`	`91`	`{`
`94`	`92`	`$pkgDirectoryPath = Join-Path $serviceDirectoryPath $directory.Name`
`95`		`- if ($ExtractPkgProps)`
	`93`	`+ if ($GetPackageInfoFromRepoFn)`
`96`	`94`	`{`
`97`		`- $pkgProps = &$ExtractPkgProps -pkgPath $pkgDirectoryPath -serviceName $ServiceName -pkgName $PackageName`
	`95`	`+ $pkgProps = &$GetPackageInfoFromRepoFn -pkgPath $pkgDirectoryPath -serviceDirectory $ServiceDirectory -pkgName $PackageName`
`98`	`96`	`}`
`99`	`97`	`else`
`100`	`98`	`{`
`101`		`- Write-Error "The function '${ExtractPkgProps}' was not found."`
	`99`	`+ Write-Error "The function 'Get-${Language}-PackageInfoFromRepo' was not found."`
`102`	`100`	`}`
`103`	`101`
`104`	`102`	`if ($pkgProps -ne $null)`
`@@ -112,11 +110,11 @@ function Get-PkgProperties`
`112`	`110`	`# Takes ServiceName and Repo Root Directory`
`113`	`111`	`# Returns important properties for each package in the specified service, or entire repo if the serviceName is not specified`
`114`	`112`	`# Returns an Table of service key to array values of PS Object with properties @ { pkgName, pkgVersion, pkgDirectoryPath, pkgReadMePath, pkgChangeLogPath }`
`115`		`-function Get-AllPkgProperties ([string]$ServiceName=$null)`
	`113`	`+function Get-AllPkgProperties ([string]$ServiceDirectory = $null)`
`116`	`114`	`{`
`117`	`115`	`$pkgPropsResult = @()`
`118`	`116`
`119`		`- if ([string]::IsNullOrEmpty($ServiceName))`
	`117`	`+ if ([string]::IsNullOrEmpty($ServiceDirectory))`
`120`	`118`	`{`
`121`	`119`	`$searchDir = Join-Path $RepoRoot "sdk"`
`122`	`120`	`foreach ($dir in (Get-ChildItem $searchDir -Directory))`
`@@ -128,32 +126,32 @@ function Get-AllPkgProperties ([string]$ServiceName=$null)`
`128`	`126`	`$activePkgList = Get-PkgListFromYml -ciYmlPath (Join-Path $serviceDir "ci.yml")`
`129`	`127`	`if ($activePkgList -ne $null)`
`130`	`128`	`{`
`131`		`- $pkgPropsResult = Operate-OnPackages -activePkgList $activePkgList -serviceName $dir.Name -pkgPropsResult $pkgPropsResult`
	`129`	`+ $pkgPropsResult = Operate-OnPackages -activePkgList $activePkgList -ServiceDirectory $dir.Name -pkgPropsResult $pkgPropsResult`
`132`	`130`	`}`
`133`	`131`	`}`
`134`	`132`	`}`
`135`	`133`	`}`
`136`	`134`	`else`
`137`	`135`	`{`
`138`		`- $serviceDir = Join-Path $RepoRoot "sdk" $ServiceName`
	`136`	`+ $serviceDir = Join-Path $RepoRoot "sdk" $ServiceDirectory`
`139`	`137`	`if (Test-Path (Join-Path $serviceDir "ci.yml"))`
`140`	`138`	`{`
`141`	`139`	`$activePkgList = Get-PkgListFromYml -ciYmlPath (Join-Path $serviceDir "ci.yml")`
`142`	`140`	`if ($activePkgList -ne $null)`
`143`	`141`	`{`
`144`		`- $pkgPropsResult = Operate-OnPackages -activePkgList $activePkgList -serviceName $ServiceName -pkgPropsResult $pkgPropsResult`
	`142`	`+ $pkgPropsResult = Operate-OnPackages -activePkgList $activePkgList -ServiceDirectory $ServiceDirectory -pkgPropsResult $pkgPropsResult`
`145`	`143`	`}`
`146`	`144`	`}`
`147`	`145`	`}`
`148`	`146`
`149`	`147`	`return $pkgPropsResult`
`150`	`148`	`}`
`151`	`149`
`152`		`-function Operate-OnPackages ($activePkgList, $serviceName, [Array]$pkgPropsResult)`
	`150`	`+function Operate-OnPackages ($activePkgList, $ServiceDirectory, [Array]$pkgPropsResult)`
`153`	`151`	`{`
`154`	`152`	`foreach ($pkg in $activePkgList)`
`155`	`153`	`{`
`156`		`- $pkgProps = Get-PkgProperties -PackageName $pkg["name"] -ServiceName $serviceName`
	`154`	`+ $pkgProps = Get-PkgProperties -PackageName $pkg["name"] -ServiceDirectory $ServiceDirectory`
`157`	`155`	`$pkgPropsResult += $pkgProps`
`158`	`156`	`}`
`159`	`157`	`return $pkgPropsResult`
`@@ -168,11 +166,11 @@ function Get-PkgListFromYml ($ciYmlPath)`
`168`	`166`	`$ciYmlObj = ConvertFrom-Yaml $ciYmlContent -Ordered`
`169`	`167`	`if ($ciYmlObj.Contains("stages"))`
`170`	`168`	`{`
`171`		`- $artifactsInCI = $ciYmlObj["stages"][0]["parameters"]["Artifacts"]`
	`169`	`+ $artifactsInCI = $ciYmlObj["stages"][0]["parameters"]["Artifacts"]`
`172`	`170`	`}`
`173`	`171`	`elseif ($ciYmlObj.Contains("extends"))`
`174`	`172`	`{`
`175`		`- $artifactsInCI = $ciYmlObj["extends"]["parameters"]["Artifacts"]`
	`173`	`+ $artifactsInCI = $ciYmlObj["extends"]["parameters"]["Artifacts"]`
`176`	`174`	`}`
`177`	`175`	`if ($artifactsInCI -eq $null)`
`178`	`176`	`{`