Updating NuGet to 3.6.0-rc-1979

This commit is contained in:
Justin Emgarten 2016-10-12 00:49:44 -07:00
parent 07418af874
commit f2eef338db
9 changed files with 18 additions and 23 deletions

View file

@ -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"
},

View file

@ -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": {

View file

@ -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": {

View file

@ -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<DiagnosticMessage> messages,

View file

@ -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": {

View file

@ -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": {

View file

@ -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": {

View file

@ -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"
},

View file

@ -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": {