From 587545275535eaeb12919b6933765324cf6caeae Mon Sep 17 00:00:00 2001 From: dougbu Date: Wed, 19 Mar 2014 23:33:34 -0700 Subject: [PATCH] Quick fix-ups - Move .NET test projects back into net45 folder - Catch up with latest System.Runtime.InteropServices version --- WebFx.sln | 11 ++++------- samples/MvcSample.Web/project.json | 2 +- src/Microsoft.AspNet.Mvc.Core/project.json | 4 ++-- src/Microsoft.AspNet.Mvc.ModelBinding/project.json | 2 +- src/Microsoft.AspNet.Mvc.Razor/project.json | 2 +- src/Microsoft.AspNet.Mvc.Rendering/project.json | 2 +- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/WebFx.sln b/WebFx.sln index e78bec887e..11c8b287bb 100644 --- a/WebFx.sln +++ b/WebFx.sln @@ -180,17 +180,14 @@ Global {BA88E212-5889-48DC-823F-A3A67DDEF123} = {4EB70D0E-E27E-4C42-AB58-BC8B325EDFB3} {D4576205-A5B5-4382-BB34-19DE9855FE94} = {4EB70D0E-E27E-4C42-AB58-BC8B325EDFB3} {688ABC8B-BFA9-4CFF-9458-A466FEBB0448} = {222CA408-93EE-473A-9325-D04989EC9FEF} - {A4E25DA1-9BC1-4534-BDAA-4AEB7C089B0F} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {5A219830-3C19-475D-901F-E580BA87DFF8} = {A4E25DA1-9BC1-4534-BDAA-4AEB7C089B0F} - {42195A56-42C0-4CFF-A982-B6E24EFC6356} = {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} + {A4E25DA1-9BC1-4534-BDAA-4AEB7C089B0F} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {537CC0EE-4B62-4789-9AE9-94BE28E0D25A} = {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} + {42195A56-42C0-4CFF-A982-B6E24EFC6356} = {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} + {998C5A2E-D043-465F-BE19-076D27444289} = {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} {3EB2CFF9-6E67-4C03-9AC4-2DD169024938} = {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} {68FC3791-A9E4-4EDE-93A5-C7AC7DC0ED6E} = {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} {75A07B53-C5EE-4995-A55B-27562C23BCCD} = {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} - {3EB2CFF9-6E67-4C03-9AC4-2DD169024938} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {75A07B53-C5EE-4995-A55B-27562C23BCCD} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {68FC3791-A9E4-4EDE-93A5-C7AC7DC0ED6E} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {998C5A2E-D043-465F-BE19-076D27444289} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {5A219830-3C19-475D-901F-E580BA87DFF8} = {A4E25DA1-9BC1-4534-BDAA-4AEB7C089B0F} EndGlobalSection EndGlobal diff --git a/samples/MvcSample.Web/project.json b/samples/MvcSample.Web/project.json index b34ee9d7e8..e1d0029322 100644 --- a/samples/MvcSample.Web/project.json +++ b/samples/MvcSample.Web/project.json @@ -29,7 +29,7 @@ "System.Diagnostics.Tools": "4.0.0.0", "System.Dynamic.Runtime": "4.0.0.0", "System.Runtime": "4.0.20.0", - "System.Runtime.InteropServices": "4.0.10.0", + "System.Runtime.InteropServices": "4.0.20.0", "System.Threading.Tasks": "4.0.0.0" } } diff --git a/src/Microsoft.AspNet.Mvc.Core/project.json b/src/Microsoft.AspNet.Mvc.Core/project.json index 53a52177fa..5c9905671d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/project.json +++ b/src/Microsoft.AspNet.Mvc.Core/project.json @@ -25,11 +25,11 @@ "System.Reflection.Emit.ILGeneration": "4.0.0.0", "System.Reflection.Emit.Lightweight": "4.0.0.0", "System.Reflection.Extensions": "4.0.0.0", - "System.Resources.ResourceManager": "4.0.0.0", + "System.Resources.ResourceManager": "4.0.0.0", "System.Runtime": "4.0.20.0", "System.Runtime.Extensions": "4.0.10.0", "System.Runtime.Hosting": "3.9.0.0", - "System.Runtime.InteropServices": "4.0.10.0", + "System.Runtime.InteropServices": "4.0.20.0", "System.Text.Encoding": "4.0.10.0", "System.Threading.Tasks": "4.0.0.0" } diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/project.json b/src/Microsoft.AspNet.Mvc.ModelBinding/project.json index d15d2da1dd..86745ff3c3 100644 --- a/src/Microsoft.AspNet.Mvc.ModelBinding/project.json +++ b/src/Microsoft.AspNet.Mvc.ModelBinding/project.json @@ -34,7 +34,7 @@ "System.Resources.ResourceManager": "4.0.0.0", "System.Runtime": "4.0.20.0", "System.Runtime.Extensions": "4.0.10.0", - "System.Runtime.InteropServices": "4.0.10.0", + "System.Runtime.InteropServices": "4.0.20.0", "System.Threading": "4.0.0.0", "System.Threading.Tasks": "4.0.0.0", "System.Runtime.Serialization.Primitives": "4.0.0.0" diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json index 15c3460d20..d56f3ea6c6 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/project.json +++ b/src/Microsoft.AspNet.Mvc.Razor/project.json @@ -42,7 +42,7 @@ "System.Resources.ResourceManager": "4.0.0.0", "System.Runtime": "4.0.20.0", "System.Runtime.Extensions": "4.0.10.0", - "System.Runtime.InteropServices": "4.0.10.0", + "System.Runtime.InteropServices": "4.0.20.0", "System.Threading.Tasks": "4.0.0.0" } } diff --git a/src/Microsoft.AspNet.Mvc.Rendering/project.json b/src/Microsoft.AspNet.Mvc.Rendering/project.json index 410d5cc4e4..9cbcf5ec53 100644 --- a/src/Microsoft.AspNet.Mvc.Rendering/project.json +++ b/src/Microsoft.AspNet.Mvc.Rendering/project.json @@ -24,7 +24,7 @@ "System.Resources.ResourceManager": "4.0.0.0", "System.Runtime": "4.0.20.0", "System.Runtime.Extensions": "4.0.10.0", - "System.Runtime.InteropServices": "4.0.10.0", + "System.Runtime.InteropServices": "4.0.20.0", "System.Threading.Tasks": "4.0.0.0" } }