Merge pull request #14496 from wtgodbe/WorkingDir

[platform/upstream/coreclr.git] / dependencies.props

diff --git a/dependencies.props b/dependencies.props
index 86ca022..b8d984e 100644 (file)
--- a/dependencies.props
+++ b/dependencies.props
@@ -8,24 +8,27 @@
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
 
-    <PreReleaseLabel>preview2</PreReleaseLabel>
+    <PreReleaseLabel>preview1</PreReleaseLabel>
   </PropertyGroup>
   
   <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
   <PropertyGroup>
-    <CoreFxCurrentRef>13b5345991e55bb0b30a236ab4f6693a870ed789</CoreFxCurrentRef>
-    <CoreClrCurrentRef>13b5345991e55bb0b30a236ab4f6693a870ed789</CoreClrCurrentRef>
+    <CoreFxCurrentRef>ae4d0587203066d577bd5ed3e6c19fbda7b255e1</CoreFxCurrentRef>
+    <CoreClrCurrentRef>a8304eb23d45ca270d5ce94d81f1eef6ab4173b0</CoreClrCurrentRef>
+    <BuildToolsCurrentRef>ae4d0587203066d577bd5ed3e6c19fbda7b255e1</BuildToolsCurrentRef>
+    <PgoDataCurrentRef>ae4d0587203066d577bd5ed3e6c19fbda7b255e1</PgoDataCurrentRef>
   </PropertyGroup>
 
   <!-- Auto-upgraded properties for each build info dependency. -->
   <PropertyGroup>
-    <CoreFxPackageVersion>4.5.0-preview2-25707-02</CoreFxPackageVersion>
-    <PlatformPackageVersion>2.1.0-preview2-25707-02</PlatformPackageVersion>
+    <CoreFxPackageVersion>4.5.0-preview1-25812-01</CoreFxPackageVersion>
+    <PlatformPackageVersion>2.1.0-preview1-25812-01</PlatformPackageVersion>
+    <PgoDataPackageVersion>99.99.99-master-20171009-0050</PgoDataPackageVersion>
   </PropertyGroup>
 
   <!-- Full package version strings that are used in other parts of the build. -->
   <PropertyGroup>
-    <CoreClrPackageVersion>2.1.0-preview2-25707-02</CoreClrPackageVersion>
+    <CoreClrPackageVersion>2.1.0-preview1-25806-01</CoreClrPackageVersion>
     <XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
     <XUnitConsoleNetCoreVersion>1.0.2-prerelease-00177</XUnitConsoleNetCoreVersion>
     <XUnitPerformanceApiVersion>1.0.0-beta-build0007</XUnitPerformanceApiVersion>
@@ -49,6 +52,14 @@
       <BuildInfoPath>$(BaseDotNetBuildInfo)coreclr/$(DependencyBranch)</BuildInfoPath>
       <CurrentRef>$(CoreClrCurrentRef)</CurrentRef>
     </RemoteDependencyBuildInfo>
+    <RemoteDependencyBuildInfo Include="BuildTools">
+      <BuildInfoPath>$(BaseDotNetBuildInfo)buildtools/$(DependencyBranch)</BuildInfoPath>
+      <CurrentRef>$(BuildToolsCurrentRef)</CurrentRef>
+    </RemoteDependencyBuildInfo>
+    <RemoteDependencyBuildInfo Include="PgoData">
+      <BuildInfoPath>$(BaseDotNetBuildInfo)optimization/$(DependencyBranch)</BuildInfoPath>
+      <CurrentRef>$(PgoDataCurrentRef)</CurrentRef>
+    </RemoteDependencyBuildInfo>
 
     <DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)">
       <RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl>
@@ -69,6 +80,16 @@
       <ElementName>CoreClrPackageVersion</ElementName>
       <PackageId>Microsoft.NETCore.Runtime.CoreCLR</PackageId>
     </XmlUpdateStep>
+    <UpdateStep Include="BuildTools">
+      <UpdaterType>File</UpdaterType>
+      <Path>$(MSBuildThisFileDirectory)BuildToolsVersion.txt</Path>
+      <PackageId>Microsoft.DotNet.BuildTools</PackageId>
+    </UpdateStep>
+    <XmlUpdateStep Include="PgoData">
+      <Path>$(MSBuildThisFileFullPath)</Path>
+      <ElementName>PgoDataPackageVersion</ElementName>
+      <PackageId>optimization.PGO.CoreCLR</PackageId>
+    </XmlUpdateStep>
   </ItemGroup>
 
   <!-- Set up dependencies on packages that aren't found in a BuildInfo. -->