Bump version, update build tools, and dependency versions

Nate McMaster · Nate McMaster · commit 022f96fc7078 · 2018-01-18T16:28:44.000-08:00
diff --git a/Directory.Build.props 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
@@ -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
@@ -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
@@ -11,7 +11,9 @@
     <MicrosoftExtensionsOptionsPackageVersion>2.0.0</MicrosoftExtensionsOptionsPackageVersion>
     <MicrosoftExtensionsPrimitivesPackageVersion>2.0.0</MicrosoftExtensionsPrimitivesPackageVersion>
     <MicrosoftExtensionsWebEncodersSourcesPackageVersion>2.0.0</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
+    <MicrosoftNETCoreApp20PackageVersion>2.0.5</MicrosoftNETCoreApp20PackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
+    <NETStandardLibrary20PackageVersion>2.0.1</NETStandardLibrary20PackageVersion>
     <SystemBuffersPackageVersion>4.4.0</SystemBuffersPackageVersion>
     <SystemTextEncodingsWebPackageVersion>4.4.0</SystemTextEncodingsWebPackageVersion>
     <XunitPackageVersion>2.3.0-beta2-build3683</XunitPackageVersion>
diff --git 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
@@ -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"
 }
diff --git a/version.props b/version.props
@@ -1,6 +1,6 @@
-<Project>
+﻿<Project>
   <PropertyGroup>
-    <VersionPrefix>2.0.1</VersionPrefix>
+    <VersionPrefix>2.0.2</VersionPrefix>
     <VersionSuffix>rtm</VersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/rel/2.0.2/tools/korebuild.schema.json",`
`3`		`- "channel": "rel/2.0.2"`
	`2`	`+ "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.0/tools/korebuild.schema.json",`
	`3`	`+ "channel": "release/2.0"`
`4`	`4`	`}`