From df9b520c2c18555c291a32103e6cfbd33b38af68 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Thu, 27 Aug 2020 16:09:54 -0700 Subject: [PATCH 1/2] Change prerelease versioning - Use alpha instead of dev - Use beta instead of preview --- doc/dev/Versioning.md | 12 ++++++------ eng/Versioning.targets | 4 ++-- sdk/template/Azure.Template/CHANGELOG.md | 3 +++ .../Azure.Template/src/Azure.Template.csproj | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/dev/Versioning.md b/doc/dev/Versioning.md index aa5847cd478a..cbd938e48c78 100644 --- a/doc/dev/Versioning.md +++ b/doc/dev/Versioning.md @@ -9,16 +9,16 @@ Package version will look like: MAJOR.MINOR.PATCH-PRERELEASE ``` -In the project file use the `Version` property to define the `MAJOR.MINOR.PATCH-preview.X` part of the version. +In the project file use the `Version` property to define the `MAJOR.MINOR.PATCH-beta.X` part of the version. ``` -1.0.0-preview.1 +1.0.0-beta.1 ``` -By default builds will replace any prerelease identifier with a `dev.yyyyMMdd.r` to ensure we have unique package versions. The date will come from either +By default builds will replace any prerelease identifier with a `alpha.yyyyMMdd.r` to ensure we have unique package versions for dev builds. The date will come from either today's date or a property named `OfficialBuildId` which we will pass as part of our build pipelines. -If we need to produce a package that is not a dev version and has the version in the project (i.e. stable or preview) then the `SkipDevBuildNumber` should +If we need to produce a package that is not an dev package with an alpha version and has the version in the project (i.e. stable or beta) then the `SkipDevBuildNumber` should be passed as `true` to the packaging command. ## Incrementing the version @@ -26,8 +26,8 @@ be passed as `true` to the packaging command. See [Incrementing after release](https://github.com/Azure/azure-sdk/blob/master/docs/policies/releases.md#incrementing-after-release) for general guidance but at a high level we will do the following versioning changes: -- After a preview release we bump the number after the preview. `1.0.0-preview.1` -> `1.0.0-preview.2` -- After a GA release we bump the minor version and switch to preview 1. `1.0.0` -> `1.1.0-preview.1` +- After a beta release we bump the number after the beta. `1.0.0-beta.1` -> `1.0.0-beta.2` +- After a GA release we bump the minor version and switch to beta 1. `1.0.0` -> `1.1.0-beta.1` - Prior to a hot-fix release we bump the patch version. `1.0.0` -> `1.0.1` Versions are automatically bumped up in package project `.csproj` files as well as package changelog `CHANGELOG.md` as part of the release process. To increment a version locally make use of the `eng\scripts\Update-PkgVersion.ps1` script. diff --git a/eng/Versioning.targets b/eng/Versioning.targets index 030eae8ed2a7..bfe1b09ede9d 100644 --- a/eng/Versioning.targets +++ b/eng/Versioning.targets @@ -4,7 +4,7 @@ <_BuildNumber>$(OfficialBuildId) <_BuildNumber Condition="'$(OfficialBuildId)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd)).1 true - false + false <_VersionInProject>$(Version) @@ -13,7 +13,7 @@ <_PrereleaseIndex>$(Version.IndexOf('-')) $(Version.SubString(0, $(_PrereleaseIndex))) - $(Version)-dev.$(_BuildNumber) + $(Version)-alpha.$(_BuildNumber)