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

Build: Update PowerShell to build with .NET Core SDK 2.1.4 (#6054)

Browse Source
This commit is contained in:
Ilya
2018-01-31 14:56:20 -08:00
committed by Dongbo Wang
parent 47c4a0a74b
commit 05ca36463a
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -56,7 +56,7 @@ after_success:
# travis-ci will quit using the cache if an enviroment variable changes
env:
- CACHE_VERSION=netcoreapp.2.0.5
- CACHE_VERSION=netcoreapp.2.0.5-sdk.2.1.4
# timeout uploading cache after 6 minutes (360 seconds)
cache:
appveyor.yml
+1 -1
View File
@@ -2,7 +2,7 @@
image: Visual Studio 2017
# cache version - netcoreapp.2.0.5
# cache version - netcoreapp.2.0.5-sdk.2.1.4
cache:
- '%LocalAppData%\Microsoft\dotnet -> appveyor.yml'
- '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'
build.psm1
+2 -2
View File
@@ -1423,8 +1423,8 @@ function Start-PSxUnit {
# '-fxversion' workaround required due to https://github.com/dotnet/cli/issues/7901#issuecomment-343323674
# Run sequential tests first, and then run the tests that can execute in parallel
dotnet xunit -fxversion 2.0.0 -configuration $Options.configuration -xml $SequentialTestResultsFile -namespace "PSTests.Sequential" -parallel none
dotnet xunit -fxversion 2.0.0 -configuration $Options.configuration -xml $ParallelTestResultsFile -namespace "PSTests.Parallel" -nobuild
dotnet xunit -fxversion 2.0.5 -configuration $Options.configuration -xml $SequentialTestResultsFile -namespace "PSTests.Sequential" -parallel none
dotnet xunit -fxversion 2.0.5 -configuration $Options.configuration -xml $ParallelTestResultsFile -namespace "PSTests.Parallel" -nobuild
}
finally {
Pop-Location
global.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.0.2"
"version": "2.1.4"
}
}