Skip to content

Update metadata json in preparation for 6.1 release #7741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 1 commit into from
Sep 8, 2018
Merged

Update metadata json in preparation for 6.1 release #7741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/appveyor.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ function Get-ReleaseTag
$metaDataPath = Join-Path -Path $PSScriptRoot -ChildPath 'metadata.json'
$metaData = Get-Content $metaDataPath | ConvertFrom-Json

$releaseTag = $metadata.NextReleaseTag
$releaseTag = $metadata.PreviewReleaseTag
if($env:APPVEYOR_BUILD_NUMBER)
{
$releaseTag = $releaseTag.split('.')[0..2] -join '.'
Expand Down
3 changes: 3 additions & 0 deletions tools/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"StableReleaseTag": "v6.0.4",
"PreviewReleaseTag": "v6.1.0-rc.1",
"ServicingReleaseTag": "v6.0.4",
"ReleaseTag": "v6.0.4",
"NextReleaseTag": "v6.1.0-rc.1"
}
2 changes: 1 addition & 1 deletion tools/releaseBuild/setReleaseTag.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if($ReleaseTag -eq 'fromBranch' -or !$ReleaseTag)
# Get version from metadata and append -<previewname>
$metaDataJsonPath = Join-Path $PSScriptRoot -ChildPath '..\metadata.json'
$metadata = Get-content $metaDataJsonPath | ConvertFrom-Json
$versionPart = $metadata.NextReleaseTag
$versionPart = $metadata.PreviewReleaseTag
if($versionPart -match '-.*$')
{
$versionPart = $versionPart -replace '-.*$'
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseTools.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ function Update-PsVersionInCode

$metaDataPath = (Join-Path -Path $PSScriptRoot -ChildPath 'metadata.json')
$metaData = Get-Content -Path $metaDataPath | convertfrom-json
$currentTag = $metaData.ReleaseTag
$currentTag = $metaData.StableReleaseTag

$currentVersion = $currentTag -replace '^v'
$newVersion = $NewReleaseTag -replace '^v'
Expand Down
2 changes: 1 addition & 1 deletion tools/travis.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function Get-ReleaseTag
$metaDataPath = Join-Path -Path $PSScriptRoot -ChildPath 'metadata.json'
$metaData = Get-Content $metaDataPath | ConvertFrom-Json

$releaseTag = $metadata.NextReleaseTag
$releaseTag = $metadata.PreviewReleaseTag
if($env:TRAVIS_BUILD_NUMBER)
{
$releaseTag = $releaseTag.split('.')[0..2] -join '.'
Expand Down