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

scbedd · azure-sdk · commit ab2c371235ea · 2024-10-10T19:54:13.000Z
diff --git a/eng/common/scripts/Helpers/Package-Helpers.ps1 b/eng/common/scripts/Helpers/Package-Helpers.ps1
@@ -79,7 +79,7 @@ function CompatibleConvertFrom-Yaml {
   # Initialize any variables or checks that need to be done once
   $yqPresent = Get-Command 'yq' -ErrorAction SilentlyContinue
   if (-not $yqPresent) {
-    . (Join-Path $PSScriptRoot "../../../../eng/common/scripts/Helpers" PSModule-Helpers.ps1)
+    . (Join-Path $PSScriptRoot PSModule-Helpers.ps1)
     Install-ModuleIfNotInstalled -WhatIf:$false "powershell-yaml" "0.4.1" | Import-Module
   }
 
@@ -90,4 +90,4 @@ function CompatibleConvertFrom-Yaml {
   else {
       return ConvertFrom-Yaml $content
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ function CompatibleConvertFrom-Yaml {`
`79`	`79`	`# Initialize any variables or checks that need to be done once`
`80`	`80`	`$yqPresent = Get-Command 'yq' -ErrorAction SilentlyContinue`
`81`	`81`	`if (-not $yqPresent) {`
`82`		`- . (Join-Path $PSScriptRoot "../../../../eng/common/scripts/Helpers" PSModule-Helpers.ps1)`
	`82`	`+ . (Join-Path $PSScriptRoot PSModule-Helpers.ps1)`
`83`	`83`	`Install-ModuleIfNotInstalled -WhatIf:$false "powershell-yaml" "0.4.1" \| Import-Module`
`84`	`84`	`}`
`85`	`85`
`@@ -90,4 +90,4 @@ function CompatibleConvertFrom-Yaml {`
`90`	`90`	`else {`
`91`	`91`	`return ConvertFrom-Yaml $content`
`92`	`92`	`}`
`93`		`-}`
	`93`	`+}`