Skip to content

Commit a27573f

Browse files
author
Daniel Peichev
committed
Update package dependencies, add trial versions of Mvc and DPL
1 parent dad26a0 commit a27573f

30 files changed

+7834
-118
lines changed

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Content/bootstrap-theme.css

+587
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Content/bootstrap-theme.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Content/bootstrap-theme.min.css

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Content/bootstrap-theme.min.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Content/bootstrap.css

+6,757
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Content/bootstrap.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Content/bootstrap.min.css

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Content/bootstrap.min.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Content/kendo.compatibility.css

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
This file overrides problematic CSS rules, which exist in the default MVC project template stylesheet (Site.css).
3+
These CSS rules use global or high-specificity selectors, and as a result, break Kendo UI widget appearance.
4+
5+
This file is not required in real production applications, which use a different custom stylesheet.
6+
*/
7+
8+
.k-grid th a
9+
{
10+
position: static;
11+
}
12+
13+
.k-grid .k-grid-header th a
14+
{
15+
padding: .5em .2em .4em;
16+
}
17+
18+
html body
19+
{
20+
border: 0;
21+
}

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/GridExcelSpreadProcessing.csproj

+73-48
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>GridExcelSpreadProcessing</RootNamespace>
1515
<AssemblyName>GridExcelSpreadProcessing</AssemblyName>
16-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1717
<MvcBuildViews>false</MvcBuildViews>
1818
<UseIISExpress>true</UseIISExpress>
1919
<IISExpressSSLPort />
2020
<IISExpressAnonymousAuthentication />
2121
<IISExpressWindowsAuthentication />
2222
<IISExpressUseClassicPipelineMode />
2323
<UseGlobalApplicationHostFile />
24+
<TargetFrameworkProfile />
2425
</PropertyGroup>
2526
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2627
<DebugSymbols>true</DebugSymbols>
@@ -40,93 +41,81 @@
4041
<WarningLevel>4</WarningLevel>
4142
</PropertyGroup>
4243
<ItemGroup>
43-
<Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
45-
<SpecificVersion>False</SpecificVersion>
46-
<Private>False</Private>
47-
</Reference>
48-
<Reference Include="Kendo.Mvc">
49-
<HintPath>..\lib\KENDOUIMVC\2016.1.412.545\Kendo.Mvc.dll</HintPath>
44+
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
5046
<Private>True</Private>
5147
</Reference>
48+
<Reference Include="Kendo.Mvc, Version=2016.3.914.440, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
49+
<SpecificVersion>False</SpecificVersion>
50+
<HintPath>..\packages\KENDOUIMVC\2016.3.914.545\Kendo.Mvc.dll</HintPath>
51+
</Reference>
5252
<Reference Include="Microsoft.CSharp" />
5353
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5454
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
5555
<Private>True</Private>
5656
</Reference>
57-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
58-
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>bin\Newtonsoft.Json.dll</HintPath>
57+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
58+
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
59+
<Private>True</Private>
6060
</Reference>
6161
<Reference Include="System" />
6262
<Reference Include="System.Data" />
63+
<Reference Include="System.Data.DataSetExtensions" />
6364
<Reference Include="System.Data.Entity" />
6465
<Reference Include="System.Drawing" />
6566
<Reference Include="System.Web.DynamicData" />
6667
<Reference Include="System.Web.Entity" />
6768
<Reference Include="System.Web.ApplicationServices" />
6869
<Reference Include="System.ComponentModel.DataAnnotations" />
69-
<Reference Include="System.Core" />
70-
<Reference Include="System.Data.DataSetExtensions" />
70+
<Reference Include="System.Web.Extensions" />
71+
<Reference Include="System.Web" />
72+
<Reference Include="System.Web.Abstractions" />
7173
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72-
<HintPath>C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v2.0\Assemblies\System.Web.Helpers.dll</HintPath>
73-
<SpecificVersion>False</SpecificVersion>
74-
<Private>False</Private>
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=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77-
<SpecificVersion>False</SpecificVersion>
78-
<HintPath>bin\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, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8182
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
82-
<SpecificVersion>False</SpecificVersion>
83-
<Private>False</Private>
83+
<Private>True</Private>
8484
</Reference>
8585
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8686
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
87-
<SpecificVersion>False</SpecificVersion>
88-
<Private>False</Private>
87+
<Private>True</Private>
8988
</Reference>
89+
<Reference Include="System.Web.Routing" />
9090
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9191
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
92-
<SpecificVersion>False</SpecificVersion>
93-
<Private>False</Private>
92+
<Private>True</Private>
9493
</Reference>
9594
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9695
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
97-
<SpecificVersion>False</SpecificVersion>
98-
<Private>False</Private>
96+
<Private>True</Private>
9997
</Reference>
10098
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
10199
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
102-
<SpecificVersion>False</SpecificVersion>
103-
<Private>False</Private>
100+
<Private>True</Private>
104101
</Reference>
105-
<Reference Include="System.Xml.Linq" />
106-
<Reference Include="System.Web" />
107-
<Reference Include="System.Web.Extensions" />
108-
<Reference Include="System.Web.Abstractions" />
109-
<Reference Include="System.Web.Routing" />
110102
<Reference Include="System.Xml" />
111103
<Reference Include="System.Configuration" />
112104
<Reference Include="System.Web.Services" />
113105
<Reference Include="System.EnterpriseServices" />
114-
<Reference Include="Telerik.Documents.SpreadsheetStreaming, Version=2016.2.606.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
115-
<SpecificVersion>False</SpecificVersion>
116-
<HintPath>bin\Telerik.Documents.SpreadsheetStreaming.dll</HintPath>
106+
<Reference Include="System.Xml.Linq" />
107+
<Reference Include="Telerik.Documents.SpreadsheetStreaming">
108+
<HintPath>..\packages\TelerikDocumentProcessing\2016.3.913.40\Telerik.Documents.SpreadsheetStreaming.dll</HintPath>
117109
</Reference>
118-
<Reference Include="Telerik.Windows.Documents.Spreadsheet, Version=2016.2.606.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
119-
<SpecificVersion>False</SpecificVersion>
120-
<HintPath>Bin\Telerik.Windows.Documents.Spreadsheet.dll</HintPath>
110+
<Reference Include="Telerik.Windows.Documents.Spreadsheet">
111+
<HintPath>..\packages\TelerikDocumentProcessing\2016.3.913.40\Telerik.Windows.Documents.Spreadsheet.dll</HintPath>
121112
</Reference>
122-
<Reference Include="Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml, Version=2016.2.606.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
123-
<SpecificVersion>False</SpecificVersion>
124-
<HintPath>Bin\Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml.dll</HintPath>
113+
<Reference Include="Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml">
114+
<HintPath>..\packages\TelerikDocumentProcessing\2016.3.913.40\Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml.dll</HintPath>
125115
</Reference>
126-
<Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127-
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
128-
<SpecificVersion>False</SpecificVersion>
129-
<Private>False</Private>
116+
<Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117+
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
118+
<Private>True</Private>
130119
</Reference>
131120
</ItemGroup>
132121
<ItemGroup>
@@ -143,8 +132,34 @@
143132
<Compile Include="Properties\AssemblyInfo.cs" />
144133
</ItemGroup>
145134
<ItemGroup>
135+
<Content Include="Content\bootstrap-theme.css" />
136+
<Content Include="Content\bootstrap-theme.min.css" />
137+
<Content Include="Content\bootstrap.css" />
138+
<Content Include="Content\bootstrap.min.css" />
139+
<Content Include="fonts\glyphicons-halflings-regular.svg" />
146140
<Content Include="Global.asax" />
147-
<Content Include="packages.config" />
141+
<Content Include="fonts\glyphicons-halflings-regular.woff2" />
142+
<Content Include="fonts\glyphicons-halflings-regular.woff" />
143+
<Content Include="fonts\glyphicons-halflings-regular.ttf" />
144+
<Content Include="fonts\glyphicons-halflings-regular.eot" />
145+
<Content Include="Content\bootstrap.min.css.map" />
146+
<Content Include="Content\bootstrap.css.map" />
147+
<Content Include="Content\bootstrap-theme.min.css.map" />
148+
<Content Include="Content\bootstrap-theme.css.map" />
149+
<None Include="Scripts\jquery-3.1.1.intellisense.js" />
150+
<Content Include="Scripts\bootstrap.js" />
151+
<Content Include="Scripts\bootstrap.min.js" />
152+
<Content Include="Scripts\jquery-3.1.1.js" />
153+
<Content Include="Scripts\jquery-3.1.1.min.js" />
154+
<Content Include="Scripts\jquery-3.1.1.slim.js" />
155+
<Content Include="Scripts\jquery-3.1.1.slim.min.js" />
156+
<Content Include="Content\kendo.compatibility.css" />
157+
<Content Include="Scripts\kendo.modernizr.custom.js" />
158+
<Content Include="Scripts\modernizr-2.8.3.js" />
159+
<Content Include="Scripts\respond.js" />
160+
<Content Include="Scripts\respond.matchmedia.addListener.js" />
161+
<Content Include="Scripts\respond.matchmedia.addListener.min.js" />
162+
<Content Include="Scripts\respond.min.js" />
148163
<Content Include="Web.config">
149164
<SubType>Designer</SubType>
150165
</Content>
@@ -177,10 +192,20 @@
177192
</ItemGroup>
178193
<ItemGroup>
179194
<Folder Include="App_Data\" />
195+
<Folder Include="Images\" />
180196
</ItemGroup>
181197
<ItemGroup>
182198
<Content Include="Views\Stream\Index.cshtml" />
183199
</ItemGroup>
200+
<ItemGroup>
201+
<Content Include="packages.config" />
202+
</ItemGroup>
203+
<ItemGroup>
204+
<Content Include="Scripts\jquery-3.1.1.slim.min.map" />
205+
</ItemGroup>
206+
<ItemGroup>
207+
<Content Include="Scripts\jquery-3.1.1.min.map" />
208+
</ItemGroup>
184209
<PropertyGroup>
185210
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
186211
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Images/NuGetGallery.png

4.05 KB
Loading

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Images/accent.png

528 Bytes
Loading

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Images/aspNetHome.png

3.65 KB
Loading

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Images/bullet.png

2.8 KB
Loading

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Images/facebook.png

529 Bytes
Loading

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Images/findHosting.png

4.23 KB
Loading

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Images/heroAccent.png

572 Bytes
Loading

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Images/orderedListOne.png

653 Bytes
Loading

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Images/orderedListThree.png

772 Bytes
Loading

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Images/orderedListTwo.png

733 Bytes
Loading

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Images/twitter.png

488 Bytes
Loading

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Images/windowsLive.png

3.22 KB
Loading

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/Views/Shared/_Layout.cshtml

+43-43
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<title>MVC Grid and DPL integration</title>
5-
<link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
6-
<!--This CSS entry was added by the Telerik VS Extensions for compatibility reasons-->
7-
<link href="@Url.Content("~/Content/kendo.compatibility.css")" rel="stylesheet" type="text/css" />
8-
<link href="https://kendo.cdn.telerik.com/2016.1.412/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
9-
<link href="https://kendo.cdn.telerik.com/2016.1.412/styles/kendo.mobile.all.min.css" rel="stylesheet" type="text/css" />
10-
<link href="https://kendo.cdn.telerik.com/2016.1.412/styles/kendo.dataviz.min.css" rel="stylesheet" type="text/css" />
11-
<link href="https://kendo.cdn.telerik.com/2016.1.412/styles/kendo.default.min.css" rel="stylesheet" type="text/css" />
12-
<link href="https://kendo.cdn.telerik.com/2016.1.412/styles/kendo.dataviz.default.min.css" rel="stylesheet" type="text/css" />
13-
<script src="https://kendo.cdn.telerik.com/2016.1.412/js/jquery.min.js"></script>
14-
<script src="https://kendo.cdn.telerik.com/2016.1.412/js/angular.min.js"></script>
15-
<script src="https://kendo.cdn.telerik.com/2016.1.412/js/jszip.min.js"></script>
16-
<script src="https://kendo.cdn.telerik.com/2016.1.412/js/kendo.all.min.js"></script>
17-
<script src="https://kendo.cdn.telerik.com/2016.1.412/js/kendo.aspnetmvc.min.js"></script>
18-
<script src="@Url.Content("~/Scripts/kendo.modernizr.custom.js")"></script>
3+
<head>
4+
<title>MVC Grid and DPL integration</title>
5+
<link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
6+
<!--This CSS entry was added by the Telerik VS Extensions for compatibility reasons-->
7+
<link href="https://kendo.cdn.telerik.com/2016.1.412/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
8+
<link href="https://kendo.cdn.telerik.com/2016.1.412/styles/kendo.mobile.all.min.css" rel="stylesheet" type="text/css" />
9+
<link href="https://kendo.cdn.telerik.com/2016.1.412/styles/kendo.dataviz.min.css" rel="stylesheet" type="text/css" />
10+
<link href="https://kendo.cdn.telerik.com/2016.1.412/styles/kendo.default.min.css" rel="stylesheet" type="text/css" />
11+
<link href="https://kendo.cdn.telerik.com/2016.1.412/styles/kendo.dataviz.default.min.css" rel="stylesheet" type="text/css" />
12+
<link href="@Url.Content("~/Content/kendo.compatibility.css")" rel="stylesheet" type="text/css" />
13+
<script src="https://kendo.cdn.telerik.com/2016.1.412/js/jquery.min.js"></script>
14+
<script src="https://kendo.cdn.telerik.com/2016.1.412/js/angular.min.js"></script>
15+
<script src="https://kendo.cdn.telerik.com/2016.1.412/js/jszip.min.js"></script>
16+
<script src="https://kendo.cdn.telerik.com/2016.1.412/js/kendo.all.min.js"></script>
17+
<script src="https://kendo.cdn.telerik.com/2016.1.412/js/kendo.aspnetmvc.min.js"></script>
18+
<script src="@Url.Content("~/Scripts/kendo.modernizr.custom.js")"></script>
1919
</head>
20-
<body>
21-
<header>
22-
<div class="content-wrapper">
23-
<div class="float-left">
24-
<p class="site-title">MVC Grid and DPL integration</p>
25-
</div>
26-
<div class="float-right">
27-
<nav>
28-
<ul id="menu">
29-
<li>@Html.ActionLink("SpreadProcessing", "Index", "Home")</li>
30-
<li>@Html.ActionLink("SpreadStreamProcessing", "Index", "Stream")</li>
31-
</ul>
32-
</nav>
33-
</div>
20+
<body>
21+
<header>
22+
<div class="content-wrapper">
23+
<div class="float-left">
24+
<p class="site-title">MVC Grid and DPL integration</p>
25+
</div>
26+
<div class="float-right">
27+
<nav>
28+
<ul id="menu">
29+
<li>@Html.ActionLink("SpreadProcessing", "Index", "Home")</li>
30+
<li>@Html.ActionLink("SpreadStreamProcessing", "Index", "Stream")</li>
31+
</ul>
32+
</nav>
3433
</div>
35-
</header>
36-
<div id="body">
37-
@RenderSection("featured", required: false)
38-
<section class="content-wrapper main-content clear-fix">
39-
@RenderBody()
40-
</section>
4134
</div>
35+
</header>
36+
<div id="body">
37+
@RenderSection("featured", required: false)
38+
<section class="content-wrapper main-content clear-fix">
39+
@RenderBody()
40+
</section>
41+
</div>
4242

43-
<footer>
44-
<div class="content-wrapper">
45-
<div class="float-left">
46-
<p>&copy; @DateTime.Now.Year - My Telerik MVC Application</p>
47-
</div>
43+
<footer>
44+
<div class="content-wrapper">
45+
<div class="float-left">
46+
<p>&copy; @DateTime.Now.Year - My Telerik MVC Application</p>
4847
</div>
49-
</footer>
50-
</body>
48+
</div>
49+
</footer>
50+
</body>
5151
</html>

‎grid/grid-dpl-integration/GridExcelSpreadProcessing/fonts/glyphicons-halflings-regular.eot

19.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)