Sync eng/common directory with azure-sdk-tools for PR 1203 (#17674)

* Refactoring artifact-metadata-parsing.ps1, update-docs-metadata.ps1, and create-tags-and-git-release.ps1 * Clean up common imports * Refactor Update-docs-ci.ps1 Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>
Azure · Nov 19, 2020 · f370be5 · f370be5
1 parent 000849c
commit f370be5
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 637 deletions.
diff --git a/eng/common/scripts/Add-IssueComment.ps1 b/eng/common/scripts/Add-IssueComment.ps1
@@ -16,7 +16,7 @@ param(
   [string]$AuthToken
 )
 
-. "${PSScriptRoot}\common.ps1"
+. (Join-Path $PSScriptRoot common.ps1)
 
 try {
   Add-GithubIssueComment -RepoOwner $RepoOwner -RepoName $RepoName `

diff --git a/eng/common/scripts/Add-IssueLabels.ps1 b/eng/common/scripts/Add-IssueLabels.ps1
@@ -16,7 +16,7 @@ param(
   [string]$AuthToken
 )
 
-. "${PSScriptRoot}\common.ps1"
+. (Join-Path $PSScriptRoot common.ps1)
 
 try {
   Add-GithubIssueLabels -RepoOwner $RepoOwner -RepoName $RepoName `

diff --git a/eng/common/scripts/Delete-RemoteBranches.ps1 b/eng/common/scripts/Delete-RemoteBranches.ps1
@@ -5,7 +5,7 @@ param(
   $AuthToken
 )
 
-. "${PSScriptRoot}\common.ps1"
+. (Join-Path $PSScriptRoot common.ps1)
 
 LogDebug "Operating on Repo [ $RepoName ]"
 try{

diff --git a/eng/common/scripts/Get-PullRequestCreator.ps1 b/eng/common/scripts/Get-PullRequestCreator.ps1
@@ -12,7 +12,7 @@ param (
     [string]$AuthToken
 )
 
-. "${PSScriptRoot}\common.ps1"
+. (Join-Path $PSScriptRoot common.ps1)
 
 try
 {

diff --git a/eng/common/scripts/Package-Properties.ps1 b/eng/common/scripts/Package-Properties.ps1
@@ -93,7 +93,7 @@ function Get-PkgProperties
     {
         $pkgDirectoryPath = Join-Path $serviceDirectoryPath $directory.Name
 
-        if ((Get-ChildItem -Path Function: | ? { $_.Name -eq $GetPackageInfoFromRepoFn }).Count -gt 0)
+        if ($GetPackageInfoFromRepoFn -and (Test-Path "Function:$GetPackageInfoFromRepoFn"))
         {
             $pkgProps = &$GetPackageInfoFromRepoFn -pkgPath $pkgDirectoryPath -serviceDirectory $ServiceDirectory -pkgName $PackageName
         }

diff --git a/eng/common/scripts/Queue-Pipeline.ps1 b/eng/common/scripts/Queue-Pipeline.ps1
@@ -21,8 +21,7 @@ param(
   [string]$Base64EncodedAuthToken
 )
 
-. "${PSScriptRoot}\logging.ps1"
-. "${PSScriptRoot}\Invoke-DevOpsAPI.ps1"
+. (Join-Path $PSScriptRoot common.ps1)
 
 if ($CancelPreviousBuilds)
 {

diff --git a/eng/common/scripts/Submit-PullRequest.ps1 b/eng/common/scripts/Submit-PullRequest.ps1
@@ -59,7 +59,7 @@ param(
   [boolean]$CloseAfterOpenForTesting=$false
 )
 
-. "${PSScriptRoot}\common.ps1"
+. (Join-Path $PSScriptRoot common.ps1)
 
 try {
   $resp = Get-GitHubPullRequests -RepoOwner $RepoOwner -RepoName $RepoName `

diff --git a/eng/common/scripts/Update-ChangeLog.ps1 b/eng/common/scripts/Update-ChangeLog.ps1
@@ -22,7 +22,7 @@ if ($ReleaseDate -and ($Unreleased -eq $True)) {
     exit 1
 }
 
-. "${PSScriptRoot}\common.ps1"
+. (Join-Path $PSScriptRoot common.ps1)
 
 if ($ReleaseDate)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ param ( @@
         [string]$AuthToken
     )
-    . "${PSScriptRoot}\common.ps1"
+    . (Join-Path $PSScriptRoot common.ps1)
     try
     {
@@ Expand Down @@