diff options
author | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-10-24 16:46:07 -0700 |
---|---|---|
committer | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-10-30 13:06:26 -0700 |
commit | 4a259ae17d2550d32b95800fcbb68267cd809659 (patch) | |
tree | 1abe4d914cc2bdc086552acd97c91da2521f316a /build.proj | |
parent | 901511aa1d201445e0c989ddd1543ff2544c4a71 (diff) | |
download | coreclr-4a259ae17d2550d32b95800fcbb68267cd809659.tar.gz coreclr-4a259ae17d2550d32b95800fcbb68267cd809659.tar.bz2 coreclr-4a259ae17d2550d32b95800fcbb68267cd809659.zip |
Use restore with no --source for optdata proj feed
This lets dotnet pick up RestoreSources hierarchically rather than only use what's predefined in DotnetRestoreCommand (in dir.props).
Diffstat (limited to 'build.proj')
-rw-r--r-- | build.proj | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/build.proj b/build.proj index 3889d1cafb..465e49c471 100644 --- a/build.proj +++ b/build.proj @@ -25,8 +25,13 @@ </Target> <Target Name="RestoreOptData"> - <Exec Command="$(DotnetRestoreCommand) $(SourceDir).nuget/optdata/optdata.csproj" - StandardOutputImportance="Low" /> + <PropertyGroup> + <OptDataRestoreCommand>"$(DotnetToolCommand)"</OptDataRestoreCommand> + <OptDataRestoreCommand>$(OptDataRestoreCommand) restore</OptDataRestoreCommand> + <OptDataRestoreCommand>$(OptDataRestoreCommand) --packages "$(PackagesDir.TrimEnd('/').TrimEnd('\'))"</OptDataRestoreCommand> + </PropertyGroup> + <Exec Command="$(OptDataRestoreCommand) $(SourceDir).nuget/optdata/optdata.csproj" + StandardOutputImportance="Low" /> </Target> <!-- |