Skip to content

Commit 304ba39

Browse files
committed
updated Kendo version in demo
1 parent 6012d41 commit 304ba39

26 files changed

+34
-56143
lines changed

grid/checkboxes-batch-editing/KendoUIMVC5/KendoUIMVC5.csproj

Lines changed: 15 additions & 25 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>
@@ -70,31 +71,31 @@
7071
<Reference Include="System.Core" />
7172
<Reference Include="System.Data.DataSetExtensions" />
7273
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
73-
<SpecificVersion>False</SpecificVersion>
74-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.Helpers.dll</HintPath>
74+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
75+
<Private>True</Private>
7576
</Reference>
76-
<Reference Include="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77-
<SpecificVersion>False</SpecificVersion>
78-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.1.2\lib\net45\System.Web.Mvc.dll</HintPath>
77+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
79+
<Private>True</Private>
7980
</Reference>
8081
<Reference Include="System.Web.Optimization">
8182
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
8283
</Reference>
8384
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84-
<SpecificVersion>False</SpecificVersion>
85-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.1.2\lib\net45\System.Web.Razor.dll</HintPath>
85+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
86+
<Private>True</Private>
8687
</Reference>
8788
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88-
<SpecificVersion>False</SpecificVersion>
89-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.WebPages.dll</HintPath>
89+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
90+
<Private>True</Private>
9091
</Reference>
9192
<Reference Include="System.Web.WebPages.Deployment, 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.WebPages.Deployment.dll</HintPath>
93+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
94+
<Private>True</Private>
9495
</Reference>
9596
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96-
<SpecificVersion>False</SpecificVersion>
97-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
97+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
98+
<Private>True</Private>
9899
</Reference>
99100
<Reference Include="System.Xml.Linq" />
100101
<Reference Include="System.Web" />
@@ -121,24 +122,14 @@
121122
<Compile Include="Properties\AssemblyInfo.cs" />
122123
</ItemGroup>
123124
<ItemGroup>
124-
<Content Include="Content\bootstrap.css" />
125-
<Content Include="Content\bootstrap.min.css" />
125+
<Content Include="bin\Kendo.Mvc.dll" />
126126
<Content Include="fonts\glyphicons-halflings-regular.svg" />
127127
<Content Include="Images\accent.png" />
128128
<Content Include="Images\bullet.png" />
129129
<Content Include="Images\heroAccent.png" />
130130
<Content Include="favicon.ico" />
131131
<Content Include="Global.asax" />
132132
<Content Include="Content\Site.css" />
133-
<Content Include="Scripts\bootstrap.js" />
134-
<Content Include="Scripts\bootstrap.min.js" />
135-
<None Include="Scripts\jquery-1.10.2.intellisense.js" />
136-
<Content Include="Scripts\jquery-1.10.2.js" />
137-
<Content Include="Scripts\jquery-1.10.2.min.js" />
138-
<Content Include="Scripts\kendo.modernizr.custom.js" />
139-
<Content Include="Scripts\modernizr-2.6.2.js" />
140-
<Content Include="Scripts\respond.js" />
141-
<Content Include="Scripts\respond.min.js" />
142133
<Content Include="Scripts\_references.js" />
143134
<Content Include="Web.config" />
144135
<Content Include="Web.Debug.config">
@@ -148,7 +139,6 @@
148139
<DependentUpon>Web.config</DependentUpon>
149140
</Content>
150141
<Content Include="Views\Web.config" />
151-
<Content Include="Scripts\jquery-1.10.2.min.map" />
152142
<Content Include="Views\Home\About.cshtml" />
153143
<Content Include="Views\Home\Index.cshtml" />
154144
<Content Include="Views\Home\Contact.cshtml" />
-328 Bytes
Binary file not shown.

grid/checkboxes-batch-editing/KendoUIMVC5/Scripts/kendo.modernizr.custom.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

grid/checkboxes-batch-editing/KendoUIMVC5/Views/Shared/_Layout.cshtml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@
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>
18-
<script src="@Url.Content("~/Scripts/kendo.modernizr.custom.js")"></script>
10+
<link rel="stylesheet" href="http://kendo.cdn.telerik.com/2017.2.621/styles/kendo.common.min.css">
11+
<link rel="stylesheet" href="http://kendo.cdn.telerik.com/2017.2.621/styles/kendo.rtl.min.css">
12+
<link rel="stylesheet" href="http://kendo.cdn.telerik.com/2017.2.621/styles/kendo.default.min.css">
13+
<link rel="stylesheet" href="http://kendo.cdn.telerik.com/2017.2.621/styles/kendo.mobile.all.min.css">
1914

20-
<script src="http://cdn.kendostatic.com/2014.2.1008/js/cultures/kendo.culture.@(culture).min.js"></script>
15+
<script src="http://code.jquery.com/jquery-1.12.3.min.js"></script>
16+
<script src="http://kendo.cdn.telerik.com/2017.2.621/js/angular.min.js"></script>
17+
<script src="http://kendo.cdn.telerik.com/2017.2.621/js/jszip.min.js"></script>
18+
<script src="http://kendo.cdn.telerik.com/2017.2.621/js/kendo.all.min.js"></script>
19+
<script src="http://kendo.cdn.telerik.com/2017.2.621/js/kendo.aspnetmvc.min.js"></script>
20+
21+
<script src="http://kendo.cdn.telerik.com/2017.2.621/js/cultures/kendo.culture.@(culture).min.js"></script>
2122
<script>
2223
kendo.culture("@culture");
2324
</script>

grid/checkboxes-batch-editing/KendoUIMVC5/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<package id="bootstrap" version="3.0.0" targetFramework="net45" />
55
<package id="EntityFramework" version="6.0.1" targetFramework="net45" />
66
<package id="jQuery" version="1.10.2" targetFramework="net45" />
7-
<package id="Microsoft.AspNet.Mvc" version="5.1.2" targetFramework="net45" />
8-
<package id="Microsoft.AspNet.Razor" version="3.1.2" targetFramework="net45" />
7+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
8+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
99
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
10-
<package id="Microsoft.AspNet.WebPages" version="3.1.2" targetFramework="net45" />
10+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
1111
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1212
<package id="Modernizr" version="2.6.2" targetFramework="net45" />
1313
<package id="Newtonsoft.Json" version="5.0.6" targetFramework="net45" />

grid/checkboxes-batch-editing/KendoUIMVC5/web.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
</system.web>
3030
<runtime>
3131
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
32+
<dependentAssembly>
33+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
34+
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
35+
</dependentAssembly>
3236
<dependentAssembly>
3337
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
3438
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
@@ -39,11 +43,7 @@
3943
</dependentAssembly>
4044
<dependentAssembly>
4145
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
42-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
43-
</dependentAssembly>
44-
<dependentAssembly>
45-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
46-
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
46+
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
4747
</dependentAssembly>
4848
</assemblyBinding>
4949
</runtime>
-1.52 MB
Binary file not shown.

0 commit comments

Comments
 (0)