From f538c4f19f16fa46fda65d48c21838a666d9ccf0 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Thu, 5 May 2016 17:21:27 -0700 Subject: [PATCH] Move to P2P references all over the place --- .../DesktopAppWhichCallsDotnet/project.json | 2 +- .../dotnet-dependency-context-test/project.json | 2 +- .../dotnet-dependency-tool-invoker/project.json | 6 +++--- .../DependencyContextValidator/project.json | 3 +-- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- src/Microsoft.DotNet.Compiler.Common/project.json | 6 +++--- src/Microsoft.DotNet.Files/project.json | 4 ++-- src/Microsoft.DotNet.ProjectModel.Loader/project.json | 2 +- .../project.json | 4 ++-- src/Microsoft.DotNet.ProjectModel/project.json | 2 +- src/Microsoft.DotNet.TestFramework/project.json | 2 +- src/Microsoft.Extensions.DependencyModel/project.json | 3 +-- .../project.json | 2 +- src/dotnet-compile-fsc/project.json | 6 +++--- src/dotnet/project.json | 8 ++++---- test/Microsoft.DotNet.Tools.Tests.Utilities/project.json | 9 ++++----- test/dotnet-publish.Tests/project.json | 2 +- tools/MultiProjectValidator/project.json | 4 ++-- tools/RuntimeGraphGenerator/project.json | 4 ++-- 19 files changed, 35 insertions(+), 38 deletions(-) diff --git a/TestAssets/DesktopTestProjects/DesktopAppWhichCallsDotnet/project.json b/TestAssets/DesktopTestProjects/DesktopAppWhichCallsDotnet/project.json index aa82c8e24..2db26f0e4 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWhichCallsDotnet/project.json +++ b/TestAssets/DesktopTestProjects/DesktopAppWhichCallsDotnet/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.DotNet.Cli.Utils": "1.0.0-preview1-*" + "Microsoft.DotNet.Cli.Utils": { "target": "project" } }, "compilationOptions": { "emitEntryPoint": true diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index d7953ebc1..7c9d17446 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -8,7 +8,7 @@ "type": "platform", "version": "1.0.0-rc2-*" }, - "Microsoft.Extensions.DependencyModel": "1.0.0-rc2-*" + "Microsoft.Extensions.DependencyModel": { "target": "project" } }, "frameworks": { "netcoreapp1.0": { diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index fb90a2260..7bba77ea9 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,9 +12,9 @@ "type": "platform", "version": "1.0.0-rc2-*" }, - "Microsoft.DotNet.Cli.Utils": "1.0.0-preview1-*", - "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", - "Microsoft.DotNet.Compiler.Common": "1.0.0-preview1-*" + "Microsoft.DotNet.Cli.Utils": { "target": "project" }, + "Microsoft.DotNet.ProjectModel": { "target": "project" }, + "Microsoft.DotNet.Compiler.Common": { "target": "project" } }, "frameworks": { "netcoreapp1.0": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 556470522..0b9a1e077 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -2,8 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.Extensions.DependencyModel": { - "target": "project", - "version": "1.0.0-*" + "target": "project" } }, "frameworks": { diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 3f3a77727..b8df84924 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -5,7 +5,7 @@ "warningsAsErrors": true }, "dependencies": { - "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", + "Microsoft.DotNet.ProjectModel": { "target": "project" }, "NuGet.Versioning": "3.5.0-beta", "NuGet.Packaging": "3.5.0-beta", "NuGet.Frameworks": "3.5.0-beta", diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 1c11b0792..77c099d07 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -5,9 +5,9 @@ }, "dependencies": { "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160429-01", - "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-preview1-*", - "Microsoft.DotNet.Files": "1.0.0-preview1-*" + "Microsoft.DotNet.ProjectModel": { "target": "project" }, + "Microsoft.DotNet.Cli.Utils": { "target": "project" }, + "Microsoft.DotNet.Files": { "target": "project" } }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index c7fbc527a..9840684b1 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -5,8 +5,8 @@ }, "description": "Abstraction to interact with the file system and file paths.", "dependencies": { - "Microsoft.DotNet.Cli.Utils": "1.0.0-preview1-*", - "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", + "Microsoft.DotNet.Cli.Utils": { "target": "project" }, + "Microsoft.DotNet.ProjectModel": { "target": "project" }, "System.Linq.Expressions": "4.0.11-rc2-24027" }, "frameworks": { diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 6a61faa34..81a6a62bb 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -4,7 +4,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", + "Microsoft.DotNet.ProjectModel": { "target": "project" }, "System.Runtime.Loader": "4.0.0-rc2-24027" }, "frameworks": { diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index e9a1b09e4..77c6aefd2 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -4,8 +4,8 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", - "Microsoft.DotNet.Compiler.Common": "1.0.0-preview1-*", + "Microsoft.DotNet.ProjectModel": { "target": "project" }, + "Microsoft.DotNet.Compiler.Common": { "target": "project" }, "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160429-01" }, "frameworks": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index fa2637b59..c29823a4b 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -5,7 +5,7 @@ }, "description": "Types to model a .NET Project", "dependencies": { - "Microsoft.Extensions.DependencyModel": "1.0.0-rc2-*", + "Microsoft.Extensions.DependencyModel": { "target": "project" }, "Newtonsoft.Json": "7.0.1", "NuGet.Packaging": "3.5.0-beta", "NuGet.RuntimeModel": "3.5.0-beta", diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index 72c0ce527..8a94264f0 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -10,7 +10,7 @@ "projectUrl": "", "licenseUrl": "", "dependencies": { - "Microsoft.DotNet.Cli.Utils": "1.0.0-preview1-*" + "Microsoft.DotNet.Cli.Utils": { "target": "project" } }, "frameworks": { "netstandard1.5": { diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 64e1523b0..9b344fb58 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -11,8 +11,7 @@ }, "dependencies": { "Microsoft.DotNet.InternalAbstractions": { - "target": "project", - "version": "1.0.0-rc2-*" + "target": "project" }, "Newtonsoft.Json": "7.0.1" }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 6b2a69a2b..4687250f4 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -12,7 +12,7 @@ }, "dependencies": { "Newtonsoft.Json": "7.0.1", - "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", + "Microsoft.DotNet.ProjectModel": { "target": "project" }, "Microsoft.DiaSymReader": "1.0.6", "Microsoft.DiaSymReader.Native": "1.3.3" }, diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 457470208..06fc3f1ab 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -11,9 +11,9 @@ ], "dependencies": { "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-160318", - "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", - "Microsoft.DotNet.Compiler.Common": "1.0.0-preview1-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-preview1-*", + "Microsoft.DotNet.ProjectModel": { "target": "project" }, + "Microsoft.DotNet.Compiler.Common": { "target": "project" }, + "Microsoft.DotNet.Cli.Utils": { "target": "project" }, "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc2-*" diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 4d9e2a05a..c6fb06b0d 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -25,10 +25,10 @@ "System.Text.Encoding.CodePages": "4.0.1-rc2-24027", "System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24027", "Microsoft.ApplicationInsights": "2.0.0", - "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", - "Microsoft.DotNet.Compiler.Common": "1.0.0-preview1-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-preview1-*", - "Microsoft.Extensions.Testing.Abstractions": "1.0.0-preview1-*", + "Microsoft.DotNet.ProjectModel": { "target": "project" }, + "Microsoft.DotNet.Compiler.Common": { "target": "project" }, + "Microsoft.DotNet.Cli.Utils": { "target": "project" }, + "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027", "Microsoft.NETCore.TestHost": "1.0.0-rc2-24027", "Microsoft.NETCore.App": { diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json index 3b28d3cf1..dab0b5ccb 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -8,12 +8,11 @@ "FluentAssertions": "4.0.0", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-173361-36", - "Microsoft.DotNet.TestFramework": "1.0.0-preview1-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-preview1-*", - "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", + "Microsoft.DotNet.TestFramework": { "target": "project" }, + "Microsoft.DotNet.Cli.Utils": { "target": "project" }, + "Microsoft.DotNet.ProjectModel": { "target": "project" }, "Microsoft.DotNet.InternalAbstractions": { - "target": "project", - "version": "1.0.0-rc2-*" + "target": "project" } }, "frameworks": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 4fdc3cec5..ed3224136 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -6,7 +6,7 @@ "version": "1.0.0-rc2-*" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027", - "Microsoft.DotNet.TestFramework": "1.0.0-preview1-*", + "Microsoft.DotNet.TestFramework": { "target": "project" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 36bcb8de7..6b15034ca 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -6,8 +6,8 @@ }, "dependencies": { "NETStandard.Library": "1.5.0-rc2-24027", - "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-preview1-*" + "Microsoft.DotNet.ProjectModel": { "target": "project" }, + "Microsoft.DotNet.Cli.Utils": { "target": "project" } }, "frameworks": { "netstandardapp1.5": { diff --git a/tools/RuntimeGraphGenerator/project.json b/tools/RuntimeGraphGenerator/project.json index 15b697567..002b265ce 100644 --- a/tools/RuntimeGraphGenerator/project.json +++ b/tools/RuntimeGraphGenerator/project.json @@ -8,8 +8,8 @@ "NuGet.Versioning": "3.5.0-beta", "System.CommandLine": "0.1.0-e160119-1", "System.Runtime.Serialization.Json": "4.0.2-rc2-24027", - "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-preview1-*", + "Microsoft.DotNet.ProjectModel": { "target": "project" }, + "Microsoft.DotNet.Cli.Utils": { "target": "project" }, "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027", "NETStandard.Library": "1.5.0-rc2-24027" },