From 282519d89c288e91e4fadb4a10f6012041468058 Mon Sep 17 00:00:00 2001
From: Praveen Kuttappan <praveen.kuttappan@gmail.com>
Date: Thu, 7 Oct 2021 15:48:22 -0400
Subject: [PATCH] Avoid overwriting package info properties when dev version is
 added

---
 .../scripts/Save-Package-Properties.ps1       | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/eng/common/scripts/Save-Package-Properties.ps1 b/eng/common/scripts/Save-Package-Properties.ps1
index 7e51813830dd..10cb4158c01f 100644
--- a/eng/common/scripts/Save-Package-Properties.ps1
+++ b/eng/common/scripts/Save-Package-Properties.ps1
@@ -37,20 +37,25 @@ Param (
 
 . (Join-Path $PSScriptRoot common.ps1)
 
-function SetOutput($outputPath, $incomingPackageSpec) { 
-  $outputObject = $incomingPackageSpec
+function SetOutput($outputPath, $incomingPackageSpec) {
 
-  if ($addDevVersion) {
+  # If there is an exsiting package info json file read that and set that as output object which gets properties updated here.
+  if (Test-Path $outputPath)
+  {
+    Write-Host "Found existing package info json."
+    $outputObject = ConvertFrom-Json (Get-Content $outputPath -Raw)
+  }
+  else
+  {
+    $outputObject = $incomingPackageSpec
+  }
+  
+
+  if ($addDevVersion)
+  {
     # Use the "Version" property which was provided by the incoming package spec
     # as the DevVersion. This may be overridden later.
     $outputObject.DevVersion = $incomingPackageSpec.Version
-
-    # If there is an exsiting package info json file read that and set the 
-    # Version property from that JSON file.
-    if (Test-Path $outputPath) { 
-      $originalObject = ConvertFrom-Json (Get-Content $outputPath -Raw)
-      $outputObject.Version = $originalObject.Version
-    }
   }
 
   # Set file paths to relative paths