Revert "Mitigate relative path calculation error on multiple iterations"

This reverts commit 45baedd990c6a3085742a38a4891d8706a93be77.
Azure · Oct 13, 2021 · 9946eda · 9946eda
1 parent eb35819
commit 9946eda
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/eng/common/scripts/Save-Package-Properties.ps1 b/eng/common/scripts/Save-Package-Properties.ps1
@@ -48,15 +48,8 @@ function SetOutput($outputPath, $incomingPackageSpec) {
   else
   {
     $outputObject = $incomingPackageSpec
-
-    # Set file paths to relative paths. Only do this if there is no existing
-    # package info json file as running this multiple times can create
-    # unexpected relative paths in some scenarios.
-    $outputObject.DirectoryPath = GetRelativePath $outputObject.DirectoryPath
-    $outputObject.ReadMePath = GetRelativePath $outputObject.ReadMePath
-    $outputObject.ChangeLogPath = GetRelativePath $outputObject.ChangeLogPath
   }
-
+  
 
   if ($addDevVersion)
   {
@@ -65,6 +58,11 @@ function SetOutput($outputPath, $incomingPackageSpec) {
     $outputObject.DevVersion = $incomingPackageSpec.Version
   }
 
+  # Set file paths to relative paths
+  $outputObject.DirectoryPath = GetRelativePath $outputObject.DirectoryPath
+  $outputObject.ReadMePath = GetRelativePath $outputObject.ReadMePath
+  $outputObject.ChangeLogPath = GetRelativePath $outputObject.ChangeLogPath
+
   Set-Content `
     -Path $outputPath `
     -Value (ConvertTo-Json -InputObject $outputObject -Depth 100)