update nuget to 1160

This commit is contained in:
Andrew Stanton-Nurse 2016-04-07 14:05:35 -07:00
parent 8ceb3ba35a
commit 2956446864
8 changed files with 25 additions and 25 deletions

View file

@ -565,7 +565,7 @@ namespace Microsoft.DotNet.Cli.Build
// in CompileTargets and the one in the shared library project.json match and are updated in lock step, but long term // in CompileTargets and the one in the shared library project.json match and are updated in lock step, but long term
// we need to be able to look at the project.lock.json file and figure out what version of Microsoft.NETCore.Runtime.CoreCLR // we need to be able to look at the project.lock.json file and figure out what version of Microsoft.NETCore.Runtime.CoreCLR
// was used, and then select that version. // was used, and then select that version.
ExecSilent(Crossgen.GetCrossgenPathForVersion(CompileTargets.CoreCLRVersion), ExecSilent(Crossgen.GetCrossgenPathForVersion(CoreCLRVersion),
"-readytorun", "-in", file, "-out", tempPathName, "-platform_assemblies_paths", pathToAssemblies); "-readytorun", "-in", file, "-out", tempPathName, "-platform_assemblies_paths", pathToAssemblies);
File.Delete(file); File.Delete(file);

View file

@ -9,7 +9,7 @@
"Microsoft.CSharp": "4.0.1-rc2-24008", "Microsoft.CSharp": "4.0.1-rc2-24008",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24008", "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24008",
"Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*", "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*",
"NuGet.Versioning": "3.5.0-beta-1130", "NuGet.Versioning": "3.5.0-beta-1160",
"Newtonsoft.Json": "7.0.1", "Newtonsoft.Json": "7.0.1",
"Octokit": "0.18.0", "Octokit": "0.18.0",
"Microsoft.Net.Http": "2.2.29" "Microsoft.Net.Http": "2.2.29"

View file

@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Cli.Utils
{ {
public class ProjectToolsCommandResolver : ICommandResolver public class ProjectToolsCommandResolver : ICommandResolver
{ {
private static readonly NuGetFramework s_toolPackageFramework = FrameworkConstants.CommonFrameworks.NetStandardApp15; private static readonly NuGetFramework s_toolPackageFramework = FrameworkConstants.CommonFrameworks.NetCoreApp10;
private static readonly CommandResolutionStrategy s_commandResolutionStrategy = private static readonly CommandResolutionStrategy s_commandResolutionStrategy =
CommandResolutionStrategy.ProjectToolsPackage; CommandResolutionStrategy.ProjectToolsPackage;

View file

@ -7,10 +7,10 @@
"dependencies": { "dependencies": {
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20459", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20459",
"NuGet.Versioning": "3.5.0-beta-1130", "NuGet.Versioning": "3.5.0-beta-1160",
"NuGet.Packaging": "3.5.0-beta-1130", "NuGet.Packaging": "3.5.0-beta-1160",
"NuGet.Frameworks": "3.5.0-beta-1130", "NuGet.Frameworks": "3.5.0-beta-1160",
"NuGet.ProjectModel": "3.5.0-beta-1130" "NuGet.ProjectModel": "3.5.0-beta-1160"
}, },
"frameworks": { "frameworks": {
"net451": { "net451": {

View file

@ -16,8 +16,8 @@
"version": "1.0.0-rc2-20221" "version": "1.0.0-rc2-20221"
}, },
"Newtonsoft.Json": "7.0.1", "Newtonsoft.Json": "7.0.1",
"NuGet.Packaging": "3.5.0-beta-1130", "NuGet.Packaging": "3.5.0-beta-1160",
"NuGet.RuntimeModel": "3.5.0-beta-1130", "NuGet.RuntimeModel": "3.5.0-beta-1160",
"System.Reflection.Metadata": "1.3.0-rc2-24008" "System.Reflection.Metadata": "1.3.0-rc2-24008"
}, },
"frameworks": { "frameworks": {

View file

@ -17,10 +17,10 @@
], ],
"dependencies": { "dependencies": {
"NuGet.Commands": { "NuGet.Commands": {
"version": "3.5.0-beta-1130", "version": "3.5.0-beta-1160",
"exclude": "compile" "exclude": "compile"
}, },
"NuGet.CommandLine.XPlat": "3.5.0-beta-1130", "NuGet.CommandLine.XPlat": "3.5.0-beta-1160",
"Newtonsoft.Json": "7.0.1", "Newtonsoft.Json": "7.0.1",
"System.Text.Encoding.CodePages": "4.0.1-rc2-24008", "System.Text.Encoding.CodePages": "4.0.1-rc2-24008",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24008", "System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24008",
@ -55,7 +55,7 @@
} }
}, },
"frameworks": { "frameworks": {
"netstandard1.5": { "netcoreapp1.0": {
"imports": [ "imports": [
"dnxcore50", "dnxcore50",
"netstandardapp1.5", "netstandardapp1.5",

View file

@ -10,10 +10,10 @@
}, },
"System.Diagnostics.TraceSource": "4.0.0-rc2-24008", "System.Diagnostics.TraceSource": "4.0.0-rc2-24008",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24008", "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24008",
"NuGet.Versioning": "3.5.0-beta-1130", "NuGet.Versioning": "3.5.0-beta-1160",
"NuGet.Packaging": "3.5.0-beta-1130", "NuGet.Packaging": "3.5.0-beta-1160",
"NuGet.Frameworks": "3.5.0-beta-1130", "NuGet.Frameworks": "3.5.0-beta-1160",
"NuGet.ProjectModel": "3.5.0-beta-1130", "NuGet.ProjectModel": "3.5.0-beta-1160",
"Microsoft.DotNet.ProjectModel": { "Microsoft.DotNet.ProjectModel": {
"target": "project" "target": "project"
}, },

View file

@ -4,8 +4,8 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NuGet.RuntimeModel": "3.5.0-beta-1130", "NuGet.RuntimeModel": "3.5.0-beta-1160",
"NuGet.Versioning": "3.5.0-beta-1130", "NuGet.Versioning": "3.5.0-beta-1160",
"System.CommandLine": "0.1.0-e160119-1", "System.CommandLine": "0.1.0-e160119-1",
"System.Runtime.Serialization.Json": "4.0.2-rc2-24008", "System.Runtime.Serialization.Json": "4.0.2-rc2-24008",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",