Skip to content
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

Jump to bottom

Update version numbers to 6.0.2 #6402

Merged
merged 2 commits into from Mar 15, 2018
Merged

Update version numbers to 6.0.2 #6402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b31bdd
Add script to update version number
TravisEz13 Mar 13, 2018
1871fbd
Update version to 6.0.2
TravisEz13 Mar 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 17 additions & 17 deletions README.md
View file
Open in desktop
Expand Up @@ -60,23 +60,23 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
| Windows (arm) **Experimental** | [32-bit][rl-winarm]/[64-bit][rl-winarm64] | [Instructions][in-windows-zip] |
| Raspbian (Stretch) **Experimental** | [.tgz][rl-raspbian] | [Instructions][in-raspbian] |

[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/PowerShell-6.0.1-win-x64.msi
[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/PowerShell-6.0.1-win-x86.msi
[rl-ubuntu17]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/powershell_6.0.1-1.ubuntu.17.04_amd64.deb
[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/powershell_6.0.1-1.ubuntu.16.04_amd64.deb
[rl-ubuntu14]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/powershell_6.0.1-1.ubuntu.14.04_amd64.deb
[rl-debian8]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/powershell_6.0.1-1.debian.8_amd64.deb
[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/powershell_6.0.1-1.debian.9_amd64.deb
[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/powershell-6.0.1-1.rhel.7.x86_64.rpm
[rl-ai]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/PowerShell-6.0.1-x86_64.AppImage
[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/powershell-6.0.1-osx.10.12-x64.pkg
[rl-winarm]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/PowerShell-6.0.1-win-arm32.zip
[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/PowerShell-6.0.1-win-arm64.zip
[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/PowerShell-6.0.1-win-x86.zip
[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/PowerShell-6.0.1-win-x64.zip
[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/powershell-6.0.1-osx-x64.tar.gz
[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/powershell-6.0.1-linux-x64.tar.gz
[rl-raspbian]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/powershell-6.0.1-linux-arm32.tar.gz
[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/PowerShell-6.0.2-win-x64.msi
[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/PowerShell-6.0.2-win-x86.msi
[rl-ubuntu17]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/powershell_6.0.2-1.ubuntu.17.04_amd64.deb
[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/powershell_6.0.2-1.ubuntu.16.04_amd64.deb
[rl-ubuntu14]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/powershell_6.0.2-1.ubuntu.14.04_amd64.deb
[rl-debian8]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/powershell_6.0.2-1.debian.8_amd64.deb
[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/powershell_6.0.2-1.debian.9_amd64.deb
[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/powershell-6.0.2-1.rhel.7.x86_64.rpm
[rl-ai]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/PowerShell-6.0.2-x86_64.AppImage
[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/powershell-6.0.2-osx.10.12-x64.pkg
[rl-winarm]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/PowerShell-6.0.2-win-arm32.zip
[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/PowerShell-6.0.2-win-arm64.zip
[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/PowerShell-6.0.2-win-x86.zip
[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/PowerShell-6.0.2-win-x64.zip
[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/powershell-6.0.2-osx-x64.tar.gz
[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/powershell-6.0.2-linux-x64.tar.gz
[rl-raspbian]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/powershell-6.0.2-linux-arm32.tar.gz

[installation]: https://github.com/PowerShell/PowerShell/tree/master/docs/installation
[in-windows]: https://github.com/PowerShell/PowerShell/tree/master/docs/installation/windows.md#msi
Expand Down
4 changes: 2 additions & 2 deletions docker/community/amazonlinux/Dockerfile
View file
Open in desktop
Expand Up @@ -2,8 +2,8 @@

FROM amazonlinux:latest

ARG POWERSHELL_VERSION=6.0.1
ARG POWERSHELL_PACKAGE=powershell-6.0.1-linux-x64.tar.gz
ARG POWERSHELL_VERSION=6.0.2
ARG POWERSHELL_PACKAGE=powershell-6.0.2-linux-x64.tar.gz
ARG IMAGE_NAME=microsoft/powershell:amazonlinux

LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
Expand Down
2 changes: 1 addition & 1 deletion docker/release/centos7/Dockerfile
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

FROM centos:7

ARG POWERSHELL_VERSION=6.0.1
ARG POWERSHELL_VERSION=6.0.2
ARG IMAGE_NAME=microsoft/powershell:centos7

LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
Expand Down
2 changes: 1 addition & 1 deletion docker/release/fedora26/Dockerfile
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

FROM fedora:26

ARG POWERSHELL_VERSION=6.0.1
ARG POWERSHELL_VERSION=6.0.2
ARG IMAGE_NAME=microsoft/powershell:fedora26

LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
Expand Down
2 changes: 1 addition & 1 deletion docker/release/fedora27/Dockerfile
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

FROM fedora:27

ARG POWERSHELL_VERSION=6.0.1
ARG POWERSHELL_VERSION=6.0.2
ARG IMAGE_NAME=microsoft/powershell:fedora27

LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
Expand Down
4 changes: 2 additions & 2 deletions docker/release/nanoserver/Dockerfile
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ ARG NanoServerRepo=microsoft/nanoserver
FROM ${WindowsServerCoreRepo}:$WindowsServerCoreVersion AS installer-env

# Arguments for installing powershell, must be defined in the container they are used
ARG PS_VERSION=6.0.1
ARG PS_VERSION=6.0.2

ENV PS_DOWNLOAD_URL https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip

Expand All @@ -25,7 +25,7 @@ RUN Expand-Archive powershell.zip -DestinationPath \PowerShell
FROM ${NanoServerRepo}:$NanoServerVersion

ARG VCS_REF="none"
ARG PS_VERSION=6.0.1
ARG PS_VERSION=6.0.2
ARG IMAGE_NAME=microsoft/powershell

LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
Expand Down
4 changes: 2 additions & 2 deletions docker/release/opensuse42.2/Dockerfile
View file
Open in desktop
Expand Up @@ -2,8 +2,8 @@

FROM opensuse:42.2

ARG POWERSHELL_VERSION=6.0.1
ARG POWERSHELL_PACKAGE=powershell-6.0.1-linux-x64.tar.gz
ARG POWERSHELL_VERSION=6.0.2
ARG POWERSHELL_PACKAGE=powershell-6.0.2-linux-x64.tar.gz
ARG IMAGE_NAME=microsoft/powershell:opensuse42.2

LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
Expand Down
2 changes: 1 addition & 1 deletion docker/release/ubuntu14.04/Dockerfile
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

FROM ubuntu:trusty

ARG POWERSHELL_VERSION=6.0.1
ARG POWERSHELL_VERSION=6.0.2
ARG IMAGE_NAME=microsoft/powershell:ubuntu14.04

LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
Expand Down
2 changes: 1 addition & 1 deletion docker/release/ubuntu16.04/Dockerfile
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

FROM ubuntu:xenial

ARG POWERSHELL_VERSION=6.0.1
ARG POWERSHELL_VERSION=6.0.2
ARG IMAGE_NAME=microsoft/powershell:ubuntu16.04

LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
Expand Down
4 changes: 2 additions & 2 deletions docker/release/windowsservercore/Dockerfile
View file
Open in desktop
@@ -1,8 +1,8 @@
# escape=`
FROM microsoft/windowsservercore:latest

ARG POWERSHELL_MSI=https://github.com/PowerShell/PowerShell/releases/download/v6.0.1/PowerShell-6.0.1-win-x64.msi
ARG POWERSHELL_VERSION=6.0.1
ARG POWERSHELL_MSI=https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/PowerShell-6.0.2-win-x64.msi
ARG POWERSHELL_VERSION=6.0.2
ARG IMAGE_NAME=microsoft/powershell:windowsservercore

LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
Expand Down
4 changes: 2 additions & 2 deletions docker/tests/Templates/centos7/Dockerfile
View file
Open in desktop
@@ -1,7 +1,7 @@
FROM centos:7

ARG PSVERSIONSTUB=6.0.1
ARG PSVERSIONSTUBRPM=6.0.1
ARG PSVERSIONSTUB=6.0.2
ARG PSVERSIONSTUBRPM=6.0.2
ARG PACKAGELOCATIONSTUB
ARG TESTLISTSTUB=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
ARG GITLOCATION=https://github.com/PowerShell/PowerShell.git
Expand Down
4 changes: 2 additions & 2 deletions docker/tests/Templates/debian.8/Dockerfile
View file
Open in desktop
@@ -1,7 +1,7 @@
FROM debian:jessie

ARG PSVERSIONSTUB=6.0.1
ARG PSVERSIONSTUBRPM=6.0.1
ARG PSVERSIONSTUB=6.0.2
ARG PSVERSIONSTUBRPM=6.0.2
ARG PACKAGELOCATIONSTUB
ARG TESTLISTSTUB=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
ARG GITLOCATION=https://github.com/PowerShell/PowerShell.git
Expand Down
4 changes: 2 additions & 2 deletions docker/tests/Templates/debian.9/Dockerfile
View file
Open in desktop
@@ -1,7 +1,7 @@
FROM debian:stretch

ARG PSVERSIONSTUB=6.0.1
ARG PSVERSIONSTUBRPM=6.0.1
ARG PSVERSIONSTUB=6.0.2
ARG PSVERSIONSTUBRPM=6.0.2
ARG PACKAGELOCATIONSTUB
ARG TESTLISTSTUB=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
ARG GITLOCATION=https://github.com/PowerShell/PowerShell.git
Expand Down
4 changes: 2 additions & 2 deletions docker/tests/Templates/fedora26/Dockerfile
View file
Open in desktop
@@ -1,7 +1,7 @@
FROM fedora:26

ARG PSVERSIONSTUB=6.0.1
ARG PSVERSIONSTUBRPM=6.0.1
ARG PSVERSIONSTUB=6.0.2
ARG PSVERSIONSTUBRPM=6.0.2
ARG PACKAGELOCATIONSTUB
ARG TESTLISTSTUB=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
ARG GITLOCATION=https://github.com/PowerShell/PowerShell.git
Expand Down
4 changes: 2 additions & 2 deletions docker/tests/Templates/fedora27/Dockerfile
View file
Open in desktop
@@ -1,7 +1,7 @@
FROM fedora:27

ARG PSVERSIONSTUB=6.0.1
ARG PSVERSIONSTUBRPM=6.0.1
ARG PSVERSIONSTUB=6.0.2
ARG PSVERSIONSTUBRPM=6.0.2
ARG PACKAGELOCATIONSTUB
ARG TESTLISTSTUB=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
ARG GITLOCATION=https://github.com/PowerShell/PowerShell.git
Expand Down
4 changes: 2 additions & 2 deletions docker/tests/Templates/kalilinux/Dockerfile
View file
Open in desktop
@@ -1,7 +1,7 @@
FROM kalilinux/kali-linux-docker:latest

ARG PSVERSIONSTUB=6.0.1
ARG PSVERSIONSTUBRPM=6.0.1
ARG PSVERSIONSTUB=6.0.2
ARG PSVERSIONSTUBRPM=6.0.2
ARG PACKAGELOCATIONSTUB
ARG TESTLISTSTUB=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
ARG GITLOCATION=https://github.com/PowerShell/PowerShell.git
Expand Down
4 changes: 2 additions & 2 deletions docker/tests/Templates/opensuse42.2/Dockerfile
View file
Open in desktop
@@ -1,7 +1,7 @@
FROM opensuse:42.2

ARG PSVERSIONSTUB=6.0.1
ARG PSVERSIONSTUBRPM=6.0.1
ARG PSVERSIONSTUB=6.0.2
ARG PSVERSIONSTUBRPM=6.0.2
ARG PACKAGELOCATIONSTUB
ARG TESTLISTSTUB=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
ARG GITLOCATION=https://github.com/PowerShell/PowerShell.git
Expand Down
4 changes: 2 additions & 2 deletions docker/tests/Templates/ubuntu14.04/Dockerfile
View file
Open in desktop
@@ -1,7 +1,7 @@
FROM ubuntu:trusty

ARG PSVERSIONSTUB=6.0.1
ARG PSVERSIONSTUBRPM=6.0.1
ARG PSVERSIONSTUB=6.0.2
ARG PSVERSIONSTUBRPM=6.0.2
ARG PACKAGELOCATIONSTUB
ARG TESTLISTSTUB=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
ARG GITLOCATION=https://github.com/PowerShell/PowerShell.git
Expand Down
4 changes: 2 additions & 2 deletions docker/tests/Templates/ubuntu16.04/Dockerfile
View file
Open in desktop
@@ -1,7 +1,7 @@
FROM ubuntu:xenial

ARG PSVERSIONSTUB=6.0.1
ARG PSVERSIONSTUBRPM=6.0.1
ARG PSVERSIONSTUB=6.0.2
ARG PSVERSIONSTUBRPM=6.0.2
ARG PACKAGELOCATIONSTUB
ARG TESTLISTSTUB=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
ARG GITLOCATION=https://github.com/PowerShell/PowerShell.git
Expand Down
4 changes: 2 additions & 2 deletions docker/tests/Templates/ubuntu17.04/Dockerfile
View file
Open in desktop
@@ -1,7 +1,7 @@
FROM ubuntu:zesty

ARG PSVERSIONSTUB=6.0.1
ARG PSVERSIONSTUBRPM=6.0.1
ARG PSVERSIONSTUB=6.0.2
ARG PSVERSIONSTUBRPM=6.0.2
ARG PACKAGELOCATIONSTUB
ARG TESTLISTSTUB=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
ARG GITLOCATION=https://github.com/PowerShell/PowerShell.git
Expand Down
4 changes: 2 additions & 2 deletions docker/tests/container.tests.ps1
View file
Open in desktop
Expand Up @@ -76,7 +76,7 @@ Describe "Linux Containers run PowerShell" -Tags 'Behavior', 'Linux' {
$path
)

Get-ContainerPowerShellVersion -TestContext $testContext -Name $Name -RepoName (Get-RepoName) | should be '6.0.1'
Get-ContainerPowerShellVersion -TestContext $testContext -Name $Name -RepoName (Get-RepoName) | should be '6.0.2'
}
}

Expand All @@ -100,6 +100,6 @@ Describe "Windows Containers run PowerShell" -Tags 'Behavior', 'Windows' {
$path
)

Get-ContainerPowerShellVersion -TestContext $testContext -Name $Name -RepoName (Get-RepoName) | should be '6.0.1'
Get-ContainerPowerShellVersion -TestContext $testContext -Name $Name -RepoName (Get-RepoName) | should be '6.0.2'
}
}
2 changes: 1 addition & 1 deletion docker/tests/containerTestCommon.psm1
View file
Open in desktop
Expand Up @@ -224,7 +224,7 @@ function Test-PSPackage
[Parameter(Mandatory=$true)]
$PSPackageLocation, # e.g. Azure storage
[string]
$PSVersion = "6.0.1",
$PSVersion = "6.0.2",
[string]
$TestList = "/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module",
[string]
Expand Down
4 changes: 2 additions & 2 deletions tools/metadata.json
View file
Open in desktop
@@ -1,4 +1,4 @@
{
"ReleaseTag": "v6.0.1",
"NextReleaseTag": "v6.1.0-preview.1"
"ReleaseTag": "v6.0.2",
"NextReleaseTag": "v6.1.0-preview.1"
}
52 changes: 51 additions & 1 deletion tools/releaseTools.psm1
View file
Open in desktop
Expand Up @@ -248,4 +248,54 @@ function Get-NewOfficalPackage
}
}

Export-ModuleMember -Function Get-ChangeLog, Get-NewOfficalPackage
##############################
#.SYNOPSIS
# Update the version number in code
#
#.PARAMETER NewReleaseTag
# The new Release Tag
#
#.PARAMETER NextReleaseTag
# The next Release Tag
#
#.PARAMETER Path
# The path to the root of where you want to update
#
##############################
function Update-PsVersionInCode
{
param(
[Parameter(Mandatory)]
[ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d+)?)?$")]
[String]
$NewReleaseTag,

[Parameter(Mandatory)]
[ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d+)?)?$")]
[String]
$NextReleaseTag,

[String]
$Path = (Join-path -Path $PSScriptRoot -ChildPath '..')
)

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

$currentVersion = $currentTag -replace '^v'
$newVersion = $NewReleaseTag -replace '^v'
$metaData.NextReleaseTag = $NextReleaseTag
Set-Content -path $metaDataPath -Encoding ascii -Force -Value ($metaData | convertto-json)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remind me again, is the ReleaseTag field in metadata.json always points to the latest GA release?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see the ReleaseTag being updated by this script, that's why I'm asking.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's discuss this...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

filed #6405 for the issue I thought you were talking about. the next step changes the release tag. We can refine this behavior later.


Get-ChildItem -Path $Path -Recurse -File |
Where-Object {$_.Extension -notin '.icns','.svg' -and $_.NAME -ne 'CHANGELOG.md' -and $_.DirectoryName -notmatch '[\\/]docs|demos[\\/]'} |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to confirm: we are not going to change version strings for docs from now on, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not automatically. I think after the change to remove the version from the path most of this will go away.

Where-Object {$_ | Select-String -SimpleMatch $currentVersion -List} |
Foreach-Object {
$content = Get-Content -Path $_.FullName -Raw -ReadCount 0
$newContent = $content.Replace($currentVersion,$newVersion)
Set-Content -path $_.FullName -Encoding ascii -Force -Value $newContent -NoNewline
}
}

Export-ModuleMember -Function Get-ChangeLog, Get-NewOfficalPackage, Update-PsVersionInCode