mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

update nuget to 1160

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/dotnet-cli-build/CompileTargets.cs
View file

@ -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);

2
scripts/update-dependencies/project.json
View file

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

2
src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectToolsCommandResolver.cs
View file

@ -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;

8
src/Microsoft.DotNet.Cli.Utils/project.json
View file

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

4
src/Microsoft.DotNet.ProjectModel/project.json
View file

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

18
src/dotnet/project.json
View file

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

8
test/Microsoft.DotNet.Cli.Utils.Tests/project.json
View file

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

4
tools/RuntimeGraphGenerator/project.json
View file

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