Skip to content

Commit 537c027

Browse files
author
Simonas Mikulenas
committed
Merge branch 'dev'
2 parents 9ff1dd8 + fdae436 commit 537c027

File tree

15 files changed

+79
-75
lines changed

15 files changed

+79
-75
lines changed

‎BetterModules.Core.Web.Tests/BetterModules.Core.Web.Tests.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,27 +65,27 @@
6565
<Reference Include="System.Web" />
6666
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6767
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
68+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
6969
</Reference>
70-
<Reference Include="System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
72+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
7373
</Reference>
7474
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7575
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
76+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
7777
</Reference>
7878
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7979
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
80+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
8181
</Reference>
8282
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8383
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
84+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
8585
</Reference>
8686
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8787
<SpecificVersion>False</SpecificVersion>
88-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
88+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
8989
</Reference>
9090
<Reference Include="System.Xml.Linq" />
9191
<Reference Include="System.Data.DataSetExtensions" />

‎BetterModules.Core.Web.Tests/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
1313
<dependentAssembly>
1414
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
15+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
1616
</dependentAssembly>
1717
<dependentAssembly>
1818
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />

‎BetterModules.Core.Web.Tests/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<packages>
33
<package id="Autofac" version="3.5.2" targetFramework="net45" />
44
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net45" />
5-
<package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
6-
<package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
7-
<package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
6+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
7+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
88
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
99
<package id="Moq" version="4.0.10827" targetFramework="net45" />
1010
<package id="NHibernate" version="3.3.3.4001" targetFramework="net45" />

‎BetterModules.Core.Web/BetterModules.Core.Web.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,27 +58,27 @@
5858
<Reference Include="Microsoft.CSharp" />
5959
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6060
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
61+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
6262
</Reference>
63-
<Reference Include="System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
63+
<Reference Include="System.Web.Mvc">
64+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
65+
<Private>True</Private>
6666
</Reference>
6767
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6868
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
69+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
7070
</Reference>
7171
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7272
<SpecificVersion>False</SpecificVersion>
73-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
73+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
7474
</Reference>
7575
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7676
<SpecificVersion>False</SpecificVersion>
77-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
77+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
7878
</Reference>
7979
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8080
<SpecificVersion>False</SpecificVersion>
81-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
81+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
8282
</Reference>
8383
</ItemGroup>
8484
<ItemGroup>

‎BetterModules.Core.Web/Mvc/Extensions/ViewRenderingExtensions.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@ public static class ViewRenderingExtensions
1515
/// <returns>View, rendered to string</returns>
1616
public static string RenderViewToString(this CoreControllerBase controller, string viewName, object model, bool enableFormContext = false)
1717
{
18-
if (string.IsNullOrEmpty(viewName))
18+
if (string.IsNullOrEmpty(viewName) || viewName.ToLower() == controller.ControllerContext.RouteData.GetRequiredString("action").ToLower())
1919
{
20-
viewName = controller.ControllerContext.RouteData.GetRequiredString("action");
20+
var areaName = controller.ControllerContext.RouteData.GetRequiredString("area");
21+
var controllerName = controller.ControllerContext.RouteData.GetRequiredString("controller");
22+
var actionName = controller.ControllerContext.RouteData.GetRequiredString("action");
23+
24+
viewName = string.Format("~/Areas/{0}/Views/{1}/{2}.cshtml", areaName, controllerName, actionName);
2125
}
2226

2327
controller.ViewData.Model = model;

‎BetterModules.Core.Web/WebApplicationContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public static void LoadAssemblies()
208208
});
209209

210210
var engine = new CompositePrecompiledMvcEngine(precompiledAssemblies.ToArray());
211-
ViewEngines.Engines.Insert(0, engine);
211+
ViewEngines.Engines.Add(engine);
212212
VirtualPathFactoryManager.RegisterVirtualPathFactory(engine);
213213
}
214214
}

‎BetterModules.Core.Web/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />

‎BetterModules.Core.Web/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<packages>
33
<package id="Autofac" version="3.1.5" targetFramework="net451" />
44
<package id="Common.Logging" version="2.1.2" targetFramework="net451" />
5-
<package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
6-
<package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
7-
<package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
6+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
7+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
88
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
99
<package id="Mvc3Futures" version="3.0.20105.0" targetFramework="net40" />
1010
</packages>

‎BetterModules.Mvc5.Sandbox/BetterModules.Mvc5.Sandbox.csproj

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,30 @@
5454
<Reference Include="System.ComponentModel.DataAnnotations" />
5555
<Reference Include="System.Core" />
5656
<Reference Include="System.Data.DataSetExtensions" />
57+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58+
<SpecificVersion>False</SpecificVersion>
59+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
60+
</Reference>
61+
<Reference Include="System.Web.Mvc">
62+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
63+
<Private>True</Private>
64+
</Reference>
65+
<Reference Include="System.Web.Razor">
66+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
67+
<Private>True</Private>
68+
</Reference>
69+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<SpecificVersion>False</SpecificVersion>
71+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
72+
</Reference>
73+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74+
<SpecificVersion>False</SpecificVersion>
75+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
76+
</Reference>
77+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78+
<SpecificVersion>False</SpecificVersion>
79+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
80+
</Reference>
5781
<Reference Include="System.Xml.Linq" />
5882
<Reference Include="System.Web" />
5983
<Reference Include="System.Web.Extensions" />
@@ -71,33 +95,9 @@
7195
</Reference>
7296
<Reference Include="System.Net.Http.WebRequest">
7397
</Reference>
74-
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<Private>True</Private>
76-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
77-
</Reference>
78-
<Reference Include="System.Web.Mvc, Version=__MvcPagesVersion__, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<Private>True</Private>
80-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
81-
</Reference>
8298
<Reference Include="System.Web.Optimization">
8399
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
84100
</Reference>
85-
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
86-
<Private>True</Private>
87-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
88-
</Reference>
89-
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
90-
<Private>True</Private>
91-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
92-
</Reference>
93-
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
94-
<Private>True</Private>
95-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
96-
</Reference>
97-
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98-
<Private>True</Private>
99-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
100-
</Reference>
101101
<Reference Include="WebGrease">
102102
<Private>True</Private>
103103
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>

‎BetterModules.Mvc5.Sandbox/Web.config

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,24 @@
5252
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
5353
</dependentAssembly>
5454
<dependentAssembly>
55-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
56-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
55+
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
56+
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
5757
</dependentAssembly>
5858
<dependentAssembly>
59-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
60-
<bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
59+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
60+
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
6161
</dependentAssembly>
6262
<dependentAssembly>
63-
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
64-
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
63+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
64+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
6565
</dependentAssembly>
6666
<dependentAssembly>
6767
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
6868
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
6969
</dependentAssembly>
7070
<dependentAssembly>
71-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
72-
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
71+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
72+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
7373
</dependentAssembly>
7474
</assemblyBinding>
7575
</runtime>

0 commit comments

Comments
 (0)