From 640ed13d22d56d898a7640949e963c6b1ce8cf08 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 1 Nov 2017 10:17:07 -0700
Subject: [PATCH] [Feature] Update powershell to use 2.0.4-servicing dotnet
 core runtime

---
 PowerShell.Common.props                   | 2 +-
 build.psm1                                | 2 +-
 global.json                               | 2 +-
 test/Test.Common.props                    | 2 +-
 test/tools/TestExe/TestExe.csproj         | 3 ++-
 test/tools/WebListener/WebListener.csproj | 3 ++-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index ccbbd1ea40f..9dd271b07e0 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -94,7 +94,7 @@
     <Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
 
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.0.4-servicing-25831-01</RuntimeFrameworkVersion>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/build.psm1 b/build.psm1
index 435fe63bbb1..4897203ca25 100644
--- a/build.psm1
+++ b/build.psm1
@@ -3,7 +3,7 @@
 $script:TestModulePathSeparator = [System.IO.Path]::PathSeparator
 
 $dotnetCLIChannel = "release"
-$dotnetCLIRequiredVersion = "2.0.0"
+$dotnetCLIRequiredVersion = "2.0.2"
 
 # Track if tags have been sync'ed
 $tagsUpToDate = $false
diff --git a/global.json b/global.json
index 110af6027d7..d427e5ce350 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.0.0"
+    "version": "2.0.2"
   }
 }
diff --git a/test/Test.Common.props b/test/Test.Common.props
index 79f0b8fbcf8..b1c1b203b64 100644
--- a/test/Test.Common.props
+++ b/test/Test.Common.props
@@ -5,7 +5,7 @@
     <Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
 
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.0.4-servicing-25831-01</RuntimeFrameworkVersion>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/test/tools/TestExe/TestExe.csproj b/test/tools/TestExe/TestExe.csproj
index a2ef5d89e5f..cc5bd30bb57 100644
--- a/test/tools/TestExe/TestExe.csproj
+++ b/test/tools/TestExe/TestExe.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="..\..\Test.Common.props"/>
+
   <PropertyGroup>
     <Description>Very simple little console class that you can use to for testing PowerShell interaction with native commands</Description>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>testexe</AssemblyName>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win7-x86;win7-x64;osx.10.12-x64;linux-x64</RuntimeIdentifiers>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index d95182c68ce..9ee1d8298ac 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
+  <Import Project="..\..\Test.Common.props"/>
+
   <PropertyGroup>
     <Description>A simple ASP.NET Core 2.0 MVC app to provide an HTTP and HTTPS server for testing.</Description>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>