From 2956446864d668f0821ea89620566c32f15c0d38 Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Thu, 7 Apr 2016 14:05:35 -0700 Subject: [PATCH] update nuget to 1160 --- scripts/dotnet-cli-build/CompileTargets.cs | 4 ++-- scripts/update-dependencies/project.json | 2 +- .../ProjectToolsCommandResolver.cs | 2 +- src/Microsoft.DotNet.Cli.Utils/project.json | 8 ++++---- src/Microsoft.DotNet.ProjectModel/project.json | 4 ++-- src/dotnet/project.json | 18 +++++++++--------- .../project.json | 8 ++++---- tools/RuntimeGraphGenerator/project.json | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs index e91d82fb9..70279cc76 100644 --- a/scripts/dotnet-cli-build/CompileTargets.cs +++ b/scripts/dotnet-cli-build/CompileTargets.cs @@ -48,7 +48,7 @@ namespace Microsoft.DotNet.Cli.Build return c.Success(); } - // Moving PrepareTargets.RestorePackages after PackagePkgProjects because managed code depends on the + // Moving PrepareTargets.RestorePackages after PackagePkgProjects because managed code depends on the // Microsoft.NETCore.App package that is created during PackagePkgProjects. [Target(nameof(PrepareTargets.Init), nameof(CompileCoreHost), nameof(PackagePkgProjects), nameof(PrepareTargets.RestorePackages), nameof(CompileStage1), nameof(CompileStage2))] public static BuildTargetResult Compile(BuildTargetContext c) @@ -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 // 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. - ExecSilent(Crossgen.GetCrossgenPathForVersion(CompileTargets.CoreCLRVersion), + ExecSilent(Crossgen.GetCrossgenPathForVersion(CoreCLRVersion), "-readytorun", "-in", file, "-out", tempPathName, "-platform_assemblies_paths", pathToAssemblies); File.Delete(file); diff --git a/scripts/update-dependencies/project.json b/scripts/update-dependencies/project.json index caf880730..4d0144085 100644 --- a/scripts/update-dependencies/project.json +++ b/scripts/update-dependencies/project.json @@ -9,7 +9,7 @@ "Microsoft.CSharp": "4.0.1-rc2-24008", "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24008", "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", "Octokit": "0.18.0", "Microsoft.Net.Http": "2.2.29" diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectToolsCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectToolsCommandResolver.cs index 49514db98..374d48b51 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectToolsCommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectToolsCommandResolver.cs @@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Cli.Utils { 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 = CommandResolutionStrategy.ProjectToolsPackage; diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index c69c99ee6..28c970794 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -7,10 +7,10 @@ "dependencies": { "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20459", - "NuGet.Versioning": "3.5.0-beta-1130", - "NuGet.Packaging": "3.5.0-beta-1130", - "NuGet.Frameworks": "3.5.0-beta-1130", - "NuGet.ProjectModel": "3.5.0-beta-1130" + "NuGet.Versioning": "3.5.0-beta-1160", + "NuGet.Packaging": "3.5.0-beta-1160", + "NuGet.Frameworks": "3.5.0-beta-1160", + "NuGet.ProjectModel": "3.5.0-beta-1160" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 321004869..787d638ae 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -16,8 +16,8 @@ "version": "1.0.0-rc2-20221" }, "Newtonsoft.Json": "7.0.1", - "NuGet.Packaging": "3.5.0-beta-1130", - "NuGet.RuntimeModel": "3.5.0-beta-1130", + "NuGet.Packaging": "3.5.0-beta-1160", + "NuGet.RuntimeModel": "3.5.0-beta-1160", "System.Reflection.Metadata": "1.3.0-rc2-24008" }, "frameworks": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index e8baa2eec..e6bd4fb92 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -17,10 +17,10 @@ ], "dependencies": { "NuGet.Commands": { - "version": "3.5.0-beta-1130", + "version": "3.5.0-beta-1160", "exclude": "compile" }, - "NuGet.CommandLine.XPlat": "3.5.0-beta-1130", + "NuGet.CommandLine.XPlat": "3.5.0-beta-1160", "Newtonsoft.Json": "7.0.1", "System.Text.Encoding.CodePages": "4.0.1-rc2-24008", "System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24008", @@ -55,13 +55,13 @@ } }, "frameworks": { - "netstandard1.5": { - "imports": [ - "dnxcore50", - "netstandardapp1.5", - "portable-net45+win8", - "portable-net45+wp80+win8+wpa81+dnxcore50" - ] + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "netstandardapp1.5", + "portable-net45+win8", + "portable-net45+wp80+win8+wpa81+dnxcore50" + ] } } } diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 2f693bd56..37cb5ae94 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -10,10 +10,10 @@ }, "System.Diagnostics.TraceSource": "4.0.0-rc2-24008", "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24008", - "NuGet.Versioning": "3.5.0-beta-1130", - "NuGet.Packaging": "3.5.0-beta-1130", - "NuGet.Frameworks": "3.5.0-beta-1130", - "NuGet.ProjectModel": "3.5.0-beta-1130", + "NuGet.Versioning": "3.5.0-beta-1160", + "NuGet.Packaging": "3.5.0-beta-1160", + "NuGet.Frameworks": "3.5.0-beta-1160", + "NuGet.ProjectModel": "3.5.0-beta-1160", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/tools/RuntimeGraphGenerator/project.json b/tools/RuntimeGraphGenerator/project.json index 12f43b9c6..efe35c501 100644 --- a/tools/RuntimeGraphGenerator/project.json +++ b/tools/RuntimeGraphGenerator/project.json @@ -4,8 +4,8 @@ "emitEntryPoint": true }, "dependencies": { - "NuGet.RuntimeModel": "3.5.0-beta-1130", - "NuGet.Versioning": "3.5.0-beta-1130", + "NuGet.RuntimeModel": "3.5.0-beta-1160", + "NuGet.Versioning": "3.5.0-beta-1160", "System.CommandLine": "0.1.0-e160119-1", "System.Runtime.Serialization.Json": "4.0.2-rc2-24008", "Microsoft.DotNet.ProjectModel": "1.0.0-*",