From 1cd9a9d0fa10112454184d59ae8e3c9ef4e4be55 Mon Sep 17 00:00:00 2001
From: praveenkuttappan <prmarott@microsoft.com>
Date: Thu, 28 Jan 2021 12:06:35 -0800
Subject: [PATCH] Fixes as per review comments to handle track 1 packages

---
 .../steps/daily-dev-build-variable.yml        | 21 +++++++-------
 eng/common/scripts/Create-APIReview.ps1       |  8 ++---
 .../scripts/Save-Package-Properties.ps1       | 29 ++++++++++---------
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml b/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml
index 84dc6ee4f15f..17f27ee32725 100644
--- a/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml
+++ b/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml
@@ -3,16 +3,17 @@
 parameters:
   ServiceDirectory: ''
 steps:
-- task: Powershell@2
-  inputs:
-   filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1
-   arguments: >
-    -ServiceName ${{parameters.ServiceDirectory}}
-    -OutDirectory $(Build.ArtifactStagingDirectory)/PackageInfo
-   pwsh: true
-   workingDirectory: $(Pipeline.Workspace)
-  displayName: Dump Package properties
-  condition: succeededOrFailed()
+- ${{if ne(parameters.ServiceDirectory, '')}}:
+  - task: Powershell@2
+    inputs:
+    filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1
+    arguments: >
+      -ServiceDirectory ${{parameters.ServiceDirectory}}
+      -OutDirectory $(Build.ArtifactStagingDirectory)/PackageInfo
+    pwsh: true
+    workingDirectory: $(Pipeline.Workspace)
+    displayName: Dump Package properties
+    condition: succeeded()
 - pwsh: |
     $setDailyDevBuild = "false"
     if (('$(Build.Reason)' -eq 'Schedule') -and ('$(System.TeamProject)' -eq 'internal')) {
diff --git a/eng/common/scripts/Create-APIReview.ps1 b/eng/common/scripts/Create-APIReview.ps1
index ff504f64daf3..210b82d4f69b 100644
--- a/eng/common/scripts/Create-APIReview.ps1
+++ b/eng/common/scripts/Create-APIReview.ps1
@@ -107,11 +107,11 @@ foreach ($pkgName in $responses.Keys)
                 $FoundFailure = $True
                 if ($respCode -eq '201')
                 {
-                    Write-Host "API Review is pending for package $($PackageName)"
+                    Write-Error "Automatic API Review approval is pending for package $($PackageName)"
                 }
                 else
                 {
-                    Write-Host "Failed to create API Review for package $($PackageName)"
+                    Write-Error "Failed to create API Review for package $($PackageName)"
                 }                
             }
             else
@@ -123,6 +123,6 @@ foreach ($pkgName in $responses.Keys)
 }
 if ($FoundFailure)
 {
-    Write-Host "Automatic API review is not yet approved for package $($PackageName)"
-    exit(1)
+    Write-Error "Automatic API review is not yet approved for package $($PackageName)"
+    exit 1
 }
diff --git a/eng/common/scripts/Save-Package-Properties.ps1 b/eng/common/scripts/Save-Package-Properties.ps1
index 2f27fd620a8b..b78e3342efe0 100644
--- a/eng/common/scripts/Save-Package-Properties.ps1
+++ b/eng/common/scripts/Save-Package-Properties.ps1
@@ -1,31 +1,34 @@
 [CmdletBinding()]
 Param (
   [Parameter(Mandatory=$True)]
-  [string] $serviceName,
+  [string] $serviceDirectory,
   [Parameter(Mandatory=$True)]
-  [string] $OutDirectory
+  [string] $outDirectory
 )
 
 . (Join-Path $PSScriptRoot common.ps1)
-$allPackageProperties = Get-AllPkgProperties $serviceName
+$allPackageProperties = Get-AllPkgProperties $serviceDirectory
 if ($allPackageProperties)
 {
-    New-Item -ItemType Directory -Force -Path $OutDirectory
+    New-Item -ItemType Directory -Force -Path $outDirectory
     foreach($pkg in $allPackageProperties)
     {
-        Write-Host "Package Name: $($pkg.Name)"
-        Write-Host "Package Version: $($pkg.Version)"
-        Write-Host "Package SDK Type: $($pkg.SdkType)"
-        $outputPath = Join-Path -Path $OutDirectory ($pkg.Name + ".json")
-        $outputObject = $pkg | ConvertTo-Json
-        Set-Content -Path $outputPath -Value $outputObject
+        if ($pkg.IsNewSDK)
+        {
+            Write-Host "Package Name: $($pkg.Name)"
+            Write-Host "Package Version: $($pkg.Version)"
+            Write-Host "Package SDK Type: $($pkg.SdkType)"
+            $outputPath = Join-Path -Path $outDirectory ($pkg.Name + ".json")
+            $outputObject = $pkg | ConvertTo-Json
+            Set-Content -Path $outputPath -Value $outputObject
+        }        
     }
 
-    Get-ChildItem -Path $OutDirectory
+    Get-ChildItem -Path $outDirectory
 }
 else
 {
-    Write-Host "Package properties are not available for service directory $($serviceName)"
-    exit(1)
+    Write-Error "Package properties are not available for service directory $($serviceDirectory)"
+    exit 1
 }