Merge branch 'master' into enable_master_replace

sima-zhu · web-flow · commit 5ebc484c664a · 2020-09-10T15:29:32.000-07:00
diff --git a/eng/pipelines/templates/stages/archetype-cpp-release.yml b/eng/pipelines/templates/stages/archetype-cpp-release.yml
@@ -5,7 +5,7 @@ parameters:
 stages:
   - ${{if and(eq(variables['Build.Reason'], 'Manual'), eq(variables['System.TeamProject'], 'internal'))}}:
     - ${{ each artifact in parameters.Artifacts }}:
-      - stage: Release_${{artifact.safeName}}
+      - stage: Release_${{ replace(artifact.Name, '-', '_') }}
         displayName: 'Release ${{artifact.name}}'
         dependsOn: Build
         condition:  and(succeeded(), ne(variables['Build.Repository.Name'], 'Azure/azure-sdk-for-cpp'))
diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1
@@ -28,18 +28,19 @@ function Get-cpp-PackageInfoFromPackageFile($pkg, $workingDirectory)
   }
 
   return New-Object PSObject -Property @{
-    PackageId $pkgName
-    PackageVersion $pkgVersion
+    PackageId      = $pkgName
+    PackageVersion = $pkgVersion
+    ReleaseTag     = "$($pkgName)_$($pkgVersion)"
     # Artifact info is always considered deployable for now becasue it is not
     # deployed anywhere. Dealing with duplicate tags happens downstream in
     # CheckArtifactShaAgainstTagsList
-    Deployable = $true
-    ReleaseNotes = $releaseNotes
+    Deployable     = $true
+    ReleaseNotes   = $releaseNotes
   }
 }
 
 # Stage and Upload Docs to blob Storage
-function Publish-cpp-GithubIODocs ()
+function Publish-cpp-GithubIODocs ($DocLocation, $PublicArtifactLocation)
 {
   $packageInfo = (Get-Content (Join-Path $DocLocation 'package-info.json') | ConvertFrom-Json)
   $releaseTag = RetrieveReleaseTag "CPP" $PublicArtifactLocation
diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release History
 
+## 1.0.0-beta.2 (Unreleased)
+
+
 ## 1.0.0-beta.1 (2020-09-09)
 
 - Initial release
diff --git a/sdk/core/azure-core/inc/azure/core/version.hpp b/sdk/core/azure-core/inc/azure/core/version.hpp
@@ -13,7 +13,7 @@
 #define AZURE_CORE_VERSION_MAJOR 1
 #define AZURE_CORE_VERSION_MINOR 0
 #define AZURE_CORE_VERSION_PATCH 0
-#define AZURE_CORE_VERSION_PRERELEASE "beta.1"
+#define AZURE_CORE_VERSION_PRERELEASE "beta.2"
 
 namespace Azure { namespace Core {
 
@@ -52,3 +52,4 @@ namespace Azure { namespace Core {
 #undef AZURE_CORE_VERSION_MINOR
 #undef AZURE_CORE_VERSION_PATCH
 #undef AZURE_CORE_VERSION_PRERELEASE
+
diff --git a/sdk/storage/azure-storage-blobs/CHANGELOG.md b/sdk/storage/azure-storage-blobs/CHANGELOG.md
@@ -1,9 +1,10 @@
 # Release History
 
-## 1.0.0-beta.2
+## 1.0.0-beta.2 (2020-09-09)
 
 * Support for Blob Batch
 * Support for Blob Index
+* Release based on azure-core_1.0.0-beta.1
 
 ## 1.0.0-beta.1
 
diff --git a/sdk/storage/azure-storage-common/CHANGELOG.md b/sdk/storage/azure-storage-common/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Release History
 
-## 1.0.0-beta.2
+## 1.0.0-beta.2 (2020-09-09)
+
+* Release based on azure-core_1.0.0-beta.1
 
 ## 1.0.0-beta.1
 
diff --git a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Release History
 
-## 1.0.0-beta.2
+## 1.0.0-beta.2 (2020-09-09)
+
+* Release based on azure-core_1.0.0-beta.1
 
 ## 1.0.0-beta.1
 
diff --git a/sdk/storage/azure-storage-files-shares/CHANGELOG.md b/sdk/storage/azure-storage-files-shares/CHANGELOG.md
@@ -1,8 +1,9 @@
 # Release History
 
-## 1.0.0-beta.2
+## 1.0.0-beta.2 (2020-09-09)
 
 * Added File SAS generation support.
+* Release based on azure-core_1.0.0-beta.1
 
 ## 1.0.0-preview.1 (Unreleased)
 
diff --git a/sdk/template/azure-template/CHANGELOG.md b/sdk/template/azure-template/CHANGELOG.md
@@ -7,6 +7,10 @@
 
 * (Engineer System) Enable master replacement link feature for cpp, attempt 1
 
+## 1.0.0-beta.2 (2020-09-09)
+
+* Validate engineering system changes
+
 ## 1.0.0-beta.1 (2020-09-01)
 
 * Template package validating release pipeline

Original file line number	Diff line number	Diff line change
`@@ -28,18 +28,19 @@ function Get-cpp-PackageInfoFromPackageFile($pkg, $workingDirectory)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`return New-Object PSObject -Property @{`
`31`		`- PackageId $pkgName`
`32`		`- PackageVersion $pkgVersion`
	`31`	`+ PackageId = $pkgName`
	`32`	`+ PackageVersion = $pkgVersion`
	`33`	`+ ReleaseTag = "$($pkgName)_$($pkgVersion)"`
`33`	`34`	`# Artifact info is always considered deployable for now becasue it is not`
`34`	`35`	`# deployed anywhere. Dealing with duplicate tags happens downstream in`
`35`	`36`	`# CheckArtifactShaAgainstTagsList`
`36`		`- Deployable = $true`
`37`		`- ReleaseNotes = $releaseNotes`
	`37`	`+ Deployable = $true`
	`38`	`+ ReleaseNotes = $releaseNotes`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`# Stage and Upload Docs to blob Storage`
`42`		`-function Publish-cpp-GithubIODocs ()`
	`43`	`+function Publish-cpp-GithubIODocs ($DocLocation, $PublicArtifactLocation)`
`43`	`44`	`{`
`44`	`45`	`$packageInfo = (Get-Content (Join-Path $DocLocation 'package-info.json') \| ConvertFrom-Json)`
`45`	`46`	`$releaseTag = RetrieveReleaseTag "CPP" $PublicArtifactLocation`