admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 6.0.0 into master

Browse Source 
# 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
This commit is contained in:
Travis Plunk
2018-01-10 17:42:41 -08:00
parent 05ed03154d 2f818615be
commit a08f3241a3
19 changed files with 122 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/community/amazonlinux/Dockerfile
+2 -2
View File
@@ -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>" \
docker/release/centos7/Dockerfile
+1 -1
View File
@@ -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>" \
docker/release/fedora25/Dockerfile
+1 -1
View File
@@ -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>" \
docker/release/fedora26/Dockerfile
+1 -1
View File
@@ -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>" \
docker/release/nanoserver/Dockerfile
+2 -2
View File
@@ -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>" `
docker/release/opensuse42.2/Dockerfile
+2 -2
View File
@@ -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>" \
docker/release/ubuntu14.04/Dockerfile
+1 -1
View File
@@ -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>" \
docker/release/ubuntu16.04/Dockerfile
+1 -1
View File
@@ -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>" \
docker/release/windowsservercore/Dockerfile
+2 -2
View File
@@ -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>" `
docker/tests/container.tests.ps1
+2 -2
View File
@@ -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'
}
}
docker/tests/containerTestCommon.psm1
+1 -1
View File
@@ -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"
)