Skip to content

Commit 2f18c5b

Browse files
VicTachevVicTachev
committed
chore: update Kendo and Bootstrap versions
1 parent 8511f32 commit 2f18c5b

32 files changed

+61
-66425
lines changed

‎chart/ChartInGrid/ChartInGrid/ChartInGrid.csproj

+11-15
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<IISExpressAnonymousAuthentication />
2121
<IISExpressWindowsAuthentication />
2222
<IISExpressUseClassicPipelineMode />
23+
<Use64BitIISExpress />
24+
<UseGlobalApplicationHostFile />
2325
</PropertyGroup>
2426
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2527
<DebugSymbols>true</DebugSymbols>
@@ -44,8 +46,7 @@
4446
<Private>True</Private>
4547
</Reference>
4648
<Reference Include="Kendo.Mvc">
47-
<HintPath>..\lib\KENDOUIMVC\2016.1.226.545\Kendo.Mvc.dll</HintPath>
48-
<Private>True</Private>
49+
<HintPath>..\lib\Kendo\2019.3.1023\Kendo.Mvc.dll</HintPath>
4950
</Reference>
5051
<Reference Include="Microsoft.CSharp" />
5152
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -67,32 +68,26 @@
6768
<Reference Include="System.Core" />
6869
<Reference Include="System.Data.DataSetExtensions" />
6970
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
71-
<Private>True</Private>
71+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
7272
</Reference>
73-
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
75-
<Private>True</Private>
73+
<Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
7675
</Reference>
7776
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7877
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
7978
<Private>True</Private>
8079
</Reference>
8180
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
82-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
83-
<Private>True</Private>
81+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
8482
</Reference>
8583
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
86-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
87-
<Private>True</Private>
84+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
8885
</Reference>
8986
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
90-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
91-
<Private>True</Private>
87+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
9288
</Reference>
9389
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
94-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
95-
<Private>True</Private>
90+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
9691
</Reference>
9792
<Reference Include="System.Xml.Linq" />
9893
<Reference Include="System.Web" />
@@ -180,6 +175,7 @@
180175
</ItemGroup>
181176
<ItemGroup>
182177
<Folder Include="App_Data\" />
178+
<Folder Include="bin\" />
183179
</ItemGroup>
184180
<PropertyGroup>
185181
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

‎chart/ChartInGrid/ChartInGrid/Views/Shared/_Layout.cshtml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<head>
44
<title>@ViewBag.Title - My Telerik MVC Application</title>
55
<link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
6-
<link href="http://kendo.cdn.telerik.com/2016.1.226/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
7-
<link href="http://kendo.cdn.telerik.com/2016.1.226/styles/kendo.default.min.css" rel="stylesheet" type="text/css" />
8-
<script src="http://kendo.cdn.telerik.com/2016.1.226/js/jquery.min.js"></script>
9-
<script src="http://kendo.cdn.telerik.com/2016.1.226/js/kendo.all.min.js"></script>
10-
<script src="http://kendo.cdn.telerik.com/2016.1.226/js/kendo.aspnetmvc.min.js"></script>
6+
<link href="http://kendo.cdn.telerik.com/2019.3.1023/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
7+
<link href="http://kendo.cdn.telerik.com/2019.3.1023/styles/kendo.default.min.css" rel="stylesheet" type="text/css" />
8+
<script src="http://kendo.cdn.telerik.com/2019.3.1023/js/jquery.min.js"></script>
9+
<script src="http://kendo.cdn.telerik.com/2019.3.1023/js/kendo.all.min.js"></script>
10+
<script src="http://kendo.cdn.telerik.com/2019.3.1023/js/kendo.aspnetmvc.min.js"></script>
1111
<script src="@Url.Content("~/Scripts/kendo.modernizr.custom.js")"></script>
1212
</head>
1313
<body>

‎chart/ChartInGrid/ChartInGrid/packages.config

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
4-
<package id="bootstrap" version="3.3.2" targetFramework="net45" />
4+
<package id="bootstrap" version="3.4.1" targetFramework="net45" />
55
<package id="jQuery" version="1.10.2" targetFramework="net45" />
6-
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
7-
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
6+
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net45" />
7+
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net45" />
88
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
9-
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
9+
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net45" />
1010
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1111
<package id="Modernizr" version="2.6.2" targetFramework="net45" />
1212
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />

‎chart/ChartInGrid/ChartInGrid/web.config

+17-17
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,39 @@
55
-->
66
<configuration>
77
<appSettings>
8-
<add key="webpages:Version" value="3.0.0.0" />
9-
<add key="webpages:Enabled" value="false" />
10-
<add key="ClientValidationEnabled" value="true" />
11-
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
8+
<add key="webpages:Version" value="3.0.0.0"/>
9+
<add key="webpages:Enabled" value="false"/>
10+
<add key="ClientValidationEnabled" value="true"/>
11+
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
1212
</appSettings>
1313
<system.web>
14-
<compilation debug="true" targetFramework="4.5" />
15-
<httpRuntime targetFramework="4.5" />
14+
<compilation debug="true" targetFramework="4.5"/>
15+
<httpRuntime targetFramework="4.5"/>
1616
<pages>
1717
<namespaces>
18-
<add namespace="Kendo.Mvc.UI" /></namespaces></pages>
18+
<add namespace="Kendo.Mvc.UI"/></namespaces></pages>
1919
</system.web>
2020
<runtime>
2121
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
2222
<dependentAssembly>
23-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
24-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
23+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
24+
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
2525
</dependentAssembly>
2626
<dependentAssembly>
27-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
28-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
27+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
28+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
2929
</dependentAssembly>
3030
<dependentAssembly>
31-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
32-
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
31+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
32+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
3333
</dependentAssembly>
3434
<dependentAssembly>
35-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
36-
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
35+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
36+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
3737
</dependentAssembly>
3838
<dependentAssembly>
39-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
40-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
39+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
40+
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
4141
</dependentAssembly>
4242
</assemblyBinding>
4343
</runtime>

‎chart/ChartInGrid/lib/KENDOUIMVC/2016.1.226.545/Kendo.Mvc.dll

-1.85 MB
Binary file not shown.

0 commit comments

Comments
 (0)