diff options
| author | Wes Haggard <Wes.Haggard@microsoft.com> | 2018-03-26 11:02:53 -0700 |
|---|---|---|
| committer | Wes Haggard <Wes.Haggard@microsoft.com> | 2018-03-26 11:02:53 -0700 |
| commit | af6715e91b241bfe09bfde3842f325429a35913a (patch) | |
| tree | c813e68ef5365578484400c0361e78c401f2ddaf /build.proj | |
| parent | b5f4d2df2e087401f2c3aab2c37021e326707915 (diff) | |
| download | coreclr-af6715e91b241bfe09bfde3842f325429a35913a.tar.gz coreclr-af6715e91b241bfe09bfde3842f325429a35913a.tar.bz2 coreclr-af6715e91b241bfe09bfde3842f325429a35913a.zip | |
Merge various restore tasks into one Sync target
There were various restore targets happening independently
when they should all be combined so the sync step can be
independent from the build step. This change merges them
together under the Sync target.
In particular this moves RestoreOptData and RestoreNETCorePlatforms
to be part of the sync step instead of being individually ran.
Pass BuildType to sync commands so optdata gets restored correctly
Diffstat (limited to 'build.proj')
| -rw-r--r-- | build.proj | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/build.proj b/build.proj index bbec18785b..1a633a65b4 100644 --- a/build.proj +++ b/build.proj @@ -26,7 +26,15 @@ <Delete Files="$(BinDir)System.Private.CoreLib.*" /> </Target> - <Target Name="RestoreOptData"> + <!-- + BuildTools will conditionally restore additional packages, including IBC tools, using the "RestoreOptionalToolingPackages" + 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="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> @@ -35,14 +43,7 @@ StandardOutputImportance="Low" /> </Target> - <!-- - BuildTools will conditionally restore additional packages, including IBC tools, using the "RestoreOptionalToolingPackages" - 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" /> - - <Target Name="RestoreNETCorePlatforms" AfterTargets="Build" Condition="'$(RestoreDuringBuild)'=='true'"> + <Target Name="RestoreNETCorePlatforms" Condition="'$(RestoreDuringBuild)'=='true'"> <Exec Command="$(DotnetRestoreCommand) $(SourceDir).nuget/init/init.csproj" StandardOutputImportance="Low" /> </Target> |