Bump version, update build tools, and dependency versions

Nate McMaster · Nate McMaster · commit 44d39bc0d42c · 2018-01-18T16:29:08.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
@@ -14,6 +14,8 @@
 <MicrosoftExtensionsLoggingConsolePackageVersion>2.0.0</MicrosoftExtensionsLoggingConsolePackageVersion>
 <MicrosoftExtensionsLoggingDebugPackageVersion>2.0.0</MicrosoftExtensionsLoggingDebugPackageVersion>
 <NewtonsoftJsonRuntimePackageVersion>10.0.1</NewtonsoftJsonRuntimePackageVersion>
+ <MicrosoftNETCoreApp20PackageVersion>2.0.5</MicrosoftNETCoreApp20PackageVersion>
+ <NETStandardLibrary20PackageVersion>2.0.1</NETStandardLibrary20PackageVersion>
 <SystemThreadingTasksDataflowPackageVersion>4.8.0</SystemThreadingTasksDataflowPackageVersion>
 </PropertyGroup>
 
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"
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
 +<Project>
 + <ImportProject="version.props" />
 + <ImportProject="build\dependencies.props" />
 + <ImportProject="build\sources.props" />
++
 + <PropertyGroup>
 + <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
 + </PropertyGroup>
 +</Project>
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`	`}`