diff options
| author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2016-09-13 01:20:12 +0300 |
|---|---|---|
| committer | Jose Perez Rodriguez <joperezr@microsoft.com> | 2016-09-13 01:20:12 +0300 |
| commit | a1989d82cff273db667638e4836ea7836f5c6eb9 (patch) | |
| tree | 24c513224c9c72120a4b9b95c57fe868a97ff690 /dependencies.props | |
| parent | d8bee609fd7b7fa232e4e36c5659514091cd6a3a (diff) | |
| parent | 5f43b8637ac49a0304bd55482a009c448eb83a47 (diff) | |
Merge remote-tracking branch 'mainrepo/dev/api' into MergeDevApi
Diffstat (limited to 'dependencies.props')
| -rw-r--r-- | dependencies.props | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dependencies.props b/dependencies.props index d6dba13cb9..76f4e925d1 100644 --- a/dependencies.props +++ b/dependencies.props @@ -1,14 +1,15 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. --> <PropertyGroup> - <CoreFxCurrentRef>8ef1d08ccf278b0f4adcec19693fd7977035cae3</CoreFxCurrentRef> + <CoreFxCurrentRef>ccb12b07354f701b6a76b19003ea28efd76ccc5b</CoreFxCurrentRef> <CoreClrCurrentRef>8ef1d08ccf278b0f4adcec19693fd7977035cae3</CoreClrCurrentRef> <ExternalCurrentRef>cdb8679634e573847e20c1eae0fa3918f5daf1e6</ExternalCurrentRef> + <ProjectNTfsCurrentRef>ccb12b07354f701b6a76b19003ea28efd76ccc5b</ProjectNTfsCurrentRef> </PropertyGroup> <!-- Auto-upgraded properties for each build info dependency. --> <PropertyGroup> - <CoreFxExpectedPrerelease>beta-24512-01</CoreFxExpectedPrerelease> + <CoreFxExpectedPrerelease>beta-devapi-24512-01</CoreFxExpectedPrerelease> <CoreClrExpectedPrerelease>beta-24512-03</CoreClrExpectedPrerelease> <ExternalExpectedPrerelease>beta-24509-00</ExternalExpectedPrerelease> </PropertyGroup> @@ -27,7 +28,7 @@ <ItemGroup> <RemoteDependencyBuildInfo Include="CoreFx"> - <BuildInfoPath>$(BaseDotNetBuildInfo)corefx/$(DependencyBranch)</BuildInfoPath> + <BuildInfoPath>$(BaseDotNetBuildInfo)corefx/dev/api</BuildInfoPath> <CurrentRef>$(CoreFxCurrentRef)</CurrentRef> </RemoteDependencyBuildInfo> <RemoteDependencyBuildInfo Include="CoreClr"> @@ -38,6 +39,10 @@ <BuildInfoPath>$(BaseDotNetBuildInfo)projectk-tfs/$(DependencyBranch)</BuildInfoPath> <CurrentRef>$(ExternalCurrentRef)</CurrentRef> </RemoteDependencyBuildInfo> + <RemoteDependencyBuildInfo Include="ProjectNTfs"> + <BuildInfoPath>$(BaseDotNetBuildInfo)projectn-tfs/$(DependencyBranch)</BuildInfoPath> + <CurrentRef>$(ProjectNTfsCurrentRef)</CurrentRef> + </RemoteDependencyBuildInfo> <DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)"> <RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl> |