mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Microsoft.NETCore.App no longer supports netstandard

Browse source 
Any project that references Microsoft.NETCore.App must target netcoreapp1.0.

Moving app projects to netcoreapp1.0; moving library projects to reference NETStandard.Library.
This commit is contained in:
Eric Erhardt 2016-05-28 09:14:59 -05:00
parent a087de2f87
commit fad7477ea5
18 changed files with 185 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json
View file

@ -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": {}

31
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json
View file

@ -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": { }
}
}

30
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json
View file

@ -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": { }
}
}

19
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json
View file

@ -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"
}
}
}
}

19
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json
View file

@ -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"
}
}
}
}

30
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json
View file

@ -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": { }
}
}

19
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json
View file

@ -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"
}
}
}
}

19
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json
View file

@ -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"
}
}
}
}

19
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json
View file

@ -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"
}
}
}
}

19
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json
View file

@ -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"
}
}
}
}

22
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json
View file

@ -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"
}
}
}
}

22
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json
View file

@ -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"
}
}
}
}

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json
View file

@ -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": {

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json
View file

@ -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": {

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json
View file

@ -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": {

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json
View file

@ -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": {

2
build_projects/dotnet-cli-build/CompileTargets.cs
View file

@ -186,7 +186,7 @@ namespace Microsoft.DotNet.Cli.Build
"--output",
sdkOutputDirectory,
"--framework",
"netstandard1.5")
"netcoreapp1.0")
.Execute()
.EnsureSuccessful();

2
src/compilers/project.json
View file

@ -13,7 +13,7 @@
"Microsoft.DiaSymReader.Native": "1.4.0-rc"
},
"frameworks": {
"netstandard1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net45+win8"