Merge 6.0.0 into master

TravisEz13 · TravisEz13 · commit a08f3241a344 · 2018-01-10T17:42:41.000-08:00
# Conflicts:
#	.github/Images/GitHub-PR.png
#	assets/Product.wxs
#	docs/installation/linux.md
#	docs/installation/macos.md
#	docs/installation/windows.md
#	test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
#	tools/metadata.json
diff --git a/.github/Images/GitHub-PR.png b/.github/Images/GitHub-PR.png
diff --git a/.spelling b/.spelling
@@ -381,6 +381,8 @@ WindowsVersion
 WSManCredSSP
 XPath
 Youtube
+stuntguy3000
+SwarfegaGit
 #endregion
 
 #region CODE_OF_CONDUCT.md Overrides
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Changelog
 
+## v6.0.0 - 2018-01-10
+
+### Breaking changes
+
+- Remove `sc` alias which conflicts with `sc.exe` (#5827)
+- Separate group policy settings and enable policy controlled logging in PowerShell Core (#5791)
+
+### Engine updates and fixes
+
+- Handle `DLLImport` failure of `libpsrpclient` in PowerShell Remoting on Unix platforms (#5622)
+
+### Test
+
+- Replace `lee.io` Tests with `WebListener` (#5709) (Thanks @markekraus!)
+- Update the docker based release package tests due to the removal of `Pester` module and other issues (#5692)
+- Replace Remaining `HttpBin.org` Tests with `WebListener` (#5665) (Thanks @markekraus!)
+
+### Build and Packaging Improvements
+
+- Update x86 and x64 `MSI` packages to not overwrite each other (#5812) (Thanks @bergmeister!)
+- Update `Restore-PSPester` to include the fix for nested describe errors (#5771)
+- Automate the generation of release change log draft (#5712)
+
+### Documentation and Help Content
+
+- Updated help Uri to point to latest help content for `Microsoft.PowerShell.Core` module (#5820)
+- Update the installation doc for `Raspberry-Pi` about supported devices (#5773)
+- Fix a typo and a Markdown linting error in the Pull Request Template (#5807) (Thanks @markekraus!)
+- Update submodule documentation for pester removal (#5786) (Thanks @bergmeister!)
+- Change `Github` to `GitHub` in `CONTRIBUTING.md` (#5697) (Thanks @stuntguy3000!)
+- Fix incorrect release date on the changelog (#5698) (Thanks @SwarfegaGit!)
+- Add instructions to deploy `win-arm` build on Windows IoT (#5682)
+
 ## v6.0.0-rc.2 - 2017-12-14
 
 ### Breaking changes
diff --git a/README.md b/README.md
@@ -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.0-rc.2/PowerShell-6.0.0-rc.2-win-x64.msi
-[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/PowerShell-6.0.0-rc.2-win-x86.msi
-[rl-ubuntu17]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/powershell_6.0.0-rc.2-1.ubuntu.17.04_amd64.deb
-[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/powershell_6.0.0-rc.2-1.ubuntu.16.04_amd64.deb
-[rl-ubuntu14]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/powershell_6.0.0-rc.2-1.ubuntu.14.04_amd64.deb
-[rl-debian8]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/powershell_6.0.0-rc.2-1.debian.8_amd64.deb
-[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/powershell_6.0.0-rc.2-1.debian.9_amd64.deb
-[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/powershell-6.0.0_rc.2-1.rhel.7.x86_64.rpm
-[rl-ai]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/PowerShell-6.0.0-rc.2-x86_64.AppImage
-[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/powershell-6.0.0-rc.2-osx.10.12-x64.pkg
-[rl-winarm]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/PowerShell-6.0.0-rc.2-win-arm32.zip
-[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/PowerShell-6.0.0-rc.2-win-arm64.zip
-[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/PowerShell-6.0.0-rc.2-win-x86.zip
-[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/PowerShell-6.0.0-rc.2-win-x64.zip
-[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/powershell-6.0.0-rc.2-osx-x64.tar.gz
-[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/powershell-6.0.0-rc.2-linux-x64.tar.gz
-[rl-raspbian]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/powershell-6.0.0-rc.2-linux-arm32.tar.gz
+[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/PowerShell-6.0.0-win-x64.msi
+[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/PowerShell-6.0.0-win-x86.msi
+[rl-ubuntu17]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/powershell_6.0.0-1.ubuntu.17.04_amd64.deb
+[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/powershell_6.0.0-1.ubuntu.16.04_amd64.deb
+[rl-ubuntu14]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/powershell_6.0.0-1.ubuntu.14.04_amd64.deb
+[rl-debian8]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/powershell_6.0.0-1.debian.8_amd64.deb
+[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/powershell_6.0.0-1.debian.9_amd64.deb
+[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/powershell-6.0.0-1.rhel.7.x86_64.rpm
+[rl-ai]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/PowerShell-6.0.0-x86_64.AppImage
+[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/powershell-6.0.0-osx.10.12-x64.pkg
+[rl-winarm]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/PowerShell-6.0.0-win-arm32.zip
+[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/PowerShell-6.0.0-win-arm64.zip
+[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/PowerShell-6.0.0-win-x86.zip
+[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/PowerShell-6.0.0-win-x64.zip
+[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/powershell-6.0.0-osx-x64.tar.gz
+[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/powershell-6.0.0-linux-x64.tar.gz
+[rl-raspbian]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/powershell-6.0.0-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
diff --git a/docker/community/amazonlinux/Dockerfile b/docker/community/amazonlinux/Dockerfile
@@ -2,8 +2,8 @@
 
 FROM amazonlinux:latest
 
-ARG POWERSHELL_VERSION=6.0.0-rc.2
-ARG POWERSHELL_PACKAGE=powershell-6.0.0-rc.2-linux-x64.tar.gz
+ARG POWERSHELL_VERSION=6.0.0
+ARG POWERSHELL_PACKAGE=powershell-6.0.0-linux-x64.tar.gz
 ARG IMAGE_NAME=microsoft/powershell:amazonlinux
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
diff --git a/docker/release/centos7/Dockerfile b/docker/release/centos7/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM centos:7
 
-ARG POWERSHELL_VERSION=6.0.0-rc.2
+ARG POWERSHELL_VERSION=6.0.0
 ARG IMAGE_NAME=microsoft/powershell:centos7
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
diff --git a/docker/release/fedora25/Dockerfile b/docker/release/fedora25/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM fedora:25
 
-ARG POWERSHELL_VERSION=6.0.0-rc.2
+ARG POWERSHELL_VERSION=6.0.0
 ARG IMAGE_NAME=microsoft/powershell:fedora25
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
diff --git a/docker/release/fedora26/Dockerfile b/docker/release/fedora26/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM fedora:26
 
-ARG POWERSHELL_VERSION=6.0.0-rc.2
+ARG POWERSHELL_VERSION=6.0.0
 ARG IMAGE_NAME=microsoft/powershell:fedora26
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
diff --git a/docker/release/nanoserver/Dockerfile b/docker/release/nanoserver/Dockerfile
@@ -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.0-rc.2
+ARG PS_VERSION=6.0.0
 
 ENV PS_DOWNLOAD_URL https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
 
@@ -25,7 +25,7 @@ RUN Expand-Archive powershell.zip -DestinationPath \PowerShell
 FROM ${NanoServerRepo}:$NanoServerVersion
 
 ARG VCS_REF="none"
-ARG PS_VERSION=6.0.0-rc.2
+ARG PS_VERSION=6.0.0
 ARG IMAGE_NAME=microsoft/powershell
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
diff --git a/docker/release/opensuse42.2/Dockerfile b/docker/release/opensuse42.2/Dockerfile
@@ -2,8 +2,8 @@
 
 FROM opensuse:42.2
 
-ARG POWERSHELL_VERSION=6.0.0-rc.2
-ARG POWERSHELL_PACKAGE=powershell-6.0.0-rc.2-linux-x64.tar.gz
+ARG POWERSHELL_VERSION=6.0.0
+ARG POWERSHELL_PACKAGE=powershell-6.0.0-linux-x64.tar.gz
 ARG IMAGE_NAME=microsoft/powershell:opensuse42.2
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
diff --git a/docker/release/ubuntu14.04/Dockerfile b/docker/release/ubuntu14.04/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM ubuntu:trusty
 
-ARG POWERSHELL_VERSION=6.0.0-rc.2
+ARG POWERSHELL_VERSION=6.0.0
 ARG IMAGE_NAME=microsoft/powershell:ubuntu14.04
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
diff --git a/docker/release/ubuntu16.04/Dockerfile b/docker/release/ubuntu16.04/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM ubuntu:xenial
 
-ARG POWERSHELL_VERSION=6.0.0-rc.2
+ARG POWERSHELL_VERSION=6.0.0
 ARG IMAGE_NAME=microsoft/powershell:ubuntu16.04
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
diff --git a/docker/release/windowsservercore/Dockerfile b/docker/release/windowsservercore/Dockerfile
@@ -1,8 +1,8 @@
 # escape=`
 FROM microsoft/windowsservercore:latest
 
-ARG POWERSHELL_MSI=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/PowerShell-6.0.0-rc.2-win-x64.msi
-ARG POWERSHELL_VERSION=6.0.0-rc.2
+ARG POWERSHELL_MSI=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0/PowerShell-6.0.0-win-x64.msi
+ARG POWERSHELL_VERSION=6.0.0
 ARG IMAGE_NAME=microsoft/powershell:windowsservercore
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
diff --git a/docker/tests/container.tests.ps1 b/docker/tests/container.tests.ps1
@@ -73,7 +73,7 @@ Describe "Linux Containers run PowerShell" -Tags 'Behavior', 'Linux' {
             $path
         )
 
-        Get-ContainerPowerShellVersion -TestContext $testContext -Name $Name -RepoName (Get-RepoName)  | should be '6.0.0-rc.2'
+        Get-ContainerPowerShellVersion -TestContext $testContext -Name $Name -RepoName (Get-RepoName)  | should be '6.0.0'
     }
 }
 
@@ -97,6 +97,6 @@ Describe "Windows Containers run PowerShell" -Tags 'Behavior', 'Windows' {
             $path
         )
 
-        Get-ContainerPowerShellVersion -TestContext $testContext -Name $Name -RepoName (Get-RepoName)  | should be '6.0.0-rc.2'
+        Get-ContainerPowerShellVersion -TestContext $testContext -Name $Name -RepoName (Get-RepoName)  | should be '6.0.0'
     }
 }
diff --git a/docker/tests/containerTestCommon.psm1 b/docker/tests/containerTestCommon.psm1
@@ -222,7 +222,7 @@ function Test-PSPackage
         [Parameter(Mandatory=$true)]
         $PSPackageLocation, # e.g. Azure storage
         [string]
-        $PSVersion = "6.0.0-rc.2",
+        $PSVersion = "6.0.0",
         [string]
         $TestList = "/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module"
     )
diff --git a/docs/installation/linux.md b/docs/installation/linux.md
diff --git a/docs/installation/macos.md b/docs/installation/macos.md
diff --git a/docs/installation/windows.md b/docs/installation/windows.md
diff --git a/tools/metadata.json b/tools/metadata.json
