From ee779b58e002ad3df40067d4e8156751efc0388a Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Wed, 10 May 2017 09:49:02 -0700 Subject: [PATCH] Update docs for beta.1 release (#3748) * First iteration * Second iteration * Third iteration * Fourth iteration * Fifth iteration * Revert the temporary workaround * beta.1 release only support Mac OSX 10.12+ --- README.md | 20 +++---- appveyor.yml | 2 +- build.psm1 | 8 +-- docker/release/fedora24/Dockerfile | 6 +-- docker/release/nanoserver/Dockerfile | 2 +- docker/release/opensuse42.1/Dockerfile | 4 +- docker/release/windowsservercore/Dockerfile | 2 +- docs/installation/linux.md | 58 ++++++++++----------- tools/download.sh | 14 +++-- 9 files changed, 55 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index 7b897e447..f150a8ba3 100644 --- a/README.md +++ b/README.md @@ -32,19 +32,19 @@ You can download and install a PowerShell package for any of the following platf | OpenSUSE 42.1 | [.rpm][rl-opensuse421] | [Instructions][in-opensuse421]| | Arch Linux | | [Instructions][in-archlinux] | | Many Linux distributions | [.AppImage][rl-ai] | [Instructions][in-appimage] | -| macOS 10.11 | [.pkg][rl-macos] | [Instructions][in-macos] | +| macOS 10.12 | [.pkg][rl-macos] | [Instructions][in-macos] | | Docker | | [Instructions][in-docker] | -[rl-windows10]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/PowerShell-6.0.0-alpha.18-win10-win2016-x64.msi -[rl-windows81]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/PowerShell-6.0.0-alpha.18-win81-win2012r2-x64.msi +[rl-windows10]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/PowerShell-6.0.0-beta.1-win10-win2016-x64.msi +[rl-windows81]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/PowerShell-6.0.0-beta.1-win81-win2012r2-x64.msi [rl-windows7-64]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/PowerShell-6.0.0-alpha.18-win7-win2008r2-x64.msi [rl-windows7-86]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/PowerShell-6.0.0-alpha.18-win7-x86.msi -[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/powershell_6.0.0-alpha.18-1ubuntu1.16.04.1_amd64.deb -[rl-ubuntu14]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/powershell_6.0.0-alpha.18-1ubuntu1.14.04.1_amd64.deb -[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/powershell-6.0.0_alpha.18-1.el7.centos.x86_64.rpm -[rl-ai]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/PowerShell-6.0.0-alpha.18-x86_64.AppImage -[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/powershell-6.0.0-alpha.18-osx.10.11-x64.pkg -[rl-opensuse421]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/powershell-6.0.0_alpha.18-1.suse.42.1.x86_64.rpm +[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell_6.0.0-beta.1-1ubuntu1.16.04.1_amd64.deb +[rl-ubuntu14]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell_6.0.0-beta.1-1ubuntu1.14.04.1_amd64.deb +[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm +[rl-ai]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/PowerShell-6.0.0-beta.1-x86_64.AppImage +[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell-6.0.0-beta.1-osx.10.12-x64.pkg +[rl-opensuse421]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell-6.0.0_beta.1-1.suse.42.1.x86_64.rpm [installation]: docs/installation [in-windows]: docs/installation/windows.md#msi @@ -55,7 +55,7 @@ You can download and install a PowerShell package for any of the following platf [in-rhel7]: docs/installation/linux.md#red-hat-enterprise-linux-rhel-7 [in-archlinux]: docs/installation/linux.md#arch-linux [in-appimage]: docs/installation/linux.md#linux-appimage -[in-macos]: docs/installation/linux.md#macos-1011 +[in-macos]: docs/installation/linux.md#macos-1012 [in-docker]: docker [in-opensuse421]: docs/installation/linux.md#opensuse-421 diff --git a/appveyor.yml b/appveyor.yml index df29d1da8..fcfbc58ce 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 6.0.0-alpha.18-{build} +version: 6.0.0-beta.1-{build} image: Visual Studio 2015 diff --git a/build.psm1 b/build.psm1 index ddf007302..496f46ae7 100644 --- a/build.psm1 +++ b/build.psm1 @@ -158,10 +158,7 @@ function Start-PSBuild { } # save Git description to file for PowerShell to include in PSVersionTable - #git --git-dir="$PSScriptRoot/.git" describe --dirty --abbrev=60 > "$psscriptroot/powershell.version" - - # temporary hack to resolve the version issue - "v6.0.0-beta.1" > "$psscriptroot/powershell.version" + git --git-dir="$PSScriptRoot/.git" describe --dirty --abbrev=60 > "$psscriptroot/powershell.version" # create the telemetry flag file $null = new-item -force -type file "$psscriptroot/DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY" @@ -1258,8 +1255,7 @@ function Start-PSPackage { # Use Git tag if not given a version if (-not $Version) { - #$Version = (git --git-dir="$PSScriptRoot/.git" describe) -Replace '^v' - $Version = "6.0.0-beta.1" + $Version = (git --git-dir="$PSScriptRoot/.git" describe) -Replace '^v' } $Source = Split-Path -Path $Script:Options.Output -Parent diff --git a/docker/release/fedora24/Dockerfile b/docker/release/fedora24/Dockerfile index 1de0c2872..a8821151e 100644 --- a/docker/release/fedora24/Dockerfile +++ b/docker/release/fedora24/Dockerfile @@ -6,9 +6,9 @@ LABEL description="This Dockerfile will install the latest release of PS." # TODO: Until a release of PowerShell for Fedora 24 is available, # this Dockerfile installs the CentOS 7 version for compatibility. -ARG POWERSHELL_VERSION=6.0.0-alpha.18 -ARG POWERSHELL_RELEASE=v6.0.0-alpha.18 -ARG POWERSHELL_PACKAGE=powershell-6.0.0_alpha.18-1.el7.centos.x86_64.rpm +ARG POWERSHELL_VERSION=6.0.0-beta.1 +ARG POWERSHELL_RELEASE=v6.0.0-beta.1 +ARG POWERSHELL_PACKAGE=powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm # The CentOS 7 release relies on an older version of libicu, so we'll be downloading it # from the University of Kent (GB) mirror service. diff --git a/docker/release/nanoserver/Dockerfile b/docker/release/nanoserver/Dockerfile index 34c83f6c3..6887ddb03 100644 --- a/docker/release/nanoserver/Dockerfile +++ b/docker/release/nanoserver/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="PowerShell Team " LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" LABEL description="This Dockerfile will install the latest release of PS." -ARG POWERSHELL_ZIP=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/PowerShell-6.0.0-alpha.18-win10-win2016-x64.zip +ARG POWERSHELL_ZIP=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/PowerShell-6.0.0-beta.1-win10-win2016-x64.zip # Setup PowerShell - Log-to > C:\Docker.log SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"] diff --git a/docker/release/opensuse42.1/Dockerfile b/docker/release/opensuse42.1/Dockerfile index c569d2a93..95ed2ec65 100644 --- a/docker/release/opensuse42.1/Dockerfile +++ b/docker/release/opensuse42.1/Dockerfile @@ -5,8 +5,8 @@ LABEL maintainer="PowerShell Team " LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" LABEL description="This Dockerfile will install the latest release of PS." -ARG POWERSHELL_VERSION=6.0.0_alpha.18 -ARG POWERSHELL_RELEASE=v6.0.0-alpha.18 +ARG POWERSHELL_VERSION=6.0.0_beta.1 +ARG POWERSHELL_RELEASE=v6.0.0-beta.1 ARG FORK=PowerShell ARG POWERSHELL_PACKAGE=powershell-$POWERSHELL_VERSION-1.suse.42.1.x86_64.rpm diff --git a/docker/release/windowsservercore/Dockerfile b/docker/release/windowsservercore/Dockerfile index 8ef8b0a42..8ab937a64 100644 --- a/docker/release/windowsservercore/Dockerfile +++ b/docker/release/windowsservercore/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="PowerShell Team " LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" LABEL description="This Dockerfile will install the latest release of PS." -ARG POWERSHELL_MSI=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/PowerShell-6.0.0-alpha.18-win10-win2016-x64.msi +ARG POWERSHELL_MSI=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/PowerShell-6.0.0-beta.1-win10-win2016-x64.msi # Setup PowerShell - Log-to > C:\Docker.log SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"] diff --git a/docs/installation/linux.md b/docs/installation/linux.md index b51800f86..6b6f094da 100644 --- a/docs/installation/linux.md +++ b/docs/installation/linux.md @@ -1,7 +1,7 @@ # Package installation instructions Supports [Ubuntu 14.04][u14], [Ubuntu 16.04][u16], [Debian 8][deb8], -[CentOS 7][cos], [Red Hat Enterprise Linux (RHEL) 7][rhel7], [Arch Linux][arch], [many Linux distributions (AppImage)][lai], and [macOS 10.11][mac]. +[CentOS 7][cos], [Red Hat Enterprise Linux (RHEL) 7][rhel7], [Arch Linux][arch], [many Linux distributions (AppImage)][lai], and [macOS 10.12][mac]. All packages are available on our GitHub [releases][] page. All of these steps can be done automatically by the [`download.sh`][download] script. @@ -10,7 +10,7 @@ You should *never* run a script without reading it first! Please **read the [download][] script first**, and then if you want to run it, use: ```sh -bash <(curl -fsSL https://raw.githubusercontent.com/PowerShell/PowerShell/v6.0.0-alpha.18/tools/download.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/PowerShell/PowerShell/v6.0.0-beta.1/tools/download.sh) ``` Once the package is installed, run `powershell` from a terminal. @@ -22,8 +22,8 @@ Once the package is installed, run `powershell` from a terminal. [rhel7]: #red-hat-enterprise-linux-rhel-7 [arch]: #arch-linux [lai]: #linux-appimage -[mac]: #macos-1011 -[download]: https://github.com/PowerShell/PowerShell/blob/v6.0.0-alpha.18/tools/download.sh +[mac]: #macos-1012 +[download]: https://github.com/PowerShell/PowerShell/blob/v6.0.0-beta.1/tools/download.sh ## Ubuntu 14.04 @@ -55,13 +55,13 @@ from then on, you just need to use `sudo apt-get upgrade powershell` to update i ### Installation via Direct Download Using [Ubuntu 14.04][], download the Debian package -`powershell_6.0.0-alpha.18-1ubuntu1.14.04.1_amd64.deb` +`powershell_6.0.0-beta.1-1ubuntu1.14.04.1_amd64.deb` from the [releases][] page onto the Ubuntu machine. Then execute the following in the terminal: ```sh -sudo dpkg -i powershell_6.0.0-alpha.18-1ubuntu1.14.04.1_amd64.deb +sudo dpkg -i powershell_6.0.0-beta.1-1ubuntu1.14.04.1_amd64.deb sudo apt-get install -f ``` @@ -107,13 +107,13 @@ from then on, you just need to use `sudo apt-get upgrade powershell` to update i ### Installation via Direct Download - Ubuntu 16.04 Using [Ubuntu 16.04][], download the Debian package -`powershell_6.0.0-alpha.18-1ubuntu1.16.04.1_amd64.deb` +`powershell_6.0.0-beta.1-1ubuntu1.16.04.1_amd64.deb` from the [releases][] page onto the Ubuntu machine. Then execute the following in the terminal: ```sh -sudo dpkg -i powershell_6.0.0-alpha.18-1ubuntu1.16.04.1_amd64.deb +sudo dpkg -i powershell_6.0.0-beta.1-1ubuntu1.16.04.1_amd64.deb sudo apt-get install -f ``` @@ -160,13 +160,13 @@ from then on, you just need to use `sudo apt-get upgrade powershell` to update i ### Installation via Direct Download - Debian 8 Download the Debian package -`powershell_6.0.0-alpha.18-1ubuntu1.14.04.1_amd64.deb` +`powershell_6.0.0-beta.1-1ubuntu1.14.04.1_amd64.deb` from the [releases][] page onto the Debian machine. Then execute the following in the terminal: ```sh -sudo dpkg -i powershell_6.0.0-alpha.18-1ubuntu1.14.04.1_amd64.deb +sudo dpkg -i powershell_6.0.0-beta.1-1ubuntu1.14.04.1_amd64.deb sudo apt-get install -f ``` @@ -205,19 +205,19 @@ you just need to use `sudo yum update powershell` to update PowerShell. ### Installation via Direct Download - CentOS 7 Using [CentOS 7][], download the RPM package -`powershell-6.0.0_alpha.18-1.el7.centos.x86_64.rpm` +`powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm` from the [releases][] page onto the CentOS machine. Then execute the following in the terminal: ```sh -sudo yum install ./powershell-6.0.0_alpha.18-1.el7.centos.x86_64.rpm +sudo yum install ./powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm ``` You can also install the RPM without the intermediate step of downloading it: ```sh -sudo yum install https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/powershell-6.0.0_alpha.18-1.el7.centos.x86_64.rpm +sudo yum install https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm ``` ### Uninstallation - CentOS 7 @@ -251,19 +251,19 @@ you just need to use `sudo yum update powershell` to update PowerShell. ### Installation via Direct Download - Red Hat Enterprise Linux (RHEL) 7 Download the RPM package -`powershell-6.0.0_alpha.18-1.el7.centos.x86_64.rpm` +`powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm` from the [releases][] page onto the Red Hat Enterprise Linux machine. Then execute the following in the terminal: ```sh -sudo yum install ./powershell-6.0.0_alpha.18-1.el7.centos.x86_64.rpm +sudo yum install ./powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm ``` You can also install the RPM without the intermediate step of downloading it: ```sh -sudo yum install https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/powershell-6.0.0_alpha.18-1.el7.centos.x86_64.rpm +sudo yum install https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm ``` ### Uninstallation - Red Hat Enterprise Linux (RHEL) 7 @@ -279,21 +279,21 @@ Installation instruction for OpenSUSE 42.1. ### Installation via Direct Download - OpenSUSE 42.1 Using [OpenSUSE 42.1][], download the RPM package -`powershell-6.0.0_alpha.18-1.suse.42.1.x86_64.rpm` +`powershell-6.0.0_beta.1-1.suse.42.1.x86_64.rpm` from the [releases][] page onto the OpenSUSE machine. Then execute the following in the terminal: ```sh sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc -sudo zypper install ./powershell-6.0.0_alpha.18-1.suse.42.1.x86_64.rpm +sudo zypper install ./powershell-6.0.0_beta.1-1.suse.42.1.x86_64.rpm ``` You can also install the RPM without the intermediate step of downloading it: ```sh sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc -sudo zypper install https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/powershell-6.0.0_alpha.18-1.suse.42.1.x86_64.rpm +sudo zypper install https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell-6.0.0_beta.1-1.suse.42.1.x86_64.rpm ``` ### Uninstallation - OpenSUSE 42.1 @@ -319,14 +319,14 @@ For more information on installing packages from the AUR, see the [Arch Linux wi ## Linux AppImage Using a recent Linux distribution, -download the AppImage `PowerShell-6.0.0-alpha.18-x86_64.AppImage` +download the AppImage `PowerShell-6.0.0-beta.1-x86_64.AppImage` from the [releases][] page onto the Linux machine. Then execute the following in the terminal: ```bash -chmod a+x PowerShell-6.0.0-alpha.18-x86_64.AppImage -./PowerShell-6.0.0-alpha.18-x86_64.AppImage +chmod a+x PowerShell-6.0.0-beta.1-x86_64.AppImage +./PowerShell-6.0.0-beta.1-x86_64.AppImage ``` The [AppImage][] lets you run PowerShell without installing it. @@ -337,20 +337,20 @@ and is a single binary. [appimage]: http://appimage.org/ -## macOS 10.11 +## macOS 10.12 -Using macOS 10.11, download the PKG package -`powershell-6.0.0-alpha.18-osx.10.11-x64.pkg` +Using macOS 10.12, download the PKG package +`powershell-6.0.0-beta.1-osx.10.12-x64.pkg` from the [releases][] page onto the macOS machine. Either double-click the file and follow the prompts, or install it from the terminal: ```sh -sudo installer -pkg powershell-6.0.0-alpha.18-osx.10.11-x64.pkg -target / +sudo installer -pkg powershell-6.0.0-beta.1-osx.10.12-x64.pkg -target / ``` -### Uninstallation - macOS 10.11 +### Uninstallation - macOS 10.12 PowerShell on MacOS must be removed manually. @@ -412,7 +412,7 @@ You *can* run this command manually if you're having trouble with .NET Core's cr ## Paths -* `$PSHOME` is `/opt/microsoft/powershell/6.0.0-alpha.18/` +* `$PSHOME` is `/opt/microsoft/powershell/6.0.0-beta.1/` * User profiles will be read from `~/.config/powershell/profile.ps1` * Default profiles will be read from `$PSHOME/profile.ps1` * User modules will be read from `~/.local/share/powershell/Modules` @@ -427,7 +427,7 @@ On Linux and macOS, the [XDG Base Directory Specification][xdg-bds] is respected Note that because macOS is a derivation of BSD, instead of `/opt`, the prefix used is `/usr/local`. -Thus, `$PSHOME` is `/usr/local/microsoft/powershell/6.0.0-alpha.18/`, +Thus, `$PSHOME` is `/usr/local/microsoft/powershell/6.0.0-beta.1/`, and the symlink is placed at `/usr/local/bin/powershell`. [releases]: https://github.com/PowerShell/PowerShell/releases/latest diff --git a/tools/download.sh b/tools/download.sh index d572de36e..fb0023a8b 100755 --- a/tools/download.sh +++ b/tools/download.sh @@ -9,7 +9,7 @@ trap ' get_url() { fork=$2 - release=v6.0.0-alpha.18 + release=v6.0.0-beta.1 echo "https://github.com/$fork/PowerShell/releases/download/$release/$1" } @@ -26,7 +26,7 @@ case "$OSTYPE" in sudo yum install -y curl fi - package=powershell-6.0.0_alpha.18-1.el7.centos.x86_64.rpm + package=powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm ;; ubuntu) if ! hash curl 2>/dev/null; then @@ -36,10 +36,10 @@ case "$OSTYPE" in case "$VERSION_ID" in 14.04) - package=powershell_6.0.0-alpha.18-1ubuntu1.14.04.1_amd64.deb + package=powershell_6.0.0-beta.1-1ubuntu1.14.04.1_amd64.deb ;; 16.04) - package=powershell_6.0.0-alpha.18-1ubuntu1.16.04.1_amd64.deb + package=powershell_6.0.0-beta.1-1ubuntu1.16.04.1_amd64.deb ;; *) echo "Ubuntu $VERSION_ID is not supported!" >&2 @@ -55,9 +55,7 @@ case "$OSTYPE" in case "$VERSION_ID" in 42.1) - # TODO during next release remove fork and fix package name - fork=TravisEz13 - package=powershell-6.0.0_alpha.18_41_g8598a51-1.suse.42.1.x86_64.rpm + package=powershell-6.0.0_beta.1-1.suse.42.1.x86_64.rpm ;; *) echo "OpenSUSE $VERSION_ID is not supported!" >&2 @@ -71,7 +69,7 @@ case "$OSTYPE" in ;; darwin*) # We don't check for curl as macOS should have a system version - package=powershell-6.0.0-alpha.18-osx.10.11-x64.pkg + package=powershell-6.0.0-beta.1-osx.10.12-x64.pkg ;; *) echo "$OSTYPE is not supported!" >&2