Skip to content

Commit 1df248c

Browse files
GusevAlexander-DevExpressGusevAlexander-DevExpress
authored
Merge pull request #2 from DevExpress-Examples/update-to-vs-2022-and-update-mvc-packages
Update to vs 2022 and update mvc packages
2 parents 7c4d888 + d63c5c7 commit 1df248c

11 files changed

+110
-81
lines changed

‎CS/GridViewCustomFiltersMvc.csproj‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ProductVersion></ProductVersion>
88
<SchemaVersion>2.0</SchemaVersion>
99
<ProjectGuid>{B1B57BA4-87E5-41A3-A4CE-FC481DCBD101}</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>GridViewCustomFiltersMvc</RootNamespace>
@@ -72,40 +72,41 @@
7272
<Private>True</Private>
7373
<HintPath>packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
7474
</Reference>
75-
<Reference Include="System.Net.Http">
76-
<Private>True</Private>
77-
<HintPath>packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll</HintPath>
75+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
76+
<HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
7877
</Reference>
79-
<Reference Include="System.Net.Http.WebRequest">
80-
<Private>True</Private>
81-
<HintPath>packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
78+
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79+
<HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
8280
</Reference>
83-
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8482
<Private>True</Private>
85-
<HintPath>packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
83+
<HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
84+
</Reference>
85+
<Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
86+
<HintPath>packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
8687
</Reference>
87-
<Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88-
<HintPath>packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll</HintPath>
88+
<Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
89+
<HintPath>packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
8990
</Reference>
90-
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91+
<Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9192
<Private>True</Private>
92-
<HintPath>packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
93+
<HintPath>packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
9394
</Reference>
94-
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
95+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9596
<Private>True</Private>
96-
<HintPath>packages\Microsoft.AspNet.Razor.2.0.20715.0\lib\net40\System.Web.Razor.dll</HintPath>
97+
<HintPath>packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
9798
</Reference>
98-
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
99+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
99100
<Private>True</Private>
100-
<HintPath>packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
101+
<HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
101102
</Reference>
102-
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103104
<Private>True</Private>
104-
<HintPath>packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
105+
<HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
105106
</Reference>
106-
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107108
<Private>True</Private>
108-
<HintPath>packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
109+
<HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
109110
</Reference>
110111
</ItemGroup>
111112
<ItemGroup>
@@ -152,7 +153,7 @@
152153
<Content Include="Views\Home\Index.cshtml" />
153154
</ItemGroup>
154155
<PropertyGroup>
155-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
156+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">17.0</VisualStudioVersion>
156157
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
157158
</PropertyGroup>
158159
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

‎CS/GridViewCustomFiltersMvc.sln‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2012
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.0.31903.59
4+
MinimumVisualStudioVersion = 10.0.40219.1
35
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridViewCustomFiltersMvc", "GridViewCustomFiltersMvc.csproj", "{B1B57BA4-87E5-41A3-A4CE-FC481DCBD101}"
46
EndProject
57
Global

‎CS/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" />
@@ -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=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">
40+
<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">
4141
<controls>
42-
<add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
42+
<add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
4343
</controls>
4444
</pages>
4545
</system.web>

‎CS/Web.config‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</sectionGroup>
1010
</configSections>
1111
<appSettings>
12-
<add key="webpages:Version" value="2.0.0.0" />
12+
<add key="webpages:Version" value="3.0.0.0" />
1313
<add key="webpages:Enabled" value="false" />
1414
<add key="PreserveLoginUrl" value="true" />
1515
<add key="ClientValidationEnabled" value="true" />
@@ -77,16 +77,24 @@
7777
<runtime>
7878
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
7979
<dependentAssembly>
80-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
81-
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
80+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
81+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
8282
</dependentAssembly>
8383
<dependentAssembly>
84-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
85-
<bindingRedirect oldVersion="1.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
84+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
85+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
8686
</dependentAssembly>
8787
<dependentAssembly>
8888
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
89-
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
89+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
90+
</dependentAssembly>
91+
<dependentAssembly>
92+
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" />
93+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
94+
</dependentAssembly>
95+
<dependentAssembly>
96+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
97+
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
9098
</dependentAssembly>
9199
</assemblyBinding>
92100
</runtime>

‎CS/packages.config‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net40" />
4-
<package id="Microsoft.AspNet.Razor" version="2.0.20715.0" targetFramework="net40" />
5-
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
6-
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
7-
<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" />
812
</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/128549482/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/T361413)
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/GridViewCustomFiltersMvc.sln‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2012
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.0.31903.59
4+
MinimumVisualStudioVersion = 10.0.40219.1
35
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GridViewCustomFiltersMvc", "GridViewCustomFiltersMvc.vbproj", "{B1B57BA4-87E5-41A3-A4CE-FC481DCBD101}"
46
EndProject
57
Global

0 commit comments

Comments
 (0)