Skip to content

Commit 211a31f

Browse files
author
Kostadin Dimitrov
committed
Updat the MVC version
1 parent 73a9071 commit 211a31f

27 files changed

+35754
-23566
lines changed

‎grid/grid-accessing-current-model-in-popUp/GridAccessingCurrentModelInPopUp/GridAccessingCurrentModelInPopUp.csproj‎

Lines changed: 26 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,17 +8,17 @@
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>
2020
<OldToolsVersion>4.0</OldToolsVersion>
21-
<UseIISExpress>false</UseIISExpress>
21+
<UseIISExpress>true</UseIISExpress>
2222
<IISExpressSSLPort />
2323
<IISExpressAnonymousAuthentication>disabled</IISExpressAnonymousAuthentication>
2424
<IISExpressWindowsAuthentication>enabled</IISExpressWindowsAuthentication>
@@ -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,12 +46,12 @@
4546
<DefineConstants>TRACE</DefineConstants>
4647
<ErrorReport>prompt</ErrorReport>
4748
<WarningLevel>4</WarningLevel>
49+
<Prefer32Bit>false</Prefer32Bit>
4850
</PropertyGroup>
4951
<ItemGroup>
5052
<Reference Include="Kendo.Mvc, Version=2014.2.1008.340, 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>..\lib\KENDOUIMVC\2016.3.914\Kendo.Mvc.dll</HintPath>
5455
</Reference>
5556
<Reference Include="Microsoft.CSharp" />
5657
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -59,18 +60,6 @@
5960
</Reference>
6061
<Reference Include="System.Data.DataSetExtensions" />
6162
<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>
7463
<Reference Include="System" />
7564
<Reference Include="System.Data" />
7665
<Reference Include="System.Drawing" />
@@ -80,17 +69,29 @@
8069
<Reference Include="System.ComponentModel.DataAnnotations" />
8170
<Reference Include="System.Web" />
8271
<Reference Include="System.Web.Abstractions" />
72+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
73+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
74+
<Private>True</Private>
75+
</Reference>
76+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
78+
<Private>True</Private>
79+
</Reference>
80+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
82+
<Private>True</Private>
83+
</Reference>
8384
<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>
85+
<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>
8687
<Private>True</Private>
8788
</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>
89+
<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>
9091
<Private>True</Private>
9192
</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>
93+
<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>
9495
<Private>True</Private>
9596
</Reference>
9697
<Reference Include="System.Xml" />
@@ -220,7 +221,7 @@
220221
<AutoAssignPort>True</AutoAssignPort>
221222
<DevelopmentServerPort>0</DevelopmentServerPort>
222223
<DevelopmentServerVPath>/</DevelopmentServerVPath>
223-
<IISUrl>http://localhost/GridAccessingCurrentModelInPopUp</IISUrl>
224+
<IISUrl>http://localhost:56524/</IISUrl>
224225
<NTLMAuthentication>False</NTLMAuthentication>
225226
<UseCustomServer>False</UseCustomServer>
226227
<CustomServerUrl>

‎grid/grid-accessing-current-model-in-popUp/GridAccessingCurrentModelInPopUp/Views/Shared/_Layout.cshtml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<head>
44
<title>@ViewBag.Title</title>
55
<link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
6-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
7-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.mobile.all.min.css" rel="stylesheet" type="text/css" />
8-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.dataviz.min.css" rel="stylesheet" type="text/css" />
9-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.bootstrap.min.css" rel="stylesheet" type="text/css" />
10-
<link href="http://cdn.kendostatic.com/2014.2.1008/styles/kendo.dataviz.bootstrap.min.css" rel="stylesheet" type="text/css" />
11-
<script src="http://cdn.kendostatic.com/2014.2.1008/js/jquery.min.js"></script>
12-
<script src="http://cdn.kendostatic.com/2014.2.1008/js/kendo.all.min.js"></script>
13-
<script src="http://cdn.kendostatic.com/2014.2.1008/js/kendo.aspnetmvc.min.js"></script>
6+
<link href="http://cdn.kendostatic.com/2016.3.914/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
7+
<link href="http://cdn.kendostatic.com/2016.3.914/styles/kendo.mobile.all.min.css" rel="stylesheet" type="text/css" />
8+
<link href="http://cdn.kendostatic.com/2016.3.914/styles/kendo.dataviz.min.css" rel="stylesheet" type="text/css" />
9+
<link href="http://cdn.kendostatic.com/2016.3.914/styles/kendo.bootstrap.min.css" rel="stylesheet" type="text/css" />
10+
<link href="http://cdn.kendostatic.com/2016.3.914/styles/kendo.dataviz.bootstrap.min.css" rel="stylesheet" type="text/css" />
11+
<script src="http://cdn.kendostatic.com/2016.3.914/js/jquery.min.js"></script>
12+
<script src="http://cdn.kendostatic.com/2016.3.914/js/kendo.all.min.js"></script>
13+
<script src="http://cdn.kendostatic.com/2016.3.914/js/kendo.aspnetmvc.min.js"></script>
1414
<script src="@Url.Content("~/Scripts/kendo.modernizr.custom.js")"></script>
1515
</head>
1616

‎grid/grid-accessing-current-model-in-popUp/GridAccessingCurrentModelInPopUp/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-accessing-current-model-in-popUp/GridAccessingCurrentModelInPopUp/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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.WebPages" version="3.2.3" targetFramework="net461" />
66
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
77
</packages>

‎grid/grid-accessing-current-model-in-popUp/GridAccessingCurrentModelInPopUp/web.config‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,28 @@
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" />
11+
<add key="autoFormsAuthentication" value="false" />
12+
<add key="enableSimpleMembership" value="false"/>
1113
</appSettings>
14+
<!--
15+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
16+
17+
The following attributes can be set on the <httpRuntime> tag.
18+
<system.Web>
19+
<httpRuntime targetFramework="4.6.1" />
20+
</system.Web>
21+
-->
1222
<system.web>
13-
<compilation debug="true" targetFramework="4.0">
23+
<compilation debug="true" targetFramework="4.6.1">
1424
<assemblies>
1525
<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" />
26+
<add assembly="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1727
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
18-
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
19-
<add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
28+
<add assembly="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
29+
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
2030
</assemblies>
2131
</compilation>
2232
<pages controlRenderingCompatibilityVersion="4.0">
@@ -37,9 +47,17 @@
3747
</system.webServer>
3848
<runtime>
3949
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
50+
<dependentAssembly>
51+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
52+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
53+
</dependentAssembly>
54+
<dependentAssembly>
55+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
56+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
57+
</dependentAssembly>
4058
<dependentAssembly>
4159
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
42-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.1" newVersion="3.0.0.1" />
60+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
4361
</dependentAssembly>
4462
</assemblyBinding>
4563
</runtime>

‎grid/grid-accessing-current-model-in-popUp/lib/KENDOUIMVC/2014.2.1008.340/distribution.xml‎

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

‎grid/grid-accessing-current-model-in-popUp/lib/KENDOUIMVC/2016.3.914/Kendo.Mvc.dll‎

1.92 MB
Binary file not shown.

0 commit comments

Comments
 (0)