From a6cc2b07dd4651a4a2808884019e77d573ee62d4 Mon Sep 17 00:00:00 2001
From: Sridhar Periyasamy <sridhper@microsoft.com>
Date: Wed, 11 May 2016 17:49:41 -0700
Subject: [PATCH] Update nuget version to 3.5.0-rc-1285

This is required to update the corefx dependencies from RC2 to RC3. Some
of the corefx libs have 'netstandard1.6' as TFM and this version of Nuget
supports that TFM.

Also the 'VersionRange.IncludePrerelease' has been removed from nuget and by
default 'VersionRange.Satisfies' returns true for any prerelease version.
---
 scripts/update-dependencies/project.json                  | 2 +-
 src/Microsoft.DotNet.Cli.Utils/project.json               | 8 ++++----
 .../Resolution/LibraryManager.cs                          | 5 -----
 src/Microsoft.DotNet.ProjectModel/project.json            | 4 ++--
 src/dotnet/project.json                                   | 4 ++--
 test/Microsoft.DotNet.Cli.Utils.Tests/project.json        | 8 ++++----
 tools/RuntimeGraphGenerator/project.json                  | 4 ++--
 7 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/scripts/update-dependencies/project.json b/scripts/update-dependencies/project.json
index 4d810e3a8..cdbe89413 100644
--- a/scripts/update-dependencies/project.json
+++ b/scripts/update-dependencies/project.json
@@ -9,7 +9,7 @@
     "Microsoft.CSharp": "4.0.1-rc2-24027",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
     "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*",
-    "NuGet.Versioning": "3.5.0-beta",
+    "NuGet.Versioning": "3.5.0-rc-1285",
     "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 663495657..98d6dac1d 100644
--- a/src/Microsoft.DotNet.Cli.Utils/project.json
+++ b/src/Microsoft.DotNet.Cli.Utils/project.json
@@ -6,10 +6,10 @@
   },
   "dependencies": {
     "Microsoft.DotNet.ProjectModel": { "target": "project" },
-    "NuGet.Versioning": "3.5.0-beta",
-    "NuGet.Packaging": "3.5.0-beta",
-    "NuGet.Frameworks": "3.5.0-beta",
-    "NuGet.ProjectModel": "3.5.0-beta"
+    "NuGet.Versioning": "3.5.0-rc-1285",
+    "NuGet.Packaging": "3.5.0-rc-1285",
+    "NuGet.Frameworks": "3.5.0-rc-1285",
+    "NuGet.ProjectModel": "3.5.0-rc-1285"
   },
   "frameworks": {
     "net451": {
diff --git a/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs b/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs
index 98fdc5038..f20feaa35 100644
--- a/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs
@@ -170,11 +170,6 @@ namespace Microsoft.DotNet.ProjectModel.Resolution
                             continue;
                         }
 
-                        if (library.Identity.Version.IsPrerelease && !versionRange.IncludePrerelease)
-                        {
-                            versionRange = VersionRange.SetIncludePrerelease(versionRange, includePrerelease: true);
-                        }
-
                         if (item.Library != library && !versionRange.Satisfies(library.Identity.Version))
                         {
                             var message = $"Dependency conflict. {item.Library.Identity} expected {FormatLibraryRange(item.Dependency)} but got {library.Identity.Version}";
diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json
index 70ef5c391..2871e20c3 100644
--- a/src/Microsoft.DotNet.ProjectModel/project.json
+++ b/src/Microsoft.DotNet.ProjectModel/project.json
@@ -7,8 +7,8 @@
   "dependencies": {
     "Microsoft.Extensions.DependencyModel": { "target": "project" },
     "Newtonsoft.Json": "7.0.1",
-    "NuGet.Packaging": "3.5.0-beta",
-    "NuGet.RuntimeModel": "3.5.0-beta",
+    "NuGet.Packaging": "3.5.0-rc-1285",
+    "NuGet.RuntimeModel": "3.5.0-rc-1285",
     "System.Reflection.Metadata": "1.3.0-rc2-24027"
   },
   "frameworks": {
diff --git a/src/dotnet/project.json b/src/dotnet/project.json
index 679ba240e..5172b58db 100644
--- a/src/dotnet/project.json
+++ b/src/dotnet/project.json
@@ -17,10 +17,10 @@
   ],
   "dependencies": {
     "NuGet.Commands": {
-      "version": "3.5.0-beta",
+      "version": "3.5.0-rc-1285",
       "exclude": "compile"
     },
-    "NuGet.CommandLine.XPlat": "3.5.0-beta",
+    "NuGet.CommandLine.XPlat": "3.5.0-rc-1285",
     "Newtonsoft.Json": "7.0.1",
     "System.Text.Encoding.CodePages": "4.0.1-rc2-24027",
     "System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24027",
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
index ed18f288f..9e607e2f2 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
@@ -11,10 +11,10 @@
     },
     "System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
-    "NuGet.Versioning": "3.5.0-beta",
-    "NuGet.Packaging": "3.5.0-beta",
-    "NuGet.Frameworks": "3.5.0-beta",
-    "NuGet.ProjectModel": "3.5.0-beta",
+    "NuGet.Versioning": "3.5.0-rc-1285",
+    "NuGet.Packaging": "3.5.0-rc-1285",
+    "NuGet.Frameworks": "3.5.0-rc-1285",
+    "NuGet.ProjectModel": "3.5.0-rc-1285",
     "Microsoft.DotNet.ProjectModel": {
       "target": "project"
     },
diff --git a/tools/RuntimeGraphGenerator/project.json b/tools/RuntimeGraphGenerator/project.json
index 002b265ce..389fa09aa 100644
--- a/tools/RuntimeGraphGenerator/project.json
+++ b/tools/RuntimeGraphGenerator/project.json
@@ -4,8 +4,8 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "NuGet.RuntimeModel": "3.5.0-beta",
-    "NuGet.Versioning": "3.5.0-beta",
+    "NuGet.RuntimeModel": "3.5.0-rc-1285",
+    "NuGet.Versioning": "3.5.0-rc-1285",
     "System.CommandLine": "0.1.0-e160119-1",
     "System.Runtime.Serialization.Json": "4.0.2-rc2-24027",
     "Microsoft.DotNet.ProjectModel": { "target": "project" },