Skip to content

Commit 28c4d08

Browse files
mcintyre321mcintyre321
committed
Added System.Runtime
1 parent b78b9bf commit 28c4d08

File tree

5 files changed

+70
-38
lines changed

5 files changed

+70
-38
lines changed

‎Mvc.JQuery.DataTables.AspNetCore/Extensions.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ public static void UseHtmlEncodeModelBinding(this MvcOptions opts)
3030
{
3131
var binderToFind = opts.ModelBinderProviders.FirstOrDefault(x => x.GetType() == typeof(DataTablesModelBinderProvider));
3232

33-
if (binderToFind == null) return;
33+
if (binderToFind != null) return;
3434

35-
var index = opts.ModelBinderProviders.IndexOf(binderToFind);
36-
opts.ModelBinderProviders.Insert(index, new DataTablesModelBinderProvider());
35+
opts.ModelBinderProviders.Insert(0, new DataTablesModelBinderProvider());
3736
}
3837
}
3938
}

‎Mvc.JQuery.DataTables.Example/App_Start/EmbeddedResourceVirtualPathProviderStart.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System.Reflection;
2+
using System.Linq;
3+
4+
[assembly: WebActivatorEx.PostApplicationStartMethod(typeof(Mvc.JQuery.DataTables.Example.EmbeddedResourceVirtualPathProviderStart), "Start")]
5+
6+
namespace Mvc.JQuery.DataTables.Example
7+
{
8+
public static class EmbeddedResourceVirtualPathProviderStart
9+
{
10+
public static void Start()
11+
{
12+
//By default, we scan all non system assemblies for embedded resources
13+
var assemblies = System.Web.Compilation.BuildManager.GetReferencedAssemblies()
14+
.Cast<Assembly>()
15+
.Where(a => a.GetName().Name.StartsWith("System") == false);
16+
System.Web.Hosting.HostingEnvironment.RegisterVirtualPathProvider(new EmbeddedResourceVirtualPathProvider.Vpp(assemblies.ToArray())
17+
{
18+
//you can do a specific assembly registration too. If you provide the assemly source path, it can read
19+
//from the source file so you can change the content while the app is running without needing to rebuild
20+
//{typeof(SomeAssembly.SomeClass).Assembly, @"..\SomeAssembly"}
21+
});
22+
}
23+
}
24+
}

‎Mvc.JQuery.DataTables.Example/packages.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="EmbeddedResourceVirtualPathProvider" version="1.3.48" targetFramework="net451" />
34
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net451" />
45
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net451" />
56
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net451" />
67
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.3" targetFramework="net451" />
78
<package id="Microsoft.Net.Compilers" version="1.3.2" targetFramework="net451" developmentDependency="true" />
89
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net451" />
910
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
11+
<package id="System.Runtime" version="4.3.0" targetFramework="net451" />
12+
<package id="WebActivatorEx" version="2.0.3" targetFramework="net451" />
1013
</packages>

‎Mvc.JQuery.Datatables.Example/Mvc.JQuery.Datatables.Example.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
<WarningLevel>4</WarningLevel>
4444
</PropertyGroup>
4545
<ItemGroup>
46+
<Reference Include="EmbeddedResourceVirtualPathProvider, Version=1.3.48.0, Culture=neutral, processorArchitecture=MSIL">
47+
<HintPath>..\packages\EmbeddedResourceVirtualPathProvider.1.3.48\lib\net40\EmbeddedResourceVirtualPathProvider.dll</HintPath>
48+
</Reference>
4649
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4750
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
4851
</Reference>
@@ -53,6 +56,7 @@
5356
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5457
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
5558
</Reference>
59+
<Reference Include="System.ComponentModel.Composition" />
5660
<Reference Include="System.Web.DynamicData" />
5761
<Reference Include="System.Web.Entity" />
5862
<Reference Include="System.Web.ApplicationServices" />
@@ -87,6 +91,9 @@
8791
<Reference Include="System.Configuration" />
8892
<Reference Include="System.Web.Services" />
8993
<Reference Include="System.EnterpriseServices" />
94+
<Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
95+
<HintPath>..\packages\WebActivatorEx.2.0.3\lib\net40\WebActivatorEx.dll</HintPath>
96+
</Reference>
9097
</ItemGroup>
9198
<ItemGroup>
9299
<Content Include="packages.config" />
@@ -589,6 +596,7 @@
589596
<DesignTime>True</DesignTime>
590597
<DependentUpon>UserViewResource.resx</DependentUpon>
591598
</Compile>
599+
<Compile Include="App_Start\EmbeddedResourceVirtualPathProviderStart.cs" />
592600
<Compile Include="Controllers\DefaultToStartOf2014Attribute.cs" />
593601
<Compile Include="Controllers\FacetController.cs" />
594602
<Compile Include="Controllers\HomeController.cs" />

‎Mvc.JQuery.Datatables.Example/Web.config‎

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
For more information on how to configure your ASP.NET application, please visit
44
http://go.microsoft.com/fwlink/?LinkId=152368
55
-->
66
<configuration>
77
<configSections>
88
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
9-
<section name="entityFramework"
10-
type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
11-
requirePermission="false"/>
9+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
1210
</configSections>
1311
<appSettings>
14-
<add key="ClientValidationEnabled" value="true"/>
15-
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
12+
<add key="ClientValidationEnabled" value="true" />
13+
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
1614
</appSettings>
1715
<!--
1816
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
@@ -23,62 +21,62 @@
2321
</system.Web>
2422
-->
2523
<system.web>
26-
<globalization culture="auto" uiCulture="auto" enableClientBasedCulture="true"/>
24+
<globalization culture="auto" uiCulture="auto" enableClientBasedCulture="true" />
2725
<compilation debug="true" targetFramework="4.5.1">
2826
<assemblies>
29-
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
30-
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
31-
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
32-
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
33-
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
27+
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
28+
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
29+
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
30+
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
31+
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
3432
</assemblies>
3533
</compilation>
3634
<authentication mode="Forms">
37-
<forms loginUrl="~/Account/LogOn" timeout="2880"/>
35+
<forms loginUrl="~/Account/LogOn" timeout="2880" />
3836
</authentication>
3937
<pages controlRenderingCompatibilityVersion="4.0">
4038
<namespaces>
41-
<add namespace="System.Web.Helpers"/>
42-
<add namespace="System.Web.Mvc"/>
43-
<add namespace="System.Web.Mvc.Ajax"/>
44-
<add namespace="System.Web.Mvc.Html"/>
45-
<add namespace="System.Web.Routing"/>
46-
<add namespace="System.Web.WebPages"/>
39+
<add namespace="System.Web.Helpers" />
40+
<add namespace="System.Web.Mvc" />
41+
<add namespace="System.Web.Mvc.Ajax" />
42+
<add namespace="System.Web.Mvc.Html" />
43+
<add namespace="System.Web.Routing" />
44+
<add namespace="System.Web.WebPages" />
4745
</namespaces>
4846
</pages>
49-
<customErrors mode="Off"/>
47+
<customErrors mode="Off" />
5048
</system.web>
5149
<system.webServer>
52-
<validation validateIntegratedModeConfiguration="false"/>
53-
<modules runAllManagedModulesForAllRequests="true"/>
50+
<validation validateIntegratedModeConfiguration="false" />
51+
<modules runAllManagedModulesForAllRequests="true" />
5452
<handlers>
55-
<add verb="GET" path="*.swf" name="Static for swf" type="System.Web.StaticFileHandler"/>
56-
<add verb="GET" path="*.js" name="Static for js" type="System.Web.StaticFileHandler"/>
57-
<add verb="GET" path="*.css" name="Static for css" type="System.Web.StaticFileHandler"/>
58-
<add verb="GET" path="*.png" name="Static for png" type="System.Web.StaticFileHandler"/>
59-
<add verb="GET" path="*.jpg" name="Static for jpg" type="System.Web.StaticFileHandler"/>
53+
<add verb="GET" path="*.swf" name="Static for swf" type="System.Web.StaticFileHandler" />
54+
<add verb="GET" path="*.js" name="Static for js" type="System.Web.StaticFileHandler" />
55+
<add verb="GET" path="*.css" name="Static for css" type="System.Web.StaticFileHandler" />
56+
<add verb="GET" path="*.png" name="Static for png" type="System.Web.StaticFileHandler" />
57+
<add verb="GET" path="*.jpg" name="Static for jpg" type="System.Web.StaticFileHandler" />
6058
</handlers>
6159
</system.webServer>
6260
<runtime>
6361
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
6462
<dependentAssembly>
65-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
66-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.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" />
6765
</dependentAssembly>
6866
<dependentAssembly>
69-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
70-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
67+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
68+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
7169
</dependentAssembly>
7270
<dependentAssembly>
73-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
74-
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
71+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
72+
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
7573
</dependentAssembly>
7674
</assemblyBinding>
7775
</runtime>
7876
<entityFramework>
79-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
77+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
8078
<providers>
81-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
79+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
8280
</providers>
8381
</entityFramework>
8482
</configuration>

0 commit comments

Comments
 (0)