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 `release-v6.2.0-preview.4'

Browse Source 
# Conflicts:
#	test/Test.Common.props
#	tools/packaging/packaging.psm1
This commit is contained in:
Travis Plunk
2019-01-28 13:50:00 -08:00
parent 3e8f85a682 9acd174225
commit b779b88c79
13 changed files with 213 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/metadata.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"StableReleaseTag": "v6.1.2",
"PreviewReleaseTag": "v6.2.0-preview.3",
"PreviewReleaseTag": "v6.2.0-preview.4",
"ServicingReleaseTag": "v6.0.5",
"ReleaseTag": "v6.1.2",
"NextReleaseTag": "v6.2.0-preview.3"
"NextReleaseTag": "v6.2.0-preview.4"
}
tools/packaging/packaging.psm1
+1 -1
View File
@@ -2899,7 +2899,7 @@ function Test-FileWxs
Write-Warning -Message "Pushing MSI File fragment failed."
}
}
elseif ($env:TF_BUILD -and $env:BUILD_REASON -ne 'PullRequest')
elseif ($env:TF_BUILD)
{
Write-Host "##vso[artifact.upload containerfolder=wix;artifactname=wix]$newXmlFileName"
}
tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile
+2 -2
View File
@@ -1,7 +1,7 @@
# Docker image file that describes an Centos7 image with PowerShell installed from Microsoft YUM Repo
FROM mcr.microsoft.com/powershell:6.1.0-alpine-3.8
LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
FROM mcr.microsoft.com/powershell:alpine-3.8
LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
# Install dependencies and clean up
RUN apk update \