From 8953400eee6367e2b3c21bd35ce1e56e9780ae09 Mon Sep 17 00:00:00 2001 From: eerhardt Date: Sat, 12 Mar 2016 05:28:08 +0000 Subject: [PATCH] Updating dependencies from last known good builds --- .../CompileFail/project.json | 33 +++-- .../FSharpTestProjects/TestApp/project.json | 35 +++-- .../TestAppWithArgs/project.json | 33 +++-- .../TestLibrary/project.json | 28 ++-- .../src/BrokenProjectPathSample/project.json | 16 +-- .../src/EmptyConsoleApp/project.json | 6 +- .../src/EmptyLibrary/project.json | 4 +- .../src/FailReleaseProject/project.json | 4 +- .../IncompatiblePackageSample/project.json | 16 +-- .../src/Project1/project.json | 22 ++- .../dotnet-hello/v1/dotnet-hello/project.json | 24 ++-- .../dotnet-hello/v2/dotnet-hello/project.json | 24 ++-- .../project.json | 42 +++--- .../AppWithDirectDependency/project.json | 32 ++--- .../AppWithToolDependency/project.json | 34 ++--- .../TestProjects/CompileFail/project.json | 24 ++-- .../DependencyContextValidator/project.json | 25 ++-- .../TestApp/project.json | 30 ++-- .../TestAppDeps/project.json | 28 ++-- .../OutputStandardOutputAndError/project.json | 24 ++-- .../PortableTests/PortableApp/project.json | 29 ++-- .../PortableTests/StandaloneApp/project.json | 46 +++--- .../TestAppMultiTarget/project.json | 25 ++-- .../TestApp/project.json | 31 ++-- .../TestLibrary/project.json | 31 ++-- .../TestProjects/TestAppWithArgs/project.json | 24 ++-- .../TestAppWithContentPackage/project.json | 7 +- .../TestAppWithContents/project.json | 27 ++-- .../TestAppWithLibrary/TestApp/project.json | 30 ++-- .../TestLibrary/project.json | 31 ++-- .../TestAppWithScripts/project.json | 39 +++-- .../TestApp/project.json | 43 +++--- .../TestLibrary/project.json | 31 ++-- .../TestLibrary2/project.json | 28 ++-- .../TestLibraryWithAppDependency/project.json | 21 +-- .../TestApp/project.json | 30 ++-- .../TestLibraryGreater/project.json | 35 +++-- .../TestLibraryLesser/project.json | 37 ++--- .../TestLibraryWithAnalyzer/project.json | 29 ++-- .../TestLibraryWithConfiguration/project.json | 38 ++--- .../project.json | 34 +++-- .../TestMicrosoftCSharpReference/project.json | 30 ++-- .../src/L0/project.json | 29 ++-- .../src/L11/project.json | 23 ++- .../src/L12/project.json | 21 ++- .../src/L21/project.json | 18 ++- .../src/L22/project.json | 18 ++- .../project.json | 24 ++-- .../TestProjectWithResource/project.json | 24 ++-- .../TestSimpleIncrementalApp/project.json | 26 ++-- .../project.json | 22 ++- scripts/dotnet-cli-build/CompileTargets.cs | 2 +- scripts/dotnet-cli-build/project.json | 38 +++-- src/Microsoft.DotNet.Cli.Utils/project.json | 46 +++--- .../project.json | 44 +++--- src/Microsoft.DotNet.Files/project.json | 38 ++--- .../project.json | 7 +- .../project.json | 28 ++-- .../project.json | 36 ++--- .../project.json | 80 +++++------ .../project.json | 4 +- .../project.json | 71 +++++---- .../project.json | 56 ++++---- .../dotnet-compile-native/appdep/project.json | 24 ++-- .../CSharp_Console/project.json.template | 24 ++-- .../FSharp_Console/project.json.template | 35 +++-- src/dotnet/project.json | 136 +++++++++--------- test/ArgumentForwardingTests/project.json | 54 +++---- test/ArgumentsReflector/project.json | 31 ++-- test/EndToEnd/project.json | 21 +-- .../project.json | 67 +++++---- .../project.json | 45 +++--- .../project.json | 12 +- .../project.json | 58 ++++---- .../project.json | 13 +- test/ScriptExecutorTests/project.json | 20 +-- test/dotnet-build.Tests/project.json | 13 +- test/dotnet-compile.Tests/project.json | 14 +- test/dotnet-compile.UnitTests/project.json | 19 ++- test/dotnet-pack.Tests/project.json | 14 +- .../project.json | 33 +++-- test/dotnet-publish.Tests/project.json | 13 +- test/dotnet-resgen.Tests/project.json | 14 +- test/dotnet-run.Tests/project.json | 13 +- test/dotnet-test.UnitTests/project.json | 11 +- test/dotnet.Tests/project.json | 20 ++- tools/MultiProjectValidator/project.json | 34 +++-- 87 files changed, 1238 insertions(+), 1315 deletions(-) diff --git a/TestAssets/FSharpTestProjects/CompileFail/project.json b/TestAssets/FSharpTestProjects/CompileFail/project.json index 40621376b..84d87f6df 100644 --- a/TestAssets/FSharpTestProjects/CompileFail/project.json +++ b/TestAssets/FSharpTestProjects/CompileFail/project.json @@ -1,20 +1,19 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - "compilerName": "fsc", - "compileFiles": [ - "Program.fs" - ], - "dependencies": { - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "compilerName": "fsc", + "compileFiles": [ + "Program.fs" + ], + "dependencies": { + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/FSharpTestProjects/TestApp/project.json b/TestAssets/FSharpTestProjects/TestApp/project.json index 141270ca8..90fcb92b9 100644 --- a/TestAssets/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/FSharpTestProjects/TestApp/project.json @@ -1,21 +1,20 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - "compilerName": "fsc", - "compileFiles": [ - "Program.fs" - ], - "dependencies": { - "TestLibrary": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23901", - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "compilerName": "fsc", + "compileFiles": [ + "Program.fs" + ], + "dependencies": { + "TestLibrary": "1.0.0-*", + "NETStandard.Library": "1.5.0-rc2-23911", + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json index 40621376b..84d87f6df 100644 --- a/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json @@ -1,20 +1,19 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - "compilerName": "fsc", - "compileFiles": [ - "Program.fs" - ], - "dependencies": { - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "compilerName": "fsc", + "compileFiles": [ + "Program.fs" + ], + "dependencies": { + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/FSharpTestProjects/TestLibrary/project.json b/TestAssets/FSharpTestProjects/TestLibrary/project.json index 61961870b..0b29b1792 100644 --- a/TestAssets/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/FSharpTestProjects/TestLibrary/project.json @@ -1,17 +1,17 @@ { - "version": "1.0.0-*", - "dependencies": { - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.0.0-rc2-23901" - }, - "compilerName": "fsc", - "compileFiles": [ - "Helper2.fs", - "Helper.fs" - ], - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "dependencies": { + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "compilerName": "fsc", + "compileFiles": [ + "Helper2.fs", + "Helper.fs" + ], + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index d183d244f..7ce8666ac 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,11 +1,11 @@ { - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "EmptyLibrary": "1.0.0-*" - }, - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "EmptyLibrary": "1.0.0-*" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index 38a3ba296..a81519a70 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -1,12 +1,12 @@ { - "dependencies": { }, + "dependencies": {}, "frameworks": { "netstandardapp1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" + "NETStandard.Library": "1.5.0-rc2-23911" } }, - "dnx451": { } + "dnx451": {} } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 667685804..17c4e9e46 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json @@ -1,11 +1,11 @@ { "version": "1.0.0-*", - "dependencies": { }, + "dependencies": {}, "frameworks": { "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" + "NETStandard.Library": "1.5.0-rc2-23911" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index 505047ad2..83b5d4335 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,9 +3,9 @@ "netstandardapp1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" + "NETStandard.Library": "1.5.0-rc2-23911" } } }, - "dependencies": { } + "dependencies": {} } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index 58af503dc..37a82e632 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,11 +1,11 @@ { - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "Microsoft.Web.Administration": "7.0.0" - }, - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "Microsoft.Web.Administration": "7.0.0" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index 8c87d36c9..bb3a9cebf 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -1,14 +1,12 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" - }, - - "frameworks": { - "dnxcore50": { } - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "dnxcore50": {} + } } diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index ea118a24d..cafaf976b 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -1,16 +1,14 @@ { - "version": "1.0.0", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index 464f94681..c1bd9c205 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -1,16 +1,14 @@ { - "version": "2.0.0", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "2.0.0", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index 679acc364..7bcb08e63 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -1,23 +1,25 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "dotnet-hello": { "version": "1.0.0", "target": "package" } - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } - }, - - "testRunner": "must-be-specified-to-generate-deps", - - "tools": { - "dotnet-hello": { "version": "2.0.0", "target": "package" } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "dotnet-hello": { + "version": "1.0.0", + "target": "package" } + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" + } + }, + "testRunner": "must-be-specified-to-generate-deps", + "tools": { + "dotnet-hello": { + "version": "2.0.0", + "target": "package" + } + } } diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index 2ce5cf482..14cc1022a 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -1,19 +1,19 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "testRunner": "must-be-specified-to-generate-deps", - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "dotnet-hello": {"version": "1.0.0", "target": "package"} - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "testRunner": "must-be-specified-to-generate-deps", + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "dotnet-hello": { + "version": "1.0.0", + "target": "package" } + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" + } + } } diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 9537feb8f..4628c7718 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -1,20 +1,20 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } - }, - - "tools": { - "dotnet-hello": { "version": "2.0.0", "target": "package" } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + }, + "tools": { + "dotnet-hello": { + "version": "2.0.0", + "target": "package" + } + } } diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index c02d0dffe..2e5ebbe30 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -1,16 +1,14 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 90a5334e8..00cd67349 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -1,16 +1,15 @@ { - "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "Microsoft.Extensions.DependencyModel": { - "target": "project", - "version": "1.0.0-*" - } - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "Microsoft.Extensions.DependencyModel": { + "target": "project", + "version": "1.0.0-*" } + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" + } + } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index 4c2908690..965a3f06e 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -1,18 +1,16 @@ -{ - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "DependencyContextValidator": "1.0.0-*" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } +{ + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true, + "preserveCompilationContext": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "DependencyContextValidator": "1.0.0-*" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index 9f1f402f6..f41c7127f 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -1,17 +1,15 @@ -{ - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "DependencyContextValidator": "1.0.0-*" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } +{ + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "DependencyContextValidator": "1.0.0-*" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index c02d0dffe..2e5ebbe30 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -1,16 +1,14 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index 4386a64ac..3111191ad 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -1,18 +1,17 @@ { - "compilationOptions": { - "emitEntryPoint": true - }, - "dependencies": { - }, - "frameworks": { - "netstandard1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc2-23911" - } - } + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": {}, + "frameworks": { + "netstandard1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ], + "dependencies": { + "Microsoft.NETCore.App": "1.0.0-rc2-23911" + } } + } } diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index eaae7c1cd..2cf04776c 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -1,26 +1,26 @@ { - "compilationOptions": { - "emitEntryPoint": true - }, - "frameworks": { - "netstandardapp1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc2-23911" - } - } - }, - "runtimes": { - "win7-x64": {}, - "win7-x86": {}, - "osx.10.10-x64": {}, - "osx.10.11-x64": {}, - "ubuntu.14.04-x64": {}, - "centos.7-x64": {}, - "rhel.7.2-x64": {}, - "debian.8.2-x64": {} + "compilationOptions": { + "emitEntryPoint": true + }, + "frameworks": { + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ], + "dependencies": { + "Microsoft.NETCore.App": "1.0.0-rc2-23911" + } } + }, + "runtimes": { + "win7-x64": { }, + "win7-x86": { }, + "osx.10.10-x64": { }, + "osx.10.11-x64": { }, + "ubuntu.14.04-x64": { }, + "centos.7-x64": { }, + "rhel.7.2-x64": { }, + "debian.8.2-x64": { } + } } diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 5ed30dfa4..a081d6a7d 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -1,16 +1,15 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50", + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + } }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - } - }, - "net451": { } - } + "net451": {} + } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index ded1b2439..6df0b0c6d 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -1,19 +1,16 @@ -{ - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "dependencies": { - "TestLibrary": "1.0.0-*", - - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } +{ + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true, + "preserveCompilationContext": true + }, + "dependencies": { + "TestLibrary": "1.0.0-*", + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index dce6a0dad..f0b60ee88 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json @@ -1,17 +1,20 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "nowarn": [ "CS1591" ], - "xmlDoc": true, - "additionalArguments": [ "-highentropyva+" ] - }, - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "nowarn": [ + "CS1591" + ], + "xmlDoc": true, + "additionalArguments": [ + "-highentropyva+" + ] + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index c02d0dffe..2e5ebbe30 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -1,16 +1,14 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index 43575128d..6e9d2a179 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -1,11 +1,10 @@ -{ +{ "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true }, - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", + "NETStandard.Library": "1.5.0-rc2-23911", "SharedContentA": "1.0.0-*" }, "frameworks": { @@ -13,4 +12,4 @@ "imports": "dnxcore50" } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index c149fddc2..e5f81bb6f 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -1,18 +1,15 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "content": "testcontentfile.txt", - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "content": "testcontentfile.txt", + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index f9f77f358..88dd7cbee 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -1,19 +1,19 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true, + "preserveCompilationContext": true + }, + "dependencies": { + "TestLibrary": { + "target": "project", + "version": "1.0.0-*" }, - - "dependencies": { - "TestLibrary": { "target":"project", "version":"1.0.0-*" }, - - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index 8e8b984b1..f0b60ee88 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json @@ -1,17 +1,20 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "nowarn": [ "CS1591" ], - "xmlDoc": true, - "additionalArguments": [ "-highentropyva+" ] - }, - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "nowarn": [ + "CS1591" + ], + "xmlDoc": true, + "additionalArguments": [ + "-highentropyva+" + ] + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 8de4803d7..11692199c 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -1,24 +1,21 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } - }, - - "scripts": { - "prepublish" : ["echoscript prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:TargetFramework%? ?%publish:Runtime%?"], - "postpublish" : ["echoscript postpublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:TargetFramework%? ?%publish:Runtime%?"], - - "precompile" : ["echoscript precompile_output ?%compile:ProjectPath%? ?%compile:Configuration%? ?%compile:OutputPath%? ?%compile:TargetFramework%? ?%compile:Runtime%?"], - "postcompile" : ["echoscript postcompile_output ?%compile:ProjectPath%? ?%compile:Configuration%? ?%compile:OutputPath%? ?%compile:TargetFramework%? ?%compile:Runtime%?"] + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + }, + "scripts": { + "prepublish": [ "echoscript prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:TargetFramework%? ?%publish:Runtime%?" ], + "postpublish": [ "echoscript postpublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:TargetFramework%? ?%publish:Runtime%?" ], + + "precompile": [ "echoscript precompile_output ?%compile:ProjectPath%? ?%compile:Configuration%? ?%compile:OutputPath%? ?%compile:TargetFramework%? ?%compile:Runtime%?" ], + "postcompile": [ "echoscript postcompile_output ?%compile:ProjectPath%? ?%compile:Configuration%? ?%compile:OutputPath%? ?%compile:TargetFramework%? ?%compile:Runtime%?" ] + } } diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index a1cb82f95..efafdef41 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -1,24 +1,27 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true, + "preserveCompilationContext": true + }, + "dependencies": { + "TestLibrary": { + "target": "project", + "version": "1.0.0-*" }, - - "dependencies": { - "TestLibrary": { "target":"project", "version":"1.0.0-*" }, - - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } - }, - - "scripts": { - "prepublish" : ["echo prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:Framework%? ?%publish:Runtime%?"], - "postpublish" : ["echo postpublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:Framework%? ?%publish:Runtime%?"] + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + }, + "scripts": { + "prepublish": [ + "echo prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:Framework%? ?%publish:Runtime%?" + ], + "postpublish": [ + "echo postpublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:Framework%? ?%publish:Runtime%?" + ] + } } diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index dce6a0dad..f0b60ee88 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json @@ -1,17 +1,20 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "nowarn": [ "CS1591" ], - "xmlDoc": true, - "additionalArguments": [ "-highentropyva+" ] - }, - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "nowarn": [ + "CS1591" + ], + "xmlDoc": true, + "additionalArguments": [ + "-highentropyva+" + ] + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index 06a4d2157..bc94bb833 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json @@ -1,18 +1,18 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "TestLibraryWithAppDependency": { + "target": "project", + "version": "1.0.0-*" }, - - "dependencies": { - "TestLibraryWithAppDependency": { "target":"project", "version":"1.0.0-*" }, - - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index 42c1b5f55..9b7ae73b7 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json @@ -1,14 +1,15 @@ { - "version": "1.0.0-*", - "dependencies": { - "TestApp": { "target":"project", "version":"1.0.0-*" }, - - "NETStandard.Library": "1.0.0-rc2-23901" + "version": "1.0.0-*", + "dependencies": { + "TestApp": { + "target": "project", + "version": "1.0.0-*" }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index f9f77f358..88dd7cbee 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -1,19 +1,19 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true, + "preserveCompilationContext": true + }, + "dependencies": { + "TestLibrary": { + "target": "project", + "version": "1.0.0-*" }, - - "dependencies": { - "TestLibrary": { "target":"project", "version":"1.0.0-*" }, - - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index 4b957d224..6254293c5 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json @@ -1,20 +1,19 @@ -{ - "version": "1.0.0-*", - "testRunner": "xunit", - "dependencies": { - "Newtonsoft.Json": "7.0.1" - }, - - "frameworks": { - "net451": { }, - "netstandardapp1.5": { - "imports": [ - "dnxcore50", - "portable-net45+wp80+win8" - ], - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - } - } +{ + "version": "1.0.0-*", + "testRunner": "xunit", + "dependencies": { + "Newtonsoft.Json": "7.0.1" + }, + "frameworks": { + "net451": {}, + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+wp80+win8" + ], + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + } } + } } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index 0cfc9606d..f1bb8120d 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -1,21 +1,22 @@ { - "version": "1.0.0-*", - "testRunner": "xunit", - "dependencies": { - "Newtonsoft.Json": "6.0.0", - "TestLibraryGreater": {"target":"project"} - }, - - "frameworks": { - "net451": { }, - "netstandardapp1.5": { - "imports": [ - "dnxcore50", - "portable-net45+wp80+win8" - ], - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - } - } + "version": "1.0.0-*", + "testRunner": "xunit", + "dependencies": { + "Newtonsoft.Json": "6.0.0", + "TestLibraryGreater": { + "target": "project" } + }, + "frameworks": { + "net451": {}, + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+wp80+win8" + ], + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + } + } + } } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index 126757ed1..930858382 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json @@ -1,17 +1,18 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" } - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "System.Runtime.Analyzers": { + "version": "1.1.0", + "type": "build" } + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" + } + } } diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index 731ac1d10..a4c57dce6 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -1,21 +1,23 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "nowarn": [ "CS1591" ], - "xmlDoc": true, - "additionalArguments": [ "-highentropyva+" ] - }, - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - "configurations": { - "Test": { - - } - }, - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "nowarn": [ + "CS1591" + ], + "xmlDoc": true, + "additionalArguments": [ + "-highentropyva+" + ] + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "configurations": { + "Test": {} + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index 391a5fc11..f12c8dafa 100644 --- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json +++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json @@ -1,21 +1,19 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": false - }, - - "dependencies": { }, - - "frameworks": { - "net20": { }, - "net35": { }, - "net40": { }, - "net461": { }, - "netstandardapp1.5": { - "imports": "dnxcore50", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - } - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": false + }, + "dependencies": {}, + "frameworks": { + "net20": {}, + "net35": {}, + "net40": {}, + "net461": {}, + "netstandardapp1.5": { + "imports": "dnxcore50", + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + } } + } } diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 8f97305eb..8d78b8ecc 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -1,17 +1,17 @@ { - "version": "1.0.0", - "dependencies": { }, - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - } - }, - "dnx451": { - "dependencies": { - "Microsoft.CSharp": "4.0.1-*" - } - } + "version": "1.0.0", + "dependencies": {}, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50", + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + } + }, + "dnx451": { + "dependencies": { + "Microsoft.CSharp": "4.0.1-rc2-23911" + } } -} \ No newline at end of file + } +} diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index ef971a748..06f18fa20 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -1,19 +1,16 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "L11": "1.0.0-*", - "L12": "1.0.0-*", - - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "L11": "1.0.0-*", + "L12": "1.0.0-*", + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index ed55b003b..ed65c4c04 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -1,16 +1,13 @@ { - "version": "1.0.0-*", - - "dependencies": { - "L12": "1.0.0-*", - "L21": "1.0.0-*", - - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "dependencies": { + "L12": "1.0.0-*", + "L21": "1.0.0-*", + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index ac03a9cf7..e9486914f 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -1,15 +1,12 @@ { - "version": "1.0.0-*", - - "dependencies": { - "L22": "1.0.0-*", - - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "dependencies": { + "L22": "1.0.0-*", + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index 8af014e51..155cb2f02 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -1,13 +1,11 @@ { - "version": "1.0.0-*", - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index 8af014e51..155cb2f02 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -1,13 +1,11 @@ { - "version": "1.0.0-*", - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index c02d0dffe..2e5ebbe30 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -1,16 +1,14 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index c02d0dffe..2e5ebbe30 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -1,16 +1,14 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 3605210ec..7c888a5ad 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -1,17 +1,15 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true, - "xmlDoc": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true, + "xmlDoc": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json b/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json index 85a4e9c85..cb16f68b2 100644 --- a/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json +++ b/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json @@ -1,15 +1,13 @@ { - "version": "1.0.0-*", - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.Diagnostics.Process": "4.1.0-rc2-23901", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537" - }, - - "frameworks": { - "netstandard1.3": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "System.Diagnostics.Process": "4.1.0-rc2-23911", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537" + }, + "frameworks": { + "netstandard1.3": { + "imports": "dnxcore50" } + } } diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs index 3391a649c..517a30ceb 100644 --- a/scripts/dotnet-cli-build/CompileTargets.cs +++ b/scripts/dotnet-cli-build/CompileTargets.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build { public class CompileTargets { - public static readonly string CoreCLRVersion = "1.0.2-rc2-23901"; + public static readonly string CoreCLRVersion = "1.0.2-rc2-23911"; public static readonly string AppDepSdkVersion = "1.0.6-prerelease-00003"; public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86; diff --git a/scripts/dotnet-cli-build/project.json b/scripts/dotnet-cli-build/project.json index f66171d24..9d1ebb1d7 100755 --- a/scripts/dotnet-cli-build/project.json +++ b/scripts/dotnet-cli-build/project.json @@ -1,23 +1,21 @@ { - "version": "1.0.0-*", - "description": "Build scripts for dotnet-cli", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.IO.Compression.ZipFile": "4.0.1-rc2-23901", - "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23901", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537", - "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*", - "WindowsAzure.Storage" : "6.2.2-preview", - "System.Reflection.Metadata" : "1.2.0" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": ["dnxcore50", "portable-net45+win8"] - } + "version": "1.0.0-*", + "description": "Build scripts for dotnet-cli", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression.ZipFile": "4.0.1-rc2-23911", + "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23911", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537", + "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*", + "WindowsAzure.Storage": "6.2.2-preview", + "System.Reflection.Metadata": "1.2.0" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": [ "dnxcore50", "portable-net45+win8" ] } + } } diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 625b48bf4..3e97e0621 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -1,27 +1,27 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "keyFile": "../../tools/Key.snk", - "warningsAsErrors": true - }, - "dependencies": { - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537" - }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Runtime": { - "type": "build" - } - } - }, - "netstandard1.3": { - "imports": "dnxcore50", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.Diagnostics.Process": "4.1.0-rc2-23901" - } + "version": "1.0.0-*", + "compilationOptions": { + "keyFile": "../../tools/Key.snk", + "warningsAsErrors": true + }, + "dependencies": { + "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537" + }, + "frameworks": { + "net451": { + "frameworkAssemblies": { + "System.Runtime": { + "type": "build" } + } + }, + "netstandard1.3": { + "imports": "dnxcore50", + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "System.Diagnostics.Process": "4.1.0-rc2-23911" + } } + } } diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 0e15d8637..f0376403a 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -1,23 +1,23 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.CommandLine": "0.1.0-e160119-1", - "Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160202-02", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "Microsoft.DotNet.Files": "1.0.0-*" - }, - "frameworks": { - "netstandard1.3": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "scripts": {} -} \ No newline at end of file + "version": "1.0.0-*", + "compilationOptions": { + "keyFile": "../../tools/Key.snk" + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "System.CommandLine": "0.1.0-e160119-1", + "Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160202-02", + "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "Microsoft.DotNet.Cli.Utils": "1.0.0-*", + "Microsoft.DotNet.Files": "1.0.0-*" + }, + "frameworks": { + "netstandard1.3": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] + } + }, + "scripts": {} +} diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 82f1a2b51..1131165e9 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -1,20 +1,20 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "keyFile": "../../tools/Key.snk" - }, - "description": "Abstraction to interact with the file system and file paths.", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.Linq.Expressions": "4.0.11-rc2-23901", - "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", - "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "Microsoft.DotNet.ProjectModel": "1.0.0-*" - }, - "frameworks": { - "netstandard1.3": { - "imports": "dnxcore50" - } - }, - "scripts": {} -} \ No newline at end of file + "version": "1.0.0-*", + "compilationOptions": { + "keyFile": "../../tools/Key.snk" + }, + "description": "Abstraction to interact with the file system and file paths.", + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "System.Linq.Expressions": "4.0.11-rc2-23911", + "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", + "Microsoft.DotNet.Cli.Utils": "1.0.0-*", + "Microsoft.DotNet.ProjectModel": "1.0.0-*" + }, + "frameworks": { + "netstandard1.3": { + "imports": "dnxcore50" + } + }, + "scripts": {} +} diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index 70b5e7221..3daa0c061 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -13,14 +13,13 @@ "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537" }, "frameworks": { - "net451": { }, + "net451": {}, "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" + "NETStandard.Library": "1.5.0-rc2-23911" } } }, - "scripts": { - } + "scripts": {} } diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index efe082435..9d2eca854 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -1,16 +1,16 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "System.Runtime.Loader": "4.0.0-rc2-23901" - }, - "frameworks": { - "netstandard1.3": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "keyFile": "../../tools/Key.snk" + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "System.Runtime.Loader": "4.0.0-rc2-23911" + }, + "frameworks": { + "netstandard1.3": { + "imports": "dnxcore50" } -} \ No newline at end of file + } +} diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 83f7a2d6e..e14bbe01b 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -1,20 +1,20 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.DotNet.Compiler.Common": "1.0.0-*", - "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160202-02" - }, - "frameworks": { - "netstandard1.3": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } + "version": "1.0.0-*", + "compilationOptions": { + "keyFile": "../../tools/Key.snk" + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "Microsoft.DotNet.Compiler.Common": "1.0.0-*", + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160202-02" + }, + "frameworks": { + "netstandard1.3": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } -} \ No newline at end of file + } +} diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 9479b166a..2cce12e3a 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -1,47 +1,47 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "keyFile": "../../tools/Key.snk" + "version": "1.0.0-*", + "compilationOptions": { + "keyFile": "../../tools/Key.snk" + }, + "description": "Types to model a .NET Project", + "dependencies": { + "System.Reflection.Metadata": "1.2.0-rc2-23911", + "NuGet.Packaging": "3.4.0-rtm-0733", + "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", + "Microsoft.Extensions.JsonParser.Sources": { + "type": "build", + "version": "1.0.0-rc2-16453" }, - "description": "Types to model a .NET Project", - "dependencies": { - "System.Reflection.Metadata": "1.2.0-rc2-23901", - "NuGet.Packaging": "3.4.0-rtm-0733", - "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", - "Microsoft.Extensions.JsonParser.Sources": { - "type": "build", - "version": "1.0.0-rc2-16453" - }, - "Microsoft.Extensions.HashCodeCombiner.Sources": { - "type": "build", - "version": "1.0.0-rc2-16054" - }, - "Microsoft.Extensions.DependencyModel": "1.0.0-*" + "Microsoft.Extensions.HashCodeCombiner.Sources": { + "type": "build", + "version": "1.0.0-rc2-16054" }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Runtime": { - "type": "build" - }, - "System.Collections": { - "type": "build" - }, - "System.IO": { - "type": "build" - } - } + "Microsoft.Extensions.DependencyModel": "1.0.0-*" + }, + "frameworks": { + "net451": { + "frameworkAssemblies": { + "System.Runtime": { + "type": "build" }, - "netstandard1.3": { - "imports": "dnxcore50", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.Dynamic.Runtime": "4.0.11-rc2-23901", - "System.Runtime.Loader": "4.0.0-rc2-23901", - "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23901", - "Microsoft.CSharp": "4.0.1-rc2-23901", - "System.Xml.XDocument": "4.0.11-rc2-23901" - } + "System.Collections": { + "type": "build" + }, + "System.IO": { + "type": "build" } + } + }, + "netstandard1.3": { + "imports": "dnxcore50", + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "System.Dynamic.Runtime": "4.0.11-rc2-23911", + "System.Runtime.Loader": "4.0.0-rc2-23911", + "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23911", + "Microsoft.CSharp": "4.0.1-rc2-23911", + "System.Xml.XDocument": "4.0.11-rc2-23911" + } } + } } diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index e04e63cb5..2e096995e 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "1.0.0-*", "description": "Microsoft.DotNet.TestFramework Class Library", "authors": [ @@ -11,7 +11,7 @@ "licenseUrl": "", "dependencies": { "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23901" + "NETStandard.Library": "1.5.0-rc2-23911" }, "frameworks": { "netstandard1.3": { diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 1ad395b56..65fd21652 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -1,39 +1,38 @@ { - "description": "Abstractions for reading `.deps` files.", - "version": "1.0.0-*", - "repository": { - "type": "git", - "url": "git://github.com/dotnet/cli" + "description": "Abstractions for reading `.deps` files.", + "version": "1.0.0-*", + "repository": { + "type": "git", + "url": "git://github.com/dotnet/cli" + }, + "compilationOptions": { + "warningsAsErrors": true, + "keyFile": "../../tools/Key.snk" + }, + "dependencies": { + "Microsoft.Extensions.HashCodeCombiner.Sources": { + "type": "build", + "version": "1.0.0-rc2-16054" }, - "compilationOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" + "Microsoft.DotNet.InternalAbstractions": { + "target": "project", + "version": "1.0.0-*" }, - "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-16537" - }, - "frameworks": { - "net451": {}, - "netstandard1.3": { - "imports": "dnxcore50", - "dependencies": { - "System.IO.FileSystem": "4.0.1-rc2-23901", - "System.Linq": "4.0.1-rc2-23901", - "System.Runtime": "4.0.21-rc2-23901", - "System.Reflection": "4.1.0-rc2-23901", - "System.Dynamic.Runtime": "4.0.11-rc2-23901" - } - } - }, - "scripts": {} -} \ No newline at end of file + "Newtonsoft.Json": "7.0.1", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537" + }, + "frameworks": { + "net451": {}, + "netstandard1.3": { + "imports": "dnxcore50", + "dependencies": { + "System.IO.FileSystem": "4.0.1-rc2-23911", + "System.Linq": "4.0.1-rc2-23911", + "System.Runtime": "4.0.21-rc2-23911", + "System.Reflection": "4.1.0-rc2-23911", + "System.Dynamic.Runtime": "4.0.11-rc2-23911" + } + } + }, + "scripts": {} +} diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 7ecb6232e..4135cd377 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -1,29 +1,29 @@ { - "description": "Abstractions for test runners to communicate to a tool, such as Visual Studio.", - "version": "1.0.0-*", - "repository": { - "type": "git", - "url": "git://github.com/dotnet/cli" - }, - "compilationOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "Newtonsoft.Json": "7.0.1", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-16040" - }, - "frameworks": { - "net451": {}, - "netstandard1.3": { - "imports": "dnxcore50", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.Resources.ResourceManager": "4.0.1-rc2-23901", - "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23901" - } - } - }, - "scripts": {} -} \ No newline at end of file + "description": "Abstractions for test runners to communicate to a tool, such as Visual Studio.", + "version": "1.0.0-*", + "repository": { + "type": "git", + "url": "git://github.com/dotnet/cli" + }, + "compilationOptions": { + "warningsAsErrors": true, + "keyFile": "../../tools/Key.snk" + }, + "dependencies": { + "Newtonsoft.Json": "7.0.1", + "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-16040" + }, + "frameworks": { + "net451": {}, + "netstandard1.3": { + "imports": "dnxcore50", + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "System.Resources.ResourceManager": "4.0.1-rc2-23911", + "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23911" + } + } + }, + "scripts": {} +} diff --git a/src/dotnet/commands/dotnet-compile-native/appdep/project.json b/src/dotnet/commands/dotnet-compile-native/appdep/project.json index 689ef478a..eaac3555d 100644 --- a/src/dotnet/commands/dotnet-compile-native/appdep/project.json +++ b/src/dotnet/commands/dotnet-compile-native/appdep/project.json @@ -1,15 +1,15 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "Microsoft.DotNet.AppDep":"1.0.6-prerelease-00003" - }, - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "Microsoft.DotNet.AppDep": "1.0.6-prerelease-00003" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index c02d0dffe..2e5ebbe30 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -1,16 +1,14 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index 60ba0af6e..84d87f6df 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -1,22 +1,19 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "compilerName": "fsc", - "compileFiles": [ - "Program.fs" - ], - - "dependencies": { - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "compilerName": "fsc", + "compileFiles": [ + "Program.fs" + ], + "dependencies": { + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } + } } diff --git a/src/dotnet/project.json b/src/dotnet/project.json index b4a5354f1..ac77cac98 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -1,77 +1,71 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "compileExclude": [ + "commands/dotnet-new/CSharp_Console/**", + "commands/dotnet-new/FSharp_Console/**" + ], + "resource": [ + "commands/dotnet-new/CSharp_Console/NuGet.Config", + "commands/dotnet-new/CSharp_Console/Program.cs", + "commands/dotnet-new/CSharp_Console/project.json.template", + "commands/dotnet-new/FSharp_Console/NuGet.config", + "commands/dotnet-new/FSharp_Console/Program.fs", + "commands/dotnet-new/FSharp_Console/project.json.template" + ], + "dependencies": { + "Newtonsoft.Json": "7.0.1", + "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160225-02", + "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-151218", + "Microsoft.Net.CSharp.Interactive.netcore": "1.3.0-beta1-20160225-02", + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160225-02", + "Microsoft.DiaSymReader.Native": "1.3.3", + "NuGet.CommandLine.XPlat": "3.4.0-rtm-0733", + "System.CommandLine": "0.1.0-e160119-1", + "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "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-16537", + "Microsoft.Extensions.CommandLineUtils.Sources": { + "type": "build", + "version": "1.0.0-rc2-16453" }, - "compileExclude": [ - "commands/dotnet-new/CSharp_Console/**", - "commands/dotnet-new/FSharp_Console/**" - ], - "resource": [ - "commands/dotnet-new/CSharp_Console/NuGet.Config", - "commands/dotnet-new/CSharp_Console/Program.cs", - "commands/dotnet-new/CSharp_Console/project.json.template", - "commands/dotnet-new/FSharp_Console/NuGet.config", - "commands/dotnet-new/FSharp_Console/Program.fs", - "commands/dotnet-new/FSharp_Console/project.json.template" - ], - "dependencies": { - "Newtonsoft.Json": "7.0.1", - - "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160225-02", - "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-151218", - "Microsoft.Net.CSharp.Interactive.netcore": "1.3.0-beta1-20160225-02", - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160225-02", - "Microsoft.DiaSymReader.Native": "1.3.3", - - "NuGet.CommandLine.XPlat": "3.4.0-rtm-0733", - "System.CommandLine": "0.1.0-e160119-1", - - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "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-16537", - "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" - }, - "Microsoft.Extensions.Testing.Abstractions": "1.0.0-*", - "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23901", - "Microsoft.NETCore.TestHost": "1.0.0-rc2-23901", - "NETStandard.Library": "1.0.0-rc2-23901", - "System.Reflection.Metadata": "1.3.0-beta-23901", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23901", - "System.Diagnostics.TraceSource": "4.0.0-rc2-23901", - "System.Linq.Expressions": "4.0.11-rc2-23901", - "System.Xml.XDocument": "4.0.11-rc2-23901", - "System.Resources.ReaderWriter": "4.0.0-rc2-23901", - "System.Net.Sockets": "4.1.0-rc2-23901", - "System.IO.Compression.ZipFile": "4.0.1-rc2-23901", - "System.Threading.ThreadPool": "4.0.10-rc2-23901", - "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23901", - - "System.Private.DataContractSerialization": "4.1.0-rc2-23901" + "Microsoft.Dnx.Runtime.CommandParsing.Sources": { + "version": "1.0.0-rc2-16453", + "type": "build" }, - "frameworks": { - "netstandardapp1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } + "Microsoft.Dnx.Runtime.Sources": { + "version": "1.0.0-rc2-16453", + "type": "build" }, - "scripts": { + "Microsoft.Extensions.Testing.Abstractions": "1.0.0-*", + "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23911", + "Microsoft.NETCore.TestHost": "1.0.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23911", + "System.Reflection.Metadata": "1.3.0-rc2-23911", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23911", + "System.Diagnostics.TraceSource": "4.0.0-rc2-23911", + "System.Linq.Expressions": "4.0.11-rc2-23911", + "System.Xml.XDocument": "4.0.11-rc2-23911", + "System.Resources.ReaderWriter": "4.0.0-rc2-23911", + "System.Net.Sockets": "4.1.0-rc2-23911", + "System.IO.Compression.ZipFile": "4.0.1-rc2-23911", + "System.Threading.ThreadPool": "4.0.10-rc2-23911", + "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23911", + "System.Private.DataContractSerialization": "4.1.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } + }, + "scripts": {} } diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 8b99a663f..ea8695288 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -1,31 +1,33 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression": "4.1.0-rc2-23911", + "Microsoft.DotNet.ProjectModel": { + "target": "project" }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.IO.Compression": "4.1.0-rc2-23901", - - "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, - - "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-79755-47" + "Microsoft.DotNet.Cli.Utils": { + "target": "project" }, - - "frameworks": { - "netstandardapp1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" }, - - "testRunner": "xunit", - - "scripts": { "precompile": "dotnet build ../ArgumentsReflector/project.json --framework netstandardapp1.5 --runtime %compile:RuntimeIdentifier% --output %compile:RuntimeOutputDir%" } + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-dev-79755-47" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] + } + }, + "testRunner": "xunit", + "scripts": { + "precompile": "dotnet build ../ArgumentsReflector/project.json --framework netstandardapp1.5 --runtime %compile:RuntimeIdentifier% --output %compile:RuntimeOutputDir%" + } } diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index b78dfacbe..6869effa2 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -1,18 +1,17 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23901" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } - }, - - "content": ["reflector_cmd.cmd"] + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" + } + }, + "content": [ + "reflector_cmd.cmd" + ] } diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 4bcbd9290..f712e1ce7 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -3,20 +3,22 @@ "compilationOptions": { "emitEntryPoint": true }, - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.IO.Compression": "4.1.0-rc2-23901", - - "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, - + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression": "4.1.0-rc2-23911", + "Microsoft.DotNet.ProjectModel": { + "target": "project" + }, + "Microsoft.DotNet.Cli.Utils": { + "target": "project" + }, + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-*", "dotnet-test-xunit": "1.0.0-dev-91790-12" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -25,6 +27,5 @@ ] } }, - "testRunner": "xunit" } diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 97536b3c7..1493122d8 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -1,39 +1,38 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression": "4.1.0-rc2-23911", + "Microsoft.DotNet.ProjectModel": { + "target": "project" }, - - "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23901", - "System.IO.Compression": "4.1.0-rc2-23901", - - "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, - - "moq.netcore": "4.4.0-beta8", - "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-79755-47" + "Microsoft.DotNet.Cli.Utils": { + "target": "project" }, - - "frameworks": { - "netstandardapp1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" }, - - "content": [ - "../../TestAssets/TestProjects/OutputStandardOutputAndError/*", - "../../TestAssets/TestProjects/TestAppWithArgs/*", - "../../TestAssets/TestProjects/AppWithDirectAndToolDependency/**/*", - "../../TestAssets/TestProjects/AppWithDirectDependency/**/*", - "../../TestAssets/TestProjects/AppWithToolDependency/**/*" - ], - - "testRunner": "xunit" + "moq.netcore": "4.4.0-beta8", + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-dev-79755-47" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] + } + }, + "content": [ + "../../TestAssets/TestProjects/OutputStandardOutputAndError/*", + "../../TestAssets/TestProjects/TestAppWithArgs/*", + "../../TestAssets/TestProjects/AppWithDirectAndToolDependency/**/*", + "../../TestAssets/TestProjects/AppWithDirectDependency/**/*", + "../../TestAssets/TestProjects/AppWithToolDependency/**/*" + ], + "testRunner": "xunit" } diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 6b7d51697..e0e51113f 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -1,26 +1,27 @@ { - "version": "1.0.0-*", - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.IO.Compression": "4.1.0-rc2-23901", - - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, - "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "Microsoft.DotNet.Compiler.Common": { "target": "project" }, - - "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-79755-47" + "version": "1.0.0-*", + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression": "4.1.0-rc2-23911", + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" }, - - "frameworks": { - "netstandardapp1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } + "Microsoft.DotNet.ProjectModel": { + "target": "project" }, - - "testRunner": "xunit" + "Microsoft.DotNet.Compiler.Common": { + "target": "project" + }, + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-dev-79755-47" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] + } + }, + "testRunner": "xunit" } diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index edaaef649..79747421e 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -1,10 +1,14 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.IO.Compression": "4.1.0-rc2-23901", - "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression": "4.1.0-rc2-23911", + "Microsoft.DotNet.ProjectModel": { + "target": "project" + }, + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12" }, diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json index cf42e619c..5df2c0e09 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -1,32 +1,30 @@ { - "version": "1.0.0-*", - "description": "Microsoft.DotNet.Tools.Tests.Utilities Class Library", - "compilationOptions": { - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.Collections.Immutable": "1.2.0-rc2-23901", - "System.IO.Compression": "4.1.0-rc2-23901", - "FluentAssertions": "4.0.0", - "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-91790-12", - - "Microsoft.DotNet.TestFramework": "1.0.0-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537", - "Microsoft.DotNet.InternalAbstractions": { - "target": "project", - "version": "1.0.0-*" - } - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, + "version": "1.0.0-*", + "description": "Microsoft.DotNet.Tools.Tests.Utilities Class Library", + "compilationOptions": { + "keyFile": "../../tools/Key.snk" + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "System.Collections.Immutable": "1.2.0-rc2-23911", + "System.IO.Compression": "4.1.0-rc2-23911", + "FluentAssertions": "4.0.0", + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-dev-91790-12", + "Microsoft.DotNet.TestFramework": "1.0.0-*", + "Microsoft.DotNet.Cli.Utils": "1.0.0-*", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537", + "Microsoft.DotNet.InternalAbstractions": { + "target": "project", + "version": "1.0.0-*" + } + }, + "frameworks": { + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] + } + } } diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index 18a43cf55..16e06287a 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -5,16 +5,16 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.IO.Compression": "4.1.0-rc2-23901", - - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression": "4.1.0-rc2-23911", + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, "FluentAssertions": "4.0.0", "moq.netcore": "4.4.0-beta8", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -23,6 +23,5 @@ ] } }, - "testRunner": "xunit" -} \ No newline at end of file +} diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index 0317d0a3b..158d402c7 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -1,17 +1,19 @@ { "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - - "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, - + "NETStandard.Library": "1.5.0-rc2-23911", + "Microsoft.DotNet.ProjectModel": { + "target": "project" + }, + "Microsoft.DotNet.Cli.Utils": { + "target": "project" + }, + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-79755-47" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -20,10 +22,8 @@ ] } }, - "content": [ "../../TestAssets/TestProjects/TestApp/**/*" ], - "testRunner": "xunit" } diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index c158034ef..cb6194bc6 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -1,19 +1,17 @@ { "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.IO.Compression": "4.1.0-rc2-23901", - - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression": "4.1.0-rc2-23911", + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -22,6 +20,5 @@ ] } }, - "testRunner": "xunit" } diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index dd02d8697..99db1f04e 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -1,19 +1,17 @@ { "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.IO.Compression": "4.1.0-rc2-23901", - - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression": "4.1.0-rc2-23911", + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -22,7 +20,6 @@ ] } }, - "content": [ "../../TestAssets/TestProjects/DependencyContextValidator/**/*", "../../TestAssets/TestProjects/TestLibraryWithAnalyzer/*", @@ -31,6 +28,5 @@ "../../TestAssets/TestProjects/TestAppCompilationContext/**/*", "../../TestAssets/TestProjects/global.json" ], - "testRunner": "xunit" } diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index 9813a2d85..e3a0d8728 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -1,23 +1,22 @@ { "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.IO.Compression": "4.1.0-rc2-23901", - + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression": "4.1.0-rc2-23911", "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - - "dotnet": { "target": "project" }, - "Microsoft.DotNet.ProjectModel": { "target": "project" }, - + "dotnet": { + "target": "project" + }, + "Microsoft.DotNet.ProjectModel": { + "target": "project" + }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12", "moq.netcore": "4.4.0-beta8", "FluentAssertions": "4.2.2" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -26,10 +25,8 @@ ] } }, - "content": [ "../../TestAssets/TestProjects/TestAppWithLibrary/**/*" ], - "testRunner": "xunit" } diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 178d883d3..86c244272 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -1,19 +1,17 @@ { "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.IO.Compression.ZipFile": "4.0.1-rc2-23901", - - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression.ZipFile": "4.0.1-rc2-23911", + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-79755-47" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -22,10 +20,8 @@ ] } }, - "content": [ "../../TestAssets/TestProjects/TestLibraryWithConfiguration/*" ], - "testRunner": "xunit" } diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index 42d8fd6f6..0638878aa 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -1,20 +1,25 @@ { "dependencies": { - "dotnet": { "target": "project" }, - "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, + "dotnet": { + "target": "project" + }, + "Microsoft.DotNet.ProjectModel": { + "target": "project" + }, + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12", - - "System.Net.NameResolution": "4.0.0-rc2-23901" + "System.Net.NameResolution": "4.0.0-rc2-23911" }, - "frameworks": { - "netstandardapp1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "testRunner": "xunit" + "frameworks": { + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] + } + }, + "testRunner": "xunit" } diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 0064f9349..328333b55 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -1,21 +1,19 @@ { "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.IO.Compression": "4.1.0-rc2-23901", - + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression": "4.1.0-rc2-23911", "Microsoft.DotNet.TestFramework": "1.0.0-*", - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-*", "dotnet-test-xunit": "1.0.0-dev-91790-12" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -24,6 +22,5 @@ ] } }, - "testRunner": "xunit" } diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index fd3d26275..071591f36 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -1,20 +1,18 @@ { "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.IO.Compression": "4.1.0-rc2-23901", - - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression": "4.1.0-rc2-23911", + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-*", "dotnet-test-xunit": "1.0.0-dev-79755-47" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -23,10 +21,8 @@ ] } }, - "content": [ "../../TestAssets/TestProjects/TestProjectWithResource/**/*" ], - "testRunner": "xunit" } diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index ecbf0c5fc..1e30b0e77 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -1,19 +1,17 @@ { "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.IO.Compression": "4.1.0-rc2-23901", - - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression": "4.1.0-rc2-23911", + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-79755-47" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -22,6 +20,5 @@ ] } }, - "testRunner": "xunit" } diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index eb23b1792..40707f654 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -1,18 +1,16 @@ { "version": "1.0.0-*", - "dependencies": { "Newtonsoft.Json": "7.0.1", - "NETStandard.Library": "1.0.0-rc2-23901", - - "dotnet": { "target": "project" }, - + "NETStandard.Library": "1.5.0-rc2-23911", + "dotnet": { + "target": "project" + }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12", "moq.netcore": "4.4.0-beta8", "FluentAssertions": "4.2.2" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -21,6 +19,5 @@ ] } }, - "testRunner": "xunit" } diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 46da798d1..6ace6d28d 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -1,20 +1,18 @@ { "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "System.IO.Compression": "4.1.0-rc2-23901", - - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, + "NETStandard.Library": "1.5.0-rc2-23911", + "System.IO.Compression": "4.1.0-rc2-23911", + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, "Microsoft.DotNet.Cli.Utils": { "target": "project", "type": "build" }, - "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -23,12 +21,10 @@ ] } }, - "content": [ - "../../TestAssets/TestProjects/AppWithDirectAndToolDependency/**/*", - "../../TestAssets/TestProjects/AppWithDirectDependency/**/*", - "../../TestAssets/TestProjects/AppWithToolDependency/**/*" + "../../TestAssets/TestProjects/AppWithDirectAndToolDependency/**/*", + "../../TestAssets/TestProjects/AppWithDirectDependency/**/*", + "../../TestAssets/TestProjects/AppWithToolDependency/**/*" ], - "testRunner": "xunit" } diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 59d9c5fb9..130929817 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -1,21 +1,19 @@ { - "version": "1.0.0-*", - "name": "pjvalidate", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-*" - }, - - "frameworks": { - "netstandardapp1.5": { - "imports": [ - "dnxcore50" - ] - } + "version": "1.0.0-*", + "name": "pjvalidate", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23911", + "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "Microsoft.DotNet.Cli.Utils": "1.0.0-*" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": [ + "dnxcore50" + ] } + } }