From a463a34ac51003234e8e4e583ab2f7a9dbc22a38 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Wed, 23 Aug 2017 10:40:26 -0700
Subject: [PATCH] Update CliTargetFramework to netcoreapp2.1, and switch from
 hardcoding to using the variable in places

---
 build.proj               | 2 +-
 dir.props                | 2 +-
 src/redist/redist.csproj | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.proj b/build.proj
index bac606d59..3117ddb85 100644
--- a/build.proj
+++ b/build.proj
@@ -20,7 +20,7 @@
           DependsOnTargets="MSBuildWorkaroundTarget;
                             RestoreDotnetCliBuildFramework">
 
-    <Exec Command="$(DotnetStage0) publish --no-restore -o $(DotnetCliBuildDirectory)/bin --framework netcoreapp2.0 /p:GeneratePropsFile=$(GeneratePropsFile)" 
+    <Exec Command="$(DotnetStage0) publish --no-restore -o $(DotnetCliBuildDirectory)/bin --framework $(CliTargetFramework) /p:GeneratePropsFile=$(GeneratePropsFile)" 
           WorkingDirectory="$(DotnetCliBuildDirectory)"/>
   </Target>
   
diff --git a/dir.props b/dir.props
index 756fccc32..eb03fece3 100644
--- a/dir.props
+++ b/dir.props
@@ -11,7 +11,7 @@
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
 
-    <CliTargetFramework>netcoreapp2.0</CliTargetFramework>
+    <CliTargetFramework>netcoreapp2.1</CliTargetFramework>
   </PropertyGroup>
 
   <Import Project="build/InitRepo.props" />
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index c45cd6bdf..a6ad0ac3f 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -6,7 +6,7 @@
 
   <PropertyGroup>
     <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(CliTargetFramework)</TargetFramework>
     <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>