diff options
| -rw-r--r-- | dependencies.props | 11 | ||||
| -rw-r--r-- | dir.props | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/dependencies.props b/dependencies.props index 86ca022249..cea79cca5c 100644 --- a/dependencies.props +++ b/dependencies.props @@ -15,12 +15,14 @@ <PropertyGroup> <CoreFxCurrentRef>13b5345991e55bb0b30a236ab4f6693a870ed789</CoreFxCurrentRef> <CoreClrCurrentRef>13b5345991e55bb0b30a236ab4f6693a870ed789</CoreClrCurrentRef> + <PgoDataCurrentRef>c485975226ad7f4a1b9a8b7aad11e0c4a7bacc1a</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> + <PgoDataPackageVersion>99.99.99-master-20170908-1805</PgoDataPackageVersion> </PropertyGroup> <!-- Full package version strings that are used in other parts of the build. --> @@ -49,6 +51,10 @@ <BuildInfoPath>$(BaseDotNetBuildInfo)coreclr/$(DependencyBranch)</BuildInfoPath> <CurrentRef>$(CoreClrCurrentRef)</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 +75,11 @@ <ElementName>CoreClrPackageVersion</ElementName> <PackageId>Microsoft.NETCore.Runtime.CoreCLR</PackageId> </XmlUpdateStep> + <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. --> @@ -22,12 +22,6 @@ <RoslynPackageName>Microsoft.Net.ToolsetCompilers</RoslynPackageName> </PropertyGroup> - <!-- Profile-based optimization data package versions --> - <PropertyGroup> - <PgoDataPackageVersion>99.99.99-master-20170830-0123</PgoDataPackageVersion> - <!--<IbcDataPackageVersion></IbcDataPackageVersion>--> - </PropertyGroup> - <!-- Switching to the .NET Core version of the BuildTools tasks seems to break numerous scenarios, such as VS intellisense and resource designer as well as runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks. |