From fad7477ea5d5dab6ed86da0c7996fc41668a986a Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Sat, 28 May 2016 09:14:59 -0500 Subject: [PATCH] Microsoft.NETCore.App no longer supports netstandard Any project that references Microsoft.NETCore.App must target netcoreapp1.0. Moving app projects to netcoreapp1.0; moving library projects to reference NETStandard.Library. --- .../DependencyContextValidator/project.json | 2 +- .../TwoTargetApp/project.json | 31 ++++++++++++++----- .../TwoTargetGraph/TwoTargetP0/project.json | 30 ++++++++++++++---- .../TwoTargetGraph/TwoTargetP1/project.json | 19 ++++++++---- .../TwoTargetGraph/TwoTargetP2/project.json | 19 ++++++++---- .../TwoTargetLargeP0/project.json | 30 ++++++++++++++---- .../TwoTargetLargeP1/project.json | 19 ++++++++---- .../TwoTargetLargeP2/project.json | 19 ++++++++---- .../TwoTargetLargeP3/project.json | 19 ++++++++---- .../TwoTargetLargeP4/project.json | 19 ++++++++---- .../TwoTargetLargeP5/project.json | 22 ++++++++----- .../TwoTargetLargeP6/project.json | 22 ++++++++----- .../src/L11/project.json | 2 +- .../src/L12/project.json | 2 +- .../src/L21/project.json | 2 +- .../src/L22/project.json | 2 +- .../dotnet-cli-build/CompileTargets.cs | 2 +- src/compilers/project.json | 2 +- 18 files changed, 185 insertions(+), 78 deletions(-) diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 7d8aa7a4d..bef2de480 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -9,7 +9,7 @@ "netstandard1.6": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004336" + "NETStandard.Library": "1.5.0-rc3-24127-01" } }, "net451": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index 408f44fec..12d0989a0 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -3,14 +3,31 @@ "buildOptions": { "emitEntryPoint": true }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc3-004336" + "dependencies": { }, + "frameworks": { + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004336" + } + } + }, + "netstandard1.6": { + "dependencies": { + "NETStandard.Library": "1.5.0-rc3-24127-01", + "Microsoft.NETCore.Runtime": "1.0.2-rc3-24127-01" + } } }, - "frameworks": { - "netcoreapp1.0": {}, - "netstandard1.5": {} + "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-x64": { } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index 217f92b96..7b1a89fb8 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -6,14 +6,32 @@ "dependencies": { "TwoTargetP1": { "target": "project" - }, - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc3-004336" } }, "frameworks": { - "netcoreapp1.0": {}, - "netstandard1.5": {} + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004336" + } + } + }, + "netstandard1.6": { + "dependencies": { + "NETStandard.Library": "1.5.0-rc3-24127-01", + "Microsoft.NETCore.Runtime": "1.0.2-rc3-24127-01" + } + } + }, + "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-x64": { } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index c446ced03..57e8b17fd 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -3,14 +3,21 @@ "dependencies": { "TwoTargetP2": { "target": "project" - }, - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc3-004336" } }, "frameworks": { - "netcoreapp1.0": {}, - "netstandard1.5": {} + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004336" + } + } + }, + "netstandard1.5": { + "dependencies": { + "NETStandard.Library": "1.5.0-rc3-24127-01" + } + } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index 13fd234ee..f1361d72b 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -1,13 +1,20 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc3-004336" - } }, "frameworks": { - "netcoreapp1.0": {}, - "netstandard1.5": {} + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004336" + } + } + }, + "netstandard1.5": { + "dependencies": { + "NETStandard.Library": "1.5.0-rc3-24127-01" + } + } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index d863831b8..5554c1d91 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -6,14 +6,32 @@ "dependencies": { "TwoTargetLargeP1": { "target": "project" - }, - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc3-004336" } }, "frameworks": { - "netcoreapp1.0": {}, - "netstandard1.5": {} + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004336" + } + } + }, + "netstandard1.6": { + "dependencies": { + "NETStandard.Library": "1.5.0-rc3-24127-01", + "Microsoft.NETCore.Runtime": "1.0.2-rc3-24127-01" + } + } + }, + "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-x64": { } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index 7cbba0ec5..c9f172bf6 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -6,14 +6,21 @@ }, "TwoTargetLargeP4": { "target": "project" - }, - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc3-004336" } }, "frameworks": { - "netcoreapp1.0": {}, - "netstandard1.5": {} + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004336" + } + } + }, + "netstandard1.5": { + "dependencies": { + "NETStandard.Library": "1.5.0-rc3-24127-01" + } + } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index 728b8333d..5e00017f1 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -6,14 +6,21 @@ }, "TwoTargetLargeP4": { "target": "project" - }, - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc3-004336" } }, "frameworks": { - "netcoreapp1.0": {}, - "netstandard1.5": {} + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004336" + } + } + }, + "netstandard1.5": { + "dependencies": { + "NETStandard.Library": "1.5.0-rc3-24127-01" + } + } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index 477b1eb22..4ea7290c8 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -3,14 +3,21 @@ "dependencies": { "TwoTargetLargeP4": { "target": "project" - }, - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc3-004336" } }, "frameworks": { - "netcoreapp1.0": {}, - "netstandard1.5": {} + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004336" + } + } + }, + "netstandard1.5": { + "dependencies": { + "NETStandard.Library": "1.5.0-rc3-24127-01" + } + } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index 8d7f2c469..b6b3d1fe4 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -6,14 +6,21 @@ }, "TwoTargetLargeP6": { "target": "project" - }, - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc3-004336" } }, "frameworks": { - "netcoreapp1.0": {}, - "netstandard1.5": {} + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004336" + } + } + }, + "netstandard1.5": { + "dependencies": { + "NETStandard.Library": "1.5.0-rc3-24127-01" + } + } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index 13fd234ee..ef971a698 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -1,13 +1,19 @@ { "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc3-004336" - } - }, + "dependencies": { }, "frameworks": { - "netcoreapp1.0": {}, - "netstandard1.5": {} + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004336" + } + } + }, + "netstandard1.5": { + "dependencies": { + "NETStandard.Library": "1.5.0-rc3-24127-01" + } + } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index 13fd234ee..ef971a698 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -1,13 +1,19 @@ { "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc3-004336" - } - }, + "dependencies": { }, "frameworks": { - "netcoreapp1.0": {}, - "netstandard1.5": {} + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004336" + } + } + }, + "netstandard1.5": { + "dependencies": { + "NETStandard.Library": "1.5.0-rc3-24127-01" + } + } } } diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index 0f83cf587..88ece17f5 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -3,7 +3,7 @@ "dependencies": { "L12": "1.0.0-*", "L21": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004336" + "NETStandard.Library": "1.5.0-rc3-24127-01" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index 0cb4f2f44..d2c85cccc 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "L22": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004336" + "NETStandard.Library": "1.5.0-rc3-24127-01" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index 9f35d9c62..e7f4f7b56 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004336" + "NETStandard.Library": "1.5.0-rc3-24127-01" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index 9f35d9c62..e7f4f7b56 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004336" + "NETStandard.Library": "1.5.0-rc3-24127-01" }, "frameworks": { "netstandard1.5": { diff --git a/build_projects/dotnet-cli-build/CompileTargets.cs b/build_projects/dotnet-cli-build/CompileTargets.cs index f3fea4d0e..c695ddf4a 100644 --- a/build_projects/dotnet-cli-build/CompileTargets.cs +++ b/build_projects/dotnet-cli-build/CompileTargets.cs @@ -186,7 +186,7 @@ namespace Microsoft.DotNet.Cli.Build "--output", sdkOutputDirectory, "--framework", - "netstandard1.5") + "netcoreapp1.0") .Execute() .EnsureSuccessful(); diff --git a/src/compilers/project.json b/src/compilers/project.json index 9e91a84b9..d8e2d38de 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -13,7 +13,7 @@ "Microsoft.DiaSymReader.Native": "1.4.0-rc" }, "frameworks": { - "netstandard1.5": { + "netcoreapp1.0": { "imports": [ "dnxcore50", "portable-net45+win8"