diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index d25ddac462..bb56e46894 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -94,7 +94,7 @@
(c) Microsoft Corporation. All rights reserved.
netcoreapp2.1
- 2.1.5
+ 2.1.7
Latest
true
diff --git a/assets/files.wxs b/assets/files.wxs
index 9d8e96d07c..d51b85db35 100644
--- a/assets/files.wxs
+++ b/assets/files.wxs
@@ -1988,12 +1988,6 @@
-
-
-
-
-
-
@@ -2157,6 +2151,12 @@
+
+
+
+
+
+
@@ -2794,8 +2794,6 @@
-
-
@@ -2850,6 +2848,8 @@
+
+
diff --git a/build.psm1 b/build.psm1
index defaa2af59..b1c8dd6794 100644
--- a/build.psm1
+++ b/build.psm1
@@ -478,6 +478,9 @@ Fix steps:
if ($CI) {
Restore-PSPester -Destination (Join-Path $publishPath "Modules")
}
+
+ # Remove .nupkg.metadata files
+ Get-ChildItem $publishPath -Filter '.nupkg.metadata' -Recurse | ForEach-Object { Remove-Item $_.FullName -ErrorAction SilentlyContinue -Force }
}
function Restore-PSPackage
@@ -1200,10 +1203,7 @@ function Publish-TestResults
$resolvedPath = (Resolve-Path -Path $Path).ProviderPath
Write-Host "##vso[results.publish type=$Type;mergeResults=true;runTitle=$Title;publishRunAttachments=true;resultFiles=$resolvedPath;]"
- if($env:BUILD_REASON -ne 'PullRequest')
- {
- Write-Host "##vso[artifact.upload containerfolder=testResults;artifactname=testResults]$resolvedPath"
- }
+ Write-Host "##vso[artifact.upload containerfolder=testResults;artifactname=testResults]$resolvedPath"
}
}
diff --git a/global.json b/global.json
index 55e448dfe0..05f4d3751c 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "2.1.403"
+ "version": "2.1.503"
}
}
diff --git a/test/Test.Common.props b/test/Test.Common.props
index 11b20a9fed..7a32a5c218 100644
--- a/test/Test.Common.props
+++ b/test/Test.Common.props
@@ -5,7 +5,7 @@
(c) Microsoft Corporation. All rights reserved.
netcoreapp2.1
- 2.1.5
+ 2.1.7
true
true
diff --git a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1 b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
index 9879d32a24..c88916e1f9 100644
--- a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
+++ b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
@@ -233,11 +233,8 @@ function Send-VstsLogFile {
Copy-Item -Path $Path -Destination $logFile
}
- if($env:BUILD_REASON -ne 'PullRequest')
- {
- Write-Host "##vso[artifact.upload containerfolder=$name;artifactname=$name]$logFile"
- Write-Verbose "Log file captured as $name" -Verbose
- }
+ Write-Host "##vso[artifact.upload containerfolder=$name;artifactname=$name]$logFile"
+ Write-Verbose "Log file captured as $name" -Verbose
}
# Tests if the Linux or macOS user is root
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 92f576a57a..9c558815ed 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index af179ecbf8..e9c4b84670 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -2792,7 +2792,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"
}
diff --git a/tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile b/tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile
index af7ec8229b..c0541b7bbd 100644
--- a/tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile
+++ b/tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile
@@ -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 "
+FROM mcr.microsoft.com/powershell:alpine-3.8
+LABEL maintainer="PowerShell Team "
# Install dependencies and clean up
RUN apk update \