Skip to content

Commit

Permalink
Sync eng/common directory with azure-sdk-tools for PR 1364 (Azure#18394)
Browse files Browse the repository at this point in the history
* Support sub directory for artifact location

* Fix as per review comment to avoid artifact sub path

* Package property file is not created for track1 and management pacakges.

* Fix property name case

* Fix as per review comments

* Fix as per review comments

* Use Config File param value as is

* Change to make path joineasily readable

Co-authored-by: praveenkuttappan <prmarott@microsoft.com>
  • Loading branch information
2 people authored and jongio committed Feb 9, 2021
1 parent e689db7 commit 44f43bc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
11 changes: 7 additions & 4 deletions eng/common/scripts/Create-APIReview.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ Param (
[string] $APIKey,
[Parameter(Mandatory=$True)]
[string] $APILabel,
[string] $PackageName = ""
[string] $PackageName,
[string] $ConfigFileDir = ""
)


Expand Down Expand Up @@ -82,17 +83,19 @@ else
}

$FoundFailure = $False
$pkgInfoPath = Join-Path -Path $ArtifactPath "PackageInfo"
if (-not $ConfigFileDir)
{
$ConfigFileDir = Join-Path -Path $ArtifactPath "PackageInfo"
}
foreach ($pkgName in $responses.Keys)
{
$respCode = $responses[$pkgName]
if ($respCode -ne '200')
{
$pkgPropPath = Join-Path -Path $pkgInfoPath ($PackageName + ".json")
$pkgPropPath = Join-Path -Path $ConfigFileDir "$PackageName.json"
if (-Not (Test-Path $pkgPropPath))
{
Write-Host " Package property file path $($pkgPropPath) is invalid."
$FoundFailure = $True
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion eng/common/scripts/Save-Package-Properties.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if ($allPackageProperties)
New-Item -ItemType Directory -Force -Path $outDirectory
foreach($pkg in $allPackageProperties)
{
if ($pkg.IsNewSDK)
if ($pkg.IsNewSdk)
{
Write-Host "Package Name: $($pkg.Name)"
Write-Host "Package Version: $($pkg.Version)"
Expand Down

0 comments on commit 44f43bc

Please sign in to comment.