From 3186432ebd513a3717c9401fe20883ffee9363bd Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 22 Mar 2016 15:19:54 -0500 Subject: [PATCH] Fix up the project.json files for CoreFX build rc2-23922. - ProjectModel uses AssemblyLoadContext which is only available in netstandard1.5. Moving ProjectModel and all its dependencies up to netstandard1.5. - Work around our dependencies still being on old CoreFX builds by hoisting System.Runtime.Serialization.Primitives, System.Private.DataContractSerialization, System.Linq.Expressions, and System.Xml.XmlSerializer references to the current version. --- TestAssets/TestProjects/ProjectWithTests/project.json | 2 ++ scripts/dotnet-cli-build/project.json | 2 ++ src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- src/Microsoft.DotNet.Compiler.Common/project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- src/Microsoft.DotNet.ProjectModel.Loader/project.json | 2 +- src/Microsoft.DotNet.ProjectModel.Workspaces/project.json | 2 +- src/Microsoft.DotNet.ProjectModel/project.json | 2 +- src/Microsoft.DotNet.TestFramework/project.json | 2 +- src/Microsoft.Extensions.DependencyModel/project.json | 5 +---- src/Microsoft.Extensions.Testing.Abstractions/project.json | 2 +- src/dotnet/project.json | 2 ++ test/ArgumentForwardingTests/project.json | 1 + test/EndToEnd/project.json | 1 + test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 1 + test/Microsoft.DotNet.Compiler.Common.Tests/project.json | 1 + test/Microsoft.DotNet.ProjectModel.Tests/project.json | 1 + test/Microsoft.DotNet.Tools.Tests.Utilities/project.json | 1 + test/dotnet-build.Tests/project.json | 1 + test/dotnet-compile.Tests/project.json | 1 + test/dotnet-pack.Tests/project.json | 1 + test/dotnet-publish.Tests/project.json | 1 + test/dotnet-resgen.Tests/project.json | 1 + test/dotnet-run.Tests/project.json | 1 + test/dotnet.Tests/project.json | 1 + 25 files changed, 28 insertions(+), 12 deletions(-) diff --git a/TestAssets/TestProjects/ProjectWithTests/project.json b/TestAssets/TestProjects/ProjectWithTests/project.json index ccdab6950..12b7e629f 100644 --- a/TestAssets/TestProjects/ProjectWithTests/project.json +++ b/TestAssets/TestProjects/ProjectWithTests/project.json @@ -2,6 +2,8 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Linq.Expressions": "4.0.11-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12" }, diff --git a/scripts/dotnet-cli-build/project.json b/scripts/dotnet-cli-build/project.json index 7fcfd6d82..1920c6db9 100755 --- a/scripts/dotnet-cli-build/project.json +++ b/scripts/dotnet-cli-build/project.json @@ -6,6 +6,8 @@ }, "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "System.Xml.XmlSerializer": "4.0.11-rc2-23922", "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*", "WindowsAzure.Storage": "6.2.2-preview", "System.Reflection.Metadata": "1.2.0" diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 8241526cf..22c957794 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -20,7 +20,7 @@ } } }, - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 5dc0d485d..256b2944f 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.Files": "1.0.0-*" }, "frameworks": { - "netstandard1.3": { + "netstandard1.5": { "imports": [ "dnxcore50", "portable-net45+win8" diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index e5c28e732..edff18f41 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.ProjectModel": "1.0.0-*" }, "frameworks": { - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50" } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index ae8627183..3c4cebefc 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -9,7 +9,7 @@ "System.Runtime.Loader": "4.0.0-rc2-23922" }, "frameworks": { - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50" } } diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 7416e3fa6..1d1d18642 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -10,7 +10,7 @@ "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160202-02" }, "frameworks": { - "netstandard1.3": { + "netstandard1.5": { "imports": [ "dnxcore50", "portable-net45+win8" diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index bb32ac46b..aafff0f43 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -32,7 +32,7 @@ } } }, - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index 7516de3b0..b4d5ed930 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -14,7 +14,7 @@ "NETStandard.Library": "1.5.0-rc2-23922" }, "frameworks": { - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50" } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 99bad0e61..2e578abb7 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -26,10 +26,7 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "System.IO.FileSystem": "4.0.1-rc2-23922", - "System.Linq": "4.1.0-rc2-23922", - "System.Runtime": "4.1.0-rc2-23922", - "System.Reflection": "4.1.0-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23922", "System.Dynamic.Runtime": "4.0.11-rc2-23922" } } diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 5e7f0a9fd..5fa4ab773 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -16,7 +16,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", diff --git a/src/dotnet/project.json b/src/dotnet/project.json index c8b5029da..0cd86acbd 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -60,6 +60,8 @@ "System.Resources.ReaderWriter": "4.0.0-rc2-23922", "System.Net.Sockets": "4.1.0-rc2-23922", "System.Threading.ThreadPool": "4.0.10-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "System.Private.DataContractSerialization": "4.1.1-rc2-23922", "Microsoft.Win32.Registry": { "version": "4.0.0-rc2-23922", "exclude": "compile" diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index dae052067..3ee0a0b6c 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -5,6 +5,7 @@ }, "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 02363e552..e414cabe0 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -5,6 +5,7 @@ }, "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 797958fe9..9e51da297 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -5,6 +5,7 @@ }, "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "NuGet.Versioning": "3.5.0-beta-1068", "NuGet.Packaging": "3.5.0-beta-1068", "NuGet.Frameworks": "3.5.0-beta-1068", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 02bf95c13..0f8e1e9db 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index 89d98fc0a..ad6af8e6d 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json index feb6a7d20..fe9ef0b32 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -6,6 +6,7 @@ }, "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "System.Collections.Immutable": "1.2.0-rc2-23922", "FluentAssertions": "4.0.0", "xunit": "2.1.0", diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 2d3d8a4de..31265a0ef 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 998db787d..b0015820f 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index c25eafc01..90a509c47 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "System.IO.Compression.ZipFile": "4.0.1-rc2-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 451ab106e..25dd63798 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.TestFramework": "1.0.0-*", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index 9724763e2..72011dbbe 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 47bca3459..26b12e51e 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 680187988..6c13bb9ca 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },