Merge pull request #3004 from dotnet/nuget-update
Update nuget version to 3.5.0-rc-1285
This commit is contained in:
commit
e68a49e1d5
7 changed files with 15 additions and 20 deletions
|
@ -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"
|
||||
|
|
|
@ -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": {
|
||||
|
|
|
@ -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}";
|
||||
|
|
|
@ -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": {
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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"
|
||||
},
|
||||
|
|
|
@ -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" },
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue