From 82531c1acda676cd87cf9e06721eee7b5af0f45d Mon Sep 17 00:00:00 2001 From: Chidozie Ononiwu Date: Tue, 15 Sep 2020 15:52:01 -0700 Subject: [PATCH] Bump Azure Template --- eng/common/pipelines/templates/steps/publish-blobs.yml | 1 - eng/common/scripts/copy-docs-to-blobstorage.ps1 | 7 ++++--- sdk/template/Azure.Template/CHANGELOG.md | 9 +++++++++ sdk/template/Azure.Template/src/Azure.Template.csproj | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/eng/common/pipelines/templates/steps/publish-blobs.yml b/eng/common/pipelines/templates/steps/publish-blobs.yml index 55bef2f04c642..773fb31b274e2 100644 --- a/eng/common/pipelines/templates/steps/publish-blobs.yml +++ b/eng/common/pipelines/templates/steps/publish-blobs.yml @@ -26,7 +26,6 @@ steps: -PublicArtifactLocation "${{ parameters.ArtifactLocation }}" -RepoReplaceRegex "(https://github.com/${{ parameters.RepoId }}/(?:blob|tree)/)master" -WorkingDirectory "$(System.DefaultWorkingDirectory)" - -ReleaseSha: "$(Build.SourceVersion)" 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 index d15e4cf0fb6c1..b1306692408dd 100644 --- a/eng/common/scripts/copy-docs-to-blobstorage.ps1 +++ b/eng/common/scripts/copy-docs-to-blobstorage.ps1 @@ -10,8 +10,7 @@ param ( $UploadLatest=1, $PublicArtifactLocation = "", $RepoReplaceRegex = "(https://github.com/.*/(?:blob|tree)/)master", - $WorkingDirectory, - $ReleaseSha + $WorkingDirectory ) . (Join-Path $PSScriptRoot artifact-metadata-parsing.ps1) @@ -264,7 +263,9 @@ if ($Language -eq "dotnet") if (($PublishedPkgs.Count -gt 1) -or ($PublishedDoc.Count -gt 1)) { - Write-Host "$($DocLocation) contains more published artifacts than expected." + Write-Host "$($DocLocation) should contain only one (1) published package and docs" + Write-Host "No of Packages $($PublishedPkgs.Count)" + Write-Host "No of Docs $($PublishedDoc.Count)" exit 1 } diff --git a/sdk/template/Azure.Template/CHANGELOG.md b/sdk/template/Azure.Template/CHANGELOG.md index 0fd394ff2386d..7f7d6652c7e7d 100644 --- a/sdk/template/Azure.Template/CHANGELOG.md +++ b/sdk/template/Azure.Template/CHANGELOG.md @@ -1,4 +1,13 @@ # Release History +## 1.0.3-beta.17 (2020-09-16) +- Package Artifacts directory restructure, attempt 7 + +## 1.0.3-beta.16 (2020-09-15) +- Package Artifacts directory restructure, attempt 6 + +## 1.0.3-beta.15 (2020-09-15) +- Package Artifacts directory restructure, attempt 5 + ## 1.0.3-beta.14 (2020-09-14) - Package Artifacts directory restructure, attempt 4 diff --git a/sdk/template/Azure.Template/src/Azure.Template.csproj b/sdk/template/Azure.Template/src/Azure.Template.csproj index 4c7dff746e0a9..1df6bc41d8746 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.14 + 1.0.3-beta.17 Azure Template $(RequiredTargetFrameworks)