diff --git a/eng/common/scripts/copy-docs-to-blobstorage.ps1 b/eng/common/scripts/copy-docs-to-blobstorage.ps1 index 69e9fc28620c3..d15e4cf0fb6c1 100644 --- a/eng/common/scripts/copy-docs-to-blobstorage.ps1 +++ b/eng/common/scripts/copy-docs-to-blobstorage.ps1 @@ -271,18 +271,17 @@ if ($Language -eq "dotnet") $DocsStagingDir = "$WorkingDirectory/docstaging" $TempDir = "$WorkingDirectory/temp" - New-Item -ItemType directory -Path "$DocsStagingDir" - New-Item -ItemType directory -Path "$TempPackageDir" + New-Item -ItemType directory -Path $DocsStagingDir + New-Item -ItemType directory -Path $TempDir - Expand-Archive -LiteralPath $PublishedDocs[0].FullName -DestinationPath "$DocsStagingDir" - $pkgProperties = VerifyPackages -pkgRepository "Nuget" -artifactLocation $DocLocation -workingDirectory "$TempDir" ` - -apiUrl "https://api.github.com/repos/Azure/azure-sdk-for-net" -releasSha $ReleaseSha -continueOnError $True + 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 "DocDir $($DocsStagingDir)" Write-Host "PkgName $($pkgProperties.PackageId)" Write-Host "DocVersion $($pkgProperties.PackageVersion)" - Upload-Blobs -DocDir "$($TempPackageDir)" -PkgName $pkgProperties.PackageId -DocVersion $pkgProperties.PackageVersion -ReleaseTag $pkgProperties.Tag + Upload-Blobs -DocDir "$($DocsStagingDir)" -PkgName $pkgProperties.PackageId -DocVersion $pkgProperties.PackageVersion -ReleaseTag $pkgProperties.Tag } if ($Language -eq "python") diff --git a/sdk/template/Azure.Template/CHANGELOG.md b/sdk/template/Azure.Template/CHANGELOG.md index 856555ed8711a..0fd394ff2386d 100644 --- a/sdk/template/Azure.Template/CHANGELOG.md +++ b/sdk/template/Azure.Template/CHANGELOG.md @@ -1,4 +1,10 @@ # Release History +## 1.0.3-beta.14 (2020-09-14) +- Package Artifacts directory restructure, attempt 4 + +## 1.0.3-beta.13 (2020-09-14) +- Package Artifacts directory restructure, attempt 3 + ## 1.0.3-beta.12 (2020-09-11) - Package Artifacts directory restructure, attempt 2 diff --git a/sdk/template/Azure.Template/src/Azure.Template.csproj b/sdk/template/Azure.Template/src/Azure.Template.csproj index c2b7b09dc747e..4c7dff746e0a9 100644 --- a/sdk/template/Azure.Template/src/Azure.Template.csproj +++ b/sdk/template/Azure.Template/src/Azure.Template.csproj @@ -2,7 +2,7 @@ This is a template project to demonstrate how to create a package that uses code generation as well as use for testing our build and release pipelines Azure SDK Template - 1.0.3-beta.12 + 1.0.3-beta.14 Azure Template $(RequiredTargetFrameworks)