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

Merge pull request #2029 from dotnet/anurse/new-get

Browse source 
update to new nuget and turn inference on
This commit is contained in:
Andrew Stanton-Nurse 2016-03-24 13:57:19 -07:00
commit d402bd98cb
7 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@
"Microsoft.CSharp": "4.0.1-rc2-23911", "Microsoft.CSharp": "4.0.1-rc2-23911",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23911", "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23911",
"Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*", "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*",
"NuGet.Versioning": "3.4.0-rtm-0764", "NuGet.Versioning": "3.5.0-beta-1068",
"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"

8
src/Microsoft.DotNet.Cli.Utils/project.json
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-16537", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537",
"NuGet.Versioning": "3.5.0-beta-1034", "NuGet.Versioning": "3.5.0-beta-1068",
"NuGet.Packaging": "3.5.0-beta-1034", "NuGet.Packaging": "3.5.0-beta-1068",
"NuGet.Frameworks": "3.5.0-beta-1034", "NuGet.Frameworks": "3.5.0-beta-1068",
"NuGet.ProjectModel": "3.5.0-beta-1034" "NuGet.ProjectModel": "3.5.0-beta-1068"
}, },
"frameworks": { "frameworks": {
"net451": { "net451": {

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

@ -6,7 +6,7 @@
"description": "Types to model a .NET Project", "description": "Types to model a .NET Project",
"dependencies": { "dependencies": {
"System.Reflection.Metadata": "1.2.0-rc2-23904", "System.Reflection.Metadata": "1.2.0-rc2-23904",
"NuGet.Packaging": "3.5.0-beta-1034", "NuGet.Packaging": "3.5.0-beta-1068",
"Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996",
"Microsoft.Extensions.JsonParser.Sources": { "Microsoft.Extensions.JsonParser.Sources": {
"type": "build", "type": "build",

6
src/dotnet/commands/dotnet-restore/Program.cs
View file

@ -36,6 +36,12 @@ namespace Microsoft.DotNet.Tools.Restore
var quiet = args.Any(s => s.Equals("--quiet", StringComparison.OrdinalIgnoreCase)); var quiet = args.Any(s => s.Equals("--quiet", StringComparison.OrdinalIgnoreCase));
args = args.Where(s => !s.Equals("--quiet", StringComparison.OrdinalIgnoreCase)).ToArray(); args = args.Where(s => !s.Equals("--quiet", StringComparison.OrdinalIgnoreCase)).ToArray();
// Always infer runtimes in dotnet-restore (for now).
if (!args.Any(s => s.Equals("--infer-runtimes", StringComparison.OrdinalIgnoreCase)))
{
args = Enumerable.Concat(new [] { "--infer-runtimes" }, args).ToArray();
}
app.OnExecute(() => app.OnExecute(() =>
{ {
try try

4
src/dotnet/project.json
View file

@ -17,10 +17,10 @@
], ],
"dependencies": { "dependencies": {
"NuGet.Commands": { "NuGet.Commands": {
"version": "3.5.0-beta-1034", "version": "3.5.0-beta-1068",
"exclude": "compile" "exclude": "compile"
}, },
"NuGet.CommandLine.XPlat": "3.5.0-beta-1034", "NuGet.CommandLine.XPlat": "3.5.0-beta-1068",
"Newtonsoft.Json": "7.0.1", "Newtonsoft.Json": "7.0.1",
"Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160225-02", "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160225-02",

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

@ -5,10 +5,10 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"NuGet.Versioning": "3.5.0-beta-1034", "NuGet.Versioning": "3.5.0-beta-1068",
"NuGet.Packaging": "3.5.0-beta-1034", "NuGet.Packaging": "3.5.0-beta-1068",
"NuGet.Frameworks": "3.5.0-beta-1034", "NuGet.Frameworks": "3.5.0-beta-1068",
"NuGet.ProjectModel": "3.5.0-beta-1034", "NuGet.ProjectModel": "3.5.0-beta-1068",
"Microsoft.DotNet.ProjectModel": { "Microsoft.DotNet.ProjectModel": {
"target": "project" "target": "project"

4
tools/RuntimeGraphGenerator/project.json
View file

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