From 828a4d55e7bc91cdf1614088ac3a71e487a733b6 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Sun, 28 Jan 2018 18:27:44 +0500
Subject: [PATCH 1/3] [Feature] Update PowerShell to build with .NET Core SDK
 2.1.4

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index d427e5ce350..815be4bfb90 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.0.2"
+    "version": "2.1.4"
   }
 }

From 3f97624ce318f8635a60a07ec33845d7a8b8bd58 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 31 Jan 2018 10:11:50 -0800
Subject: [PATCH 2/3] [Feature] Update appveyor.yml and .travis.yml to flush
 the cache

---
 .travis.yml  | 2 +-
 appveyor.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f96b214ff6b..472f23a807d 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 a5135d31655..c997322a085 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'

From 21a582a4a48a42e7ea97a5675267184e03630966 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 31 Jan 2018 11:50:36 -0800
Subject: [PATCH 3/3] [Feature] Update the .NET runtime version used in xUnit
 tests

---
 build.psm1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.psm1 b/build.psm1
index d472b1e7932..8fc04c04edd 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