| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394 |
- commit c4c6e1b0e9667662646939139205e12bf57e865c
- Author: Nate McMaster <[email protected]>
- Date: Thu Jan 18 16:27:57 2018 -0800
- Bump version, update build tools, and dependency versions
- diff --git a/Directory.Build.props b/Directory.Build.props
- new file mode 100644
- index 00000000000..e3f34ed9902
- --- /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 246f7ac20c4..58066966aad 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 c967a47ed87..7362e803fa3 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 5c7eeef915b..7a9415a927b 100644
- --- a/build/dependencies.props
- +++ b/build/dependencies.props
- @@ -11,7 +11,9 @@
- <MicrosoftExtensionsLoggingPackageVersion>2.0.0</MicrosoftExtensionsLoggingPackageVersion>
- <MicrosoftExtensionsOptionsPackageVersion>2.0.0</MicrosoftExtensionsOptionsPackageVersion>
- <MicrosoftExtensionsWebEncodersSourcesPackageVersion>2.0.0</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
- + <MicrosoftNETCoreApp20PackageVersion>2.0.5</MicrosoftNETCoreApp20PackageVersion>
- <MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
- + <NETStandardLibrary20PackageVersion>2.0.1</NETStandardLibrary20PackageVersion>
- <MicrosoftWin32RegistryPackageVersion>4.4.0</MicrosoftWin32RegistryPackageVersion>
- <MoqPackageVersion>4.7.49</MoqPackageVersion>
- <StackExchangeRedisStrongNamePackageVersion>1.2.4</StackExchangeRedisStrongNamePackageVersion>
- diff --git a/korebuild-lock.txt b/korebuild-lock.txt
- index 632c589cce4..e0cb1b1c60f 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 6bbc5eeb9cd..9deb2b62d78 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"
- }
- diff --git a/version.props b/version.props
- index 3e4b5d6f6d9..ae37ea60681 100644
- --- a/version.props
- +++ b/version.props
- @@ -1,7 +1,7 @@
- -<Project>
- +<Project>
- <PropertyGroup>
- - <VersionPrefix>2.0.1</VersionPrefix>
- - <ExperimentalProjectVersionPrefix>0.3.1</ExperimentalProjectVersionPrefix>
- + <VersionPrefix>2.0.2</VersionPrefix>
- + <ExperimentalProjectVersionPrefix>0.3.2</ExperimentalProjectVersionPrefix>
- <VersionSuffix>rtm</VersionSuffix>
- <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
- <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
|