From 16fa8362157da2ec626c7aaee01636068929cd00 Mon Sep 17 00:00:00 2001 From: Bryan Date: Tue, 8 Dec 2015 13:29:49 -0800 Subject: [PATCH] Upgrade references to use NETStandard.Library, or up to rc2-23608 where applicable --- src/Microsoft.DotNet.Cli.Utils/project.json | 8 ++----- src/Microsoft.DotNet.Cli/project.json | 7 +++--- .../project.json | 6 ++--- .../project.json | 17 +++++++------ src/Microsoft.DotNet.Runtime/Program.cs | 2 +- src/Microsoft.DotNet.Runtime/project.json | 3 ++- .../project.json | 12 ++++------ .../project.json | 24 +++++++++---------- .../project.json | 10 +++----- src/Microsoft.DotNet.Tools.New/project.json | 7 +----- src/Microsoft.DotNet.Tools.Pack/project.json | 10 +++----- .../project.json | 10 ++------ .../project.json | 11 ++++----- src/Microsoft.DotNet.Tools.Repl/project.json | 7 ++---- .../project.json | 9 +++---- src/Microsoft.DotNet.Tools.Run/project.json | 12 ++++------ src/Microsoft.DotNet.Tools.Test/project.json | 16 ++++--------- .../project.json | 9 +++---- 18 files changed, 66 insertions(+), 114 deletions(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index e2ee59a5c..65f5d8b9e 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -4,14 +4,10 @@ "shared": "**/*.cs", "dependencies": { - "System.AppContext": "4.0.0", - "System.Console": "4.0.0-beta-23504", - "System.IO.FileSystem": "4.0.1-beta-23504", - "System.Threading": "4.0.11-beta-23504", - "System.Diagnostics.Process": "4.1.0-beta-23504", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23504", + "NETStandard.Library": "1.0.0-rc2-23608", "Microsoft.DotNet.ProjectModel": "1.0.0" }, + "frameworks": { "dnxcore50": { } } diff --git a/src/Microsoft.DotNet.Cli/project.json b/src/Microsoft.DotNet.Cli/project.json index 7e28db3c2..80a3f3c2c 100644 --- a/src/Microsoft.DotNet.Cli/project.json +++ b/src/Microsoft.DotNet.Cli/project.json @@ -5,10 +5,9 @@ "emitEntryPoint": true }, "dependencies": { - "System.Console": "4.0.0-beta-23504", - "System.Collections": "4.0.11-beta-23504", - "System.Linq": "4.0.1-beta-23504", - "System.Diagnostics.Process": "4.1.0-beta-23504", + "NETStandard.Library": "1.0.0-rc2-23608", + "System.Linq": "4.0.1-rc2-23608", + "Microsoft.DotNet.Cli.Utils": { "type": "build", "version": "1.0.0-*" diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index c4f20af74..288b9bf83 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -2,12 +2,12 @@ "version": "1.0.0-*", "dependencies": { + "NETStandard.Library": "1.0.0-rc2-23608", + "System.Linq": "4.0.1-rc2-23608", "System.CommandLine": "0.1.0-*", - "System.Linq": "4.0.1-beta-23504", - "System.Runtime": "4.0.21-beta-23504", + "Microsoft.DotNet.ProjectModel": "1.0.0-*" }, - "frameworks": { "dnxcore50": { } }, diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 5bbc88832..c6b18e23f 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -2,15 +2,14 @@ "version": "1.0.0-*", "description": "Types to model a .NET Project", "dependencies": { - "Microsoft.CSharp": "4.0.1-beta-23504", - "System.Collections": "4.0.11-beta-23504", - "System.Linq": "4.0.1-beta-23504", - "System.Threading.Thread": "4.0.0-beta-23504", - "System.Runtime.Loader": "4.0.0-beta-23504", - "System.Dynamic.Runtime": "4.0.11-beta-23504", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23504", - "System.Security.Cryptography.Algorithms": "4.0.0-beta-23504", - "System.Xml.XDocument": "4.0.11-beta-23504", + "NETStandard.Library": "1.0.0-rc2-23608", + "System.Linq": "4.0.1-rc2-23608", + "System.Threading.Thread": "4.0.0-rc2-23608", + "System.Runtime.Loader": "4.0.0-rc2-23608", + "System.Dynamic.Runtime": "4.0.11-rc2-23608", + "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23608", + "Microsoft.CSharp": "4.0.1-rc2-23608", + "System.Xml.XDocument": "4.0.11-rc2-23608", "NuGet.Packaging": "3.3.0-*", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15791", diff --git a/src/Microsoft.DotNet.Runtime/Program.cs b/src/Microsoft.DotNet.Runtime/Program.cs index a14709f14..1ed282518 100644 --- a/src/Microsoft.DotNet.Runtime/Program.cs +++ b/src/Microsoft.DotNet.Runtime/Program.cs @@ -1,6 +1,6 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. - +using System; namespace Microsoft.DotNet.Runtime { public class Program diff --git a/src/Microsoft.DotNet.Runtime/project.json b/src/Microsoft.DotNet.Runtime/project.json index cbc6dbd25..6a4e9c5bf 100644 --- a/src/Microsoft.DotNet.Runtime/project.json +++ b/src/Microsoft.DotNet.Runtime/project.json @@ -5,7 +5,8 @@ }, "dependencies": { - "Microsoft.NETCore.Runtime": "1.0.1-beta-23504" + "NETStandard.Library" : "1.0.0-rc2-23608", + "Microsoft.NETCore.Runtime": "1.0.1-rc2-23608" }, "frameworks": { diff --git a/src/Microsoft.DotNet.Tools.Compiler.Csc/project.json b/src/Microsoft.DotNet.Tools.Compiler.Csc/project.json index 93068d4f8..ab37ebc01 100644 --- a/src/Microsoft.DotNet.Tools.Compiler.Csc/project.json +++ b/src/Microsoft.DotNet.Tools.Compiler.Csc/project.json @@ -5,11 +5,10 @@ "emitEntryPoint": true }, "dependencies": { - "System.Console": "4.0.0-beta-23504", - "System.Collections": "4.0.11-beta-23504", - "System.Linq": "4.0.1-beta-23504", - "System.Diagnostics.Process": "4.1.0-beta-23504", - "System.IO.FileSystem": "4.0.1-beta-23504", + "NETStandard.Library": "1.0.0-rc2-23608", + "System.Linq": "4.0.1-rc2-23608", + + "Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151117-04", "Microsoft.DotNet.Cli.Utils": { "type": "build", @@ -19,8 +18,7 @@ "type": "build", "version": "1.0.0-*" }, - "Microsoft.DotNet.Compiler.Common": "1.0.0-*", - "Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151117-04" + "Microsoft.DotNet.Compiler.Common": "1.0.0-*" }, "frameworks": { "dnxcore50": { } diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/project.json b/src/Microsoft.DotNet.Tools.Compiler.Native/project.json index d1d11e431..2d128b6f1 100644 --- a/src/Microsoft.DotNet.Tools.Compiler.Native/project.json +++ b/src/Microsoft.DotNet.Tools.Compiler.Native/project.json @@ -5,16 +5,14 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1-beta-23504", - "Microsoft.NETCore.Runtime": "1.0.1-beta-23504", - "System.Console": "4.0.0-beta-23504", - "System.Collections": "4.0.11-beta-23504", - "System.Linq": "4.0.1-beta-23504", - "Microsoft.NETCore.TestHost": "1.0.0-beta-23504", - "System.Diagnostics.Process": "4.1.0-beta-23504", - "System.IO": "4.0.11-beta-23504", - "System.IO.FileSystem": "4.0.1-beta-23504", - "System.AppContext": "4.0.1-beta-23504", + "NETStandard.Library": "1.0.0-rc2-23608", + "System.Linq": "4.0.1-rc2-23608", + + "Microsoft.DotNet.ILCompiler": "1.0.2-*", + "Microsoft.DotNet.ObjectWriter": "1.0.2-*", + "Microsoft.DotNet.RyuJit": "1.0.0-*", + "Microsoft.DotNet.Compiler.Common": "1.0.0-*", + "Microsoft.DotNet.Cli.Utils": { "type": "build", "version": "1.0.0-*" @@ -23,9 +21,9 @@ "type": "build", "version": "1.0.0-*" }, - "Microsoft.DotNet.ILCompiler": "1.0.3-*", - "Microsoft.DotNet.ILCompiler.SDK": "1.0.3-*", - "Microsoft.DotNet.Compiler.Common": "1.0.0-*" + "Microsoft.DotNet.ILCompiler": "1.0.3-*", + "Microsoft.DotNet.ILCompiler.SDK": "1.0.3-*", + "Microsoft.DotNet.Compiler.Common": "1.0.0-*" }, "frameworks": { "dnxcore50": { } diff --git a/src/Microsoft.DotNet.Tools.Compiler/project.json b/src/Microsoft.DotNet.Tools.Compiler/project.json index df8d4fb4a..f7d5ac984 100644 --- a/src/Microsoft.DotNet.Tools.Compiler/project.json +++ b/src/Microsoft.DotNet.Tools.Compiler/project.json @@ -5,14 +5,10 @@ "emitEntryPoint": true }, "dependencies": { - "System.Console": "4.0.0-beta-23504", - "System.Collections": "4.0.11-beta-23504", - "System.Linq": "4.0.1-beta-23504", - "System.Diagnostics.Process": "4.1.0-beta-23504", - "System.IO.FileSystem": "4.0.1-beta-23504", - "System.AppContext": "4.0.1-beta-23504", + "NETStandard.Library": "1.0.0-rc2-23608", + "System.Linq": "4.0.1-rc2-23608", "System.Reflection.Metadata": "1.1.0", - + "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": { diff --git a/src/Microsoft.DotNet.Tools.New/project.json b/src/Microsoft.DotNet.Tools.New/project.json index 3635002a5..7601e07f9 100644 --- a/src/Microsoft.DotNet.Tools.New/project.json +++ b/src/Microsoft.DotNet.Tools.New/project.json @@ -5,14 +5,9 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.Runtime": "1.0.1-beta-23504", + "NETStandard.Library": "1.0.0-rc2-23608", - "System.Console": "4.0.0-beta-23504", - "System.Collections": "4.0.11-beta-23504", "System.Linq": "4.0.1-beta-23504", - "System.Diagnostics.Process": "4.1.0-beta-23504", - "System.IO.FileSystem": "4.0.1-beta-23504", - "System.AppContext": "4.0.1-beta-23504", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": { diff --git a/src/Microsoft.DotNet.Tools.Pack/project.json b/src/Microsoft.DotNet.Tools.Pack/project.json index 377c01c99..d978f9de1 100644 --- a/src/Microsoft.DotNet.Tools.Pack/project.json +++ b/src/Microsoft.DotNet.Tools.Pack/project.json @@ -5,15 +5,11 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.Runtime": "1.0.1-beta-23504", - "System.IO.Compression.ZipFile": "4.0.1-beta-23504", + "NETStandard.Library": "1.0.0-rc2-23608", + "System.IO.Compression.ZipFile": "4.0.1-rc2-23608", "Microsoft.NETCore.Targets.DNXCore": "5.0.0-beta-23511", - "System.Console": "4.0.0-beta-23504", - "System.Collections": "4.0.11-beta-23504", - "System.Linq": "4.0.1-beta-23504", - "System.Diagnostics.Process": "4.1.0-beta-23504", - "System.IO.FileSystem": "4.0.1-beta-23504", + "System.Linq": "4.0.1-rc2-23608", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": { diff --git a/src/Microsoft.DotNet.Tools.Publish/project.json b/src/Microsoft.DotNet.Tools.Publish/project.json index 10a0082bf..ebe64f6fe 100644 --- a/src/Microsoft.DotNet.Tools.Publish/project.json +++ b/src/Microsoft.DotNet.Tools.Publish/project.json @@ -5,14 +5,8 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.Runtime": "1.0.1-beta-23504", - - "System.Console": "4.0.0-beta-23504", - "System.Collections": "4.0.11-beta-23504", - "System.Linq": "4.0.1-beta-23504", - "System.Diagnostics.Process": "4.1.0-beta-23504", - "System.IO.FileSystem": "4.0.1-beta-23504", - "System.AppContext": "4.0.1-beta-23504", + "NETStandard.Library": "1.0.0-rc2-23608", + "System.Linq": "4.0.1-rc2-23608", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": { diff --git a/src/Microsoft.DotNet.Tools.Repl.Csi/project.json b/src/Microsoft.DotNet.Tools.Repl.Csi/project.json index 1a0b3e909..a1414ab9e 100644 --- a/src/Microsoft.DotNet.Tools.Repl.Csi/project.json +++ b/src/Microsoft.DotNet.Tools.Repl.Csi/project.json @@ -5,12 +5,10 @@ "emitEntryPoint": true }, "dependencies": { - "System.Console": "4.0.0-beta-23504", - "System.Collections": "4.0.11-beta-23504", + "NETStandard.Library": "1.0.0-rc2-23608", "System.Linq": "4.0.1-beta-23504", - "System.Diagnostics.Process": "4.1.0-beta-23504", - "System.IO.FileSystem": "4.0.1-beta-23504", - "System.AppContext": "4.0.1-beta-23504", + + "Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta-20151106-02", "Microsoft.DotNet.Cli.Utils": { "type": "build", @@ -19,8 +17,7 @@ "Microsoft.Extensions.CommandLineUtils.Sources": { "type": "build", "version": "1.0.0-*" - }, - "Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta-20151106-02" + } }, "frameworks": { "dnxcore50": { } diff --git a/src/Microsoft.DotNet.Tools.Repl/project.json b/src/Microsoft.DotNet.Tools.Repl/project.json index 5a3fd9854..192b8242c 100644 --- a/src/Microsoft.DotNet.Tools.Repl/project.json +++ b/src/Microsoft.DotNet.Tools.Repl/project.json @@ -5,11 +5,8 @@ "emitEntryPoint": true }, "dependencies": { - "System.Console": "4.0.0-beta-23504", - "System.Collections": "4.0.11-beta-23504", - "System.Linq": "4.0.1-beta-23504", - "System.Diagnostics.Process": "4.1.0-beta-23504", - "System.IO.FileSystem": "4.0.1-beta-23504", + "NETStandard.Library": "1.0.0-rc2-23608", + "System.Linq": "4.0.1-rc2-23608", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": { diff --git a/src/Microsoft.DotNet.Tools.Resgen/project.json b/src/Microsoft.DotNet.Tools.Resgen/project.json index 0d087c821..a6e9d52f7 100644 --- a/src/Microsoft.DotNet.Tools.Resgen/project.json +++ b/src/Microsoft.DotNet.Tools.Resgen/project.json @@ -5,13 +5,10 @@ "emitEntryPoint": true }, "dependencies": { - "System.Console": "4.0.0-beta-23504", - "System.Collections": "4.0.11-beta-23504", - "System.Linq": "4.0.1-beta-23504", - "System.Diagnostics.Process": "4.1.0-beta-23504", - "System.IO.FileSystem": "4.0.1-beta-23504", + "NETStandard.Library": "1.0.0-rc2-23608", + "System.Linq": "4.0.1-rc2-23608", "System.Xml.XDocument": "4.0.11-beta-23504", - "System.Resources.ReaderWriter": "4.0.0-beta-23504", + "System.Resources.ReaderWriter": "4.0.0-rc2-23608", "Microsoft.DotNet.Cli.Utils": { "type": "build", diff --git a/src/Microsoft.DotNet.Tools.Run/project.json b/src/Microsoft.DotNet.Tools.Run/project.json index 99fac659d..149697e11 100644 --- a/src/Microsoft.DotNet.Tools.Run/project.json +++ b/src/Microsoft.DotNet.Tools.Run/project.json @@ -5,19 +5,17 @@ "emitEntryPoint": true }, "dependencies": { - "System.Console": "4.0.0-beta-23504", - "System.Collections": "4.0.11-beta-23504", + "NETStandard.Library": "1.0.0-rc2-23608", "System.Linq": "4.0.1-beta-23504", - "System.Diagnostics.Process": "4.1.0-beta-23504", - "System.IO.FileSystem": "4.0.1-beta-23504", + + "Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151117-04", + "System.CommandLine" : "0.1.0-d111815-3", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": { "type": "build", "version": "1.0.0-*" - }, - "Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151117-04", - "System.CommandLine" : "0.1.0-d111815-3" + } }, "frameworks": { "dnxcore50": { } diff --git a/src/Microsoft.DotNet.Tools.Test/project.json b/src/Microsoft.DotNet.Tools.Test/project.json index e1e584fa2..4d97ccc9e 100644 --- a/src/Microsoft.DotNet.Tools.Test/project.json +++ b/src/Microsoft.DotNet.Tools.Test/project.json @@ -40,17 +40,11 @@ "frameworks": { "dnxcore50": { "dependencies": { - "System.Console": "4.0.0-beta-*", - "System.Diagnostics.Process": "4.1.0-beta-*", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-beta-*", - "System.Diagnostics.TraceSource": "4.0.0-beta-*", - "System.Dynamic.Runtime": "4.0.11-beta-*", - "System.Net.Primitives": "4.0.11-beta-*", - "System.Net.Sockets": "4.1.0-beta-*", - "System.Runtime": "4.0.21-rc2-*", - "System.Reflection.Extensions": "4.0.1-beta-*", - "System.Reflection.TypeExtensions": "4.0.1-beta-*", - "System.Threading.Thread": "4.0.0-beta-*" + "NETStandard.Library": "1.0.0-rc2-23608", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23608", + "System.Diagnostics.TraceSource": "4.0.0-rc2-23608", + "System.Dynamic.Runtime": "4.0.11-rc2-23608", + "System.Threading.Thread": "4.0.0-rc2-23608" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 232e683e7..70b0c4048 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -16,16 +16,13 @@ }, "Microsoft.Extensions.Compilation.Abstractions": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", - "System.Runtime.Serialization.Primitives": "4.0.11-beta-*" + "System.Runtime.Serialization.Primitives": "4.0.11-rc2-23608" }, "frameworks": { "dnxcore50": { "dependencies": { - "System.Collections": "4.0.11-rc2-*", - "System.Reflection": "4.1.0-beta-*", - "System.Resources.ResourceManager": "4.0.1-beta-*", - "System.Runtime": "4.0.21-rc2-*", - "System.Runtime.Extensions": "4.0.11-rc2-*" + "NETStandard.Library": "1.0.0-rc2-23608", + "System.Resources.ResourceManager": "4.0.1-rc2-23608" } } },