Merge

--HG--
branch : dev

src/Orchard.Azure/AzureFileSystem.cs

@@ -29,7 +29,7 @@ namespace Orchard.Azure {
             _storageAccount = storageAccount;
             ContainerName = containerName;
             _root = String.IsNullOrEmpty(root) ? "": root + "/";
-            _absoluteRoot = _storageAccount.BlobEndpoint.AbsoluteUri + "/" + containerName + "/" + root;
+            _absoluteRoot = Combine(Combine(_storageAccount.BlobEndpoint.AbsoluteUri, containerName), root);
 
             using ( new HttpContextWeaver() ) {
 

src/Orchard.Azure/Orchard.Azure.Web/Default.aspx

@@ -1,3 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="Orchard.Azure.Web._Default" %>
-
-<%-- Please do not delete this file. It is used to ensure that ASP.NET MVC is activated by IIS when a user makes a "/" request to the server. --%>

src/Orchard.Azure/Orchard.Azure.Web/Default.aspx.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.UI;
-
-namespace Orchard.Azure.Web {
-    public class _Default : Page { 
-        public void Page_Load(object sender, EventArgs e) {
-            // Change the current path so that the Routing handler can correctly interpret
-            // the request, then restore the original path so that the OutputCache module
-            // can correctly process the response (if caching is enabled).
-
-            var originalPath = Request.Path;
-            HttpContext.Current.RewritePath(Request.ApplicationPath, false);
-            IHttpHandler httpHandler = new MvcHttpHandler();
-            httpHandler.ProcessRequest(HttpContext.Current);
-            HttpContext.Current.RewritePath(originalPath, false);
-        }
-    }
-}

src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj

@@ -140,10 +140,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Default.aspx.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
@@ -151,7 +147,6 @@
     <Compile Include="WebRole.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Default.aspx" />
     <Content Include="Global.asax" />
   </ItemGroup>
   <ItemGroup>

src/Orchard.Azure/Orchard.Azure.Web/Web.config

@@ -53,7 +53,7 @@
             affects performance, set this value to true only 
             during development.
     -->
-    <compilation debug="true" targetFramework="4.0">
+    <compilation debug="true" targetFramework="4.0" batch="true" numRecompilesBeforeAppRestart="250">
       <buildProviders>
         <add extension=".csproj" type="Orchard.Environment.Extensions.Compilers.CSharpExtensionBuildProviderShim" />
       </buildProviders>
@@ -116,7 +116,6 @@
     <httpHandlers>
       <!-- see below -->
       <clear />
-      <add path="default.aspx" verb="*" type="System.Web.UI.PageHandlerFactory" validate="true" />
       <add path="*" verb="*" type="System.Web.HttpNotFoundHandler" />
 
     </httpHandlers>
@@ -133,7 +132,6 @@
       <!-- clear all handlers, prevents executing code file extensions, prevents returning any file contents -->
       <clear />
       <!-- Return 404 for all requests via managed handler. The url routing handler will substitute the mvc request handler when routes match. -->
-      <add name="Default" path="default.aspx" verb="*" type="System.Web.UI.PageHandlerFactory" preCondition="integratedMode" requireAccess="Script" />
       <add name="NotFound" path="*" verb="*" type="System.Web.HttpNotFoundHandler" preCondition="integratedMode" requireAccess="Script" />
     </handlers>
   </system.webServer>
@@ -142,7 +140,8 @@
       <probing privatePath="App_Data/Dependencies" />
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
+        <bindingRedirect oldVersion="1.0.0.0" newVersion="3.0.0.0"/>
+        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0"  />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>