From 5cec601abe968c8475bac7f3b6e7f48c154a6d63 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Tue, 5 May 2015 23:26:45 -0700 Subject: [PATCH] Fix MVC packages being broken on CoreCLR - Mvc is currently broken on CoreCLR because it is inheriting dependencies from Microsoft.AspNet.Mvc.Common but the resulting dependency to Microsoft.AspNet.Mvc.Common is then erased at pack time. This change moves the dependencies down and makes the shared package only depend on System.Runtime. #2507 --- src/Microsoft.AspNet.JsonPatch/project.json | 5 ++++- src/Microsoft.AspNet.Mvc.Abstractions/project.json | 5 ++++- src/Microsoft.AspNet.Mvc.Common/project.json | 4 +--- src/Microsoft.AspNet.Mvc.Razor.Host/project.json | 5 ++++- test/Microsoft.AspNet.Mvc.Common.Test/project.json | 8 +++++++- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.AspNet.JsonPatch/project.json b/src/Microsoft.AspNet.JsonPatch/project.json index eaf8c97b46..e5d5d811e9 100644 --- a/src/Microsoft.AspNet.JsonPatch/project.json +++ b/src/Microsoft.AspNet.JsonPatch/project.json @@ -15,7 +15,10 @@ "System.Collections": "4.0.10-beta-*", "System.Collections.Concurrent": "4.0.10-beta-*", "System.Globalization": "4.0.10-beta-*", - "System.Runtime.Extensions": "4.0.10-beta-*" + "System.Runtime.Extensions": "4.0.10-beta-*", + "System.ComponentModel.TypeConverter": "4.0.0-beta-*", + "System.Reflection.Extensions": "4.0.0-beta-*", + "System.Text.Encoding.Extensions": "4.0.10-beta-*" } } } diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/project.json b/src/Microsoft.AspNet.Mvc.Abstractions/project.json index 4ba0235b5d..52f22b3dc8 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/project.json +++ b/src/Microsoft.AspNet.Mvc.Abstractions/project.json @@ -15,7 +15,10 @@ "dnx451": {}, "dnxcore50": { "dependencies": { - "Microsoft.CSharp": "4.0.0-beta-*" + "Microsoft.CSharp": "4.0.0-beta-*", + "System.ComponentModel.TypeConverter": "4.0.0-beta-*", + "System.Reflection.Extensions": "4.0.0-beta-*", + "System.Text.Encoding.Extensions": "4.0.10-beta-*" } } } diff --git a/src/Microsoft.AspNet.Mvc.Common/project.json b/src/Microsoft.AspNet.Mvc.Common/project.json index b9e84a0f09..7606e55354 100644 --- a/src/Microsoft.AspNet.Mvc.Common/project.json +++ b/src/Microsoft.AspNet.Mvc.Common/project.json @@ -8,9 +8,7 @@ "dnx451": { }, "dnxcore50": { "dependencies": { - "System.ComponentModel.TypeConverter": "4.0.0-beta-*", - "System.Reflection.Extensions": "4.0.0-beta-*", - "System.Text.Encoding.Extensions": "4.0.10-beta-*" + "System.Runtime": "4.0.20-beta-*" } } } diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json index e45593f00d..65d873ccd8 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json +++ b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json @@ -22,7 +22,10 @@ "dnxcore50": { "dependencies": { "System.Collections.Concurrent": "4.0.10-beta-*", - "Microsoft.Framework.Runtime.Abstractions": "1.0.0-*" + "Microsoft.Framework.Runtime.Abstractions": "1.0.0-*", + "System.ComponentModel.TypeConverter": "4.0.0-beta-*", + "System.Reflection.Extensions": "4.0.0-beta-*", + "System.Text.Encoding.Extensions": "4.0.10-beta-*" } } } diff --git a/test/Microsoft.AspNet.Mvc.Common.Test/project.json b/test/Microsoft.AspNet.Mvc.Common.Test/project.json index c0c96258c2..729aa96a73 100644 --- a/test/Microsoft.AspNet.Mvc.Common.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Common.Test/project.json @@ -20,6 +20,12 @@ "Moq": "4.2.1312.1622" } }, - "dnxcore50": { } + "dnxcore50": { + "dependencies": { + "System.ComponentModel.TypeConverter": "4.0.0-beta-*", + "System.Reflection.Extensions": "4.0.0-beta-*", + "System.Text.Encoding.Extensions": "4.0.10-beta-*" + } + } } }