Skip to content

Commit 4536aa1

Browse files
mcintyre321mcintyre321
committed
Updated to MVC5
1 parent 7539c3a commit 4536aa1

File tree

12 files changed

+228
-41
lines changed

12 files changed

+228
-41
lines changed

‎Mvc.JQuery.Datatables.Example/App_GlobalResources/UserViewResource.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
</ProductVersion>
99
<SchemaVersion>2.0</SchemaVersion>
1010
<ProjectGuid>{476D3266-8699-4E89-A528-646C1235EEB1}</ProjectGuid>
11-
<ProjectTypeGuids>{E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
11+
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
1212
<OutputType>Library</OutputType>
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>Mvc.JQuery.Datatables.Example</RootNamespace>
1515
<AssemblyName>Mvc.JQuery.Datatables.Example</AssemblyName>
16-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1717
<MvcBuildViews>false</MvcBuildViews>
1818
<UseIISExpress>false</UseIISExpress>
1919
<FileUpgradeFlags>
@@ -28,6 +28,7 @@
2828
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
2929
<RestorePackages>true</RestorePackages>
3030
<MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
31+
<TargetFrameworkProfile />
3132
</PropertyGroup>
3233
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3334
<DebugSymbols>true</DebugSymbols>
@@ -37,6 +38,7 @@
3738
<DefineConstants>DEBUG;TRACE</DefineConstants>
3839
<ErrorReport>prompt</ErrorReport>
3940
<WarningLevel>4</WarningLevel>
41+
<Prefer32Bit>false</Prefer32Bit>
4042
</PropertyGroup>
4143
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4244
<DebugType>pdbonly</DebugType>
@@ -45,19 +47,37 @@
4547
<DefineConstants>TRACE</DefineConstants>
4648
<ErrorReport>prompt</ErrorReport>
4749
<WarningLevel>4</WarningLevel>
50+
<Prefer32Bit>false</Prefer32Bit>
4851
</PropertyGroup>
4952
<ItemGroup>
50-
<Reference Include="EmbeddedResourceVirtualPathProvider">
51-
<HintPath>..\packages\EmbeddedResourceVirtualPathProvider.1.2.5\lib\net40\EmbeddedResourceVirtualPathProvider.dll</HintPath>
53+
<Reference Include="EmbeddedResourceVirtualPathProvider, Version=1.0.5165.34913, Culture=neutral, processorArchitecture=MSIL">
54+
<SpecificVersion>False</SpecificVersion>
55+
<HintPath>..\packages\EmbeddedResourceVirtualPathProvider.1.2.22\lib\net40\EmbeddedResourceVirtualPathProvider.dll</HintPath>
56+
</Reference>
57+
<Reference Include="EntityFramework">
58+
<HintPath>..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll</HintPath>
59+
</Reference>
60+
<Reference Include="EntityFramework.SqlServer">
61+
<HintPath>..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
5262
</Reference>
5363
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5464
<Private>True</Private>
5565
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
5666
</Reference>
57-
<Reference Include="System.Data.Entity" />
58-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
59-
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
60-
<Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
67+
<Reference Include="System.Data.DataSetExtensions" />
68+
<Reference Include="System.Web.Extensions" />
69+
<Reference Include="System.Web.Helpers">
70+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.Helpers.dll</HintPath>
71+
<Private>True</Private>
72+
</Reference>
73+
<Reference Include="System.Web.Mvc">
74+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.0\lib\net45\System.Web.Mvc.dll</HintPath>
75+
<Private>True</Private>
76+
</Reference>
77+
<Reference Include="System.Web.Razor">
78+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.0\lib\net45\System.Web.Razor.dll</HintPath>
79+
<Private>True</Private>
80+
</Reference>
6181
<Reference Include="Microsoft.CSharp" />
6282
<Reference Include="System" />
6383
<Reference Include="System.Data" />
@@ -66,17 +86,26 @@
6686
<Reference Include="System.Web.Entity" />
6787
<Reference Include="System.Web.ApplicationServices" />
6888
<Reference Include="System.ComponentModel.DataAnnotations" />
69-
<Reference Include="System.Core" />
70-
<Reference Include="System.Data.DataSetExtensions" />
71-
<Reference Include="System.Xml.Linq" />
7289
<Reference Include="System.Web" />
73-
<Reference Include="System.Web.Extensions" />
7490
<Reference Include="System.Web.Abstractions" />
7591
<Reference Include="System.Web.Routing" />
92+
<Reference Include="System.Web.WebPages">
93+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.dll</HintPath>
94+
<Private>True</Private>
95+
</Reference>
96+
<Reference Include="System.Web.WebPages.Deployment">
97+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
98+
<Private>True</Private>
99+
</Reference>
100+
<Reference Include="System.Web.WebPages.Razor">
101+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
102+
<Private>True</Private>
103+
</Reference>
76104
<Reference Include="System.Xml" />
77105
<Reference Include="System.Configuration" />
78106
<Reference Include="System.Web.Services" />
79107
<Reference Include="System.EnterpriseServices" />
108+
<Reference Include="System.Xml.Linq" />
80109
</ItemGroup>
81110
<ItemGroup>
82111
<Content Include="App_Code\RegisterVirtualPathProvider.cs" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<configuration>
44
<configSections>
55
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
6-
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
7-
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
6+
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
7+
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
88
</sectionGroup>
99
</configSections>
1010

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

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,37 @@
44
http://go.microsoft.com/fwlink/?LinkId=152368
55
-->
66
<configuration>
7+
<configSections>
8+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
9+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
10+
</configSections>
711
<appSettings>
8-
<add key="webpages:Version" value="1.0.0.0" />
912
<add key="ClientValidationEnabled" value="true" />
1013
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
1114
</appSettings>
15+
<!--
16+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
17+
18+
The following attributes can be set on the <httpRuntime> tag.
19+
<system.Web>
20+
<httpRuntime targetFramework="4.5" />
21+
</system.Web>
22+
-->
1223
<system.web>
1324
<globalization culture="auto" uiCulture="auto" enableClientBasedCulture="true" />
14-
<compilation debug="true" targetFramework="4.0">
25+
<compilation debug="true" targetFramework="4.5">
1526
<assemblies>
1627
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1728
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1829
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1930
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
20-
<add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
31+
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
2132
</assemblies>
2233
</compilation>
2334
<authentication mode="Forms">
2435
<forms loginUrl="~/Account/LogOn" timeout="2880" />
2536
</authentication>
26-
<pages>
37+
<pages controlRenderingCompatibilityVersion="4.0">
2738
<namespaces>
2839
<add namespace="System.Web.Helpers" />
2940
<add namespace="System.Web.Mvc" />
@@ -33,26 +44,39 @@
3344
<add namespace="System.Web.WebPages" />
3445
</namespaces>
3546
</pages>
36-
<customErrors mode="Off"></customErrors>
47+
<customErrors mode="Off" />
3748
</system.web>
3849
<system.webServer>
3950
<validation validateIntegratedModeConfiguration="false" />
4051
<modules runAllManagedModulesForAllRequests="true" />
4152
<handlers>
53+
<add verb="GET" path="*.swf" name="Static for swf" type="System.Web.StaticFileHandler" />
4254
<add verb="GET" path="*.js" name="Static for js" type="System.Web.StaticFileHandler" />
4355
<add verb="GET" path="*.css" name="Static for css" type="System.Web.StaticFileHandler" />
4456
<add verb="GET" path="*.png" name="Static for png" type="System.Web.StaticFileHandler" />
4557
<add verb="GET" path="*.jpg" name="Static for jpg" type="System.Web.StaticFileHandler" />
46-
<add verb="GET" path="*.swf" name="Static for swf" type="System.Web.StaticFileHandler" />
47-
4858
</handlers>
4959
</system.webServer>
5060
<runtime>
5161
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
62+
<dependentAssembly>
63+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
64+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
65+
</dependentAssembly>
66+
<dependentAssembly>
67+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
68+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
69+
</dependentAssembly>
5270
<dependentAssembly>
5371
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
54-
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0" />
72+
<bindingRedirect oldVersion="1.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
5573
</dependentAssembly>
5674
</assemblyBinding>
5775
</runtime>
76+
<entityFramework>
77+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
78+
<providers>
79+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
80+
</providers>
81+
</entityFramework>
5882
</configuration>

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AristojQueryUITheme" version="1.2" />
4-
<package id="EmbeddedResourceVirtualPathProvider" version="1.2.5" />
5-
<package id="EntityFramework" version="4.1.10331.0" />
4+
<package id="EmbeddedResourceVirtualPathProvider" version="1.2.22" targetFramework="net45" />
5+
<package id="EntityFramework" version="6.1.1" targetFramework="net45" />
66
<package id="jQuery" version="1.4.4" />
77
<package id="jQuery" version="1.6.4" targetFramework="net40" />
88
<package id="jQuery.UI.Combined" version="1.8.11" />
@@ -12,7 +12,10 @@
1212
<package id="jQuery.vsdoc" version="1.6" targetFramework="net40" />
1313
<package id="jquery-globalize" version="0.1.1" targetFramework="net40" />
1414
<package id="MahApps.Twitter.Bootstrap" version="0.1.2" />
15-
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
15+
<package id="Microsoft.AspNet.Mvc" version="5.2.0" targetFramework="net45" />
16+
<package id="Microsoft.AspNet.Razor" version="3.2.0" targetFramework="net45" />
17+
<package id="Microsoft.AspNet.WebPages" version="3.2.0" targetFramework="net45" />
18+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" requireReinstallation="True" />
1619
<package id="Modernizr" version="1.7" />
1720
<package id="Modernizr" version="2.0.6" />
1821
<package id="Twitter.Bootstrap" version="1.4.0" />

‎Mvc.JQuery.Datatables.Templates/Mvc.JQuery.Datatables.Templates.csproj‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Mvc.JQuery.Datatables.Templates</RootNamespace>
1212
<AssemblyName>Mvc.JQuery.Datatables.Templates</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15+
<TargetFrameworkProfile />
16+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
17+
<RestorePackages>true</RestorePackages>
1518
</PropertyGroup>
1619
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1720
<DebugSymbols>true</DebugSymbols>
@@ -21,6 +24,7 @@
2124
<DefineConstants>DEBUG;TRACE</DefineConstants>
2225
<ErrorReport>prompt</ErrorReport>
2326
<WarningLevel>4</WarningLevel>
27+
<Prefer32Bit>false</Prefer32Bit>
2428
</PropertyGroup>
2529
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2630
<DebugType>pdbonly</DebugType>
@@ -29,10 +33,39 @@
2933
<DefineConstants>TRACE</DefineConstants>
3034
<ErrorReport>prompt</ErrorReport>
3135
<WarningLevel>4</WarningLevel>
36+
<Prefer32Bit>false</Prefer32Bit>
3237
</PropertyGroup>
3338
<ItemGroup>
39+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40+
<Private>True</Private>
41+
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
42+
</Reference>
3443
<Reference Include="System" />
3544
<Reference Include="System.Core" />
45+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46+
<SpecificVersion>False</SpecificVersion>
47+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.Helpers.dll</HintPath>
48+
</Reference>
49+
<Reference Include="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50+
<SpecificVersion>False</SpecificVersion>
51+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.0\lib\net45\System.Web.Mvc.dll</HintPath>
52+
</Reference>
53+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54+
<SpecificVersion>False</SpecificVersion>
55+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.0\lib\net45\System.Web.Razor.dll</HintPath>
56+
</Reference>
57+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58+
<SpecificVersion>False</SpecificVersion>
59+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.dll</HintPath>
60+
</Reference>
61+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62+
<SpecificVersion>False</SpecificVersion>
63+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
64+
</Reference>
65+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66+
<SpecificVersion>False</SpecificVersion>
67+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
68+
</Reference>
3669
<Reference Include="System.Xml.Linq" />
3770
<Reference Include="System.Data.DataSetExtensions" />
3871
<Reference Include="Microsoft.CSharp" />
@@ -44,6 +77,7 @@
4477
<Compile Include="Properties\AssemblyInfo.cs" />
4578
</ItemGroup>
4679
<ItemGroup>
80+
<None Include="packages.config" />
4781
<None Include="Views\Web.config" />
4882
</ItemGroup>
4983
<ItemGroup>
@@ -57,6 +91,13 @@
5791
</ProjectReference>
5892
</ItemGroup>
5993
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
94+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
95+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
96+
<PropertyGroup>
97+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
98+
</PropertyGroup>
99+
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
100+
</Target>
60101
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
61102
Other similar extension points exist, see Microsoft.Common.targets.
62103
<Target Name="BeforeBuild">

‎Mvc.JQuery.Datatables.Templates/packages.config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.AspNet.Mvc" version="5.2.0" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.Razor" version="3.2.0" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.WebPages" version="3.2.0" targetFramework="net45" />
6+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
7+
</packages>

0 commit comments

Comments
 (0)