Skip to content

Commit 739dddd

Browse files
author
Kostadin Dimitrov
committed
Update mvc version
1 parent bc77750 commit 739dddd

File tree

5 files changed

+84
-46
lines changed

5 files changed

+84
-46
lines changed

‎grid/grid-render-byte-and-base64-images-and-show-preview-using-window/GridRenderImages/GridRenderImages.csproj‎

Lines changed: 40 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,12 +8,12 @@
88
</ProductVersion>
99
<SchemaVersion>2.0</SchemaVersion>
1010
<ProjectGuid>{F065BAD2-3226-4791-AF62-523B7F78FD75}</ProjectGuid>
11-
<ProjectTypeGuids>{E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
11+
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
1212
<OutputType>Library</OutputType>
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>ForeignKeyColumnDemo</RootNamespace>
1515
<AssemblyName>ForeignKeyColumnDemo</AssemblyName>
16-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1717
<MvcBuildViews>false</MvcBuildViews>
1818
<FileUpgradeFlags>
1919
</FileUpgradeFlags>
@@ -37,6 +37,7 @@
3737
<DefineConstants>DEBUG;TRACE</DefineConstants>
3838
<ErrorReport>prompt</ErrorReport>
3939
<WarningLevel>4</WarningLevel>
40+
<Prefer32Bit>false</Prefer32Bit>
4041
</PropertyGroup>
4142
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4243
<DebugType>pdbonly</DebugType>
@@ -45,32 +46,24 @@
4546
<DefineConstants>TRACE</DefineConstants>
4647
<ErrorReport>prompt</ErrorReport>
4748
<WarningLevel>4</WarningLevel>
49+
<Prefer32Bit>false</Prefer32Bit>
4850
</PropertyGroup>
4951
<ItemGroup>
50-
<Reference Include="Kendo.Mvc, Version=2014.2.1008.340, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
52+
<Reference Include="Kendo.Mvc, Version=2016.3.914.545, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
5153
<SpecificVersion>False</SpecificVersion>
52-
<HintPath>..\lib\KENDOUIMVC\2014.2.1008.340\Kendo.Mvc.dll</HintPath>
53-
<Private>True</Private>
54+
<HintPath>bin\Kendo.Mvc.dll</HintPath>
5455
</Reference>
5556
<Reference Include="Microsoft.CSharp" />
57+
<Reference Include="Microsoft.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58+
<HintPath>..\packages\Microsoft.AspNet.WebHelpers.3.2.3\lib\net45\Microsoft.Web.Helpers.dll</HintPath>
59+
<Private>True</Private>
60+
</Reference>
5661
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5762
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
5863
<Private>True</Private>
5964
</Reference>
6065
<Reference Include="System.Data.DataSetExtensions" />
6166
<Reference Include="System.Web.Extensions" />
62-
<Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63-
<HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
64-
<Private>True</Private>
65-
</Reference>
66-
<Reference Include="System.Web.Mvc, Version=3.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<HintPath>..\packages\Microsoft.AspNet.Mvc.3.0.50813.1\lib\net40\System.Web.Mvc.dll</HintPath>
68-
<Private>True</Private>
69-
</Reference>
70-
<Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<HintPath>..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
72-
<Private>True</Private>
73-
</Reference>
7467
<Reference Include="System" />
7568
<Reference Include="System.Data" />
7669
<Reference Include="System.Drawing" />
@@ -80,24 +73,44 @@
8073
<Reference Include="System.ComponentModel.DataAnnotations" />
8174
<Reference Include="System.Web" />
8275
<Reference Include="System.Web.Abstractions" />
76+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
78+
<Private>True</Private>
79+
</Reference>
80+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
82+
<Private>True</Private>
83+
</Reference>
84+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
86+
<Private>True</Private>
87+
</Reference>
8388
<Reference Include="System.Web.Routing" />
84-
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85-
<HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.dll</HintPath>
89+
<Reference Include="System.Web.WebPages, 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.dll</HintPath>
8691
<Private>True</Private>
8792
</Reference>
88-
<Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
89-
<HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
93+
<Reference Include="System.Web.WebPages.Deployment, 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.Deployment.dll</HintPath>
9095
<Private>True</Private>
9196
</Reference>
92-
<Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
93-
<HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
97+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
9499
<Private>True</Private>
95100
</Reference>
96101
<Reference Include="System.Xml" />
97102
<Reference Include="System.Configuration" />
98103
<Reference Include="System.Web.Services" />
99104
<Reference Include="System.EnterpriseServices" />
100105
<Reference Include="System.Xml.Linq" />
106+
<Reference Include="WebMatrix.Data, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107+
<HintPath>..\packages\Microsoft.AspNet.WebPages.Data.3.2.3\lib\net45\WebMatrix.Data.dll</HintPath>
108+
<Private>True</Private>
109+
</Reference>
110+
<Reference Include="WebMatrix.WebData, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
111+
<HintPath>..\packages\Microsoft.AspNet.WebPages.WebData.3.2.3\lib\net45\WebMatrix.WebData.dll</HintPath>
112+
<Private>True</Private>
113+
</Reference>
101114
</ItemGroup>
102115
<ItemGroup>
103116
<Compile Include="Controllers\HomeController.cs" />
@@ -209,9 +222,11 @@
209222
<WebProjectProperties>
210223
<UseIIS>True</UseIIS>
211224
<AutoAssignPort>True</AutoAssignPort>
212-
<DevelopmentServerPort>0</DevelopmentServerPort>
225+
<DevelopmentServerPort>51875</DevelopmentServerPort>
213226
<DevelopmentServerVPath>/</DevelopmentServerVPath>
214227
<IISUrl>http://localhost/GridRenderImages</IISUrl>
228+
<OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
229+
<IISAppRootUrl>http://localhost/GridRenderImages</IISAppRootUrl>
215230
<NTLMAuthentication>False</NTLMAuthentication>
216231
<UseCustomServer>False</UseCustomServer>
217232
<CustomServerUrl>

‎grid/grid-render-byte-and-base64-images-and-show-preview-using-window/GridRenderImages/Views/Shared/_Layout.cshtml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<title>@ViewBag.Title</title>
55
<link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
66

7-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
8-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.mobile.all.min.css" rel="stylesheet" type="text/css" />
9-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.dataviz.min.css" rel="stylesheet" type="text/css" />
10-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.blueopal.min.css" rel="stylesheet" type="text/css" />
11-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.dataviz.blueopal.min.css" rel="stylesheet" type="text/css" />
12-
<script src="http://cdn.kendostatic.com/2014.2.1008/js/jquery.min.js"></script>
13-
<script src="http://cdn.kendostatic.com/2014.2.1008/js/kendo.all.min.js"></script>
14-
<script src="http://cdn.kendostatic.com/2014.2.1008/js/kendo.aspnetmvc.min.js"></script>
7+
<link href="http://cdn.kendostatic.com/2016.3.914/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
8+
<link href="http://cdn.kendostatic.com/2016.3.914/styles/kendo.mobile.all.min.css" rel="stylesheet" type="text/css" />
9+
<link href="http://cdn.kendostatic.com/2016.3.914/styles/kendo.dataviz.min.css" rel="stylesheet" type="text/css" />
10+
<link href="http://cdn.kendostatic.com/2016.3.914/styles/kendo.blueopal.min.css" rel="stylesheet" type="text/css" />
11+
<link href="http://cdn.kendostatic.com/2016.3.914/styles/kendo.dataviz.blueopal.min.css" rel="stylesheet" type="text/css" />
12+
<script src="http://cdn.kendostatic.com/2016.3.914/js/jquery.min.js"></script>
13+
<script src="http://cdn.kendostatic.com/2016.3.914/js/kendo.all.min.js"></script>
14+
<script src="http://cdn.kendostatic.com/2016.3.914/js/kendo.aspnetmvc.min.js"></script>
1515
<script src="@Url.Content("~/Scripts/kendo.modernizr.custom.js")"></script>
1616
</head>
1717

‎grid/grid-render-byte-and-base64-images-and-show-preview-using-window/GridRenderImages/Views/web.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
<configuration>
44
<configSections>
5-
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
6-
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
7-
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
5+
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
6+
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
7+
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
88
</sectionGroup>
99
</configSections>
1010

1111
<system.web.webPages.razor>
12-
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
12+
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1313
<pages pageBaseType="System.Web.Mvc.WebViewPage">
1414
<namespaces>
1515
<add namespace="System.Web.Mvc" />
@@ -37,9 +37,9 @@
3737
To change this behavior apply the ValidateInputAttribute to a
3838
controller or action.
3939
-->
40-
<pages validateRequest="false" pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
40+
<pages validateRequest="false" pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
4141
<controls>
42-
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
42+
<add assembly="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
4343
</controls>
4444
</pages>
4545
</system.web>

‎grid/grid-render-byte-and-base64-images-and-show-preview-using-window/GridRenderImages/packages.config‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.Mvc" version="3.0.50813.1" targetFramework="net40" />
4-
<package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net40" />
5-
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net40" />
3+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net461" />
4+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net461" />
5+
<package id="Microsoft.AspNet.WebHelpers" version="3.2.3" targetFramework="net461" />
6+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net461" />
7+
<package id="Microsoft.AspNet.WebPages.Data" version="3.2.3" targetFramework="net461" />
8+
<package id="Microsoft.AspNet.WebPages.WebData" version="3.2.3" targetFramework="net461" />
69
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
710
</packages>

‎grid/grid-render-byte-and-base64-images-and-show-preview-using-window/GridRenderImages/web.config‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,23 @@
55
-->
66
<configuration>
77
<appSettings>
8-
<add key="webpages:Version" value="1.0.0.0" />
8+
<add key="webpages:Version" value="3.0.0.0" />
99
<add key="ClientValidationEnabled" value="true" />
1010
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
1111
</appSettings>
12+
<!--
13+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
14+
15+
The following attributes can be set on the <httpRuntime> tag.
16+
<system.Web>
17+
<httpRuntime targetFramework="4.6.1" />
18+
</system.Web>
19+
-->
1220
<system.web>
13-
<compilation debug="true" targetFramework="4.0">
21+
<compilation debug="true" targetFramework="4.6.1">
1422
<assemblies>
1523
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
16-
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
24+
<add assembly="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1725
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1826
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1927
<add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
@@ -37,9 +45,21 @@
3745
</system.webServer>
3846
<runtime>
3947
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
48+
<dependentAssembly>
49+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
50+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
51+
</dependentAssembly>
52+
<dependentAssembly>
53+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
54+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
55+
</dependentAssembly>
4056
<dependentAssembly>
4157
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
42-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.1" newVersion="3.0.0.1" />
58+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
59+
</dependentAssembly>
60+
<dependentAssembly>
61+
<assemblyIdentity name="WebMatrix.Data" publicKeyToken="31bf3856ad364e35" culture="neutral" />
62+
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
4363
</dependentAssembly>
4464
</assemblyBinding>
4565
</runtime>

0 commit comments

Comments
 (0)