From 05ca36463a810eb76c15c3f9e38661441dcf0d97 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Thu, 1 Feb 2018 02:56:20 +0400
Subject: [PATCH] Build: Update PowerShell to build with .NET Core SDK 2.1.4
 (#6054)

---
 .travis.yml  | 2 +-
 appveyor.yml | 2 +-
 build.psm1   | 4 ++--
 global.json  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f96b214ff6..472f23a807 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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:
diff --git a/appveyor.yml b/appveyor.yml
index a5135d3165..c997322a08 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -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'
diff --git a/build.psm1 b/build.psm1
index d472b1e793..8fc04c04ed 100644
--- a/build.psm1
+++ b/build.psm1
@@ -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
diff --git a/global.json b/global.json
index d427e5ce35..815be4bfb9 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.0.2"
+    "version": "2.1.4"
   }
 }