Skip to content

Commit 0651fb7

Browse files
committed
chore: update biding to dataTable example to latest Kendo version
1 parent 9fa429a commit 0651fb7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+41294
-23507
lines changed

grid/binding-to-datatable/KendoUIMVC5/KendoUIMVC5.csproj

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<IISExpressAnonymousAuthentication />
2121
<IISExpressWindowsAuthentication />
2222
<IISExpressUseClassicPipelineMode />
23+
<UseGlobalApplicationHostFile />
2324
</PropertyGroup>
2425
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2526
<DebugSymbols>true</DebugSymbols>
@@ -89,31 +90,31 @@
8990
<Reference Include="System.Core" />
9091
<Reference Include="System.Data.DataSetExtensions" />
9192
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92-
<SpecificVersion>False</SpecificVersion>
93-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.Helpers.dll</HintPath>
93+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
94+
<Private>True</Private>
9495
</Reference>
95-
<Reference Include="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96-
<SpecificVersion>False</SpecificVersion>
97-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.1.2\lib\net45\System.Web.Mvc.dll</HintPath>
96+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
97+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
98+
<Private>True</Private>
9899
</Reference>
99100
<Reference Include="System.Web.Optimization">
100101
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
101102
</Reference>
102103
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103-
<SpecificVersion>False</SpecificVersion>
104-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.1.2\lib\net45\System.Web.Razor.dll</HintPath>
104+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
105+
<Private>True</Private>
105106
</Reference>
106107
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107-
<SpecificVersion>False</SpecificVersion>
108-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.WebPages.dll</HintPath>
108+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
109+
<Private>True</Private>
109110
</Reference>
110111
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
111-
<SpecificVersion>False</SpecificVersion>
112-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
112+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
113+
<Private>True</Private>
113114
</Reference>
114115
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115-
<SpecificVersion>False</SpecificVersion>
116-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
116+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
117+
<Private>True</Private>
117118
</Reference>
118119
<Reference Include="System.Xml.Linq" />
119120
<Reference Include="System.Web" />
@@ -145,6 +146,7 @@
145146
<Content Include="App_Data\Sample_log.ldf">
146147
<DependentUpon>Sample.mdf</DependentUpon>
147148
</Content>
149+
<Content Include="bin\Kendo.Mvc.dll" />
148150
<Content Include="Images\accent.png" />
149151
<Content Include="Images\bullet.png" />
150152
<Content Include="Images\heroAccent.png" />
@@ -184,6 +186,26 @@
184186
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
185187
</ItemGroup>
186188
<ItemGroup>
189+
<Folder Include="bin\bg-BG\" />
190+
<Folder Include="bin\cs-CZ\" />
191+
<Folder Include="bin\da-DK\" />
192+
<Folder Include="bin\de-DE\" />
193+
<Folder Include="bin\es-ES\" />
194+
<Folder Include="bin\fr-CA\" />
195+
<Folder Include="bin\fr-FR\" />
196+
<Folder Include="bin\he-IL\" />
197+
<Folder Include="bin\it-IT\" />
198+
<Folder Include="bin\nl-NL\" />
199+
<Folder Include="bin\pl-PL\" />
200+
<Folder Include="bin\pt-BR\" />
201+
<Folder Include="bin\pt-PT\" />
202+
<Folder Include="bin\ro-RO\" />
203+
<Folder Include="bin\ru-RU\" />
204+
<Folder Include="bin\sk-SK\" />
205+
<Folder Include="bin\sv-SE\" />
206+
<Folder Include="bin\tr-TR\" />
207+
<Folder Include="bin\uk-UA\" />
208+
<Folder Include="bin\zh-CN\" />
187209
<Folder Include="Models\" />
188210
</ItemGroup>
189211
<PropertyGroup>

grid/binding-to-datatable/KendoUIMVC5/Views/Home/Index.cshtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
.Editable(ed=>ed.Mode(GridEditMode.PopUp))
2525
.Filterable()
2626
.Groupable()
27+
.Scrollable()
2728
.DataSource(dataSource => dataSource
2829
.Ajax()
2930
.Model(model =>

grid/binding-to-datatable/KendoUIMVC5/Views/Shared/_Layout.cshtml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77

88
<title>@ViewBag.Title - My Telerik MVC Application</title>
99
<link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
10-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
11-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.mobile.all.min.css" rel="stylesheet" type="text/css" />
12-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.dataviz.min.css" rel="stylesheet" type="text/css" />
13-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.default.min.css" rel="stylesheet" type="text/css" />
14-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.dataviz.default.min.css" rel="stylesheet" type="text/css" />
15-
<script src="http://cdn.kendostatic.com/2014.2.1008/js/jquery.min.js"></script>
16-
<script src="http://cdn.kendostatic.com/2014.2.1008/js/kendo.all.min.js"></script>
17-
<script src="http://cdn.kendostatic.com/2014.2.1008/js/kendo.aspnetmvc.min.js"></script>
10+
11+
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/2017.3.1026/styles/kendo.common.min.css">
12+
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/2017.3.1026/styles/kendo.default.min.css">
13+
14+
<script src="https://code.jquery.com/jquery-1.12.3.min.js"></script>
15+
<script src="https://kendo.cdn.telerik.com/2017.3.1026/js/kendo.all.min.js"></script>
16+
<script src="https://kendo.cdn.telerik.com/2017.3.1026/js/kendo.aspnetmvc.min.js"></script>
17+
1818
<script src="@Url.Content("~/Scripts/kendo.modernizr.custom.js")"></script>
1919

20-
<script src="http://cdn.kendostatic.com/2014.2.1008/js/cultures/kendo.culture.@(culture).min.js"></script>
20+
<script src="https://kendo.cdn.telerik.com/2017.3.1026/js/cultures/kendo.culture.@(culture).min.js"></script>
2121
<script>
2222
kendo.culture("@culture");
2323
</script>

grid/binding-to-datatable/KendoUIMVC5/Web.config

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@
3030
</system.web>
3131
<runtime>
3232
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
33+
<dependentAssembly>
34+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
36+
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="EntityFramework" publicKeyToken="b77a5c561934e089" culture="neutral" />
39+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
40+
</dependentAssembly>
3341
<dependentAssembly>
3442
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
3543
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
@@ -40,23 +48,15 @@
4048
</dependentAssembly>
4149
<dependentAssembly>
4250
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
43-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
44-
</dependentAssembly>
45-
<dependentAssembly>
46-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
47-
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
48-
</dependentAssembly>
49-
<dependentAssembly>
50-
<assemblyIdentity name="EntityFramework" publicKeyToken="b77a5c561934e089" culture="neutral" />
51-
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
51+
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
5252
</dependentAssembly>
5353
</assemblyBinding>
5454
</runtime>
5555
<entityFramework>
5656
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
5757
</entityFramework>
5858
<connectionStrings>
59-
<add name="NorthwindEntities" connectionString="data source=(LocalDB)\v11.0;attachdbfilename=|DataDirectory|\Sample.mdf;integrated security=True;" providerName="System.Data.EntityClient" />
60-
<add name="SampleEntities" connectionString="metadata=res://*/Models.Northwind.csdl|res://*/Models.Northwind.ssdl|res://*/Models.Northwind.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=(LocalDB)\v11.0;attachdbfilename=|DataDirectory|\Sample.mdf;integrated security=True;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
59+
<add name="NorthwindEntities" connectionString="data source=(LocalDB)\mssqllocaldb;attachdbfilename=|DataDirectory|\Sample.mdf;integrated security=True;" providerName="System.Data.EntityClient" />
60+
<add name="SampleEntities" connectionString="metadata=res://*/Models.Northwind.csdl|res://*/Models.Northwind.ssdl|res://*/Models.Northwind.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=(LocalDB)\mssqllocaldb;attachdbfilename=|DataDirectory|\Sample.mdf;integrated security=True;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
6161
</connectionStrings>
6262
</configuration>

grid/binding-to-datatable/KendoUIMVC5/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net45" />
66
<package id="EntityFramework" version="5.0.0" targetFramework="net45" />
77
<package id="jQuery" version="1.10.2" targetFramework="net45" />
8-
<package id="Microsoft.AspNet.Mvc" version="5.1.2" targetFramework="net45" />
9-
<package id="Microsoft.AspNet.Razor" version="3.1.2" targetFramework="net45" />
8+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
9+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
1010
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
11-
<package id="Microsoft.AspNet.WebPages" version="3.1.2" targetFramework="net45" />
11+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
1212
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1313
<package id="Modernizr" version="2.6.2" targetFramework="net45" />
1414
<package id="Newtonsoft.Json" version="5.0.6" targetFramework="net45" />
-1.52 MB
Binary file not shown.
-22.5 KB
Binary file not shown.
-20 KB
Binary file not shown.
-20 KB
Binary file not shown.
-20.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)