Sync eng/common directory with azure-sdk-tools repository for Tools P…

…R 1022 (Azure#15269)
AzureSDKAutomation · Sep 22, 2020 · 816dc0f · 816dc0f
1 parent 1dece6e
commit 816dc0f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/eng/common/pipelines/templates/steps/publish-blobs.yml b/eng/common/pipelines/templates/steps/publish-blobs.yml
@@ -25,7 +25,6 @@ steps:
       -BlobName "${{ parameters.BlobName }}"
       -PublicArtifactLocation "${{ parameters.ArtifactLocation }}"
       -RepoReplaceRegex "(https://github.com/${{ parameters.RepoId }}/(?:blob|tree)/)master"
-      -WorkingDirectory "$(System.DefaultWorkingDirectory)"
     pwsh: true
     workingDirectory: $(Pipeline.Workspace)
   displayName: Copy Docs to Blob

diff --git a/eng/common/scripts/copy-docs-to-blobstorage.ps1 b/eng/common/scripts/copy-docs-to-blobstorage.ps1
@@ -9,8 +9,7 @@ param (
   $ExitOnError=1,
   $UploadLatest=1,
   $PublicArtifactLocation = "",
-  $RepoReplaceRegex = "(https://github.com/.*/(?:blob|tree)/)master",
-  $WorkingDirectory
+  $RepoReplaceRegex = "(https://github.com/.*/(?:blob|tree)/)master"
 )
 . (Join-Path $PSScriptRoot artifact-metadata-parsing.ps1)
 
@@ -278,11 +277,11 @@ if ($Language -eq "dotnet")
     Expand-Archive -LiteralPath $PublishedDocs[0].FullName -DestinationPath $DocsStagingDir
     $pkgProperties = ParseNugetPackage -pkg $PublishedPkgs[0].FullName -workingDirectory $TempDir
 
-    Write-Host "Start Upload for $($pkgProperties.Tag)"
+    Write-Host "Start Upload for $($pkgProperties.ReleaseTag)"
     Write-Host "DocDir $($DocsStagingDir)"
     Write-Host "PkgName $($pkgProperties.PackageId)"
     Write-Host "DocVersion $($pkgProperties.PackageVersion)"
-    Upload-Blobs -DocDir "$($DocsStagingDir)" -PkgName $pkgProperties.PackageId -DocVersion $pkgProperties.PackageVersion -ReleaseTag $pkgProperties.Tag
+    Upload-Blobs -DocDir "$($DocsStagingDir)" -PkgName $pkgProperties.PackageId -DocVersion $pkgProperties.PackageVersion -ReleaseTag $pkgProperties.ReleaseTag
 }
 
 if ($Language -eq "python")