Skip to content

Commit 40d7a74

Browse files
GusevAlexander-DevExpressGusevAlexander-DevExpress
authored
Merge pull request #2 from DevExpress-Examples/upgrade-VS,-mvc-and-devexpress-packages
Upgrade vs, mvc and devexpress packages
2 parents c46aa7a + 012fb3c commit 40d7a74

File tree

11 files changed

+124
-67
lines changed

11 files changed

+124
-67
lines changed

‎CS/Solution.sln‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
Microsoft Visual Studio Solution File, Format Version 11.00
2-
# Visual Studio 2010
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.0.31903.59
4+
MinimumVisualStudioVersion = 10.0.40219.1
35
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExpressMvcApplication1", "WebSite\DevExpressMvcApplication1.csproj", "{9EAA45FD-BEC5-4579-B312-A59365EA785A}"
46
ProjectSection(WebsiteProperties) = preProject
57
Debug.AspNetCompiler.Debug = "True"

‎CS/WebSite/DevExpressMvcApplication1.csproj‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ProductVersion></ProductVersion>
88
<SchemaVersion>2.0</SchemaVersion>
99
<ProjectGuid>{9EAA45FD-BEC5-4579-B312-A59365EA785A}</ProjectGuid>
10-
<ProjectTypeGuids>{E3E379DF-F4C6-4180-9B81-6769533ABE47};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
10+
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
1111
<OutputType>Library</OutputType>
1212
<AppDesignerFolder>Properties</AppDesignerFolder>
1313
<RootNamespace>DevExpressMvcApplication1</RootNamespace>
@@ -93,34 +93,46 @@
9393
<Reference Include="System.Configuration" />
9494
<Reference Include="System.Web.Services" />
9595
<Reference Include="System.EnterpriseServices" />
96-
<Reference Include="System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
97-
<HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.40804.0\lib\net40\System.Web.Mvc.dll</HintPath>
96+
<Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
97+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
9898
<Private>True</Private>
9999
</Reference>
100-
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
100+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
102102
<Private>True</Private>
103103
</Reference>
104-
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
105-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
104+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
105+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
106106
<Private>True</Private>
107107
</Reference>
108-
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
108+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
110110
<Private>True</Private>
111111
</Reference>
112-
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
113-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
112+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
113+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
114114
<Private>True</Private>
115115
</Reference>
116116
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117117
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
118118
<Private>True</Private>
119119
</Reference>
120-
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
121-
<HintPath>..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
120+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
121+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
122122
<Private>True</Private>
123123
</Reference>
124+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
125+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
126+
</Reference>
127+
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
129+
</Reference>
130+
<Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
131+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
132+
</Reference>
133+
<Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134+
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
135+
</Reference>
124136
</ItemGroup>
125137
<ItemGroup>
126138
<Content Include="Global.asax" />
@@ -165,7 +177,7 @@
165177
<Compile Include="Properties\AssemblyInfo.cs" />
166178
</ItemGroup>
167179
<PropertyGroup>
168-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
180+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">17.0</VisualStudioVersion>
169181
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
170182
</PropertyGroup>
171183
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

‎CS/WebSite/Views/Web.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
5-
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
6-
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
4+
<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">
5+
<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" />
6+
<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" />
77
</sectionGroup>
88
</configSections>
99
<system.web.webPages.razor>
10-
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
10+
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1111
<pages pageBaseType="System.Web.Mvc.WebViewPage">
1212
<namespaces>
1313
<add namespace="System.Web.Mvc" />
@@ -49,9 +49,9 @@
4949
To change this behavior apply the ValidateInputAttribute to a
5050
controller or action.
5151
-->
52-
<pages validateRequest="false" pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
52+
<pages validateRequest="false" pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
5353
<controls>
54-
<add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
54+
<add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
5555
</controls>
5656
</pages>
5757
</system.web>

‎CS/WebSite/Web.config‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
<add name="DefaultConnection" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=aspnet-DevExpressMvcApplication1-20130731144431;Integrated Security=SSPI" providerName="System.Data.SqlClient" />
1313
</connectionStrings>
1414
<appSettings>
15-
<add key="webpages:Version" value="2.0.0.0" />
15+
<add key="webpages:Version" value="3.0.0.0" />
16+
<add key="webpages:Enabled" value="false" />
17+
<add key="PreserveLoginUrl" value="true" />
1618
<add key="ClientValidationEnabled" value="true" />
1719
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
1820
</appSettings>
@@ -48,9 +50,9 @@
4850
<add assembly="DevExpress.XtraScheduler.v24.2.Core.Desktop, Version=24.2.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
4951
<add assembly="DevExpress.Web.ASPxScheduler.v24.2, Version=24.2.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
5052
<add assembly="DevExpress.Web.Mvc.v24.2, Version=24.2.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
51-
<add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
52-
<add assembly="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
53-
<add assembly="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
53+
<add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
54+
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
55+
<add assembly="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
5456
<add assembly="DevExpress.Docs.v24.2, Version=24.2.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
5557
</assemblies>
5658
</compilation>
@@ -118,17 +120,25 @@
118120
</system.webServer>
119121
<runtime>
120122
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
123+
<dependentAssembly>
124+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
125+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
126+
</dependentAssembly>
121127
<dependentAssembly>
122128
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
123-
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
129+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
124130
</dependentAssembly>
125131
<dependentAssembly>
126132
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
127-
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
133+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
134+
</dependentAssembly>
135+
<dependentAssembly>
136+
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" />
137+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
128138
</dependentAssembly>
129139
<dependentAssembly>
130140
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
131-
<bindingRedirect oldVersion="3.0.0.0-4.0.0.1" newVersion="4.0.0.1" />
141+
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
132142
</dependentAssembly>
133143
</assemblyBinding>
134144
</runtime>

‎CS/WebSite/packages.config‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.Mvc" version="4.0.40804.0" targetFramework="net40" />
4-
<package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net40" />
5-
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
6-
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
3+
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
4+
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
5+
<package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net472" />
6+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net472" />
7+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net472" />
8+
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
9+
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
10+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net472" />
11+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
712
</packages>

‎Readme.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<!-- default badges list -->
2-
![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/128552131/24.2.1%2B)
32
[![](https://img.shields.io/badge/Open_in_DevExpress_Support_Center-FF7200?style=flat-square&logo=DevExpress&logoColor=white)](https://supportcenter.devexpress.com/ticket/details/E4825)
43
[![](https://img.shields.io/badge/📖_How_to_use_DevExpress_Examples-e9f6fc?style=flat-square)](https://docs.devexpress.com/GeneralInformation/403183)
54
[![](https://img.shields.io/badge/💬_Leave_Feedback-feecdd?style=flat-square)](#does-this-example-address-your-development-requirementsobjectives)

‎VB/Solution.sln‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
Microsoft Visual Studio Solution File, Format Version 11.00
2-
# Visual Studio 2010
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.0.31903.59
4+
MinimumVisualStudioVersion = 10.0.40219.1
35
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DevExpressMvcApplication1", "WebSite\DevExpressMvcApplication1.vbproj", "{9EAA45FD-BEC5-4579-B312-A59365EA785A}"
46
ProjectSection(WebsiteProperties) = preProject
57
Debug.AspNetCompiler.Debug = "True"

0 commit comments

Comments
 (0)