Sync eng/common directory with azure-sdk-tools repository

Azure · Jul 7, 2020 · dca0733 · dca0733
1 parent 1961116
commit dca0733
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/eng/common/scripts/Verify-ChangeLog.ps1 b/eng/common/scripts/Verify-ChangeLog.ps1
@@ -11,6 +11,7 @@ param (
     [boolean]$ForRelease=$False
 )
 
+$ProgressPreference = SilentlyContinue
 . (Join-Path $PSScriptRoot SemVer.ps1)
 Import-Module (Join-Path $PSScriptRoot modules ChangeLog-Operations.psm1)
 

diff --git a/eng/common/scripts/modules/Package-Properties.psm1 b/eng/common/scripts/modules/Package-Properties.psm1
@@ -45,6 +45,7 @@ class PackageProps
     }
 }
 
+$ProgressPreference = SilentlyContinue
 Install-Module -Name powershell-yaml -RequiredVersion 0.4.1 -Force -Scope CurrentUser
 
 function Extract-PkgProps ($pkgPath, $serviceName, $pkgName, $lang)
@@ -239,8 +240,14 @@ function Get-PkgListFromYml ($ciYmlPath)
 {
     $ciYmlContent = Get-Content $ciYmlPath -Raw
     $ciYmlObj = ConvertFrom-Yaml $ciYmlContent -Ordered
-    $artifactsInCI = $ciYmlObj["stages"][0]["parameters"]["Artifacts"]
-
+    if ($ciYmlObj.Contains("stages"))
+    {
+      $artifactsInCI = $ciYmlObj["stages"][0]["parameters"]["Artifacts"]
+    }
+    elseif ($ciYmlObj.Contains("extends")) 
+    {
+      $artifactsInCI = $ciYmlObj["extends"]["parameters"]["Artifacts"]
+    }
     if ($artifactsInCI -eq $null)
     {
         Write-Error "Failed to retrive package names in ci $ciYmlPath"