From 5dfe115febc9ebc7becec91840cf4566e69ee887 Mon Sep 17 00:00:00 2001
From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Date: Tue, 7 Jul 2020 15:14:52 -0700
Subject: [PATCH] Sync eng/common directory with azure-sdk-tools repository
 (#12870)

---
 eng/common/scripts/Verify-ChangeLog.ps1            |  1 +
 eng/common/scripts/modules/Package-Properties.psm1 | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/eng/common/scripts/Verify-ChangeLog.ps1 b/eng/common/scripts/Verify-ChangeLog.ps1
index 816a82f5bcb25..7a821a1d54b06 100644
--- 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
index dca123f929f71..01865594f6cf3 100644
--- 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"