* Consume optimization packages using new dependency flow system.
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build"
+ xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="dir.props" />
<ItemGroup>
target, which runs automatically before "Sync". Since no "Sync" target actually exists, go ahead and define one now so that
the tools are fetched before "Build".
-->
- <Target Name="Sync" BeforeTargets="Build"
- DependsOnTargets="RestoreOptData;RestoreNETCorePlatforms" />
+ <Target Name="Sync" BeforeTargets="Build" DependsOnTargets="RestoreOptData;RestoreNETCorePlatforms" />
<Target Name="RestoreOptData" Condition="'$(RestoreDuringBuild)'=='true' and '$(BuildType)'=='Release'">
- <PropertyGroup>
- <_OptimizationDataFeed Condition="'$(DotNetBuildOffline)' != 'true'">--source https://dotnet.myget.org/F/dotnet-core-optimization-data/api/v3/index.json</_OptimizationDataFeed>
- </PropertyGroup>
-
- <Exec Command="$(DotnetRestoreCommand) $(_OptimizationDataFeed) $(SourceDir).nuget/optdata/optdata.csproj"
- StandardOutputImportance="Low" />
+ <Exec Command="$(DotnetRestoreCommand) $(SourceDir).nuget/optdata/optdata.csproj" StandardOutputImportance="Low" />
</Target>
<Target Name="RestoreNETCorePlatforms" Condition="'$(RestoreDuringBuild)'=='true'">
- <Exec Command="$(DotnetRestoreCommand) $(SourceDir).nuget/init/init.csproj"
- StandardOutputImportance="Low" />
+ <Exec Command="$(DotnetRestoreCommand) $(SourceDir).nuget/init/init.csproj" StandardOutputImportance="Low" />
</Target>
<Target Name="CleanAllProjects">
<PropertyGroup>
<CoreClrCurrentRef>9ff62111734d641ece5e5ccb873f2a463675d81b</CoreClrCurrentRef>
<BuildToolsCurrentRef>9ff62111734d641ece5e5ccb873f2a463675d81b</BuildToolsCurrentRef>
- <PgoDataCurrentRef>9ff62111734d641ece5e5ccb873f2a463675d81b</PgoDataCurrentRef>
- <IbcDataCurrentRef>9ff62111734d641ece5e5ccb873f2a463675d81b</IbcDataCurrentRef>
</PropertyGroup>
<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
- <PgoDataPackageVersion>99.99.99-master-20190227.1</PgoDataPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview4-27427-72</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<XunitPackageVersion>2.4.1</XunitPackageVersion>
- <IbcDataPackageVersion>99.99.99-master-20190227.1</IbcDataPackageVersion>
- <IbcMergePackageVersion>4.6.0-alpha-00001</IbcMergePackageVersion>
<XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
<MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.36</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
+ <IbcMergePackageVersion>4.6.0-alpha-00001</IbcMergePackageVersion>
<CommandLineParserVersion>2.2.0</CommandLineParserVersion>
<!-- Scenario tests install this version of Microsoft.NetCore.App, then patch coreclr binaries via xcopy. At the moment it is
<BuildInfoPath>$(BaseDotNetBuildInfo)buildtools/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(BuildToolsCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
- <RemoteDependencyBuildInfo Include="PgoData">
- <BuildInfoPath>$(BaseDotNetBuildInfo)optimization/$(DependencyBranch)/PGO</BuildInfoPath>
- <CurrentRef>$(PgoDataCurrentRef)</CurrentRef>
- </RemoteDependencyBuildInfo>
- <RemoteDependencyBuildInfo Include="IbcData">
- <BuildInfoPath>$(BaseDotNetBuildInfo)optimization/$(DependencyBranch)/IBC</BuildInfoPath>
- <CurrentRef>$(IbcDataCurrentRef)</CurrentRef>
- </RemoteDependencyBuildInfo>
-
+
<DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)">
<RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl>
</DependencyBuildInfo>
<ElementName>FeedTasksPackageVersion</ElementName>
<PackageId>$(FeedTasksPackage)</PackageId>
</XmlUpdateStep>
- <XmlUpdateStep Include="PgoData">
- <Path>$(MSBuildThisFileFullPath)</Path>
- <ElementName>PgoDataPackageVersion</ElementName>
- <PackageId>optimization.PGO.CoreCLR</PackageId>
- </XmlUpdateStep>
- <XmlUpdateStep Include="IbcData">
- <Path>$(MSBuildThisFileFullPath)</Path>
- <ElementName>IbcDataPackageVersion</ElementName>
- <PackageId>optimization.IBC.CoreCLR</PackageId>
- </XmlUpdateStep>
<UpdateStep Include="ILAsm">
<UpdaterType>File</UpdaterType>
<Path>$(MSBuildThisFileDirectory)ILAsmVersion.txt</Path>
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>60bc48d3688e6c912ffd00aba04a629d2d801aed</Sha>
</Dependency>
+ <Dependency Name="optimization.IBC.CoreCLR" Version="99.99.99-master-20190227.1">
+ <Uri>https://dnceng@dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
+ <Sha>6cf1c3d858719aa31d0d78ce537dc92f3b0a6ddd</Sha>
+ </Dependency>
+ <Dependency Name="optimization.PGO.CoreCLR" Version="99.99.99-master-20190227.1">
+ <Uri>https://dnceng@dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
+ <Sha>6cf1c3d858719aa31d0d78ce537dc92f3b0a6ddd</Sha>
+ </Dependency>
</ToolsetDependencies>
</Dependencies>
<MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview4.19118.1</MicrosoftPrivateCoreFxNETCoreAppVersion>
<MicrosoftNETCorePlatformsVersion>3.0.0-preview4.19118.1</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCoreAppVersion>3.0.0-preview4-27427-1</MicrosoftNETCoreAppVersion>
+ <optimizationIBCCoreCLRVersion>99.99.99-master-20190227.1</optimizationIBCCoreCLRVersion>
+ <optimizationPGOCoreCLRVersion>99.99.99-master-20190227.1</optimizationPGOCoreCLRVersion>
</PropertyGroup>
<!--Package names-->
<PropertyGroup>
<MicrosoftPrivateCoreFxNETCoreAppPackage>Microsoft.Private.CoreFx.NETCoreApp</MicrosoftPrivateCoreFxNETCoreAppPackage>
<MicrosoftNETCorePlatformsPackage>Microsoft.NETCore.Platforms</MicrosoftNETCorePlatformsPackage>
<MicrosoftNETCoreAppPackage>Microsoft.NETCore.App</MicrosoftNETCoreAppPackage>
+ <optimizationIBCCoreCLRPackage>optimization.IBC.CoreCLR</optimizationIBCCoreCLRPackage>
+ <optimizationPGOCoreCLRPackage>optimization.PGO.CoreCLR</optimizationPGOCoreCLRPackage>
</PropertyGroup>
<PropertyGroup>
<!-- Override signing package version. Current version breaks signing SPC, remove
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="optimization.PGO.CoreCLR" Version="$(PgoDataPackageVersion)" Condition="'$(PgoDataPackageVersion)'!=''" />
- <PackageReference Include="optimization.IBC.CoreCLR" Version="$(IbcDataPackageVersion)" Condition="'$(IbcDataPackageVersion)'!=''" />
+ <PackageReference Include="optimization.PGO.CoreCLR" Version="$(optimizationPGOCoreCLRVersion)" Condition="'$(optimizationPGOCoreCLRVersion)'!=''" />
+ <PackageReference Include="optimization.IBC.CoreCLR" Version="$(optimizationIBCCoreCLRVersion)" Condition="'$(optimizationIBCCoreCLRVersion)'!=''" />
</ItemGroup>
<Target Name="DumpPgoDataPackageVersion">
- <Message Importance="high" Text="$(PgoDataPackageVersion)" />
+ <Message Importance="high" Text="$(optimizationPGOCoreCLRVersion)" />
</Target>
<Target Name="DumpIbcDataPackageVersion">
- <Message Importance="high" Text="$(IbcDataPackageVersion)" />
+ <Message Importance="high" Text="$(optimizationIBCCoreCLRVersion)" />
</Target>
</Project>
def get_optdata_version(tool):
"""Returns the version string specified in project file for the given tool."""
element_name = {
- 'IBC': 'IbcDataPackageVersion',
- 'PGO': 'PgoDataPackageVersion',
+ 'IBC': 'optimizationIBCCoreCLRVersion',
+ 'PGO': 'optimizationPGOCoreCLRVersion',
}[tool]
root = ET.parse(ORIGIN_FILE)
return root.findtext('./PropertyGroup/{}'.format(element_name))
</PropertyGroup>
<PropertyGroup>
- <PgoDataPackageVersion>99.99.99-test</PgoDataPackageVersion>
- <IbcDataPackageVersion>99.99.99-test</IbcDataPackageVersion>
+ <optimizationPGOCoreCLRVersion>99.99.99-test</optimizationPGOCoreCLRVersion>
+ <optimizationIBCCoreCLRVersion>99.99.99-test</optimizationIBCCoreCLRVersion>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="optimization.PGO.CoreCLR" Version="$(PgoDataPackageVersion)" Condition="'$(PgoDataPackageVersion)'!=''" />
- <PackageReference Include="optimization.IBC.CoreCLR" Version="$(IbcDataPackageVersion)" Condition="'$(IbcDataPackageVersion)'!=''" />
+ <PackageReference Include="optimization.PGO.CoreCLR" Version="$(optimizationPGOCoreCLRVersion)" Condition="'$(optimizationPGOCoreCLRVersion)'!=''" />
+ <PackageReference Include="optimization.IBC.CoreCLR" Version="$(optimizationIBCCoreCLRVersion)" Condition="'$(optimizationIBCCoreCLRVersion)'!=''" />
</ItemGroup>
<Target Name="DumpPgoDataPackageVersion">
- <Message Importance="high" Text="$(PgoDataPackageVersion)" />
+ <Message Importance="high" Text="$(optimizationPGOCoreCLRVersion)" />
</Target>
<Target Name="DumpIbcDataPackageVersion">
- <Message Importance="high" Text="$(IbcDataPackageVersion)" />
+ <Message Importance="high" Text="$(optimizationIBCCoreCLRVersion)" />
</Target>
</Project>