From bc619cb9bec34c5a9cee134212fd02d50e4ddea6 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 20 Apr 2016 13:50:34 -0500 Subject: [PATCH] Move ASP.NET package references to rc2-20581 from the aspnetrelease feed. The places where I removed a dependency is because a lower package (InternalAbstrations) was already bringing in that dependency. Fix #2567 --- scripts/Microsoft.DotNet.Cli.Build.Framework/project.json | 2 +- src/Microsoft.DotNet.Cli.Utils/project.json | 1 - src/Microsoft.DotNet.InternalAbstractions/project.json | 2 +- src/Microsoft.DotNet.ProjectModel/project.json | 2 +- src/Microsoft.Extensions.DependencyModel/project.json | 1 - src/Microsoft.Extensions.Testing.Abstractions/project.json | 2 +- src/dotnet/project.json | 5 ++--- test/Microsoft.DotNet.Tools.Tests.Utilities/project.json | 1 - 8 files changed, 6 insertions(+), 10 deletions(-) diff --git a/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json b/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json index 266cc6afc..3fc6976be 100644 --- a/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json +++ b/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json @@ -3,7 +3,7 @@ "dependencies": { "NETStandard.Library": "1.5.0-rc2-24018", "System.Diagnostics.Process": "4.1.0-rc2-24018", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20100" + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20581" }, "frameworks": { "netstandard1.3": { diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index d8d783004..bc8a51d77 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -6,7 +6,6 @@ }, "dependencies": { "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20459", "NuGet.Versioning": "3.5.0-beta-1178", "NuGet.Packaging": "3.5.0-beta-1178", "NuGet.Frameworks": "3.5.0-beta-1178", diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index 441fdef8c..319f32dbb 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -10,7 +10,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20459" + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20581" }, "frameworks": { "net451": {}, diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index b47c61125..ea3de55dc 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -6,7 +6,7 @@ "description": "Types to model a .NET Project", "dependencies": { "Microsoft.Extensions.DependencyModel": "1.0.0-*", - "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20459", + "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20581", "Microsoft.Extensions.HashCodeCombiner.Sources": { "type": "build", "version": "1.0.0-rc2-20459" diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 2bb06027c..8926e9fd9 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -18,7 +18,6 @@ "type": "build", "version": "1.0.0-rc2-20459" }, - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20459", "Newtonsoft.Json": "7.0.1" }, "frameworks": { diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 0b716de8d..6ba119064 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-20459", + "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-20581", "Microsoft.DiaSymReader": "1.0.6", "Microsoft.DiaSymReader.Native": "1.3.3" }, diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 5bee8a27b..0ac174b3e 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -30,9 +30,8 @@ "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.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.Logging": "1.0.0-rc2-20581", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20581", "Microsoft.Extensions.CommandLineUtils.Sources": { "type": "build", "version": "1.0.0-rc2-20221" diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json index 38a069902..60f22af6a 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -18,7 +18,6 @@ "Microsoft.DotNet.TestFramework": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20100", "Microsoft.DotNet.InternalAbstractions": { "target": "project", "version": "1.0.0-*"