From e51dd1594c018a4b72adfe75fef618d6939963d9 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 5 Apr 2016 19:24:26 -0700 Subject: [PATCH] Update to the latest AspNet packages --- NuGet.Config | 3 -- src/Microsoft.DotNet.Cli.Utils/project.json | 8 +++-- .../project.json | 9 +++-- src/Microsoft.DotNet.Files/project.json | 11 +++--- .../project.json | 9 ++--- .../project.json | 3 +- .../project.json | 6 ++-- .../project.json | 36 ++++++++++--------- .../project.json | 11 +++--- .../project.json | 16 ++++----- .../project.json | 5 ++- src/dotnet/project.json | 22 ++++-------- 12 files changed, 62 insertions(+), 77 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index a8993ec6d..fd5ce235a 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -6,7 +6,4 @@ - - - diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index dd2833dcd..619d52f82 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.ApplicationInsights": "2.0.0-rc1", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20100", + "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", @@ -22,9 +22,11 @@ } }, "netstandard1.5": { - "imports": "dnxcore50", + "imports": [ + "portable-net45+wp80+win8+wpa81+dnxcore50", + "dnxcore50" + ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23931", "System.Diagnostics.Process": "4.1.0-rc2-23931" } } diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index c87b4d2c9..6609469ba 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -4,18 +4,17 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23931", - "System.CommandLine": "0.1.0-e160323-1", "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160405-05", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "Microsoft.DotNet.Files": "1.0.0-*" + "Microsoft.DotNet.Files": "1.0.0-*", + "System.CommandLine": "0.1.0-e160323-1" }, "frameworks": { "netstandard1.5": { "imports": [ - "dnxcore50", - "portable-net45+win8" + "portable-net45+wp80+win8+wpa81+dnxcore50", + "dnxcore50" ] } }, diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 0ddd55b0b..938bbf87f 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -5,15 +5,16 @@ }, "description": "Abstraction to interact with the file system and file paths.", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23931", - "System.Linq.Expressions": "4.0.11-rc2-23931", - "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "Microsoft.DotNet.ProjectModel": "1.0.0-*" + "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "System.Linq.Expressions": "4.0.11-rc2-23931" }, "frameworks": { "netstandard1.5": { - "imports": "dnxcore50" + "imports": [ + "portable-net45+wp80+win8+wpa81+dnxcore50", + "dnxcore50" + ] } }, "scripts": {} diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index 006a0c5c6..441fdef8c 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -10,16 +10,11 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20100" + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20459" }, "frameworks": { "net451": {}, - "netstandard1.3": { - "imports": "dnxcore50", - "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23931" - } - } + "netstandard1.3": {} }, "scripts": {} } diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 3134122e9..1f7dda0b0 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -4,13 +4,12 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23931", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "System.Runtime.Loader": "4.0.0-rc2-23931" }, "frameworks": { "netstandard1.5": { - "imports": "dnxcore50" + "imports": "portable-net45+wp80+win8+wpa81+dnxcore50" } } } diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index f90d8ecf5..bd020bfd5 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -4,7 +4,6 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23931", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160405-05" @@ -12,8 +11,9 @@ "frameworks": { "netstandard1.5": { "imports": [ - "dnxcore50", - "portable-net45+win8" + "portable-net45+wp80+win8+wpa81+dnxcore50", + "portable-net45+win8", + "dnxcore50" ] } } diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 125830412..8ac357018 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -5,20 +5,19 @@ }, "description": "Types to model a .NET Project", "dependencies": { - "System.Reflection.Metadata": "1.3.0-rc2-23931", - "NuGet.Packaging": "3.5.0-beta-1130", - "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", - "Microsoft.Extensions.JsonParser.Sources": { - "type": "build", - "version": "1.0.0-rc2-16453" - }, - "Newtonsoft.Json": "7.0.1", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23931", + "Microsoft.Extensions.DependencyModel": "1.0.0-*", + "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20459", "Microsoft.Extensions.HashCodeCombiner.Sources": { "type": "build", - "version": "1.0.0-rc2-16054" + "version": "1.0.0-rc2-20459" }, - "Microsoft.Extensions.DependencyModel": "1.0.0-*" + "Microsoft.Extensions.JsonParser.Sources": { + "type": "build", + "version": "1.0.0-rc2-20221" + }, + "Newtonsoft.Json": "7.0.1", + "NuGet.Packaging": "3.5.0-beta-1130", + "System.Reflection.Metadata": "1.3.0-rc2-23931" }, "frameworks": { "net451": { @@ -35,14 +34,17 @@ } }, "netstandard1.5": { - "imports": "dnxcore50", + "imports": [ + "portable-net45+wp80+win8+wpa81+dnxcore50", + "dotnet5.4" + ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23931", - "System.Dynamic.Runtime": "4.0.11-rc2-23931", - "System.Threading.Thread": "4.0.0-rc2-23931", - "System.Runtime.Loader": "4.0.0-rc2-23931", - "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23931", "Microsoft.CSharp": "4.0.1-rc2-23931", + "System.Dynamic.Runtime": "4.0.11-rc2-23931", + "System.Runtime.Loader": "4.0.0-rc2-23931", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23931", + "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23931", + "System.Threading.Thread": "4.0.0-rc2-23931", "System.Xml.XDocument": "4.0.11-rc2-23931" } } diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index fe519b5c2..928b8102a 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -1,21 +1,20 @@ { "version": "1.0.0-*", "description": "Microsoft.DotNet.TestFramework Class Library", - "authors": [ - "sridhper" - ], "tags": [ "" ], "projectUrl": "", "licenseUrl": "", "dependencies": { - "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "NETStandard.Library": "1.5.0-rc2-23931" + "Microsoft.DotNet.Cli.Utils": "1.0.0-*" }, "frameworks": { "netstandard1.5": { - "imports": "dnxcore50" + "imports": [ + "portable-net45+wp80+win8+wpa81+dnxcore50", + "dnxcore50" + ] } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index a39e0691c..3839faeb5 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -10,23 +10,23 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.Extensions.HashCodeCombiner.Sources": { - "type": "build", - "version": "1.0.0-rc2-16054" - }, "Microsoft.DotNet.InternalAbstractions": { "target": "project", "version": "1.0.0-*" }, - "Newtonsoft.Json": "7.0.1", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20100" + "Microsoft.Extensions.HashCodeCombiner.Sources": { + "type": "build", + "version": "1.0.0-rc2-20459" + }, + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20459", + "Newtonsoft.Json": "7.0.1" }, "frameworks": { "net451": {}, "netstandard1.5": { - "imports": "dnxcore50", + "imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23931", + "System.Diagnostics.Debug": "4.0.11-rc2-23931", "System.Dynamic.Runtime": "4.0.11-rc2-23931" } } diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 39c2b624b..98d8d0db9 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -13,7 +13,7 @@ "dependencies": { "Newtonsoft.Json": "7.0.1", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-16040", + "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-20459", "Microsoft.DiaSymReader": "1.0.6", "Microsoft.DiaSymReader.Native": "1.3.3" }, @@ -21,11 +21,10 @@ "net451": {}, "netstandard1.5": { "imports": [ - "dnxcore50", + "portable-net45+wp80+win8+wpa81+dnxcore50", "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23931", "System.Resources.ResourceManager": "4.0.1-rc2-23931", "System.Reflection.TypeExtensions": "4.1.0-rc2-23931" } diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 3878fe1ba..89950e39f 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -29,20 +29,12 @@ "Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.ILCompiler.SDK": "1.0.6-prerelease-00003", - "Microsoft.Extensions.Logging": "1.0.0-rc2-16040", - "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-16040", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20100", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20459", + "Microsoft.Extensions.Logging": "1.0.0-rc2-20459", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20459", "Microsoft.Extensions.CommandLineUtils.Sources": { "type": "build", - "version": "1.0.0-rc2-16453" - }, - "Microsoft.Dnx.Runtime.CommandParsing.Sources": { - "version": "1.0.0-rc2-16453", - "type": "build" - }, - "Microsoft.Dnx.Runtime.Sources": { - "version": "1.0.0-rc2-16453", - "type": "build" + "version": "1.0.0-rc2-20221" }, "Microsoft.Extensions.Testing.Abstractions": "1.0.0-*", "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23931", @@ -66,9 +58,9 @@ "imports": [ "dnxcore50", "netstandardapp1.5", - "portable-net45+win8" + "portable-net45+win8", + "portable-net45+wp80+win8+wpa81+dnxcore50" ] } - }, - "scripts": {} + } }