From 0a369aa6d5cadacc9e3ecaca9b8a0906a13fd344 Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@andrewnurse.net>
Date: Thu, 24 Mar 2016 09:40:36 -0700
Subject: [PATCH] update to new nuget and turn inference on

---
 scripts/update-dependencies/project.json           | 2 +-
 src/Microsoft.DotNet.Cli.Utils/project.json        | 8 ++++----
 src/Microsoft.DotNet.ProjectModel/project.json     | 2 +-
 src/dotnet/commands/dotnet-restore/Program.cs      | 6 ++++++
 src/dotnet/project.json                            | 4 ++--
 test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 8 ++++----
 tools/RuntimeGraphGenerator/project.json           | 4 ++--
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/scripts/update-dependencies/project.json b/scripts/update-dependencies/project.json
index d5a24cc82..bec7ab10d 100644
--- a/scripts/update-dependencies/project.json
+++ b/scripts/update-dependencies/project.json
@@ -9,7 +9,7 @@
     "Microsoft.CSharp": "4.0.1-rc2-23911",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23911",
     "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*",
-    "NuGet.Versioning": "3.4.0-rtm-0764",
+    "NuGet.Versioning": "3.5.0-beta-1068",
     "Newtonsoft.Json": "7.0.1",
     "Octokit": "0.18.0",
     "Microsoft.Net.Http": "2.2.29"
diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json
index 37b17014d..a6c174cf6 100644
--- a/src/Microsoft.DotNet.Cli.Utils/project.json
+++ b/src/Microsoft.DotNet.Cli.Utils/project.json
@@ -7,10 +7,10 @@
   "dependencies": {
     "Microsoft.DotNet.ProjectModel": "1.0.0-*",
     "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537",
-    "NuGet.Versioning": "3.5.0-beta-1034",
-    "NuGet.Packaging": "3.5.0-beta-1034",
-    "NuGet.Frameworks": "3.5.0-beta-1034",
-    "NuGet.ProjectModel": "3.5.0-beta-1034"
+    "NuGet.Versioning": "3.5.0-beta-1068",
+    "NuGet.Packaging": "3.5.0-beta-1068",
+    "NuGet.Frameworks": "3.5.0-beta-1068",
+    "NuGet.ProjectModel": "3.5.0-beta-1068"
   },
   "frameworks": {
     "net451": {
diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json
index 0f5a5702f..05e4099ce 100644
--- a/src/Microsoft.DotNet.ProjectModel/project.json
+++ b/src/Microsoft.DotNet.ProjectModel/project.json
@@ -6,7 +6,7 @@
   "description": "Types to model a .NET Project",
   "dependencies": {
     "System.Reflection.Metadata": "1.2.0-rc2-23904",
-    "NuGet.Packaging": "3.5.0-beta-1034",
+    "NuGet.Packaging": "3.5.0-beta-1068",
     "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996",
     "Microsoft.Extensions.JsonParser.Sources": {
       "type": "build",
diff --git a/src/dotnet/commands/dotnet-restore/Program.cs b/src/dotnet/commands/dotnet-restore/Program.cs
index 7cf615663..6ccfb516f 100644
--- a/src/dotnet/commands/dotnet-restore/Program.cs
+++ b/src/dotnet/commands/dotnet-restore/Program.cs
@@ -36,6 +36,12 @@ namespace Microsoft.DotNet.Tools.Restore
             var quiet = args.Any(s => s.Equals("--quiet", StringComparison.OrdinalIgnoreCase));
             args = args.Where(s => !s.Equals("--quiet", StringComparison.OrdinalIgnoreCase)).ToArray();
 
+            // Always infer runtimes in dotnet-restore (for now).
+            if (!args.Any(s => s.Equals("--infer-runtimes", StringComparison.OrdinalIgnoreCase)))
+            {
+                args = Enumerable.Concat(new [] { "--infer-runtimes" }, args).ToArray();
+            }
+
             app.OnExecute(() =>
             {
                 try
diff --git a/src/dotnet/project.json b/src/dotnet/project.json
index 2ef6e57e8..3afdc9056 100644
--- a/src/dotnet/project.json
+++ b/src/dotnet/project.json
@@ -17,10 +17,10 @@
   ],
   "dependencies": {
     "NuGet.Commands": {
-      "version": "3.5.0-beta-1034",
+      "version": "3.5.0-beta-1068",
       "exclude": "compile"
     },
-    "NuGet.CommandLine.XPlat": "3.5.0-beta-1034",
+    "NuGet.CommandLine.XPlat": "3.5.0-beta-1068",
 
     "Newtonsoft.Json": "7.0.1",
     "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160225-02",
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
index e89669933..995255af3 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
@@ -5,10 +5,10 @@
   },
   "dependencies": {
     "NETStandard.Library": "1.5.0-rc2-23911",
-    "NuGet.Versioning": "3.5.0-beta-1034",
-    "NuGet.Packaging": "3.5.0-beta-1034",
-    "NuGet.Frameworks": "3.5.0-beta-1034",
-    "NuGet.ProjectModel": "3.5.0-beta-1034",
+    "NuGet.Versioning": "3.5.0-beta-1068",
+    "NuGet.Packaging": "3.5.0-beta-1068",
+    "NuGet.Frameworks": "3.5.0-beta-1068",
+    "NuGet.ProjectModel": "3.5.0-beta-1068",
 
     "Microsoft.DotNet.ProjectModel": {
       "target": "project"
diff --git a/tools/RuntimeGraphGenerator/project.json b/tools/RuntimeGraphGenerator/project.json
index b58197748..02b0682c8 100644
--- a/tools/RuntimeGraphGenerator/project.json
+++ b/tools/RuntimeGraphGenerator/project.json
@@ -4,8 +4,8 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "NuGet.RuntimeModel": "3.5.0-beta-1034",
-    "NuGet.Versioning": "3.5.0-beta-1034",
+    "NuGet.RuntimeModel": "3.5.0-beta-1068",
+    "NuGet.Versioning": "3.5.0-beta-1068",
     "System.CommandLine": "0.1.0-e160119-1",
     "System.Runtime.Serialization.Json": "1.0.0-rc2-23911",
     "Microsoft.DotNet.ProjectModel": "1.0.0-*",