From ff55ddbd92b0266ac28d9f486704376dc127f611 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 18 Jan 2018 16:29:32 -0800
Subject: [PATCH] Update build tools and dependency versions

---
 Directory.Build.props    | 9 +++++++++
 Directory.Build.targets  | 6 ++++--
 build/common.props       | 3 +--
 build/dependencies.props | 2 ++
 korebuild-lock.txt       | 4 ++--
 korebuild.json           | 4 ++--
 6 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 Directory.Build.props

diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..e3f34ed
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+  <Import Project="version.props" />
+  <Import Project="build\dependencies.props" />
+  <Import Project="build\sources.props" />
+
+  <PropertyGroup>
+    <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
+  </PropertyGroup>
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 246f7ac..5806696 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,4 +1,6 @@
 <Project>
-  <Import Project="build\sources.props" />
-  <Import Project="build\dependencies.props" />
+  <PropertyGroup>
+    <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
+  </PropertyGroup>
 </Project>
diff --git a/build/common.props b/build/common.props
index 5ccb47f..341c01c 100644
--- a/build/common.props
+++ b/build/common.props
@@ -1,5 +1,4 @@
-<Project>
-  <Import Project="..\version.props" />
+<Project>
 
   <PropertyGroup>
     <Product>Microsoft ASP.NET Core</Product>
diff --git a/build/dependencies.props b/build/dependencies.props
index bbbda24..d80a629 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -15,7 +15,9 @@
     <MicrosoftExtensionsLoggingConsolePackageVersion>2.0.0</MicrosoftExtensionsLoggingConsolePackageVersion>
     <MicrosoftExtensionsLoggingPackageVersion>2.0.0</MicrosoftExtensionsLoggingPackageVersion>
     <MicrosoftExtensionsLoggingTestingPackageVersion>2.0.0</MicrosoftExtensionsLoggingTestingPackageVersion>
+    <MicrosoftNETCoreApp20PackageVersion>2.0.5</MicrosoftNETCoreApp20PackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
+    <NETStandardLibrary20PackageVersion>2.0.1</NETStandardLibrary20PackageVersion>
     <XunitPackageVersion>2.3.0-beta2-build3683</XunitPackageVersion>
     <XunitRunnerVisualStudioPackageVersion>2.3.0-beta2-build1317</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 632c589..e0cb1b1 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.0.2-rc1-15526
-commithash:436afc3dc08f5e278431db807866cc5f032f4d7b
+version:2.0.5-rtm-10016
+commithash:02bda79ac9c564229da734a836f258d6c1321eb7
diff --git a/korebuild.json b/korebuild.json
index 6bbc5ee..9deb2b6 100644
--- a/korebuild.json
+++ b/korebuild.json
@@ -1,4 +1,4 @@
 {
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/rel/2.0.2/tools/korebuild.schema.json",
-  "channel": "rel/2.0.2"
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.0/tools/korebuild.schema.json",
+  "channel": "release/2.0"
 }