diff --git a/README.md b/README.md index de82e81f70..c8fcadcfb7 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,8 @@ You can download and install a PowerShell package for any of the following platf | Platform | Downloads | How to Install | | ---------------------------------- | ---------------------- | ----------------------------- | -| Windows 10 / Server 2016 (x64) | [.msi][rl-windows10] | [Instructions][in-windows] | -| Windows 8.1 / Server 2012 R2 (x64) | [.msi][rl-windows81] | [Instructions][in-windows] | -| Windows 7 / Server 2008 R2 (x64) | [.msi][rl-windows7-64] | [Instructions][in-windows] | -| Windows 7 (x86) | [.msi][rl-windows7-86] | [Instructions][in-windows] | +| Windows (x64) | [.msi][rl-windows-64] | [Instructions][in-windows] | +| Windows (x86) | [.msi][rl-windows-86] | [Instructions][in-windows] | | Ubuntu 16.04 | [.deb][rl-ubuntu16] | [Instructions][in-ubuntu16] | | Ubuntu 14.04 | [.deb][rl-ubuntu14] | [Instructions][in-ubuntu14] | | Debian 8 | [.deb][rl-ubuntu14] | [Instructions][in-deb8] | @@ -43,10 +41,8 @@ You can download and install a PowerShell package for any of the following platf | Docker | | [Instructions][in-docker] | | Kali Linux | [.deb][rl-ubuntu16] | [Instructions][in-kali] -[rl-windows10]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.7/PowerShell-6.0.0-beta.7-win10-win2016-x64.msi -[rl-windows81]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.7/PowerShell-6.0.0-beta.7-win81-win2012r2-x64.msi -[rl-windows7-64]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.7/PowerShell-6.0.0-beta.7-win7-win2008r2-x64.msi -[rl-windows7-86]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.7/PowerShell-6.0.0-beta.7-win7-x86.msi +[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.7/PowerShell-6.0.0-beta.7-win-x64.msi +[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.7/PowerShell-6.0.0-beta.7-win-x86.msi [rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.7/powershell_6.0.0-beta.7-1ubuntu1.16.04.1_amd64.deb [rl-ubuntu14]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.7/powershell_6.0.0-beta.7-1ubuntu1.14.04.1_amd64.deb [rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.7/powershell-6.0.0_beta.7-1.el7.x86_64.rpm diff --git a/docker/release/nanoserver-insider/Dockerfile b/docker/release/nanoserver-insider/Dockerfile index e9dcbeeca2..e0ef088f68 100755 --- a/docker/release/nanoserver-insider/Dockerfile +++ b/docker/release/nanoserver-insider/Dockerfile @@ -12,7 +12,7 @@ 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-beta.7 -ENV PS_DOWNLOAD_URL https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win10-win2016-x64.zip +ENV PS_DOWNLOAD_URL https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] RUN Invoke-WebRequest $Env:PS_DOWNLOAD_URL -OutFile powershell.zip diff --git a/docker/release/nanoserver/Dockerfile b/docker/release/nanoserver/Dockerfile index 6b8d0da14a..ba9dc55176 100644 --- a/docker/release/nanoserver/Dockerfile +++ b/docker/release/nanoserver/Dockerfile @@ -1,7 +1,7 @@ # escape=` FROM microsoft/nanoserver:latest -ARG POWERSHELL_ZIP=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.7/PowerShell-6.0.0-beta.7-win10-win2016-x64.zip +ARG POWERSHELL_ZIP=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.7/PowerShell-6.0.0-beta.7-win-x64.zip ARG POWERSHELL_VERSION=6.0.0-beta.7 ARG IMAGE_NAME=microsoft/powershell:nanoserver @@ -25,7 +25,7 @@ LABEL maintainer="PowerShell Team " ` RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%" # Setup PowerShell - Log-to > C:\Docker.log SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"] -ADD $POWERSHELL_ZIP /powershell-win10-x64.zip +ADD $POWERSHELL_ZIP /powershell-win-x64.zip # Install PowerShell package and clean up RUN $ErrorActionPreference='Stop'; ` @@ -36,7 +36,7 @@ RUN $ErrorActionPreference='Stop'; ` $VerInfo = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion' ; ` ('FullBuildString: '+$VerInfo.BuildLabEx) | Write-Output ; ` ('OperatingSystem: '+$VerInfo.ProductName+' '+$VerInfo.EditionId+' '+$VerInfo.InstallationType) | Write-Output ; ` - [System.IO.FileInfo]$ZipFile = Get-Item -Path ./powershell-win10-x64.zip ; ` + [System.IO.FileInfo]$ZipFile = Get-Item -Path ./powershell-win-x64.zip ; ` New-Item -Path $Env:ProgramFiles/PowerShell -ItemType Directory -Force | out-null ; ` [System.IO.DirectoryInfo]$PsFolder=New-Item -Path $Env:ProgramFiles\PowerShell -ItemType Directory -Force ; ` Add-Type -AssemblyName System.IO.Compression.ZipFile ; ` diff --git a/docker/release/windowsservercore/Dockerfile b/docker/release/windowsservercore/Dockerfile index 1e3ea7637e..24d25825b9 100644 --- a/docker/release/windowsservercore/Dockerfile +++ b/docker/release/windowsservercore/Dockerfile @@ -1,7 +1,7 @@ # escape=` FROM microsoft/windowsservercore:latest -ARG POWERSHELL_MSI=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.7/PowerShell-6.0.0-beta.7-win10-win2016-x64.msi +ARG POWERSHELL_MSI=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.7/PowerShell-6.0.0-beta.7-win-x64.msi ARG POWERSHELL_VERSION=6.0.0-beta.7 ARG IMAGE_NAME=microsoft/powershell:windowsservercore @@ -25,7 +25,7 @@ LABEL maintainer="PowerShell Team " ` RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%" # Setup PowerShell - Log-to > C:\Docker.log SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"] -ADD $POWERSHELL_MSI /PowerShell-win10-x64.msi +ADD $POWERSHELL_MSI /PowerShell-win-x64.msi # Install PowerShell package and clean up RUN $ErrorActionPreference='Stop'; ` @@ -36,15 +36,15 @@ RUN $ErrorActionPreference='Stop'; ` $VerInfo = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion' ; ` ('FullBuildString: '+$VerInfo.BuildLabEx) | Write-Output ; ` ('OperatingSystem: '+$VerInfo.ProductName+' '+$VerInfo.EditionId+' '+$VerInfo.InstallationType) | Write-Output ; ` - [System.IO.FileInfo]$MsiFile = Get-Item -Path ./PowerShell-win10-x64.msi ; ` - Start-Process -FilePath msiexec.exe -ArgumentList '-qn','-i c:\PowerShell-win10-x64.msi', ` - '-log c:\PowerShell-win10-x64.msi.log','-norestart' -wait ; ` - $log=get-content -Path C:\PowerShell-win10-x64.msi.log -Last 10 ; ` + [System.IO.FileInfo]$MsiFile = Get-Item -Path ./PowerShell-win-x64.msi ; ` + Start-Process -FilePath msiexec.exe -ArgumentList '-qn','-i c:\PowerShell-win-x64.msi', ` + '-log c:\PowerShell-win-x64.msi.log','-norestart' -wait ; ` + $log=get-content -Path C:\PowerShell-win-x64.msi.log -Last 10 ; ` if ($log -match 'Installation success or error status: 0') { ` Remove-Item -Path $MsiFile ; ` $psexe=Get-Item -Path $Env:ProgramFiles\PowerShell\*\powershell.exe ; ` New-Item -Type SymbolicLink -Path $Env:ProgramFiles\PowerShell\ -Name latest -Value $psexe.DirectoryName ` - } else { throw 'Installation failed! See c:\PowerShell-win10-x64.msi.log' } ; + } else { throw 'Installation failed! See c:\PowerShell-win-x64.msi.log' } ; # Verify New Powershell.exe runs SHELL ["C:\\Program Files\\PowerShell\\latest\\PowerShell.exe", "-command"] diff --git a/docs/installation/windows.md b/docs/installation/windows.md index 50c5484d9c..fdb3b9d753 100644 --- a/docs/installation/windows.md +++ b/docs/installation/windows.md @@ -49,7 +49,7 @@ $session = New-PSSession -ComputerName -Credential \powershell--win10-win2016-x64.zip c:\ -ToSession $session +Copy-Item \powershell--win-x64.zip c:\ -ToSession $session ``` * Enter the session @@ -62,7 +62,7 @@ Enter-PSSession $session ```powershell # Insert the appropriate version. -Expand-Archive -Path C:\powershell--win10-win2016-x64.zip -DestinationPath "C:\PowerShellCore_" +Expand-Archive -Path C:\powershell--win-x64.zip -DestinationPath "C:\PowerShellCore_" ``` * Follow the instructions to create a remoting endpoint using the [another instance technique](#executed-by-another-instance-of-powershell-on-behalf-of-the-instance-that-it-will-register).