From 6468b14e1d89391488706b8460db837ff27da4ce Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 1 Mar 2016 17:35:32 -0600 Subject: [PATCH] Move to CoreFX build rc2-23901 Update .exe's project.json Target Framework from dnxcore50 to netstandardapp1.5. Update .dll's project.json Target Framework from dnxcore50 to netstandard1.3. Adding workaround for DataContractSerialization to src\dotnet\project.json to fix crossgen issue. Build 23901 has a dependency issue that doesn't allow the runtime.any.System.Private.DataContractSerialization package to be restored. When we move to a new build of CoreFX we should take this workaround out. --- .../CompileFail/project.json | 6 +-- .../FSharpTestProjects/TestApp/project.json | 8 ++-- .../TestAppWithArgs/project.json | 6 +-- .../TestLibrary/project.json | 6 +-- .../src/BrokenProjectPathSample/project.json | 6 ++- .../src/EmptyConsoleApp/project.json | 5 ++- .../src/EmptyLibrary/project.json | 7 ++-- .../src/FailReleaseProject/project.json | 5 ++- .../IncompatiblePackageSample/project.json | 8 ++-- .../dotnet-hello/v1/dotnet-hello/project.json | 6 ++- .../dotnet-hello/v2/dotnet-hello/project.json | 6 ++- .../project.json | 6 ++- .../AppWithDirectDependency/project.json | 6 ++- .../AppWithToolDependency/project.json | 6 ++- .../TestProjects/CompileFail/project.json | 6 ++- .../DependencyContextValidator/project.json | 6 ++- .../TestApp/project.json | 6 ++- .../TestAppDeps/project.json | 8 ++-- .../OutputStandardOutputAndError/project.json | 6 ++- .../TestAppMultiTarget/project.json | 7 ++-- .../TestApp/project.json | 6 ++- .../TestLibrary/project.json | 6 ++- .../TestProjects/TestAppWithArgs/project.json | 6 ++- .../TestAppWithContentPackage/project.json | 6 ++- .../TestAppWithContents/project.json | 6 ++- .../TestAppWithLibrary/TestApp/project.json | 6 ++- .../TestLibrary/project.json | 4 +- .../TestAppWithScripts/project.json | 6 ++- .../TestApp/project.json | 6 ++- .../TestLibrary/project.json | 6 ++- .../TestLibrary2/project.json | 8 ++-- .../TestLibraryWithAppDependency/project.json | 6 ++- .../TestApp/project.json | 6 ++- .../TestLibrary/project.json | 3 +- .../TestLibraryGreater/project.json | 11 ++++-- .../TestLibraryLesser/project.json | 11 ++++-- .../TestLibraryWithAnalyzer/project.json | 6 ++- .../TestLibraryWithConfiguration/project.json | 6 ++- .../project.json | 5 ++- .../TestMicrosoftCSharpReference/project.json | 5 ++- .../src/L0/project.json | 8 ++-- .../src/L11/project.json | 10 +++-- .../src/L12/project.json | 6 ++- .../src/L21/project.json | 6 ++- .../src/L22/project.json | 6 ++- .../project.json | 6 ++- .../TestProjectWithResource/project.json | 6 ++- .../TestSimpleIncrementalApp/project.json | 6 ++- .../project.json | 8 ++-- scripts/dotnet-cli-build/CompileTargets.cs | 2 +- scripts/dotnet-cli-build/PublishTargets.cs | 2 +- scripts/dotnet-cli-build/TestTargets.cs | 2 +- scripts/dotnet-cli-build/project.json | 8 ++-- scripts/run-build.ps1 | 2 +- scripts/run-build.sh | 2 +- .../CommandResolver.cs | 2 +- src/Microsoft.DotNet.Cli.Utils/project.json | 6 +-- .../project.json | 9 +++-- src/Microsoft.DotNet.Files/project.json | 8 ++-- .../project.json | 7 ++-- .../project.json | 8 ++-- .../project.json | 9 +++-- .../project.json | 18 ++++----- .../project.json | 6 +-- .../project.json | 25 ++++--------- .../project.json | 10 ++--- src/dotnet/Program.cs | 2 +- .../dotnet-compile-native/appdep/project.json | 6 ++- .../CSharp_Console/project.json.template | 6 ++- .../FSharp_Console/project.json.template | 6 ++- .../commands/dotnet-publish/PublishCommand.cs | 2 +- src/dotnet/commands/dotnet-restore/Program.cs | 6 +-- src/dotnet/project.json | 37 +++++++++++-------- test/ArgumentForwardingTests/project.json | 12 ++++-- test/ArgumentsReflector/project.json | 6 +-- test/EndToEnd/project.json | 10 +++-- .../StreamForwarderTests.cs | 2 +- .../project.json | 10 +++-- .../project.json | 10 +++-- .../PackageDependencyProviderTests.cs | 4 +- .../project.json | 10 +++-- .../Assertions/CommandResultAssertions.cs | 4 +- .../TestBase.cs | 2 +- .../project.json | 15 +++++--- .../project.json | 10 +++-- .../ScriptExecutorTests.cs | 2 +- test/ScriptExecutorTests/project.json | 9 +++-- test/dotnet-build.Tests/BuildOutputTests.cs | 2 +- .../dotnet-build.Tests/IncrementalTestBase.cs | 4 +- test/dotnet-build.Tests/project.json | 12 ++++-- test/dotnet-compile.Tests/project.json | 10 +++-- .../GivenACompilationDriver.cs | 2 +- ...boutScriptVariablesFromAManagedCompiler.cs | 14 +++---- test/dotnet-compile.UnitTests/project.json | 10 +++-- test/dotnet-pack.Tests/PackTests.cs | 2 +- test/dotnet-pack.Tests/project.json | 11 ++++-- .../DthTests.cs | 2 +- .../project.json | 7 +++- .../Microsoft.DotNet.Tools.Publish.Tests.cs | 6 +-- test/dotnet-publish.Tests/project.json | 10 +++-- test/dotnet-resgen.Tests/project.json | 10 +++-- test/dotnet-run.Tests/project.json | 12 ++++-- test/dotnet-test.UnitTests/project.json | 9 +++-- test/dotnet.Tests/project.json | 10 +++-- tools/MultiProjectValidator/project.json | 8 +++- 105 files changed, 457 insertions(+), 294 deletions(-) diff --git a/TestAssets/FSharpTestProjects/CompileFail/project.json b/TestAssets/FSharpTestProjects/CompileFail/project.json index b3805b7cb..40621376b 100644 --- a/TestAssets/FSharpTestProjects/CompileFail/project.json +++ b/TestAssets/FSharpTestProjects/CompileFail/project.json @@ -9,12 +9,12 @@ ], "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": "dnxcore50" } } } diff --git a/TestAssets/FSharpTestProjects/TestApp/project.json b/TestAssets/FSharpTestProjects/TestApp/project.json index beeeb6878..141270ca8 100644 --- a/TestAssets/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/FSharpTestProjects/TestApp/project.json @@ -9,13 +9,13 @@ ], "dependencies": { "TestLibrary": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23811", - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", + "NETStandard.Library": "1.0.0-rc2-23901", + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": "dnxcore50" } } } diff --git a/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json index b3805b7cb..40621376b 100644 --- a/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json @@ -9,12 +9,12 @@ ], "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": "dnxcore50" } } } diff --git a/TestAssets/FSharpTestProjects/TestLibrary/project.json b/TestAssets/FSharpTestProjects/TestLibrary/project.json index 9ad1d7c4b..61961870b 100644 --- a/TestAssets/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/FSharpTestProjects/TestLibrary/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "compilerName": "fsc", "compileFiles": [ @@ -10,8 +10,8 @@ "Helper.fs" ], "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": "dnxcore50" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 4fb61f066..d183d244f 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,9 +1,11 @@ { "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", "EmptyLibrary": "1.0.0-*" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index 605055059..38a3ba296 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -1,9 +1,10 @@ { "dependencies": { }, "frameworks": { - "dnxcore50": { + "netstandardapp1.5": { + "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" } }, "dnx451": { } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index d3ff05ba2..667685804 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json @@ -2,9 +2,10 @@ "version": "1.0.0-*", "dependencies": { }, "frameworks": { - "dnxcore50": { - "dependencies":{ - "NETStandard.Library": "1.0.0-rc2-23811" + "netstandard1.3": { + "imports": "dnxcore50", + "dependencies": { + "NETStandard.Library": "1.0.0-rc2-23901" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index ac54eee2f..505047ad2 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -1,8 +1,9 @@ { "frameworks": { - "dnxcore50": { + "netstandardapp1.5": { + "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index 061c66869..58af503dc 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-23811", + "NETStandard.Library": "1.0.0-rc2-23901", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" - } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index c63b3b811..ea118a24d 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -5,10 +5,12 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "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 907930594..464f94681 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -5,10 +5,12 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index e8dad70a0..679acc364 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -5,12 +5,14 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", "dotnet-hello": { "version": "1.0.0", "target": "package" } }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } }, "testRunner": "must-be-specified-to-generate-deps", diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index 153989b48..2ce5cf482 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -7,11 +7,13 @@ "testRunner": "must-be-specified-to-generate-deps", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", "dotnet-hello": {"version": "1.0.0", "target": "package"} }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 101a4088d..f8982d688 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -5,11 +5,13 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } }, "tools": { diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 8c87d36c9..c02d0dffe 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -5,10 +5,12 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index a8b1c8d28..90a5334e8 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", "Microsoft.Extensions.DependencyModel": { "target": "project", "version": "1.0.0-*" @@ -9,6 +9,8 @@ }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index 688252bf4..4c2908690 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -6,11 +6,13 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index f36764265..9f1f402f6 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -1,15 +1,17 @@ { "version": "1.0.0-*", "compilationOptions": { - "emitEntryPoint": true, + "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index f9b804dda..c02d0dffe 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -5,10 +5,12 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23728" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 265ca0bf2..5ed30dfa4 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -5,10 +5,11 @@ }, "frameworks": { - "dnxcore50": { + "netstandardapp1.5": { + "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" - }, + "NETStandard.Library": "1.0.0-rc2-23901" + } }, "net451": { } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index dcc22edfe..ded1b2439 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -8,10 +8,12 @@ "dependencies": { "TestLibrary": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index 5752b3494..dce6a0dad 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json @@ -6,10 +6,12 @@ "additionalArguments": [ "-highentropyva+" ] }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 8c87d36c9..c02d0dffe 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -5,10 +5,12 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index d9dd13dfc..43575128d 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,10 +5,12 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", "SharedContentA": "1.0.0-*" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 163d133ed..c149fddc2 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -5,12 +5,14 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "content": "testcontentfile.txt", "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index 64ba761af..f9f77f358 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -8,10 +8,12 @@ "dependencies": { "TestLibrary": { "target":"project", "version":"1.0.0-*" }, - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index 5752b3494..8e8b984b1 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json @@ -10,6 +10,8 @@ }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 8df726e4d..8de4803d7 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -5,11 +5,13 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } }, "scripts": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index 51b830d57..a1cb82f95 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -8,11 +8,13 @@ "dependencies": { "TestLibrary": { "target":"project", "version":"1.0.0-*" }, - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } }, "scripts": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index 5752b3494..dce6a0dad 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json @@ -6,10 +6,12 @@ "additionalArguments": [ "-highentropyva+" ] }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index ab0c84a05..06a4d2157 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json @@ -7,10 +7,12 @@ "dependencies": { "TestLibraryWithAppDependency": { "target":"project", "version":"1.0.0-*" }, - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } - }, + "netstandardapp1.5": { + "imports": "dnxcore50" + } + } } diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index 6d3f74c0e..42c1b5f55 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json @@ -3,10 +3,12 @@ "dependencies": { "TestApp": { "target":"project", "version":"1.0.0-*" }, - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index 64ba761af..f9f77f358 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -8,10 +8,12 @@ "dependencies": { "TestLibrary": { "target":"project", "version":"1.0.0-*" }, - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/project.json index 10bf5d798..5fb2b0c73 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/project.json @@ -1,6 +1,7 @@ { "frameworks": { - "dnxcore50": { + "netstandardapp1.5": { + "imports": "dnxcore50", "bin": { "assembly": "bin\\{configuration}\\dnxcore50\\TestLibrary.dll", "pdb": "bin\\{configuration}\\dnxcore50\\TestLibrary.pdb" diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index 58f75ef01..4b957d224 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json @@ -7,10 +7,13 @@ "frameworks": { "net451": { }, - "dnxcore50": { - "imports" : "portable-net45+wp80+win8", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+wp80+win8" + ], + "dependencies": { + "NETStandard.Library": "1.0.0-rc2-23901" } } } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index a98513eb9..0cfc9606d 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -8,10 +8,13 @@ "frameworks": { "net451": { }, - "dnxcore50": { - "imports" : "portable-net45+wp80+win8", - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+wp80+win8" + ], + "dependencies": { + "NETStandard.Library": "1.0.0-rc2-23901" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index 1988d3125..126757ed1 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json @@ -5,11 +5,13 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" } }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index b15199995..731ac1d10 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -6,7 +6,7 @@ "additionalArguments": [ "-highentropyva+" ] }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "configurations": { "Test": { @@ -14,6 +14,8 @@ } }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index 4d87acf96..391a5fc11 100644 --- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json +++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json @@ -11,9 +11,10 @@ "net35": { }, "net40": { }, "net461": { }, - "dnxcore50": { + "netstandardapp1.5": { + "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" } } } diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index c84c8945e..8f97305eb 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -2,9 +2,10 @@ "version": "1.0.0", "dependencies": { }, "frameworks": { - "dnxcore50": { + "netstandardapp1.5": { + "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" } }, "dnx451": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 20570bca8..ef971a748 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -7,11 +7,13 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - - "NETStandard.Library": "1.0.0-rc2-23811" + + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index 99855bb69..ed55b003b 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -2,13 +2,15 @@ "version": "1.0.0-*", "dependencies": { - "L12": "1.0.0-*", - "L21": "1.0.0-*", + "L12": "1.0.0-*", + "L21": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index c962653e4..ac03a9cf7 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -4,10 +4,12 @@ "dependencies": { "L22": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index 4d4484b9c..8af014e51 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -2,10 +2,12 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index 4d4484b9c..8af014e51 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -2,10 +2,12 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 8c87d36c9..c02d0dffe 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -5,10 +5,12 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 8c87d36c9..c02d0dffe 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -5,10 +5,12 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index c36cabd5e..3605210ec 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -6,10 +6,12 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "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 ff3a3dbc6..85a4e9c85 100644 --- a/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json +++ b/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json @@ -2,12 +2,14 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", - "System.Diagnostics.Process": "4.1.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", + "System.Diagnostics.Process": "4.1.0-rc2-23901", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537" }, "frameworks": { - "dnxcore50": { } + "netstandard1.3": { + "imports": "dnxcore50" + } } } diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs index e62fba929..cba422de1 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.1-rc2-23811"; + public static readonly string CoreCLRVersion = "1.0.2-rc2-23901"; 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/PublishTargets.cs b/scripts/dotnet-cli-build/PublishTargets.cs index 0255c2946..2648461b6 100644 --- a/scripts/dotnet-cli-build/PublishTargets.cs +++ b/scripts/dotnet-cli-build/PublishTargets.cs @@ -32,7 +32,7 @@ namespace Microsoft.DotNet.Cli.Build { { "RID", PlatformServices.Default.Runtime.GetRuntimeIdentifier() }, { "OSNAME", PlatformServices.Default.Runtime.OperatingSystem }, - { "TFM", "dnxcore50" }, + { "TFM", "netstandardapp1.5" }, { "OutputDir", Dirs.Output }, { "Stage1Dir", Dirs.Stage1 }, { "Stage1CompilationDir", Dirs.Stage1Compilation }, diff --git a/scripts/dotnet-cli-build/TestTargets.cs b/scripts/dotnet-cli-build/TestTargets.cs index 0fbbc84bf..b1a783be8 100644 --- a/scripts/dotnet-cli-build/TestTargets.cs +++ b/scripts/dotnet-cli-build/TestTargets.cs @@ -132,7 +132,7 @@ namespace Microsoft.DotNet.Cli.Build foreach (var project in projects) { c.Info($"Building: {project}"); - dotnet.Build("--framework", "dnxcore50") + dotnet.Build("--framework", "netstandardapp1.5") .WorkingDirectory(Path.GetDirectoryName(project)) .Execute() .EnsureSuccessful(); diff --git a/scripts/dotnet-cli-build/project.json b/scripts/dotnet-cli-build/project.json index 326ce33b3..7b6298d22 100755 --- a/scripts/dotnet-cli-build/project.json +++ b/scripts/dotnet-cli-build/project.json @@ -6,13 +6,15 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", - "System.IO.Compression.ZipFile": "4.0.1-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", + "System.IO.Compression.ZipFile": "4.0.1-rc2-23901", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537", "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/scripts/run-build.ps1 b/scripts/run-build.ps1 index cc2e0a56c..79809e4c6 100644 --- a/scripts/run-build.ps1 +++ b/scripts/run-build.ps1 @@ -78,7 +78,7 @@ popd # Publish the builder Write-Host "Compiling Build Scripts..." -dotnet publish "$PSScriptRoot\dotnet-cli-build" -o "$PSScriptRoot/dotnet-cli-build/bin" --framework dnxcore50 +dotnet publish "$PSScriptRoot\dotnet-cli-build" -o "$PSScriptRoot/dotnet-cli-build/bin" --framework netstandardapp1.5 if($LASTEXITCODE -ne 0) { throw "Failed to compile build scripts" } # Run the builder diff --git a/scripts/run-build.sh b/scripts/run-build.sh index ee11ecdf4..2fe9811e0 100755 --- a/scripts/run-build.sh +++ b/scripts/run-build.sh @@ -104,7 +104,7 @@ echo "Restoring Build Script projects..." # Build the builder echo "Compiling Build Scripts..." -dotnet publish "$DIR/dotnet-cli-build" -o "$DIR/dotnet-cli-build/bin" --framework dnxcore50 +dotnet publish "$DIR/dotnet-cli-build" -o "$DIR/dotnet-cli-build/bin" --framework netstandardapp1.5 # Run the builder echo "Invoking Build Scripts..." diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolver.cs index 791848b03..0c5b67724 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolver.cs @@ -121,7 +121,7 @@ namespace Microsoft.DotNet.Cli.Utils public static CommandSpec ResolveFromProjectTools(string commandName, IEnumerable args) { - var context = GetProjectContext(FrameworkConstants.CommonFrameworks.DnxCore50); + var context = GetProjectContext(FrameworkConstants.CommonFrameworks.NetStandardApp15); if (context == null) { diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 72eeaa107..877df020f 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -16,10 +16,10 @@ } } }, - "dnxcore50": { - "imports": "portable-net45+win8", + "netstandard1.3": { + "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" } } } diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index d5cdc889e..0e15d8637 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -4,7 +4,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "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-*", @@ -12,8 +12,11 @@ "Microsoft.DotNet.Files": "1.0.0-*" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "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 11ee828db..82f1a2b51 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -5,15 +5,15 @@ }, "description": "Abstraction to interact with the file system and file paths.", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", - "System.Linq.Expressions": "4.0.11-rc2-23811", + "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": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandard1.3": { + "imports": "dnxcore50" } }, "scripts": {} diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index 67016d56d..70b5e7221 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -14,11 +14,12 @@ }, "frameworks": { "net451": { }, - "dotnet5.4": { + "netstandard1.3": { + "imports": "dnxcore50", "dependencies": { - "System.Runtime": "4.0.21-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" } - }, + } }, "scripts": { } diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 75b1ce0ce..efe082435 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -4,13 +4,13 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "System.Runtime.Loader": "4.0.0-rc2-23811" + "System.Runtime.Loader": "4.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "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 63dd15c8e..83f7a2d6e 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -4,14 +4,17 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "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": { - "dnxcore50": { - "imports": "portable-net45+win8" + "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 b0973d277..29752a4e7 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -5,7 +5,7 @@ }, "description": "Types to model a .NET Project", "dependencies": { - "System.Reflection.Metadata": "1.2.0-rc2-23811", + "System.Reflection.Metadata": "1.2.0-rc2-23901", "NuGet.Packaging": "3.4.0-beta-632", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", "Microsoft.Extensions.JsonParser.Sources": { @@ -32,15 +32,15 @@ } } }, - "dnxcore50": { - "imports": "portable-net45+win8", + "netstandard1.3": { + "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", - "System.Dynamic.Runtime": "4.0.11-rc2-23811", - "System.Runtime.Loader": "4.0.0-rc2-23811", - "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23811", - "Microsoft.CSharp": "4.0.1-rc2-23811", - "System.Xml.XDocument": "4.0.11-rc2-23811" + "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" } } } diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index bd0a4ff26..e04e63cb5 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -11,11 +11,11 @@ "licenseUrl": "", "dependencies": { "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandard1.3": { + "imports": "dnxcore50" } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index b64b34476..c439b0a1b 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -20,25 +20,14 @@ }, "frameworks": { "net451": {}, - "dotnet5.4": { - "imports": "portable-net451+win8", + "netstandard1.3": { + "imports": "dnxcore50", "dependencies": { - "System.IO.FileSystem": "4.0.1-rc2-23811", - "System.Linq": "4.0.1-rc2-23811", - "System.Runtime": "4.0.21-rc2-23811", - "System.Reflection": "4.1.0-rc2-23811", - "System.Dynamic.Runtime": "4.0.11-rc2-23811" - } - }, - "dnxcore50": { - "imports": "portable-net45+win8", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1-rc2-23811", - "System.IO.FileSystem": "4.0.1-rc2-23811", - "System.Linq": "4.0.1-rc2-23811", - "System.Runtime": "4.0.21-rc2-23811", - "System.Reflection": "4.1.0-rc2-23811", - "System.Dynamic.Runtime": "4.0.11-rc2-23811" + "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" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 2748f3a2b..7ecb6232e 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -16,12 +16,12 @@ }, "frameworks": { "net451": {}, - "dnxcore50": { - "imports": "portable-net45+win8", + "netstandard1.3": { + "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", - "System.Resources.ResourceManager": "4.0.1-rc2-23811", - "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901", + "System.Resources.ResourceManager": "4.0.1-rc2-23901", + "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23901" } } }, diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs index be4048f7a..b858fc955 100644 --- a/src/dotnet/Program.cs +++ b/src/dotnet/Program.cs @@ -123,7 +123,7 @@ namespace Microsoft.DotNet.Cli return builtIn(appArgs.ToArray()); } - return Command.Create("dotnet-" + command, appArgs, FrameworkConstants.CommonFrameworks.DnxCore50) + return Command.Create("dotnet-" + command, appArgs, FrameworkConstants.CommonFrameworks.NetStandardApp15) .ForwardStdErr() .ForwardStdOut() .Execute() diff --git a/src/dotnet/commands/dotnet-compile-native/appdep/project.json b/src/dotnet/commands/dotnet-compile-native/appdep/project.json index 652976f99..689ef478a 100644 --- a/src/dotnet/commands/dotnet-compile-native/appdep/project.json +++ b/src/dotnet/commands/dotnet-compile-native/appdep/project.json @@ -4,10 +4,12 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", "Microsoft.DotNet.AppDep":"1.0.6-prerelease-00003" }, "frameworks": { - "dnxcore50": { } + "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 8c87d36c9..c02d0dffe 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -5,10 +5,12 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "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 829f37a4c..60ba0af6e 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -11,10 +11,12 @@ "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.0.0-rc2-23811" + "NETStandard.Library": "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": "dnxcore50" + } } } diff --git a/src/dotnet/commands/dotnet-publish/PublishCommand.cs b/src/dotnet/commands/dotnet-publish/PublishCommand.cs index ffd8f4988..802a1c963 100644 --- a/src/dotnet/commands/dotnet-publish/PublishCommand.cs +++ b/src/dotnet/commands/dotnet-publish/PublishCommand.cs @@ -75,7 +75,7 @@ namespace Microsoft.DotNet.Tools.Publish } /// - /// Publish the project for given 'framework (ex - dnxcore50)' and 'runtimeID (ex - win7-x64)' + /// Publish the project for given 'framework (ex - netstandardapp1.5)' and 'runtimeID (ex - win7-x64)' /// /// project that is to be published /// Location of published files diff --git a/src/dotnet/commands/dotnet-restore/Program.cs b/src/dotnet/commands/dotnet-restore/Program.cs index d26d7d1da..8ca6057a1 100644 --- a/src/dotnet/commands/dotnet-restore/Program.cs +++ b/src/dotnet/commands/dotnet-restore/Program.cs @@ -150,7 +150,7 @@ namespace Microsoft.DotNet.Tools.Restore private static void CreateDepsInPackageCache(LibraryRange toolLibrary, string projectPath) { var context = ProjectContext.Create(projectPath, - FrameworkConstants.CommonFrameworks.DnxCore50, new[] { DefaultRid }); + FrameworkConstants.CommonFrameworks.NetStandardApp15, new[] { DefaultRid }); var toolDescription = context.LibraryManager.GetLibraries() .Select(l => l as PackageDescription) @@ -179,7 +179,7 @@ namespace Microsoft.DotNet.Tools.Restore Console.WriteLine($"Restoring Tool '{tooldep.Name}' for '{projectPath}' in '{tempPath}'"); - File.WriteAllText(projectPath, GenerateProjectJsonContents(new[] {"dnxcore50"}, tooldep)); + File.WriteAllText(projectPath, GenerateProjectJsonContents(new[] {"netstandardapp1.5"}, tooldep)); return NuGet3.Restore(new [] { $"{projectPath}", "--runtime", $"{DefaultRid}"}.Concat(args), quiet) == 0; } @@ -193,7 +193,7 @@ namespace Microsoft.DotNet.Tools.Restore sb.AppendLine(" \"frameworks\": {"); foreach (var framework in frameworks) { - var importsStatement = "\"imports\": \"portable-net452+win81\""; + var importsStatement = "\"imports\": [ \"dnxcore50\", \"portable-net452+win81\" ]"; sb.AppendLine($" \"{framework}\": {{ {importsStatement} }}"); } diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 852e8adaa..b98fab4ff 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -21,7 +21,7 @@ "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.CodeAnalysis.CSharp": "1.3.0-beta1-20160225-02", "Microsoft.DiaSymReader.Native": "1.3.3", "NuGet.CommandLine.XPlat": "3.4.0-beta-632", @@ -48,23 +48,28 @@ "type": "build" }, "Microsoft.Extensions.Testing.Abstractions": "1.0.0-*", - "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23811", - "Microsoft.NETCore.TestHost": "1.0.0-rc2-23811", - "NETStandard.Library": "1.0.0-rc2-23811", - "System.Reflection.Metadata": "1.3.0-beta-23811", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23811", - "System.Diagnostics.TraceSource": "4.0.0-rc2-23811", - "System.Linq.Expressions": "4.0.11-rc2-23811", - "System.Xml.XDocument": "4.0.11-rc2-23811", - "System.Resources.ReaderWriter": "4.0.0-rc2-23811", - "System.Net.Sockets": "4.1.0-rc2-23811", - "System.IO.Compression.ZipFile": "4.0.1-rc2-23811", - "System.Threading.ThreadPool": "4.0.10-rc2-23811", - "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23811" + "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" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "scripts": { diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index f79589085..7175750b5 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -5,7 +5,8 @@ }, "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23811", + "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" }, @@ -16,12 +17,15 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "testRunner": "xunit", - "scripts": { "precompile": "dotnet build ../ArgumentsReflector/project.json --framework dnxcore50 --output %compile:RuntimeOutputDir%" } + "scripts": { "precompile": "dotnet build ../ArgumentsReflector/project.json --framework netstandardapp1.5 --output %compile:RuntimeOutputDir%" } } diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index e2dc63e05..b78dfacbe 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -5,12 +5,12 @@ }, "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23811" + "NETStandard.Library" : "1.0.0-rc2-23901" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": "dnxcore50" } }, diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index a77e796a6..93c7084d9 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -5,7 +5,8 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "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" }, @@ -17,8 +18,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/StreamForwarderTests.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/StreamForwarderTests.cs index 7bdc5184a..6e797bea1 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/StreamForwarderTests.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/StreamForwarderTests.cs @@ -139,7 +139,7 @@ namespace StreamForwarderTests buildCommand.Execute(); var buildOutputExe = "OutputStandardOutputAndError" + Constants.ExeSuffix; - var buildOutputPath = Path.Combine(binTestProjectPath, "bin/Debug/dnxcore50", buildOutputExe); + var buildOutputPath = Path.Combine(binTestProjectPath, "bin/Debug/netstandardapp1.5", buildOutputExe); return buildOutputPath; } diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 8a33a570f..4aae182ed 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -5,7 +5,8 @@ }, "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23811", + "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" }, @@ -17,8 +18,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index c747cf74f..6b7d51697 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -2,7 +2,8 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "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" }, @@ -13,8 +14,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/PackageDependencyProviderTests.cs b/test/Microsoft.DotNet.ProjectModel.Tests/PackageDependencyProviderTests.cs index 5f43f0beb..50d3aab3d 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/PackageDependencyProviderTests.cs +++ b/test/Microsoft.DotNet.ProjectModel.Tests/PackageDependencyProviderTests.cs @@ -29,8 +29,8 @@ namespace Microsoft.DotNet.ProjectModel.Tests target.CompileTimeAssemblies.Add("lib/dotnet/_._"); target.NativeLibraries.Add("runtimes/any/native/Microsoft.CSharp.CurrentVersion.targets"); - var p1 = provider.GetDescription(NuGetFramework.Parse("dnxcore50"), package, target); - var p2 = provider.GetDescription(NuGetFramework.Parse("dnxcore50"), package, target); + var p1 = provider.GetDescription(NuGetFramework.Parse("netstandardapp1.5"), package, target); + var p2 = provider.GetDescription(NuGetFramework.Parse("netstandardapp1.5"), package, target); Assert.True(p1.Compatible); Assert.True(p2.Compatible); diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index 77177501c..0a33d56a1 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -1,15 +1,19 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "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" }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "content": [ diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs index 70b452596..38812e448 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs @@ -93,14 +93,14 @@ namespace Microsoft.DotNet.Tools.Test.Utilities public AndConstraint HaveSkippedProjectCompilation(string skippedProject) { - _commandResult.StdOut.Should().Contain($"Project {skippedProject} (DNXCore,Version=v5.0) was previously compiled. Skipping compilation."); + _commandResult.StdOut.Should().Contain($"Project {skippedProject} (.NETStandardApp,Version=v1.5) was previously compiled. Skipping compilation."); return new AndConstraint(this); } public AndConstraint HaveCompiledProject(string compiledProject) { - _commandResult.StdOut.Should().Contain($"Project {compiledProject} (DNXCore,Version=v5.0) will be compiled"); + _commandResult.StdOut.Should().Contain($"Project {compiledProject} (.NETStandardApp,Version=v1.5) will be compiled"); return new AndConstraint(this); } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs index 8e1a58a05..2db36724b 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs @@ -17,7 +17,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities /// public abstract class TestBase : IDisposable { - protected const string DefaultFramework = "dnxcore50"; + protected const string DefaultFramework = "netstandardapp1.5"; private TempRoot _temp; private static TestAssetsManager s_testsAssetsMgr; private static string s_repoRoot; diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json index c96146073..535f5b902 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -5,8 +5,9 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", - "System.Collections.Immutable": "1.2.0-rc2-23811", + "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-79755-47", @@ -21,9 +22,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "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 732a5874e..cb583becc 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -5,7 +5,8 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", + "System.IO.Compression": "4.1.0-rc2-23901", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "FluentAssertions": "4.0.0", @@ -15,8 +16,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, diff --git a/test/ScriptExecutorTests/ScriptExecutorTests.cs b/test/ScriptExecutorTests/ScriptExecutorTests.cs index b1e156cac..48a5d7212 100644 --- a/test/ScriptExecutorTests/ScriptExecutorTests.cs +++ b/test/ScriptExecutorTests/ScriptExecutorTests.cs @@ -25,7 +25,7 @@ namespace Microsoft.DotNet.Cli.Utils.ScriptExecutorTests var sourceTestProjectPath = Path.Combine(s_testProjectRoot, "TestApp"); binTestProjectPath = _root.CopyDirectory(sourceTestProjectPath).Path; - project = ProjectContext.Create(binTestProjectPath, NuGetFramework.Parse("dnxcore50")).ProjectFile; + project = ProjectContext.Create(binTestProjectPath, NuGetFramework.Parse("netstandardapp1.5")).ProjectFile; } [Fact] diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index 9e55131fb..0317d0a3b 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", "Microsoft.DotNet.ProjectModel": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" }, @@ -13,8 +13,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, diff --git a/test/dotnet-build.Tests/BuildOutputTests.cs b/test/dotnet-build.Tests/BuildOutputTests.cs index 947cec835..7575875ef 100644 --- a/test/dotnet-build.Tests/BuildOutputTests.cs +++ b/test/dotnet-build.Tests/BuildOutputTests.cs @@ -134,7 +134,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests // [InlineData("net20", false, true)] // [InlineData("net40", true, true)] // [InlineData("net461", true, true)] - [InlineData("dnxcore50", true, false)] + [InlineData("netstandardapp1.5", true, false)] public void MultipleFrameworks_ShouldHaveValidTargetFrameworkAttribute(string frameworkName, bool shouldHaveTargetFrameworkAttribute, bool windowsOnly) { var framework = NuGetFramework.Parse(frameworkName); diff --git a/test/dotnet-build.Tests/IncrementalTestBase.cs b/test/dotnet-build.Tests/IncrementalTestBase.cs index 046f9e781..a5bbc1d03 100644 --- a/test/dotnet-build.Tests/IncrementalTestBase.cs +++ b/test/dotnet-build.Tests/IncrementalTestBase.cs @@ -66,7 +66,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests protected CommandResult BuildProject(string projectFile, bool noDependencies = false, bool noIncremental = false, bool expectBuildFailure = false) { - var buildCommand = new BuildCommand(projectFile, output: GetOutputDir(), framework: "dnxcore50", noIncremental: noIncremental, noDependencies : noDependencies); + var buildCommand = new BuildCommand(projectFile, output: GetOutputDir(), framework: "netstandardapp1.5", noIncremental: noIncremental, noDependencies : noDependencies); var result = buildCommand.ExecuteWithCapturedOutput(); if (!expectBuildFailure) @@ -120,7 +120,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests protected string GetCompilationOutputPath() { - var executablePath = Path.Combine(GetBinRoot(), "Debug", "dnxcore50"); + var executablePath = Path.Combine(GetBinRoot(), "Debug", "netstandardapp1.5"); return executablePath; } diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index ab7e74981..00afd26c1 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -1,8 +1,9 @@ { "version": "1.0.0-*", - + "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", + "System.IO.Compression": "4.1.0-rc2-23901", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { @@ -14,8 +15,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } }, diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 2338584b6..83f842a88 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -2,7 +2,8 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", + "System.IO.Compression": "4.1.0-rc2-23901", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { @@ -14,8 +15,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } }, diff --git a/test/dotnet-compile.UnitTests/GivenACompilationDriver.cs b/test/dotnet-compile.UnitTests/GivenACompilationDriver.cs index b277c4169..4d4fb34b9 100644 --- a/test/dotnet-compile.UnitTests/GivenACompilationDriver.cs +++ b/test/dotnet-compile.UnitTests/GivenACompilationDriver.cs @@ -36,7 +36,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests _contexts = new List { - ProjectContext.Create(_projectJson, NuGetFramework.Parse("dnxcore50")) + ProjectContext.Create(_projectJson, NuGetFramework.Parse("netstandardapp1.5")) }; _args = new CompilerCommandApp("dotnet compile", ".NET Compiler", "Compiler for the .NET Platform"); diff --git a/test/dotnet-compile.UnitTests/GivenThatICareAboutScriptVariablesFromAManagedCompiler.cs b/test/dotnet-compile.UnitTests/GivenThatICareAboutScriptVariablesFromAManagedCompiler.cs index 3b7253668..961240a69 100644 --- a/test/dotnet-compile.UnitTests/GivenThatICareAboutScriptVariablesFromAManagedCompiler.cs +++ b/test/dotnet-compile.UnitTests/GivenThatICareAboutScriptVariablesFromAManagedCompiler.cs @@ -28,14 +28,14 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests public void It_passes_a_FullTargetFramework_variable_to_the_pre_compile_scripts() { _fixture.PreCompileScriptVariables.Should().ContainKey("compile:FullTargetFramework"); - _fixture.PreCompileScriptVariables["compile:FullTargetFramework"].Should().Be("dnxcore,Version=v5.0"); + _fixture.PreCompileScriptVariables["compile:FullTargetFramework"].Should().Be(".NETStandardApp,Version=v1.5"); } [Fact] public void It_passes_a_TargetFramework_variable_to_the_pre_compile_scripts() { _fixture.PreCompileScriptVariables.Should().ContainKey("compile:TargetFramework"); - _fixture.PreCompileScriptVariables["compile:TargetFramework"].Should().Be("dnxcore50"); + _fixture.PreCompileScriptVariables["compile:TargetFramework"].Should().Be("netstandardapp1.5"); } [Fact] @@ -80,14 +80,14 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests public void It_passes_a_FullTargetFramework_variable_to_the_post_compile_scripts() { _fixture.PostCompileScriptVariables.Should().ContainKey("compile:FullTargetFramework"); - _fixture.PostCompileScriptVariables["compile:FullTargetFramework"].Should().Be("dnxcore,Version=v5.0"); + _fixture.PostCompileScriptVariables["compile:FullTargetFramework"].Should().Be(".NETStandardApp,Version=v1.5"); } [Fact] public void It_passes_a_TargetFramework_variable_to_the_post_compile_scripts() { _fixture.PostCompileScriptVariables.Should().ContainKey("compile:TargetFramework"); - _fixture.PostCompileScriptVariables["compile:TargetFramework"].Should().Be("dnxcore50"); + _fixture.PostCompileScriptVariables["compile:TargetFramework"].Should().Be("netstandardapp1.5"); } [Fact] @@ -151,7 +151,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests TestAssetPath, "bin", ConfigValue, - "dnxcore50"); + "netstandardapp1.5"); public string RuntimeOutputDir { get; private set; } @@ -161,7 +161,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests TestAssetPath, "obj", ConfigValue, - "dnxcore50", + "netstandardapp1.5", "dotnet-compile.rsp"); public Dictionary PreCompileScriptVariables { get; private set; } @@ -218,7 +218,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests rids.Add(rid); } - var context = ProjectContext.Create(projectJson, new NuGetFramework("dnxcore", new Version(5, 0)), rids); + var context = ProjectContext.Create(projectJson, new NuGetFramework(".NETStandardApp", new Version(1, 5)), rids); managedCompiler.Compile(context, _args); RuntimeOutputDir = Path.Combine(OutputPath, rid); diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index 6ee54d754..0208dc29c 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -2,7 +2,8 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", + "System.IO.Compression": "4.1.0-rc2-23901", "Microsoft.DotNet.Cli.Utils": { "target": "project" @@ -18,8 +19,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } }, diff --git a/test/dotnet-pack.Tests/PackTests.cs b/test/dotnet-pack.Tests/PackTests.cs index aaf66b551..db1005b89 100644 --- a/test/dotnet-pack.Tests/PackTests.cs +++ b/test/dotnet-pack.Tests/PackTests.cs @@ -92,7 +92,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests File.Exists(outputPackage).Should().BeTrue(outputPackage); var zip = ZipFile.Open(outputPackage, ZipArchiveMode.Read); - zip.Entries.Should().Contain(e => e.FullName == "lib/dnxcore50/TestLibraryWithConfiguration.dll"); + zip.Entries.Should().Contain(e => e.FullName == "lib/netstandardapp1.5/TestLibraryWithConfiguration.dll"); } private void CopyProjectToTempDir(string projectDir, TempDirectory tempDir) diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 9df3bae0a..178d883d3 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -2,8 +2,8 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", - "System.IO.Compression.ZipFile": "4.0.1-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", + "System.IO.Compression.ZipFile": "4.0.1-rc2-23901", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { @@ -15,8 +15,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] } }, diff --git a/test/dotnet-projectmodel-server.Tests/DthTests.cs b/test/dotnet-projectmodel-server.Tests/DthTests.cs index 07d7ddf49..238d9d524 100644 --- a/test/dotnet-projectmodel-server.Tests/DthTests.cs +++ b/test/dotnet-projectmodel-server.Tests/DthTests.cs @@ -66,7 +66,7 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests .AssertJArrayCount(2) .Select(f => f["ShortName"].Value()); - Assert.Contains("dnxcore50", frameworkShortNames); + Assert.Contains("netstandardapp1.5", frameworkShortNames); Assert.Contains("dnx451", frameworkShortNames); } } diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index 65d15d9b0..0e925470a 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -7,8 +7,11 @@ "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "testRunner": "xunit" diff --git a/test/dotnet-publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs b/test/dotnet-publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs index c19c7b10b..c1dcfeda3 100644 --- a/test/dotnet-publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs +++ b/test/dotnet-publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs @@ -30,12 +30,12 @@ namespace Microsoft.DotNet.Tools.Publish.Tests return new[] { new object[] { "1", "", "", "", "" }, - new object[] { "2", "dnxcore50", "", "", "" }, + new object[] { "2", "netstandardapp1.5", "", "", "" }, new object[] { "3", "", PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier(), "", "" }, new object[] { "4", "", "", "Release", "" }, new object[] { "5", "", "", "", "some/dir"}, new object[] { "6", "", "", "", "some/dir/with spaces" }, - new object[] { "7", "dnxcore50", PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier(), "Debug", "some/dir" }, + new object[] { "7", "netstandardapp1.5", PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier(), "Debug", "some/dir" }, }; } } @@ -131,7 +131,7 @@ namespace Microsoft.DotNet.Tools.Publish.Tests publishCommand.GetOutputDirectory().Should().HaveFile("Newtonsoft.Json.dll"); publishCommand.GetOutputDirectory().Delete(true); - publishCommand = new PublishCommand(lesserTestProject, "dnxcore50", PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier()); + publishCommand = new PublishCommand(lesserTestProject, "netstandardapp1.5", PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier()); publishCommand.Execute().Should().Pass(); publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.dll"); diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index ab6058c86..ab16338b8 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -2,7 +2,8 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", + "System.IO.Compression": "4.1.0-rc2-23901", "Microsoft.DotNet.TestFramework": "1.0.0-*", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, @@ -16,8 +17,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index 2159b5bf5..fd3d26275 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -2,7 +2,8 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", + "System.IO.Compression": "4.1.0-rc2-23901", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { @@ -15,8 +16,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 3cb3ea7b2..ecbf0c5fc 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -1,8 +1,9 @@ { "version": "1.0.0-*", - + "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", + "System.IO.Compression": "4.1.0-rc2-23901", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { @@ -14,8 +15,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index dd42494fd..1aa86bcd6 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Newtonsoft.Json": "7.0.1", - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", "dotnet": { "target": "project" }, @@ -14,8 +14,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 325af0130..f6266f4ae 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -2,7 +2,8 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", + "System.IO.Compression": "4.1.0-rc2-23901", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { @@ -15,8 +16,11 @@ }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 98ddea4cf..59d9c5fb9 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -6,12 +6,16 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23901", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*" }, "frameworks": { - "dnxcore50": { } + "netstandardapp1.5": { + "imports": [ + "dnxcore50" + ] + } } }