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

Move to netstandard1.6

Browse source 
This is needed because DependencyModel uses the AppContext.GetData API, which is only available in netstandard1.6 as of CoreFX build rc3-24126.
This commit is contained in:
Eric Erhardt 2016-05-26 15:42:30 -05:00
parent 409ccb2c9c
commit 08a3ffe3aa
13 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@
} }
}, },
"frameworks": { "frameworks": {
"netstandard1.5": { "netstandard1.6": {
"imports": "dnxcore50", "imports": "dnxcore50",
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004312" "Microsoft.NETCore.App": "1.0.0-rc3-004312"

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

@ -4,7 +4,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc3-24126-00", "Microsoft.NETCore.App": "1.0.0-rc3-004312",
"Microsoft.CSharp": "4.0.1-rc3-24126-00", "Microsoft.CSharp": "4.0.1-rc3-24126-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24126-00", "System.Dynamic.Runtime": "4.0.11-rc3-24126-00",
"System.Reflection.Metadata": "1.3.0-rc3-24126-00", "System.Reflection.Metadata": "1.3.0-rc3-24126-00",

16
build_projects/dotnet-cli-build/TestPackageProjects.cs
View file

@ -125,7 +125,7 @@ namespace Microsoft.DotNet.Cli.Build
IsApplicable = true, IsApplicable = true,
VersionSuffix = s_testPackageBuildVersionSuffix, VersionSuffix = s_testPackageBuildVersionSuffix,
Clean = false, Clean = false,
Frameworks = new [] { "net451", "netstandard1.5" } Frameworks = new [] { "net451", "netstandard1.6" }
}, },
new TestPackageProject() new TestPackageProject()
{ {
@ -135,7 +135,7 @@ namespace Microsoft.DotNet.Cli.Build
IsApplicable = true, IsApplicable = true,
VersionSuffix = s_testPackageBuildVersionSuffix, VersionSuffix = s_testPackageBuildVersionSuffix,
Clean = false, Clean = false,
Frameworks = new [] { "net451", "netstandard1.5" } Frameworks = new [] { "net451", "netstandard1.6" }
}, },
new TestPackageProject() new TestPackageProject()
{ {
@ -145,7 +145,7 @@ namespace Microsoft.DotNet.Cli.Build
IsApplicable = true, IsApplicable = true,
VersionSuffix = s_testPackageBuildVersionSuffix, VersionSuffix = s_testPackageBuildVersionSuffix,
Clean = false, Clean = false,
Frameworks = new [] { "netstandard1.5" } Frameworks = new [] { "netstandard1.6" }
}, },
new TestPackageProject() new TestPackageProject()
{ {
@ -155,7 +155,7 @@ namespace Microsoft.DotNet.Cli.Build
IsApplicable =true, IsApplicable =true,
VersionSuffix = s_testPackageBuildVersionSuffix, VersionSuffix = s_testPackageBuildVersionSuffix,
Clean = false, Clean = false,
Frameworks = new [] { "netstandard1.5" } Frameworks = new [] { "netstandard1.6" }
}, },
new TestPackageProject() new TestPackageProject()
{ {
@ -175,7 +175,7 @@ namespace Microsoft.DotNet.Cli.Build
IsApplicable = true, IsApplicable = true,
VersionSuffix = s_testPackageBuildVersionSuffix, VersionSuffix = s_testPackageBuildVersionSuffix,
Clean = false, Clean = false,
Frameworks = new [] { "net451", "netstandard1.5" } Frameworks = new [] { "net451", "netstandard1.6" }
}, },
new TestPackageProject() new TestPackageProject()
{ {
@ -185,7 +185,7 @@ namespace Microsoft.DotNet.Cli.Build
IsApplicable = true, IsApplicable = true,
VersionSuffix = s_testPackageBuildVersionSuffix, VersionSuffix = s_testPackageBuildVersionSuffix,
Clean = false, Clean = false,
Frameworks = new [] { "net451", "netstandard1.5" } Frameworks = new [] { "net451", "netstandard1.6" }
}, },
new TestPackageProject() new TestPackageProject()
{ {
@ -195,7 +195,7 @@ namespace Microsoft.DotNet.Cli.Build
IsApplicable = true, IsApplicable = true,
VersionSuffix = s_testPackageBuildVersionSuffix, VersionSuffix = s_testPackageBuildVersionSuffix,
Clean = false, Clean = false,
Frameworks = new [] { "netstandard1.5" } Frameworks = new [] { "netstandard1.6" }
}, },
new TestPackageProject() new TestPackageProject()
{ {
@ -205,7 +205,7 @@ namespace Microsoft.DotNet.Cli.Build
IsApplicable = true, IsApplicable = true,
VersionSuffix = s_testPackageBuildVersionSuffix, VersionSuffix = s_testPackageBuildVersionSuffix,
Clean = false, Clean = false,
Frameworks = new [] { "netstandard1.5" } Frameworks = new [] { "netstandard1.6" }
}, },
new TestPackageProject() new TestPackageProject()
{ {

2
src/Microsoft.DotNet.Cli.Utils/project.json
View file

@ -21,7 +21,7 @@
} }
} }
}, },
"netstandard1.5": { "netstandard1.6": {
"imports": [ "imports": [
"portable-net45+wp80+win8+wpa81+dnxcore50" "portable-net45+wp80+win8+wpa81+dnxcore50"
], ],

2
src/Microsoft.DotNet.Compiler.Common/project.json
View file

@ -32,7 +32,7 @@
} }
} }
}, },
"netstandard1.5": { "netstandard1.6": {
"imports": [ "imports": [
"portable-net45+wp80+win8+wpa81+dnxcore50" "portable-net45+wp80+win8+wpa81+dnxcore50"
] ]

2
src/Microsoft.DotNet.Files/project.json
View file

@ -27,7 +27,7 @@
} }
} }
}, },
"netstandard1.5": { "netstandard1.6": {
"imports": [ "imports": [
"portable-net45+wp80+win8+wpa81+dnxcore50" "portable-net45+wp80+win8+wpa81+dnxcore50"
] ]

2
src/Microsoft.DotNet.ProjectModel.Loader/project.json
View file

@ -10,7 +10,7 @@
"System.Runtime.Loader": "4.0.0-rc3-24126-00" "System.Runtime.Loader": "4.0.0-rc3-24126-00"
}, },
"frameworks": { "frameworks": {
"netstandard1.5": { "netstandard1.6": {
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50" "imports": "portable-net45+wp80+win8+wpa81+dnxcore50"
} }
} }

2
src/Microsoft.DotNet.ProjectModel.Workspaces/project.json
View file

@ -26,7 +26,7 @@
} }
} }
}, },
"netstandard1.5": { "netstandard1.6": {
"imports": [ "imports": [
"portable-net45+wp80+win8+wpa81+dnxcore50", "portable-net45+wp80+win8+wpa81+dnxcore50",
"portable-net45+win8" "portable-net45+win8"

2
src/Microsoft.DotNet.ProjectModel/project.json
View file

@ -27,7 +27,7 @@
} }
} }
}, },
"netstandard1.5": { "netstandard1.6": {
"imports": [ "imports": [
"portable-net45+wp80+win8+wpa81+dnxcore50", "portable-net45+wp80+win8+wpa81+dnxcore50",
"dotnet5.4" "dotnet5.4"

2
src/Microsoft.DotNet.TestFramework/project.json
View file

@ -10,7 +10,7 @@
} }
}, },
"frameworks": { "frameworks": {
"netstandard1.5": { "netstandard1.6": {
"imports": [ "imports": [
"portable-net45+wp80+win8+wpa81+dnxcore50" "portable-net45+wp80+win8+wpa81+dnxcore50"
] ]

2
src/Microsoft.Extensions.DependencyModel/DependencyContextPaths.cs
View file

@ -20,7 +20,7 @@ namespace Microsoft.Extensions.DependencyModel
private static DependencyContextPaths GetCurrent() private static DependencyContextPaths GetCurrent()
{ {
#if NETSTANDARD1_5 #if NETSTANDARD1_6
var deps = AppContext.GetData(DepsFilesProperty); var deps = AppContext.GetData(DepsFilesProperty);
#else #else
var deps = AppDomain.CurrentDomain.GetData(DepsFilesProperty); var deps = AppDomain.CurrentDomain.GetData(DepsFilesProperty);

2
src/Microsoft.Extensions.DependencyModel/project.json
View file

@ -13,7 +13,7 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"netstandard1.5": { "netstandard1.6": {
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "imports": "portable-net45+wp80+win8+wpa81+dnxcore50",
"dependencies": { "dependencies": {
"System.Diagnostics.Debug": "4.0.11-rc3-24126-00", "System.Diagnostics.Debug": "4.0.11-rc3-24126-00",

2
src/Microsoft.Extensions.Testing.Abstractions/project.json
View file

@ -16,7 +16,7 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"netstandard1.5": { "netstandard1.6": {
"imports": [ "imports": [
"portable-net45+wp80+win8+wpa81+dnxcore50", "portable-net45+wp80+win8+wpa81+dnxcore50",
"portable-net45+win8" "portable-net45+win8"