Skip to content

Commit 5feb343

Browse files
DevExpressExampleBotDevExpressExampleBot
committed
Create 24.2.1+ branch
1 parent 63e25d6 commit 5feb343

File tree

4 files changed

+73
-82
lines changed

4 files changed

+73
-82
lines changed

‎CS/ASPxPivotGrid_RuntimeDataBinding/ASPxPivotGrid_RuntimeDataBinding.csproj‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -12,12 +12,10 @@
1212
<AppDesignerFolder>Properties</AppDesignerFolder>
1313
<RootNamespace>ASPxPivotGrid_RuntimeDataBinding</RootNamespace>
1414
<AssemblyName>ASPxPivotGrid_RuntimeDataBinding</AssemblyName>
15-
<FileUpgradeFlags>
16-
</FileUpgradeFlags>
17-
<UpgradeBackupLocation>
18-
</UpgradeBackupLocation>
15+
<FileUpgradeFlags></FileUpgradeFlags>
16+
<UpgradeBackupLocation></UpgradeBackupLocation>
1917
<OldToolsVersion>2.0</OldToolsVersion>
20-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
2119
<TargetFrameworkProfile />
2220
<UseIISExpress>false</UseIISExpress>
2321
<Use64BitIISExpress />
@@ -48,17 +46,17 @@
4846
<Prefer32Bit>false</Prefer32Bit>
4947
</PropertyGroup>
5048
<ItemGroup>
51-
<Reference Include="DevExpress.Pdf.v22.1.Core, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
52-
<Reference Include="DevExpress.RichEdit.v22.1.Export, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
53-
<Reference Include="DevExpress.Printing.v22.1.Core, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
54-
<Reference Include="DevExpress.Drawing.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
55-
<Reference Include="DevExpress.Data.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
56-
<Reference Include="DevExpress.PivotGrid.v22.1.Core, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
57-
<Reference Include="DevExpress.Web.ASPxPivotGrid.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
58-
<Reference Include="DevExpress.Office.v22.1.Core, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
59-
<Reference Include="DevExpress.Docs.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
60-
<Reference Include="DevExpress.RichEdit.v22.1.Core, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
61-
<Reference Include="DevExpress.Web.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
49+
<Reference Include="DevExpress.Pdf.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
50+
<Reference Include="DevExpress.RichEdit.v24.2.Export, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
51+
<Reference Include="DevExpress.Printing.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
52+
<Reference Include="DevExpress.Drawing.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
53+
<Reference Include="DevExpress.Data.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
54+
<Reference Include="DevExpress.PivotGrid.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
55+
<Reference Include="DevExpress.Web.ASPxPivotGrid.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
56+
<Reference Include="DevExpress.Office.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
57+
<Reference Include="DevExpress.Docs.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
58+
<Reference Include="DevExpress.RichEdit.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
59+
<Reference Include="DevExpress.Web.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
6260
<Reference Include="System" />
6361
<Reference Include="System.Data" />
6462
<Reference Include="System.Drawing" />
@@ -71,8 +69,7 @@
7169
</ItemGroup>
7270
<ItemGroup>
7371
<Content Include="Default.aspx" />
74-
<Content Include="App_Data\nwind.mdb">
75-
</Content>
72+
<Content Include="App_Data\nwind.mdb"></Content>
7673
<Content Include="Web.config" />
7774
</ItemGroup>
7875
<ItemGroup>
@@ -108,15 +105,13 @@
108105
<AutoAssignPort>True</AutoAssignPort>
109106
<DevelopmentServerPort>51031</DevelopmentServerPort>
110107
<DevelopmentServerVPath>/</DevelopmentServerVPath>
111-
<IISUrl>
112-
</IISUrl>
108+
<IISUrl></IISUrl>
113109
<NTLMAuthentication>False</NTLMAuthentication>
114110
<UseCustomServer>False</UseCustomServer>
115-
<CustomServerUrl>
116-
</CustomServerUrl>
111+
<CustomServerUrl></CustomServerUrl>
117112
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
118113
</WebProjectProperties>
119114
</FlavorProperties>
120115
</VisualStudio>
121116
</ProjectExtensions>
122-
</Project>
117+
</Project>

‎CS/ASPxPivotGrid_RuntimeDataBinding/Web.config‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<configuration>
33
<configSections>
44
<sectionGroup name="devExpress">
5-
<section name="settings" type="DevExpress.Web.SettingsConfigurationSection, DevExpress.Web.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
6-
<section name="compression" type="DevExpress.Web.CompressionConfigurationSection, DevExpress.Web.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
7-
<section name="themes" type="DevExpress.Web.ThemesConfigurationSection, DevExpress.Web.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
8-
<section name="errors" type="DevExpress.Web.ErrorsConfigurationSection, DevExpress.Web.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
5+
<section name="settings" type="DevExpress.Web.SettingsConfigurationSection, DevExpress.Web.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
6+
<section name="compression" type="DevExpress.Web.CompressionConfigurationSection, DevExpress.Web.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
7+
<section name="themes" type="DevExpress.Web.ThemesConfigurationSection, DevExpress.Web.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
8+
<section name="errors" type="DevExpress.Web.ErrorsConfigurationSection, DevExpress.Web.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
99
</sectionGroup>
1010
</configSections>
1111
<appSettings>
@@ -27,15 +27,16 @@
2727
affects performance, set this value to true only
2828
during development.
2929
-->
30-
<compilation debug="true" targetFramework="4.5.2">
30+
<compilation debug="true" targetFramework="4.7.2">
3131
<assemblies>
32-
<add assembly="DevExpress.Web.ASPxPivotGrid.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
33-
<add assembly="DevExpress.Web.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
34-
<add assembly="DevExpress.PivotGrid.v22.1.Core, Version=22.1.14.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
35-
<add assembly="DevExpress.Printing.v22.1.Core, Version=22.1.14.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
36-
<add assembly="DevExpress.Data.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
37-
<add assembly="DevExpress.RichEdit.v22.1.Core, Version=22.1.14.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
38-
<add assembly="DevExpress.Docs.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
32+
<add assembly="DevExpress.Web.ASPxPivotGrid.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
33+
<add assembly="DevExpress.Web.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
34+
<add assembly="DevExpress.PivotGrid.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
35+
<add assembly="DevExpress.Printing.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
36+
<add assembly="DevExpress.Data.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
37+
<add assembly="DevExpress.Drawing.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
38+
<add assembly="DevExpress.RichEdit.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
39+
<add assembly="DevExpress.Docs.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=B88D1754D700E49A" />
3940
<add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
4041
<add assembly="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
4142
<add assembly="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
@@ -71,20 +72,20 @@
7172
</customErrors>
7273
-->
7374
<httpModules>
74-
<add type="DevExpress.Web.ASPxHttpHandlerModule, DevExpress.Web.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" name="ASPxHttpHandlerModule" />
75+
<add type="DevExpress.Web.ASPxHttpHandlerModule, DevExpress.Web.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" name="ASPxHttpHandlerModule" />
7576
</httpModules>
7677
<pages controlRenderingCompatibilityVersion="4.0" />
7778
<httpHandlers>
78-
<add verb="GET,POST" path="ASPxUploadProgressHandlerPage.ashx" type="DevExpress.Web.ASPxUploadProgressHttpHandler, DevExpress.Web.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
79+
<add verb="GET,POST" path="ASPxUploadProgressHandlerPage.ashx" type="DevExpress.Web.ASPxUploadProgressHttpHandler, DevExpress.Web.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
7980
</httpHandlers>
8081
</system.web>
8182
<system.webServer>
8283
<validation validateIntegratedModeConfiguration="false" />
8384
<modules>
84-
<add type="DevExpress.Web.ASPxHttpHandlerModule, DevExpress.Web.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" name="ASPxHttpHandlerModule" />
85+
<add type="DevExpress.Web.ASPxHttpHandlerModule, DevExpress.Web.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" name="ASPxHttpHandlerModule" />
8586
</modules>
8687
<handlers>
87-
<add name="ASPxUploadProgressHandler" preCondition="integratedMode" verb="GET,POST" path="ASPxUploadProgressHandlerPage.ashx" type="DevExpress.Web.ASPxUploadProgressHttpHandler, DevExpress.Web.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
88+
<add name="ASPxUploadProgressHandler" preCondition="integratedMode" verb="GET,POST" path="ASPxUploadProgressHandlerPage.ashx" type="DevExpress.Web.ASPxUploadProgressHttpHandler, DevExpress.Web.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
8889
</handlers>
8990
</system.webServer>
9091
<devExpress>

‎VB/ASPxPivotGrid_RuntimeDataBinding/ASPxPivotGrid_RuntimeDataBinding.vbproj‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -11,15 +11,12 @@
1111
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
1212
<OutputType>Library</OutputType>
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
14-
<RootNamespace>
15-
</RootNamespace>
14+
<RootNamespace></RootNamespace>
1615
<AssemblyName>ASPxPivotGrid_RuntimeDataBinding</AssemblyName>
17-
<FileUpgradeFlags>
18-
</FileUpgradeFlags>
19-
<UpgradeBackupLocation>
20-
</UpgradeBackupLocation>
16+
<FileUpgradeFlags></FileUpgradeFlags>
17+
<UpgradeBackupLocation></UpgradeBackupLocation>
2118
<OldToolsVersion>2.0</OldToolsVersion>
22-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
19+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
2320
<TargetFrameworkProfile />
2421
<UseIISExpress>false</UseIISExpress>
2522
<Use64BitIISExpress />
@@ -50,17 +47,17 @@
5047
<Prefer32Bit>false</Prefer32Bit>
5148
</PropertyGroup>
5249
<ItemGroup>
53-
<Reference Include="DevExpress.Pdf.v22.1.Core, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
54-
<Reference Include="DevExpress.RichEdit.v22.1.Export, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
55-
<Reference Include="DevExpress.Printing.v22.1.Core, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
56-
<Reference Include="DevExpress.Drawing.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
57-
<Reference Include="DevExpress.Data.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
58-
<Reference Include="DevExpress.PivotGrid.v22.1.Core, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
59-
<Reference Include="DevExpress.Web.ASPxPivotGrid.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
60-
<Reference Include="DevExpress.Office.v22.1.Core, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
61-
<Reference Include="DevExpress.Docs.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
62-
<Reference Include="DevExpress.RichEdit.v22.1.Core, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
63-
<Reference Include="DevExpress.Web.v22.1, Version=22.1.14.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
50+
<Reference Include="DevExpress.Pdf.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
51+
<Reference Include="DevExpress.RichEdit.v24.2.Export, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
52+
<Reference Include="DevExpress.Printing.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
53+
<Reference Include="DevExpress.Drawing.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
54+
<Reference Include="DevExpress.Data.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
55+
<Reference Include="DevExpress.PivotGrid.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
56+
<Reference Include="DevExpress.Web.ASPxPivotGrid.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
57+
<Reference Include="DevExpress.Office.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
58+
<Reference Include="DevExpress.Docs.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
59+
<Reference Include="DevExpress.RichEdit.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
60+
<Reference Include="DevExpress.Web.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
6461
<Reference Include="System" />
6562
<Reference Include="System.Data" />
6663
<Reference Include="System.Drawing" />
@@ -73,8 +70,7 @@
7370
</ItemGroup>
7471
<ItemGroup>
7572
<Content Include="Default.aspx" />
76-
<Content Include="App_Data\nwind.mdb">
77-
</Content>
73+
<Content Include="App_Data\nwind.mdb"></Content>
7874
<Content Include="Web.config" />
7975
</ItemGroup>
8076
<ItemGroup>
@@ -110,15 +106,13 @@
110106
<AutoAssignPort>True</AutoAssignPort>
111107
<DevelopmentServerPort>51031</DevelopmentServerPort>
112108
<DevelopmentServerVPath>/</DevelopmentServerVPath>
113-
<IISUrl>
114-
</IISUrl>
109+
<IISUrl></IISUrl>
115110
<NTLMAuthentication>False</NTLMAuthentication>
116111
<UseCustomServer>False</UseCustomServer>
117-
<CustomServerUrl>
118-
</CustomServerUrl>
112+
<CustomServerUrl></CustomServerUrl>
119113
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
120114
</WebProjectProperties>
121115
</FlavorProperties>
122116
</VisualStudio>
123117
</ProjectExtensions>
124-
</Project>
118+
</Project>

0 commit comments

Comments
 (0)