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.
This commit is contained in:
Eric Erhardt 2016-03-22 15:19:54 -05:00
parent 9bc478660a
commit 3186432ebd
25 changed files with 28 additions and 12 deletions

View file

@ -2,6 +2,8 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "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", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-dev-91790-12" "dotnet-test-xunit": "1.0.0-dev-91790-12"
}, },

View file

@ -6,6 +6,8 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "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-*", "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*",
"WindowsAzure.Storage": "6.2.2-preview", "WindowsAzure.Storage": "6.2.2-preview",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.2.0"

View file

@ -20,7 +20,7 @@
} }
} }
}, },
"netstandard1.3": { "netstandard1.5": {
"imports": "dnxcore50", "imports": "dnxcore50",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",

View file

@ -12,7 +12,7 @@
"Microsoft.DotNet.Files": "1.0.0-*" "Microsoft.DotNet.Files": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"netstandard1.3": { "netstandard1.5": {
"imports": [ "imports": [
"dnxcore50", "dnxcore50",
"portable-net45+win8" "portable-net45+win8"

View file

@ -12,7 +12,7 @@
"Microsoft.DotNet.ProjectModel": "1.0.0-*" "Microsoft.DotNet.ProjectModel": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"netstandard1.3": { "netstandard1.5": {
"imports": "dnxcore50" "imports": "dnxcore50"
} }
}, },

View file

@ -9,7 +9,7 @@
"System.Runtime.Loader": "4.0.0-rc2-23922" "System.Runtime.Loader": "4.0.0-rc2-23922"
}, },
"frameworks": { "frameworks": {
"netstandard1.3": { "netstandard1.5": {
"imports": "dnxcore50" "imports": "dnxcore50"
} }
} }

View file

@ -10,7 +10,7 @@
"Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160202-02" "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160202-02"
}, },
"frameworks": { "frameworks": {
"netstandard1.3": { "netstandard1.5": {
"imports": [ "imports": [
"dnxcore50", "dnxcore50",
"portable-net45+win8" "portable-net45+win8"

View file

@ -32,7 +32,7 @@
} }
} }
}, },
"netstandard1.3": { "netstandard1.5": {
"imports": "dnxcore50", "imports": "dnxcore50",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",

View file

@ -14,7 +14,7 @@
"NETStandard.Library": "1.5.0-rc2-23922" "NETStandard.Library": "1.5.0-rc2-23922"
}, },
"frameworks": { "frameworks": {
"netstandard1.3": { "netstandard1.5": {
"imports": "dnxcore50" "imports": "dnxcore50"
} }
} }

View file

@ -26,10 +26,7 @@
"netstandard1.3": { "netstandard1.3": {
"imports": "dnxcore50", "imports": "dnxcore50",
"dependencies": { "dependencies": {
"System.IO.FileSystem": "4.0.1-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",
"System.Linq": "4.1.0-rc2-23922",
"System.Runtime": "4.1.0-rc2-23922",
"System.Reflection": "4.1.0-rc2-23922",
"System.Dynamic.Runtime": "4.0.11-rc2-23922" "System.Dynamic.Runtime": "4.0.11-rc2-23922"
} }
} }

View file

@ -16,7 +16,7 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"netstandard1.3": { "netstandard1.5": {
"imports": "dnxcore50", "imports": "dnxcore50",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",

View file

@ -60,6 +60,8 @@
"System.Resources.ReaderWriter": "4.0.0-rc2-23922", "System.Resources.ReaderWriter": "4.0.0-rc2-23922",
"System.Net.Sockets": "4.1.0-rc2-23922", "System.Net.Sockets": "4.1.0-rc2-23922",
"System.Threading.ThreadPool": "4.0.10-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": { "Microsoft.Win32.Registry": {
"version": "4.0.0-rc2-23922", "version": "4.0.0-rc2-23922",
"exclude": "compile" "exclude": "compile"

View file

@ -5,6 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
"Microsoft.DotNet.ProjectModel": { "Microsoft.DotNet.ProjectModel": {
"target": "project" "target": "project"
}, },

View file

@ -5,6 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
"Microsoft.DotNet.ProjectModel": { "Microsoft.DotNet.ProjectModel": {
"target": "project" "target": "project"
}, },

View file

@ -5,6 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
"NuGet.Versioning": "3.5.0-beta-1068", "NuGet.Versioning": "3.5.0-beta-1068",
"NuGet.Packaging": "3.5.0-beta-1068", "NuGet.Packaging": "3.5.0-beta-1068",
"NuGet.Frameworks": "3.5.0-beta-1068", "NuGet.Frameworks": "3.5.0-beta-1068",

View file

@ -2,6 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },

View file

@ -2,6 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
"Microsoft.DotNet.ProjectModel": { "Microsoft.DotNet.ProjectModel": {
"target": "project" "target": "project"
}, },

View file

@ -6,6 +6,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
"System.Collections.Immutable": "1.2.0-rc2-23922", "System.Collections.Immutable": "1.2.0-rc2-23922",
"FluentAssertions": "4.0.0", "FluentAssertions": "4.0.0",
"xunit": "2.1.0", "xunit": "2.1.0",

View file

@ -2,6 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },

View file

@ -2,6 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },

View file

@ -2,6 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "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", "System.IO.Compression.ZipFile": "4.0.1-rc2-23922",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"

View file

@ -2,6 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
"Microsoft.DotNet.TestFramework": "1.0.0-*", "Microsoft.DotNet.TestFramework": "1.0.0-*",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"

View file

@ -2,6 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },

View file

@ -2,6 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },

View file

@ -2,6 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23922", "NETStandard.Library": "1.5.0-rc2-23922",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },