Merge branch 'master' into UpdateBuildTools

diff --cc dependencies.props
index d08b2ce,cea79cc..a943472
--- 1/dependencies.props
--- 2/dependencies.props
+++ b/dependencies.props
@@@ -15,7 -15,7 +15,8 @@@
    <PropertyGroup>
      <CoreFxCurrentRef>13b5345991e55bb0b30a236ab4f6693a870ed789</CoreFxCurrentRef>
      <CoreClrCurrentRef>13b5345991e55bb0b30a236ab4f6693a870ed789</CoreClrCurrentRef>
 +    <BuildToolsCurrentRef>7c9088cd9078e1d90be01eb94a3f66ba0a33c9f4</BuildToolsCurrentRef>
+     <PgoDataCurrentRef>c485975226ad7f4a1b9a8b7aad11e0c4a7bacc1a</PgoDataCurrentRef>
    </PropertyGroup>
  
    <!-- Auto-upgraded properties for each build info dependency. -->
@@@ -50,10 -51,10 +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>
@@@ -74,11 -75,11 +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. -->