Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync eng/common directory with azure-sdk-tools for PR 6544 #21221

Merged
merged 2 commits into from
Jul 20, 2023
Merged

Sync eng/common directory with azure-sdk-tools for PR 6544 #21221

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
232cf00
Only save package properties for track 2 packages (prevents overwrite…
danieljurek Jul 19, 2023
ca507e1
Only overwrite if the package is track 2
danieljurek Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions eng/common/scripts/Save-Package-Properties.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ an artifact name property is available in the package properties.
Can optionally add a dev version property which can be used logic for daily
builds.

In cases of collisions where track 2 packages (IsNewSdk = true) have the same
filename as track 1 packages (e.g. same artifact name or package name), the
track 2 package properties will be written.

.PARAMETER serviceDirectory
Service directory in which to search for packages

Expand Down Expand Up @@ -87,6 +91,7 @@ function GetRelativePath($path) {
return $relativePath
}

$exportedPaths = @{}
$allPackageProperties = Get-AllPkgProperties $serviceDirectory
if ($allPackageProperties)
{
Expand Down Expand Up @@ -114,6 +119,15 @@ if ($allPackageProperties)
Write-Host "Creating directory $($outDir) for json property file"
New-Item -ItemType Directory -Path $outDir
}

# If package properties for a track 2 (IsNewSdk = true) package has
# already been written, skip writing to that same path.
if ($exportedPaths.ContainsKey($outputPath) -and $exportedPaths[$outputPath].IsNewSdk -eq $true) {
Write-Host "Track 2 package info with file name $($outputPath) already exported. Skipping export."
continue
}
$exportedPaths[$outputPath] = $pkg

SetOutput $outputPath $pkg
}

Expand Down