From 9da62aa9656ba71e71800cb1c1ccf756e9357986 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 6 Dec 2012 10:30:52 -0100 Subject: [PATCH 1/4] Correct wrongly committed urlrewriting/xsltextensions configs --- src/Umbraco.Web.UI/config/UrlRewriting.config | 7 ++----- src/Umbraco.Web.UI/config/xsltExtensions.config | 8 ++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Web.UI/config/UrlRewriting.config b/src/Umbraco.Web.UI/config/UrlRewriting.config index 82343ba4e7..05ffe1eeb6 100644 --- a/src/Umbraco.Web.UI/config/UrlRewriting.config +++ b/src/Umbraco.Web.UI/config/UrlRewriting.config @@ -6,7 +6,7 @@ look at http://www.urlrewriting.net/. Remember to read the manual! - http://www.urlrewriting.net/download/UrlRewritingNet20.English.pdf + http://our.umbraco.org/wiki/recommendations/recommended-reading-for-web-developers The sample below rewrites a url from "/product/someproductid.aspx" to @@ -28,8 +28,5 @@ Any bugs or problems with the rewriter, contact Anders/Duckie --> - - - - \ No newline at end of file + diff --git a/src/Umbraco.Web.UI/config/xsltExtensions.config b/src/Umbraco.Web.UI/config/xsltExtensions.config index 354f37fd64..58a11e1d5f 100644 --- a/src/Umbraco.Web.UI/config/xsltExtensions.config +++ b/src/Umbraco.Web.UI/config/xsltExtensions.config @@ -1,4 +1,4 @@ - + @@ -8,8 +8,4 @@ - - - - - \ No newline at end of file + From 323af078ca68ba999b55eba52f466dc1bcab7268 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 6 Dec 2012 10:31:54 -0100 Subject: [PATCH 2/4] Upgrade to MVC4 --- src/Umbraco.Core/Umbraco.Core.csproj | 29 ++++- src/Umbraco.Core/packages.config | 4 + src/Umbraco.Tests/Umbraco.Tests.csproj | 30 +++++- src/Umbraco.Tests/packages.config | 4 + src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 102 ++++++++++-------- src/Umbraco.Web.UI/Views/Web.config | 6 +- src/Umbraco.Web.UI/packages.config | 6 +- src/Umbraco.Web.UI/web.Template.config | 10 +- src/Umbraco.Web/Umbraco.Web.csproj | 30 +++--- src/Umbraco.Web/packages.config | 4 + src/umbraco.MacroEngines/packages.config | 5 +- .../umbraco.MacroEngines.csproj | 31 +++--- 12 files changed, 166 insertions(+), 95 deletions(-) diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index d4df8a8350..5b60e54f68 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -37,6 +37,10 @@ False ..\packages\log4net-mediumtrust.2.0.0\lib\log4net.dll + + True + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + ..\packages\ServiceStack.Text.3.9.21\lib\net35\ServiceStack.Text.dll @@ -54,7 +58,30 @@ - + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + + + True + ..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll + + + True + ..\packages\Microsoft.AspNet.Razor.2.0.20715.0\lib\net40\System.Web.Razor.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll + diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config index 56975fc96c..0d95c3d75b 100644 --- a/src/Umbraco.Core/packages.config +++ b/src/Umbraco.Core/packages.config @@ -1,5 +1,9 @@  + + + + \ No newline at end of file diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 0b86657215..7ae3071121 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -64,6 +64,10 @@ False ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll + + True + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + ..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll @@ -83,8 +87,30 @@ - - + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + + + True + ..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll + + + True + ..\packages\Microsoft.AspNet.Razor.2.0.20715.0\lib\net40\System.Web.Razor.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll + diff --git a/src/Umbraco.Tests/packages.config b/src/Umbraco.Tests/packages.config index f55b9c5fc4..af6c498773 100644 --- a/src/Umbraco.Tests/packages.config +++ b/src/Umbraco.Tests/packages.config @@ -3,6 +3,10 @@ + + + + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 1b159e1032..d7b4e90eb9 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -1,3 +1,4 @@ + @@ -7,10 +8,13 @@ {E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Debug AnyCPU - - + + + + Umbraco.Web.UI - + + JScript Grid IE50 @@ -18,13 +22,20 @@ Library Umbraco.Web.UI OnBuildSuccess - - - - - - - + + + + + + + + + + + + + + 4.0 v4.0 @@ -41,13 +52,16 @@ false 285212672 false - + + DEBUG;TRACE - + + true 4096 false - + + false false false @@ -62,13 +76,16 @@ false 285212672 false - + + TRACE - + + false 4096 false - + + true false false @@ -134,31 +151,32 @@ - + True - ..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll - + True - ..\packages\Microsoft.AspNet.Mvc.3.0.20105.1\lib\net40\System.Web.Mvc.dll + ..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll - + True - ..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll + ..\packages\Microsoft.AspNet.Razor.2.0.20715.0\lib\net40\System.Web.Razor.dll System.Web.Services - + True - ..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll - + True - ..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Deployment.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll - + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll System.XML @@ -2209,7 +2227,7 @@ - + @@ -2219,7 +2237,8 @@ - + + xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /D xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\" /Y /F /E /D @@ -2236,7 +2255,8 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\" http://localhost:61638/ False False - + + False @@ -2245,28 +2265,16 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\" - + + - + - - + - + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Views/Web.config b/src/Umbraco.Web.UI/Views/Web.config index 5b163e5df2..164240ef61 100644 --- a/src/Umbraco.Web.UI/Views/Web.config +++ b/src/Umbraco.Web.UI/Views/Web.config @@ -1,4 +1,4 @@ - + @@ -19,8 +19,8 @@ - - + + diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config index a88236cb32..2a066bbffc 100644 --- a/src/Umbraco.Web.UI/packages.config +++ b/src/Umbraco.Web.UI/packages.config @@ -1,9 +1,9 @@  - - - + + + diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config index b2a5ff660e..8f3cf391d7 100644 --- a/src/Umbraco.Web.UI/web.Template.config +++ b/src/Umbraco.Web.UI/web.Template.config @@ -19,9 +19,9 @@
- -
-
+ +
+
@@ -160,8 +160,8 @@ - - + + diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index b949df8da7..2ec3420958 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -113,12 +113,9 @@ ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll - - ..\..\lib\WebPages\Microsoft.Web.Helpers.dll - True - ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\Microsoft.Web.Infrastructure.dll + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll True @@ -158,33 +155,36 @@ - + True - ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\System.Web.Helpers.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll - - + True - ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\System.Web.Razor.dll + ..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll + + + True + ..\packages\Microsoft.AspNet.Razor.2.0.20715.0\lib\net40\System.Web.Razor.dll System.Web.Services - + True - ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\System.Web.WebPages.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll True ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\System.Web.WebPages.Administration.dll - + True - ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\System.Web.WebPages.Deployment.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll - + True - ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\System.Web.WebPages.Razor.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll System.XML diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config index cb33a1dd71..e8131d6de6 100644 --- a/src/Umbraco.Web/packages.config +++ b/src/Umbraco.Web/packages.config @@ -5,6 +5,10 @@ + + + + diff --git a/src/umbraco.MacroEngines/packages.config b/src/umbraco.MacroEngines/packages.config index 78da2b4533..af909515d2 100644 --- a/src/umbraco.MacroEngines/packages.config +++ b/src/umbraco.MacroEngines/packages.config @@ -1,9 +1,12 @@  - + + + + \ No newline at end of file diff --git a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj index ef96811cf2..f1932c9c8e 100644 --- a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj +++ b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj @@ -59,41 +59,36 @@ True - ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - True - ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\NuGet.Core.dll + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - + True - ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\System.Web.Helpers.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll - - + True - ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\System.Web.Razor.dll + ..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll - + True - ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\System.Web.WebPages.dll + ..\packages\Microsoft.AspNet.Razor.2.0.20715.0\lib\net40\System.Web.Razor.dll - + True - ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\System.Web.WebPages.Administration.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll - + True - ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\System.Web.WebPages.Deployment.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll - + True - ..\packages\CodeSharp.Package.AspNetWebPage.1.0\lib\net40\System.Web.WebPages.Razor.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll From cd2711957fae4cc37ccf5edf9dd2ab5d27545d61 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 6 Dec 2012 11:33:17 -0100 Subject: [PATCH 3/4] Additional update for MVC4 support, nuget dependency updated, errors due to web.config file in Views folder fixed --- build/NuSpecs/UmbracoCms.Core.nuspec | 2 +- src/Umbraco.Web.UI/Views/Web.config | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index d2d9799aa8..1b46661d82 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -15,7 +15,7 @@ en-US umbraco - + diff --git a/src/Umbraco.Web.UI/Views/Web.config b/src/Umbraco.Web.UI/Views/Web.config index 164240ef61..edac1a2296 100644 --- a/src/Umbraco.Web.UI/Views/Web.config +++ b/src/Umbraco.Web.UI/Views/Web.config @@ -1,15 +1,8 @@ - - -
-
- - - - + @@ -42,11 +35,11 @@ --> + pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" + pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" + userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"> - + From db2d73dc88250dcdb342c5092be82bbb8b447702 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 6 Dec 2012 14:27:41 -0100 Subject: [PATCH 4/4] Alter the web.config template for mvc4 support --- src/Umbraco.Web/Mvc/web.config.template | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/Umbraco.Web/Mvc/web.config.template b/src/Umbraco.Web/Mvc/web.config.template index 92e6cf94c1..ce3b317e80 100644 --- a/src/Umbraco.Web/Mvc/web.config.template +++ b/src/Umbraco.Web/Mvc/web.config.template @@ -1,15 +1,8 @@  - - -
-
- - - - + @@ -42,11 +35,11 @@ --> + pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" + pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" + userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"> - +