diff --git a/src/Umbraco.Core/DictionaryExtensions.cs b/src/Umbraco.Core/DictionaryExtensions.cs
index ddfe963f48..c488650496 100644
--- a/src/Umbraco.Core/DictionaryExtensions.cs
+++ b/src/Umbraco.Core/DictionaryExtensions.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using System.Text;
-using System.Web.Mvc;
using System.Web;
namespace Umbraco.Core
@@ -135,20 +134,6 @@ namespace Umbraco.Core
return n;
}
- ///
- /// Converts a dictionary to a FormCollection
- ///
- ///
- ///
- public static FormCollection ToFormCollection(this IDictionary d)
- {
- var n = new FormCollection();
- foreach (var i in d)
- {
- n.Add(i.Key, Convert.ToString(i.Value));
- }
- return n;
- }
///
/// Merges all key/values from the sources dictionaries into the destination dictionary
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index e59e530f29..19cba49d14 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -78,10 +78,6 @@
False
..\packages\Microsoft.Owin.Security.OAuth.3.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll
-
- True
- ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
-
False
..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll
@@ -128,33 +124,9 @@
-
- True
- ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll
-
-
- True
- ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll
-
-
- True
- ..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll
-
False
-
- True
- ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll
-
-
- True
- ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll
-
-
- True
- ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll
-
@@ -1000,8 +972,6 @@
-
-
@@ -1319,7 +1289,6 @@
-
diff --git a/src/Umbraco.Core/UmbracoApplicationBase.cs b/src/Umbraco.Core/UmbracoApplicationBase.cs
index bed1149234..a53dd09ca5 100644
--- a/src/Umbraco.Core/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Core/UmbracoApplicationBase.cs
@@ -2,9 +2,6 @@
using System.Linq;
using System.Web;
using System.Web.Hosting;
-using System.Web.Mvc;
-using StackExchange.Profiling;
-using Umbraco.Core.Configuration;
using Umbraco.Core.Logging;
using Umbraco.Core.ObjectResolution;
@@ -34,8 +31,6 @@ namespace Umbraco.Core
///
internal void StartApplication(object sender, EventArgs e)
{
- //don't output the MVC version header (security)
- MvcHandler.DisableMvcResponseHeader = true;
//boot up the application
GetBootManager()
diff --git a/src/Umbraco.Core/UriExtensions.cs b/src/Umbraco.Core/UriExtensions.cs
index 53441d7ea1..05c5da7450 100644
--- a/src/Umbraco.Core/UriExtensions.cs
+++ b/src/Umbraco.Core/UriExtensions.cs
@@ -1,9 +1,6 @@
using System;
using System.IO;
using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
using Umbraco.Core.Configuration;
using Umbraco.Core.IO;
diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config
index 9e91a9bd71..1161f36e76 100644
--- a/src/Umbraco.Core/packages.config
+++ b/src/Umbraco.Core/packages.config
@@ -5,10 +5,8 @@
-
-
+
-
@@ -16,7 +14,6 @@
-
diff --git a/src/Umbraco.Core/Profiling/ProfilingView.cs b/src/Umbraco.Web/Mvc/ProfilingView.cs
similarity index 92%
rename from src/Umbraco.Core/Profiling/ProfilingView.cs
rename to src/Umbraco.Web/Mvc/ProfilingView.cs
index 354132df0f..59d85ba62c 100644
--- a/src/Umbraco.Core/Profiling/ProfilingView.cs
+++ b/src/Umbraco.Web/Mvc/ProfilingView.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
using System.Web.Mvc;
namespace Umbraco.Core.Profiling
@@ -25,4 +25,4 @@ namespace Umbraco.Core.Profiling
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Profiling/ProfilingViewEngine.cs b/src/Umbraco.Web/Mvc/ProfilingViewEngine.cs
similarity index 95%
rename from src/Umbraco.Core/Profiling/ProfilingViewEngine.cs
rename to src/Umbraco.Web/Mvc/ProfilingViewEngine.cs
index 70bb014bb3..7c5b7a2ce3 100644
--- a/src/Umbraco.Core/Profiling/ProfilingViewEngine.cs
+++ b/src/Umbraco.Web/Mvc/ProfilingViewEngine.cs
@@ -1,4 +1,4 @@
-using System.Web.Mvc;
+using System.Web.Mvc;
namespace Umbraco.Core.Profiling
{
@@ -45,4 +45,4 @@ namespace Umbraco.Core.Profiling
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Mvc/QueryStringFilterAttribute.cs b/src/Umbraco.Web/Mvc/QueryStringFilterAttribute.cs
index 5e9399cf0d..db5ea4869d 100644
--- a/src/Umbraco.Web/Mvc/QueryStringFilterAttribute.cs
+++ b/src/Umbraco.Web/Mvc/QueryStringFilterAttribute.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;
using Umbraco.Core;
@@ -30,12 +31,28 @@ namespace Umbraco.Web.Mvc
{
var nonNullKeys = filterContext.HttpContext.Request.QueryString.AllKeys.Where(x => !string.IsNullOrEmpty(x));
var vals = nonNullKeys.ToDictionary(q => q, q => (object)filterContext.HttpContext.Request.QueryString[q]);
- var qs = vals.ToFormCollection();
+ var qs = ToFormCollection(vals);
filterContext.ActionParameters[ParameterName] = qs;
base.OnActionExecuting(filterContext);
}
+
+ ///
+ /// Converts a dictionary to a FormCollection
+ ///
+ ///
+ ///
+ public static FormCollection ToFormCollection(IDictionary d)
+ {
+ var n = new FormCollection();
+ foreach (var i in d)
+ {
+ n.Add(i.Key, Convert.ToString(i.Value));
+ }
+ return n;
+ }
+
}
}
diff --git a/src/Umbraco.Core/UrlHelperExtensions.cs b/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
similarity index 96%
rename from src/Umbraco.Core/UrlHelperExtensions.cs
rename to src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
index 4320bab5cc..543844ee08 100644
--- a/src/Umbraco.Core/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 793d0f7861..193660000c 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -322,6 +322,9 @@
+
+
+