From 4a259ae17d2550d32b95800fcbb68267cd809659 Mon Sep 17 00:00:00 2001
From: Wes Haggard <Wes.Haggard@microsoft.com>
Date: Tue, 24 Oct 2017 16:46:07 -0700
Subject: 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).
---
 build.proj | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'build.proj')

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>
 
   <!--
-- 
cgit v1.2.3