From f2eef338dbde1fa1b9b6aa94bf27e760fb5c3cdd Mon Sep 17 00:00:00 2001 From: Justin Emgarten Date: Wed, 12 Oct 2016 00:49:44 -0700 Subject: [PATCH] Updating NuGet to 3.6.0-rc-1979 --- build_projects/dotnet-cli-build/project.json | 2 +- src/Microsoft.DotNet.Cli.Utils/project.json | 8 ++++---- src/Microsoft.DotNet.Compiler.Common/project.json | 2 +- .../Resolution/LibraryManager.cs | 7 +------ src/Microsoft.DotNet.ProjectModel/project.json | 8 ++++---- src/redist/project.json | 2 +- src/tool_nuget/project.json | 2 +- test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 8 ++++---- test/Microsoft.DotNet.ProjectModel.Tests/project.json | 2 +- 9 files changed, 18 insertions(+), 23 deletions(-) diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index 41c1c00f7..9ae4316b9 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -20,7 +20,7 @@ "System.Runtime.Serialization.Primitives": "4.1.1", "System.Xml.XmlSerializer": "4.0.11", "WindowsAzure.Storage": "6.2.2-preview", - "NuGet.CommandLine.XPlat": "3.6.0-rc-1954", + "NuGet.CommandLine.XPlat": "3.6.0-rc-1979", "Microsoft.Build.Utilities.Core": "0.1.0-preview-00043-160929", "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933" }, diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index a3c80fe9a..02b93369e 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -9,10 +9,10 @@ "target": "project" }, "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933", - "NuGet.Versioning": "3.6.0-rc-1954", - "NuGet.Packaging": "3.6.0-rc-1954", - "NuGet.Frameworks": "3.6.0-rc-1954", - "NuGet.ProjectModel": "3.6.0-rc-1954" + "NuGet.Versioning": "3.6.0-rc-1979", + "NuGet.Packaging": "3.6.0-rc-1979", + "NuGet.Frameworks": "3.6.0-rc-1979", + "NuGet.ProjectModel": "3.6.0-rc-1979" }, "frameworks": { "netstandard1.3": { diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 10fe56ee9..1092f7d53 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -14,7 +14,7 @@ "Microsoft.DotNet.Files": { "target": "project" }, - "NuGet.ProjectModel": "3.6.0-rc-1954" + "NuGet.ProjectModel": "3.6.0-rc-1979" }, "frameworks": { "netstandard1.3": { diff --git a/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs b/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs index 15227f3a7..8044bed54 100644 --- a/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs +++ b/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs @@ -192,12 +192,7 @@ namespace Microsoft.DotNet.ProjectModel.Resolution private static string FormatLibraryRange(ProjectLibraryDependency range) { - if (range.LibraryRange.VersionRange == null) - { - return range.Name; - } - - return range.Name + " " + VersionUtility.RenderVersion(range.LibraryRange.VersionRange); + return range.LibraryRange.ToLockFileDependencyGroupString(); } private void AddDiagnostics(List messages, diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 375e7ee4d..cfdb9a1de 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -8,10 +8,10 @@ "Microsoft.Extensions.DependencyModel": "1.0.1-beta-000933", "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933", "Newtonsoft.Json": "9.0.1", - "NuGet.Configuration": "3.6.0-rc-1954", - "NuGet.Packaging": "3.6.0-rc-1954", - "NuGet.RuntimeModel": "3.6.0-rc-1954", - "NuGet.ProjectModel": "3.6.0-rc-1954", + "NuGet.Configuration": "3.6.0-rc-1979", + "NuGet.Packaging": "3.6.0-rc-1979", + "NuGet.RuntimeModel": "3.6.0-rc-1979", + "NuGet.ProjectModel": "3.6.0-rc-1979", "System.Reflection.Metadata": "1.4.1-beta-24410-02" }, "frameworks": { diff --git a/src/redist/project.json b/src/redist/project.json index a197cccdc..1c0d1e373 100644 --- a/src/redist/project.json +++ b/src/redist/project.json @@ -22,7 +22,7 @@ "Microsoft.Build.Runtime": "15.1.316-preview5", "Microsoft.CodeAnalysis.Build.Tasks": "2.0.0-beta6-60922-08", "System.Runtime.Serialization.Xml": "4.1.1", - "NuGet.Build.Tasks": "3.6.0-rc-1954", + "NuGet.Build.Tasks": "3.6.0-rc-1979", "Microsoft.TestPlatform.CLI": "15.0.0-preview-20160915-01" }, "frameworks": { diff --git a/src/tool_nuget/project.json b/src/tool_nuget/project.json index a077120aa..02f0d8cd5 100644 --- a/src/tool_nuget/project.json +++ b/src/tool_nuget/project.json @@ -8,7 +8,7 @@ "type": "platform", "version": "1.0.1" }, - "NuGet.CommandLine.XPlat": "3.6.0-rc-1954" + "NuGet.CommandLine.XPlat": "3.6.0-rc-1979" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 36fd1ecab..cbdadd442 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -30,10 +30,10 @@ }, "System.Diagnostics.TraceSource": "4.0.0", "System.Runtime.Serialization.Primitives": "4.1.1", - "NuGet.Versioning": "3.6.0-rc-1954", - "NuGet.Packaging": "3.6.0-rc-1954", - "NuGet.Frameworks": "3.6.0-rc-1954", - "NuGet.ProjectModel": "3.6.0-rc-1954", + "NuGet.Versioning": "3.6.0-rc-1979", + "NuGet.Packaging": "3.6.0-rc-1979", + "NuGet.Frameworks": "3.6.0-rc-1979", + "NuGet.ProjectModel": "3.6.0-rc-1979", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index 47b002045..68e54b2ed 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -22,7 +22,7 @@ }, "xunit": "2.2.0-beta3-build3330", "dotnet-test-xunit": "1.0.0-rc2-350904-49", - "NuGet.ProjectModel": "3.6.0-rc-1954" + "NuGet.ProjectModel": "3.6.0-rc-1979" }, "frameworks": { "netcoreapp1.0": {