From 58299db1610df8041399ff539cf89ccff70c09c6 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Wed, 30 Mar 2016 18:33:46 -0700
Subject: [PATCH] Infer rids for build script restore

---
 scripts/dotnet-cli-build/PrepareTargets.cs | 2 +-
 scripts/run-build.ps1                      | 2 +-
 scripts/run-build.sh                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/dotnet-cli-build/PrepareTargets.cs b/scripts/dotnet-cli-build/PrepareTargets.cs
index eea61e300..2faad973b 100644
--- a/scripts/dotnet-cli-build/PrepareTargets.cs
+++ b/scripts/dotnet-cli-build/PrepareTargets.cs
@@ -206,7 +206,7 @@ namespace Microsoft.DotNet.Cli.Build
             var dotnet = DotNetCli.Stage0;
 
             dotnet.Restore("--verbosity", "verbose", "--disable-parallel").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "src")).Execute().EnsureSuccessful();
-            dotnet.Restore("--verbosity", "verbose", "--disable-parallel").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "tools")).Execute().EnsureSuccessful();
+            dotnet.Restore("--verbosity", "verbose", "--disable-parallel", "--infer-runtimes").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "tools")).Execute().EnsureSuccessful();
 
             return c.Success();
         }
diff --git a/scripts/run-build.ps1 b/scripts/run-build.ps1
index 936596f7f..6d91706d1 100644
--- a/scripts/run-build.ps1
+++ b/scripts/run-build.ps1
@@ -72,7 +72,7 @@ $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
 # Restore the build scripts
 Write-Host "Restoring Build Script projects..."
 pushd $PSScriptRoot
-dotnet restore --disable-parallel
+dotnet restore --disable-parallel --infer-runtimes
 if($LASTEXITCODE -ne 0) { throw "Failed to restore" }
 popd
 
diff --git a/scripts/run-build.sh b/scripts/run-build.sh
index 01a07cfb5..78c2d546d 100755
--- a/scripts/run-build.sh
+++ b/scripts/run-build.sh
@@ -103,7 +103,7 @@ fi
 echo "Restoring Build Script projects..."
 (
     cd $DIR
-    dotnet restore --disable-parallel
+    dotnet restore --disable-parallel --infer-runtimes
 )
 
 # Build the builder