From e5a9ff95ec6cfffc266eced3b8aae90f162a834a Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 30 Oct 2023 12:22:51 -0700 Subject: [PATCH] ensure that empty package properties are not honored when dumping them to json (#5081) Co-authored-by: Scott Beddall (from Dev Box) --- .../scripts/Save-Package-Properties.ps1 | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/eng/common/scripts/Save-Package-Properties.ps1 b/eng/common/scripts/Save-Package-Properties.ps1 index 44f622357..0e8ce26aa 100644 --- a/eng/common/scripts/Save-Package-Properties.ps1 +++ b/eng/common/scripts/Save-Package-Properties.ps1 @@ -101,34 +101,36 @@ if ($allPackageProperties) } foreach($pkg in $allPackageProperties) { - Write-Host "Package Name: $($pkg.Name)" - Write-Host "Package Version: $($pkg.Version)" - Write-Host "Package SDK Type: $($pkg.SdkType)" - Write-Host "Artifact Name: $($pkg.ArtifactName)" - Write-Host "Release date: $($pkg.ReleaseStatus)" - $configFilePrefix = $pkg.Name - if ($pkg.ArtifactName) - { - $configFilePrefix = $pkg.ArtifactName - } - $outputPath = Join-Path -Path $outDirectory "$configFilePrefix.json" - Write-Host "Output path of json file: $outputPath" - $outDir = Split-Path $outputPath -parent - if (-not (Test-Path -path $outDir)) - { - Write-Host "Creating directory $($outDir) for json property file" - New-Item -ItemType Directory -Path $outDir - } + if ($pkg.Name) { + Write-Host "Package Name: $($pkg.Name)" + Write-Host "Package Version: $($pkg.Version)" + Write-Host "Package SDK Type: $($pkg.SdkType)" + Write-Host "Artifact Name: $($pkg.ArtifactName)" + Write-Host "Release date: $($pkg.ReleaseStatus)" + $configFilePrefix = $pkg.Name + if ($pkg.ArtifactName) + { + $configFilePrefix = $pkg.ArtifactName + } + $outputPath = Join-Path -Path $outDirectory "$configFilePrefix.json" + Write-Host "Output path of json file: $outputPath" + $outDir = Split-Path $outputPath -parent + if (-not (Test-Path -path $outDir)) + { + 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 + # 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 + SetOutput $outputPath $pkg + } } Get-ChildItem -Path $outDirectory