From 08a3ffe3aae9c0b50d78c6cf8d99ec4d8b847b92 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 26 May 2016 15:42:30 -0500 Subject: [PATCH] Move to netstandard1.6 This is needed because DependencyModel uses the AppContext.GetData API, which is only available in netstandard1.6 as of CoreFX build rc3-24126. --- .../DependencyContextValidator/project.json | 2 +- .../TestAppWithResourceDeps/project.json | 2 +- .../dotnet-cli-build/TestPackageProjects.cs | 16 ++++++++-------- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- .../project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- src/Microsoft.DotNet.ProjectModel/project.json | 2 +- src/Microsoft.DotNet.TestFramework/project.json | 2 +- .../DependencyContextPaths.cs | 2 +- .../project.json | 2 +- .../project.json | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 7451538b2..08366b78a 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -6,7 +6,7 @@ } }, "frameworks": { - "netstandard1.5": { + "netstandard1.6": { "imports": "dnxcore50", "dependencies": { "Microsoft.NETCore.App": "1.0.0-rc3-004312" diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index 3efc07eb7..50064dbbf 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "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", "System.Dynamic.Runtime": "4.0.11-rc3-24126-00", "System.Reflection.Metadata": "1.3.0-rc3-24126-00", diff --git a/build_projects/dotnet-cli-build/TestPackageProjects.cs b/build_projects/dotnet-cli-build/TestPackageProjects.cs index dbe5d42b6..a6e4a6931 100644 --- a/build_projects/dotnet-cli-build/TestPackageProjects.cs +++ b/build_projects/dotnet-cli-build/TestPackageProjects.cs @@ -125,7 +125,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable = true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "net451", "netstandard1.5" } + Frameworks = new [] { "net451", "netstandard1.6" } }, new TestPackageProject() { @@ -135,7 +135,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable = true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "net451", "netstandard1.5" } + Frameworks = new [] { "net451", "netstandard1.6" } }, new TestPackageProject() { @@ -145,7 +145,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable = true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "netstandard1.5" } + Frameworks = new [] { "netstandard1.6" } }, new TestPackageProject() { @@ -155,7 +155,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable =true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "netstandard1.5" } + Frameworks = new [] { "netstandard1.6" } }, new TestPackageProject() { @@ -175,7 +175,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable = true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "net451", "netstandard1.5" } + Frameworks = new [] { "net451", "netstandard1.6" } }, new TestPackageProject() { @@ -185,7 +185,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable = true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "net451", "netstandard1.5" } + Frameworks = new [] { "net451", "netstandard1.6" } }, new TestPackageProject() { @@ -195,7 +195,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable = true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "netstandard1.5" } + Frameworks = new [] { "netstandard1.6" } }, new TestPackageProject() { @@ -205,7 +205,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable = true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "netstandard1.5" } + Frameworks = new [] { "netstandard1.6" } }, new TestPackageProject() { diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 8e7f4c9cd..429967dba 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -21,7 +21,7 @@ } } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50" ], diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index a6d846f1d..45c3fa058 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -32,7 +32,7 @@ } } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50" ] diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index ff860b1ec..b166224b4 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -27,7 +27,7 @@ } } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50" ] diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 6bda11d14..583063d7f 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -10,7 +10,7 @@ "System.Runtime.Loader": "4.0.0-rc3-24126-00" }, "frameworks": { - "netstandard1.5": { + "netstandard1.6": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50" } } diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 33bdaaf76..f0245a3ea 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -26,7 +26,7 @@ } } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50", "portable-net45+win8" diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 2d96e13a7..5c08abab1 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -27,7 +27,7 @@ } } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50", "dotnet5.4" diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index e7c68774c..a4b1a4cbb 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -10,7 +10,7 @@ } }, "frameworks": { - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50" ] diff --git a/src/Microsoft.Extensions.DependencyModel/DependencyContextPaths.cs b/src/Microsoft.Extensions.DependencyModel/DependencyContextPaths.cs index 1374d3a1f..28700ba1b 100644 --- a/src/Microsoft.Extensions.DependencyModel/DependencyContextPaths.cs +++ b/src/Microsoft.Extensions.DependencyModel/DependencyContextPaths.cs @@ -20,7 +20,7 @@ namespace Microsoft.Extensions.DependencyModel private static DependencyContextPaths GetCurrent() { -#if NETSTANDARD1_5 +#if NETSTANDARD1_6 var deps = AppContext.GetData(DepsFilesProperty); #else var deps = AppDomain.CurrentDomain.GetData(DepsFilesProperty); diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index a1db0b4e9..d4e806539 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -13,7 +13,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.5": { + "netstandard1.6": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "dependencies": { "System.Diagnostics.Debug": "4.0.11-rc3-24126-00", diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index bbc8a149a..910696d54 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -16,7 +16,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50", "portable-net45+win8"