Skip to content

Commit 1246603

Browse files
author
Martin Atanasov
committed
Update the project for R3 2018
1 parent 93afbab commit 1246603

Some content is hidden

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

54 files changed

+34
-30
lines changed

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration.sln renamed to ‎KendoUIBootstrapIntegration.sln

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/App_Start/BundleConfig.cs renamed to ‎KendoUIBootstrapIntegration/App_Start/BundleConfig.cs

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/App_Start/FilterConfig.cs renamed to ‎KendoUIBootstrapIntegration/App_Start/FilterConfig.cs

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/App_Start/RouteConfig.cs renamed to ‎KendoUIBootstrapIntegration/App_Start/RouteConfig.cs

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Content/bootstrap.min.css renamed to ‎KendoUIBootstrapIntegration/Content/bootstrap.min.css

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Content/styles.css renamed to ‎KendoUIBootstrapIntegration/Content/styles.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@font-face {
22
font-family: "Kendo UI";
3-
src: url("https://kendo.cdn.telerik.com/2017.3.913/styles/images/kendoui.woff") format("woff"),
4-
url("https://kendo.cdn.telerik.com/2017.3.913/styles/images/kendoui.ttf") format("truetype");
3+
src: url("https://kendo.cdn.telerik.com/2018.3.911/styles/images/kendoui.woff") format("woff"),
4+
url("https://kendo.cdn.telerik.com/2018.3.911/styles/images/kendoui.ttf") format("truetype");
55
}
66

77
body:before
@@ -111,7 +111,7 @@ header .k-dropdown-wrap .k-select {
111111
}
112112

113113
header .k-dropdown .k-i-arrow-s {
114-
background-image: url("https://cdn.kendostatic.com/2017.3.913/styles/Bootstrap/sprite.png");
114+
background-image: url("https://cdn.kendostatic.com/2018.3.911/styles/Bootstrap/sprite.png");
115115
background-position: -16px -32px;
116116
}
117117

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Controllers/HomeController.cs renamed to ‎KendoUIBootstrapIntegration/Controllers/HomeController.cs

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Global.asax renamed to ‎KendoUIBootstrapIntegration/Global.asax

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Global.asax.cs renamed to ‎KendoUIBootstrapIntegration/Global.asax.cs

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/KendoUIBootstrapIntegration.csproj renamed to ‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration.csproj

+16-16
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@
4343
<Reference Include="Antlr3.Runtime">
4444
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
4545
</Reference>
46-
<Reference Include="Kendo.Mvc, Version=2017.1.223.545, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
47-
<SpecificVersion>False</SpecificVersion>
48-
<HintPath>..\lib\net45\Kendo.Mvc.dll</HintPath>
46+
<Reference Include="Kendo.Mvc, Version=2018.3.911.545, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
47+
<HintPath>..\packages\Telerik.UI.for.AspNet.Mvc5.Trial.2018.3.911\lib\net45\Kendo.Mvc.dll</HintPath>
4948
</Reference>
5049
<Reference Include="Microsoft.CSharp" />
5150
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -59,38 +58,39 @@
5958
<Reference Include="System.Data" />
6059
<Reference Include="System.Data.Entity" />
6160
<Reference Include="System.Drawing" />
61+
<Reference Include="System.Net.Http" />
62+
<Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
64+
</Reference>
6265
<Reference Include="System.Web.DynamicData" />
6366
<Reference Include="System.Web.Entity" />
6467
<Reference Include="System.Web.ApplicationServices" />
6568
<Reference Include="System.ComponentModel.DataAnnotations" />
6669
<Reference Include="System.Core" />
6770
<Reference Include="System.Data.DataSetExtensions" />
6871
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
70-
<Private>True</Private>
72+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll</HintPath>
7173
</Reference>
72-
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
73-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
74-
<Private>True</Private>
74+
<Reference Include="System.Web.Http, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.6\lib\net45\System.Web.Http.dll</HintPath>
76+
</Reference>
77+
<Reference Include="System.Web.Mvc, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.6\lib\net45\System.Web.Mvc.dll</HintPath>
7579
</Reference>
7680
<Reference Include="System.Web.Optimization">
7781
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
7882
</Reference>
7983
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
81-
<Private>True</Private>
84+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.6\lib\net45\System.Web.Razor.dll</HintPath>
8285
</Reference>
8386
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
85-
<Private>True</Private>
87+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.dll</HintPath>
8688
</Reference>
8789
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
89-
<Private>True</Private>
90+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
9091
</Reference>
9192
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
93-
<Private>True</Private>
93+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
9494
</Reference>
9595
<Reference Include="System.Xml.Linq" />
9696
<Reference Include="System.Web" />

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Models/DonutChartViewModel.cs renamed to ‎KendoUIBootstrapIntegration/Models/DonutChartViewModel.cs

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Models/ListView.cs renamed to ‎KendoUIBootstrapIntegration/Models/ListView.cs

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Models/OrdersViewModel.cs renamed to ‎KendoUIBootstrapIntegration/Models/OrdersViewModel.cs

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Models/RevenueViewModel.cs renamed to ‎KendoUIBootstrapIntegration/Models/RevenueViewModel.cs

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Models/SalesPerDayViewModel.cs renamed to ‎KendoUIBootstrapIntegration/Models/SalesPerDayViewModel.cs

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Models/SalesPerRegionViewModel.cs renamed to ‎KendoUIBootstrapIntegration/Models/SalesPerRegionViewModel.cs

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Models/Task.cs renamed to ‎KendoUIBootstrapIntegration/Models/Task.cs

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Models/TaskViewModel.cs renamed to ‎KendoUIBootstrapIntegration/Models/TaskViewModel.cs

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Properties/AssemblyInfo.cs renamed to ‎KendoUIBootstrapIntegration/Properties/AssemblyInfo.cs

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Scripts/_references.js renamed to ‎KendoUIBootstrapIntegration/Scripts/_references.js

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Scripts/html5shiv.js renamed to ‎KendoUIBootstrapIntegration/Scripts/html5shiv.js

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Scripts/jquery-1.9.1.intellisense.js renamed to ‎KendoUIBootstrapIntegration/Scripts/jquery-1.9.1.intellisense.js

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Scripts/jquery-1.9.1.js renamed to ‎KendoUIBootstrapIntegration/Scripts/jquery-1.9.1.js

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Scripts/respond.js renamed to ‎KendoUIBootstrapIntegration/Scripts/respond.js

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Scripts/respond.min.js renamed to ‎KendoUIBootstrapIntegration/Scripts/respond.min.js

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Scripts/theme-chooser.js renamed to ‎KendoUIBootstrapIntegration/Scripts/theme-chooser.js

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Views/Home/About.cshtml renamed to ‎KendoUIBootstrapIntegration/Views/Home/About.cshtml

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Views/Home/Contact.cshtml renamed to ‎KendoUIBootstrapIntegration/Views/Home/Contact.cshtml

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Views/Home/Index.cshtml renamed to ‎KendoUIBootstrapIntegration/Views/Home/Index.cshtml

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Views/Shared/_Layout.cshtml renamed to ‎KendoUIBootstrapIntegration/Views/Shared/_Layout.cshtml

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<title>Kendo UI&reg; &hearts; Twitter Bootstrap: Responsive demo</title>
55
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
66
<link href="~/Content/bootstrap.min.css" rel="stylesheet" />
7-
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/2017.3.913/styles/kendo.common-bootstrap.min.css" />
8-
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/2017.3.913/styles/kendo.bootstrap.min.css" />
9-
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/2017.3.913/styles/kendo.dataviz.min.css" />
10-
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/2017.3.913/styles/kendo.dataviz.bootstrap.min.css" />
7+
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/2018.3.911/styles/kendo.common-bootstrap.min.css" />
8+
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/2018.3.911/styles/kendo.bootstrap.min.css" />
9+
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/2018.3.911/styles/kendo.dataviz.min.css" />
10+
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/2018.3.911/styles/kendo.dataviz.bootstrap.min.css" />
1111
<script src="https://code.jquery.com/jquery-1.12.3.min.js"></script>
12-
<script src="https://kendo.cdn.telerik.com/2017.3.913/js/kendo.all.min.js"></script>
13-
<script src="https://kendo.cdn.telerik.com/2017.3.913/js/kendo.timezones.min.js"></script>
14-
<script src="https://kendo.cdn.telerik.com/2017.3.913/js/kendo.aspnetmvc.min.js"></script>
12+
<script src="https://kendo.cdn.telerik.com/2018.3.911/js/kendo.all.min.js"></script>
13+
<script src="https://kendo.cdn.telerik.com/2018.3.911/js/kendo.timezones.min.js"></script>
14+
<script src="https://kendo.cdn.telerik.com/2018.3.911/js/kendo.aspnetmvc.min.js"></script>
1515
<script src="~/Scripts/theme-chooser.js"></script>
1616
<link href="~/Content/styles.css" rel="stylesheet" />
1717
<!--[if lt IE 9]>

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Views/Web.config renamed to ‎KendoUIBootstrapIntegration/Views/Web.config

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Views/_ViewStart.cshtml renamed to ‎KendoUIBootstrapIntegration/Views/_ViewStart.cshtml

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Web.Debug.config renamed to ‎KendoUIBootstrapIntegration/Web.Debug.config

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/Web.Release.config renamed to ‎KendoUIBootstrapIntegration/Web.Release.config

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/assets/avatar.jpg renamed to ‎KendoUIBootstrapIntegration/assets/avatar.jpg

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/assets/photos/1.jpg renamed to ‎KendoUIBootstrapIntegration/assets/photos/1.jpg

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/assets/photos/10.jpg renamed to ‎KendoUIBootstrapIntegration/assets/photos/10.jpg

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/assets/photos/11.jpg renamed to ‎KendoUIBootstrapIntegration/assets/photos/11.jpg

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/assets/photos/12.jpg renamed to ‎KendoUIBootstrapIntegration/assets/photos/12.jpg

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/assets/photos/2.jpg renamed to ‎KendoUIBootstrapIntegration/assets/photos/2.jpg

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/assets/photos/3.jpg renamed to ‎KendoUIBootstrapIntegration/assets/photos/3.jpg

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/assets/photos/4.jpg renamed to ‎KendoUIBootstrapIntegration/assets/photos/4.jpg

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/assets/photos/5.jpg renamed to ‎KendoUIBootstrapIntegration/assets/photos/5.jpg

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/assets/photos/6.jpg renamed to ‎KendoUIBootstrapIntegration/assets/photos/6.jpg

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/assets/photos/7.jpg renamed to ‎KendoUIBootstrapIntegration/assets/photos/7.jpg

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/assets/photos/8.jpg renamed to ‎KendoUIBootstrapIntegration/assets/photos/8.jpg

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/assets/photos/9.jpg renamed to ‎KendoUIBootstrapIntegration/assets/photos/9.jpg

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/favicon.ico renamed to ‎KendoUIBootstrapIntegration/favicon.ico

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/fonts/glyphicons-halflings-regular.eot renamed to ‎KendoUIBootstrapIntegration/fonts/glyphicons-halflings-regular.eot

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/fonts/glyphicons-halflings-regular.svg renamed to ‎KendoUIBootstrapIntegration/fonts/glyphicons-halflings-regular.svg

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/fonts/glyphicons-halflings-regular.ttf renamed to ‎KendoUIBootstrapIntegration/fonts/glyphicons-halflings-regular.ttf

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/fonts/glyphicons-halflings-regular.woff renamed to ‎KendoUIBootstrapIntegration/fonts/glyphicons-halflings-regular.woff

File renamed without changes.

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/packages.config renamed to ‎KendoUIBootstrapIntegration/packages.config

+7-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22
<packages>
33
<package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
44
<package id="EntityFramework" version="5.0.0" targetFramework="net45" />
5-
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
6-
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
5+
<package id="jQuery" version="1.9.1" targetFramework="net45" />
6+
<package id="Microsoft.AspNet.Mvc" version="5.2.6" targetFramework="net45" />
7+
<package id="Microsoft.AspNet.Razor" version="3.2.6" targetFramework="net45" />
78
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
8-
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
9+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net45" />
10+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.6" targetFramework="net45" />
11+
<package id="Microsoft.AspNet.WebPages" version="3.2.6" targetFramework="net45" />
912
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1013
<package id="Modernizr" version="2.6.2" targetFramework="net45" />
1114
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
15+
<package id="Telerik.UI.for.AspNet.Mvc5.Trial" version="2018.3.911" targetFramework="net45" />
1216
<package id="WebGrease" version="1.5.2" targetFramework="net45" />
1317
</packages>

‎KendoUIBootstrapIntegration/KendoUIBootstrapIntegration/web.config renamed to ‎KendoUIBootstrapIntegration/web.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</dependentAssembly>
3535
<dependentAssembly>
3636
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
37-
<bindingRedirect oldVersion="1.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
37+
<bindingRedirect oldVersion="1.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
3838
</dependentAssembly>
3939
<dependentAssembly>
4040
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />

0 commit comments

Comments
 (0)