diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
index 8fa3aa6b42..d5e495c822 100644
--- a/.vsts-ci/linux.yml
+++ b/.vsts-ci/linux.yml
@@ -67,5 +67,4 @@ phases:
Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
}
displayName: Publish Artifacts
- condition: ne(variables['Build.Reason'], 'PullRequest')
continueOnError: true
diff --git a/.vsts-ci/mac.yml b/.vsts-ci/mac.yml
index b878ff3a19..929690f302 100644
--- a/.vsts-ci/mac.yml
+++ b/.vsts-ci/mac.yml
@@ -54,5 +54,4 @@ phases:
Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
}
displayName: Publish Artifacts
- condition: ne(variables['Build.Reason'], 'PullRequest')
continueOnError: true
diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index bb56e46894..53d2351f82 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -94,7 +94,7 @@
(c) Microsoft Corporation. All rights reserved.
netcoreapp2.1
- 2.1.7
+ 2.1.8
Latest
true
diff --git a/appveyor.yml b/appveyor.yml
index 04d31f65f8..25240bafdb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,7 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
Purpose: ElevatedPesterTests_xUnit_Packaging
-# cache version - netcoreapp.2.1-sdk.2.1.503
+# cache version - netcoreapp.2.1-sdk.2.1.504
cache:
- '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'
diff --git a/assets/files.wxs b/assets/files.wxs
index 9f1bfb2e12..9c68b2f59a 100644
--- a/assets/files.wxs
+++ b/assets/files.wxs
@@ -1991,11 +1991,11 @@
-
-
+
+
-
-
+
+
@@ -2636,8 +2636,8 @@
-
-
+
+
diff --git a/global.json b/global.json
index 05f4d3751c..4ac738bc32 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "2.1.503"
+ "version": "2.1.504"
}
}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj b/src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj
index 7cd97b8c4c..13e782a348 100644
--- a/src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj
+++ b/src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/test/Test.Common.props b/test/Test.Common.props
index 7a32a5c218..7779e06c94 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.7
+ 2.1.8
true
true
diff --git a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1 b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
index daa8283f83..ab8c2fd622 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 11c073a5e6..440fc85aac 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/tools/appveyor.psm1 b/tools/appveyor.psm1
index b70cb093cd..a7b91dcd5c 100644
--- a/tools/appveyor.psm1
+++ b/tools/appveyor.psm1
@@ -602,7 +602,7 @@ function Invoke-AppveyorFinish
{
Push-AppveyorArtifact $_
}
- elseif ($env:TF_BUILD -and $env:BUILD_REASON -ne 'PullRequest') {
+ elseif ($env:TF_BUILD) {
# In VSTS
Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts;]$_"
}