Sync eng/common directory with azure-sdk-tools for PR 8912 (#30985)

azure-sdk · hallipr · web-flow · commit 202822c111b1 · 2024-09-03T15:51:47.000-07:00
Sync eng/common directory with azure-sdk-tools for PR Azure/azure-sdk-tools#8912 See [eng/common workflow](https://github.com/Azure/azure-sdk-tools/blob/main/eng/common/README.md#workflow) Co-authored-by: Patrick Hallisey <pahallis@microsoft.com>
diff --git a/eng/common/scripts/Package-Properties.ps1 b/eng/common/scripts/Package-Properties.ps1
@@ -119,7 +119,7 @@ function Get-PrPkgProperties([string]$InputDiffJson) {
     foreach ($pkg in $allPackageProperties)
     {
         $pkgDirectory = Resolve-Path "$($pkg.DirectoryPath)"
-        $lookupKey = ($pkg.DirectoryPath).Replace($RepoRoot, "").SubString(1)
+        $lookupKey = ($pkg.DirectoryPath).Replace($RepoRoot, "").TrimStart('\/')
         $lookup[$lookupKey] = $pkg
 
         foreach ($file in $targetedFiles)
@@ -132,12 +132,15 @@ function Get-PrPkgProperties([string]$InputDiffJson) {
                 if ($pkg.AdditionalValidationPackages) {
                     $additionalValidationPackages += $pkg.AdditionalValidationPackages
                 }
+
+                # avoid adding the same package multiple times
+                break
             }
         }
     }
 
     foreach ($addition in $additionalValidationPackages) {
-        $key = $addition.Replace($RepoRoot, "").SubString(1)
+        $key = $addition.Replace($RepoRoot, "").TrimStart('\/')
 
         if ($lookup[$key]) {
             $packagesWithChanges += $lookup[$key]

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ function Get-PrPkgProperties([string]$InputDiffJson) {`
`119`	`119`	`foreach ($pkg in $allPackageProperties)`
`120`	`120`	`{`
`121`	`121`	`$pkgDirectory = Resolve-Path "$($pkg.DirectoryPath)"`
`122`		`- $lookupKey = ($pkg.DirectoryPath).Replace($RepoRoot, "").SubString(1)`
	`122`	`+ $lookupKey = ($pkg.DirectoryPath).Replace($RepoRoot, "").TrimStart('\/')`
`123`	`123`	`$lookup[$lookupKey] = $pkg`
`124`	`124`
`125`	`125`	`foreach ($file in $targetedFiles)`
`@@ -132,12 +132,15 @@ function Get-PrPkgProperties([string]$InputDiffJson) {`
`132`	`132`	`if ($pkg.AdditionalValidationPackages) {`
`133`	`133`	`$additionalValidationPackages += $pkg.AdditionalValidationPackages`
`134`	`134`	`}`
	`135`	`+`
	`136`	`+ # avoid adding the same package multiple times`
	`137`	`+ break`
`135`	`138`	`}`
`136`	`139`	`}`
`137`	`140`	`}`
`138`	`141`
`139`	`142`	`foreach ($addition in $additionalValidationPackages) {`
`140`		`- $key = $addition.Replace($RepoRoot, "").SubString(1)`
	`143`	`+ $key = $addition.Replace($RepoRoot, "").TrimStart('\/')`
`141`	`144`
`142`	`145`	`if ($lookup[$key]) {`
`143`	`146`	`$packagesWithChanges += $lookup[$key]`