diff options
| author | Wes Haggard <Wes.Haggard@microsoft.com> | 2018-03-21 16:40:34 -0700 |
|---|---|---|
| committer | Wes Haggard <Wes.Haggard@microsoft.com> | 2018-03-27 13:07:02 -0700 |
| commit | ad1ad9e87965f23b5821216affb906aff63fe5da (patch) | |
| tree | f5e2799c97e3ef25461058807c83b58cc2b6cb4c /build.proj | |
| parent | 5142664458905a6f5164fd4e4baf483d8aa2b99e (diff) | |
| download | coreclr-ad1ad9e87965f23b5821216affb906aff63fe5da.tar.gz coreclr-ad1ad9e87965f23b5821216affb906aff63fe5da.tar.bz2 coreclr-ad1ad9e87965f23b5821216affb906aff63fe5da.zip | |
Fix RestoreSources for optdata packages
Pass unprocessed args to restore optdata step so it
can override the sources when doing restore
Handle prority as an unprocessed arg for the sync alias
Diffstat (limited to 'build.proj')
| -rw-r--r-- | build.proj | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/build.proj b/build.proj index eabe0e5b4b..bbec18785b 100644 --- a/build.proj +++ b/build.proj @@ -28,12 +28,11 @@ <Target Name="RestoreOptData"> <PropertyGroup> - <OptDataRestoreCommand>"$(DotnetToolCommand)"</OptDataRestoreCommand> - <OptDataRestoreCommand>$(OptDataRestoreCommand) restore</OptDataRestoreCommand> - <OptDataRestoreCommand>$(OptDataRestoreCommand) --packages "$(PackagesDir.TrimEnd('/').TrimEnd('\'))"</OptDataRestoreCommand> + <_OptimizationDataFeed Condition="'$(DotNetBuildOffline)' != 'true'">--source https://dotnet.myget.org/F/dotnet-core-optimization-data/api/v3/index.json</_OptimizationDataFeed> </PropertyGroup> - <Exec Command="$(OptDataRestoreCommand) $(SourceDir).nuget/optdata/optdata.csproj" - StandardOutputImportance="Low" /> + + <Exec Command="$(DotnetRestoreCommand) $(_OptimizationDataFeed) $(SourceDir).nuget/optdata/optdata.csproj" + StandardOutputImportance="Low" /> </Target> <!-- @@ -52,5 +51,5 @@ <Message Condition="Exists($(RootBinDir))" Importance="High" Text="Removing $(RootBinDir)"/> <RemoveDir Directories="$(RootBinDir)" /> </Target> - + </Project> |