lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-18 17:47:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Updating depencencies to MVC 2 RC2

Browse Source 
Should allow RC1 or RC2 versions on app start. RC2 is deployed in bin.
Had a report from @chrissutton the binaries are compatible for Orchard's purposes.

--HG--
branch : dev
This commit is contained in:
Louis DeJardin
2010-02-19 10:30:43 -08:00
parent ec4d049551
commit 76fb32350e
3 changed files with 1249 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/aspnetmvc/System.Web.Mvc.dll
View File

Binary file not shown.

1834
lib/aspnetmvc/System.Web.Mvc.xml
View File

File diff suppressed because it is too large Load Diff

20
src/Orchard.Web/Global.asax.cs
View File

@@ -27,7 +27,9 @@ namespace Orchard.Web {
protected void Application_Start() { protected void Application_Start() {
// This is temporary until MVC2 is officially released. // This is temporary until MVC2 is officially released.
// We want to avoid running against an outdated preview installed in the GAC // We want to avoid running against an outdated preview installed in the GAC
CheckMvcVersion(new Version("2.0.41211.0")/*MVC2 RC file version #*/); CheckMvcVersion(
new Version("2.0.50129.0")/*MVC2 RC2 file version #*/,
new Version("2.0.41211.0")/*MVC2 RC file version #*/);
RegisterRoutes(RouteTable.Routes); RegisterRoutes(RouteTable.Routes);
_host = OrchardStarter.CreateHost(MvcSingletons); _host = OrchardStarter.CreateHost(MvcSingletons);
@@ -41,16 +43,16 @@ namespace Orchard.Web {
_host.BeginRequest(); _host.BeginRequest();
} }
protected void Application_EndRequest() { protected void Application_EndRequest() {
_host.EndRequest(); _host.EndRequest();
} }
private void CheckMvcVersion(Version requiredVersion) { private void CheckMvcVersion(Version requiredVersion, Version requiredVersion2) {
Assembly loadedMvcAssembly = typeof(System.Web.Mvc.Controller).Assembly; Assembly loadedMvcAssembly = typeof(System.Web.Mvc.Controller).Assembly;
Version loadedMvcVersion = ReadAssemblyFileVersion(loadedMvcAssembly); Version loadedMvcVersion = ReadAssemblyFileVersion(loadedMvcAssembly);
if (loadedMvcVersion != requiredVersion) { if (loadedMvcVersion != requiredVersion && loadedMvcVersion != requiredVersion2) {
string message; string message;
if (loadedMvcAssembly.GlobalAssemblyCache) { if (loadedMvcAssembly.GlobalAssemblyCache) {
message = string.Format( message = string.Format(
@@ -59,8 +61,8 @@ namespace Orchard.Web {
"This implies that Orchard will not be able to run properly in this machine configuration.\r\n" + "This implies that Orchard will not be able to run properly in this machine configuration.\r\n" +
"Please un-install MVC from the GAC or install a more recent version.", "Please un-install MVC from the GAC or install a more recent version.",
loadedMvcAssembly.GetName().Name, loadedMvcAssembly.GetName().Name,
loadedMvcVersion, requiredVersion,
requiredVersion); loadedMvcVersion);
} }
else { else {
message = string.Format( message = string.Format(
@@ -68,11 +70,11 @@ namespace Orchard.Web {
"but the version deployed with the application is {2}.\r\n" + "but the version deployed with the application is {2}.\r\n" +
"This probably implies that Orchard is deployed with a newer version " + "This probably implies that Orchard is deployed with a newer version " +
"and the source code hasn't been updated accordingly.\r\n" + "and the source code hasn't been updated accordingly.\r\n" +
"Update the Orchard.Web application source code (look for \"CheckMvcVersion\") to " + "Update the Orchard.Web application source code (look for \"CheckMvcVersion\") to " +
"specify the correct file version number.\r\n", "specify the correct file version number.\r\n",
loadedMvcAssembly.GetName().Name, loadedMvcAssembly.GetName().Name,
loadedMvcVersion, requiredVersion,
requiredVersion); loadedMvcVersion);
} }
throw new HttpException(500, message); throw new HttpException(500, message);