Skip to content

Commit 9b74a52

Browse files
DevExpressExampleBotDevExpressExampleBot
committed
Create 24.2.1+ branch
1 parent 4f99f0a commit 9b74a52

File tree

6 files changed

+66
-66
lines changed

6 files changed

+66
-66
lines changed

‎CS/ChildrenSelector/App.config‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="DXThemeManager" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
6-
</sectionGroup>
7-
</configSections>
8-
<userSettings>
9-
<DXThemeManager>
10-
<setting name="ApplicationThemeName" serializeAs="String">
11-
<value>Office2016White</value>
12-
</setting>
13-
</DXThemeManager>
14-
</userSettings>
3+
<configSections>
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="DXThemeManager" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
6+
</sectionGroup>
7+
</configSections>
8+
<userSettings>
9+
<DXThemeManager>
10+
<setting name="ApplicationThemeName" serializeAs="String">
11+
<value>Office2016White</value>
12+
</setting>
13+
</DXThemeManager>
14+
</userSettings>
1515
</configuration>

‎CS/ChildrenSelector/ChildrenSelector.Net5.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net6.0-windows</TargetFramework>
4+
<TargetFramework>net8.0-windows</TargetFramework>
55
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
66
<OutputType>WinExe</OutputType>
77
<RootNamespace>DXApplication7</RootNamespace>
@@ -23,12 +23,12 @@
2323
<AppDesigner Include="Properties\" />
2424
</ItemGroup>
2525
<ItemGroup>
26-
<PackageReference Include="DevExpress.Data" Version="22.2.*-*" />
27-
<PackageReference Include="DevExpress.Data.Desktop" Version="22.2.*-*" />
28-
<PackageReference Include="DevExpress.Mvvm" Version="22.2.*-*" />
29-
<PackageReference Include="DevExpress.Wpf.Accordion" Version="22.2.*-*" />
30-
<PackageReference Include="DevExpress.Wpf.Core" Version="22.2.*-*" />
31-
<PackageReference Include="DevExpress.Wpf.Reporting" Version="22.2.*-*" />
32-
<PackageReference Include="DevExpress.Wpf.Themes.All" Version="22.2.*-*" />
26+
<PackageReference Include="DevExpress.Data" Version="24.2.*-*" />
27+
<PackageReference Include="DevExpress.Data.Desktop" Version="24.2.*-*" />
28+
<PackageReference Include="DevExpress.Mvvm" Version="24.2.*-*" />
29+
<PackageReference Include="DevExpress.Wpf.Accordion" Version="24.2.*-*" />
30+
<PackageReference Include="DevExpress.Wpf.Core" Version="24.2.*-*" />
31+
<PackageReference Include="DevExpress.Wpf.Reporting" Version="24.2.*-*" />
32+
<PackageReference Include="DevExpress.Wpf.Themes.All" Version="24.2.*-*" />
3333
</ItemGroup>
34-
</Project>
34+
</Project>

‎CS/ChildrenSelector/ChildrenSelector.csproj‎

Lines changed: 11 additions & 11 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 ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>DXApplication7</RootNamespace>
1212
<AssemblyName>DXApplication7</AssemblyName>
13-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1616
<WarningLevel>4</WarningLevel>
@@ -36,14 +36,14 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="DevExpress.Drawing.v22.2, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
40-
<Reference Include="DevExpress.Printing.v22.2.Core, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
41-
<Reference Include="DevExpress.Data.v22.2, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
42-
<Reference Include="DevExpress.Mvvm.v22.2, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
43-
<Reference Include="DevExpress.Xpf.Accordion.v22.2, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
44-
<Reference Include="DevExpress.Xpf.CodeView.v22.2, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
45-
<Reference Include="DevExpress.Data.Desktop.v22.2, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
46-
<Reference Include="DevExpress.Xpf.Core.v22.2, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
39+
<Reference Include="DevExpress.Drawing.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
40+
<Reference Include="DevExpress.Printing.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
41+
<Reference Include="DevExpress.Data.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
42+
<Reference Include="DevExpress.Mvvm.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
43+
<Reference Include="DevExpress.Xpf.Accordion.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
44+
<Reference Include="DevExpress.Xpf.CodeView.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
45+
<Reference Include="DevExpress.Data.Desktop.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
46+
<Reference Include="DevExpress.Xpf.Core.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
4747
<Reference Include="System" />
4848
<Reference Include="System.Data" />
4949
<Reference Include="System.Xml" />
@@ -110,4 +110,4 @@
110110
<Target Name="AfterBuild">
111111
</Target>
112112
-->
113-
</Project>
113+
</Project>

‎VB/ChildrenSelector/App.config‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="DXThemeManager" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
6-
</sectionGroup>
7-
</configSections>
8-
<userSettings>
9-
<DXThemeManager>
10-
<setting name="ApplicationThemeName" serializeAs="String">
11-
<value>Office2016White</value>
12-
</setting>
13-
</DXThemeManager>
14-
</userSettings>
3+
<configSections>
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="DXThemeManager" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
6+
</sectionGroup>
7+
</configSections>
8+
<userSettings>
9+
<DXThemeManager>
10+
<setting name="ApplicationThemeName" serializeAs="String">
11+
<value>Office2016White</value>
12+
</setting>
13+
</DXThemeManager>
14+
</userSettings>
1515
</configuration>

‎VB/ChildrenSelector/ChildrenSelector.Net5.vbproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net6.0-windows</TargetFramework>
4+
<TargetFramework>net8.0-windows</TargetFramework>
55
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
66
<OutputType>WinExe</OutputType>
77
<RootNamespace></RootNamespace>
@@ -42,18 +42,18 @@
4242
<AppDesigner Include="My Project\" />
4343
</ItemGroup>
4444
<ItemGroup>
45-
<PackageReference Include="DevExpress.Data" Version="22.2.*-*" />
46-
<PackageReference Include="DevExpress.Data.Desktop" Version="22.2.*-*" />
47-
<PackageReference Include="DevExpress.Mvvm" Version="22.2.*-*" />
48-
<PackageReference Include="DevExpress.Wpf.Accordion" Version="22.2.*-*" />
49-
<PackageReference Include="DevExpress.Wpf.Core" Version="22.2.*-*" />
50-
<PackageReference Include="DevExpress.Wpf.Reporting" Version="22.2.*-*" />
51-
<PackageReference Include="DevExpress.Wpf.Themes.All" Version="22.2.*-*" />
45+
<PackageReference Include="DevExpress.Data" Version="24.2.*-*" />
46+
<PackageReference Include="DevExpress.Data.Desktop" Version="24.2.*-*" />
47+
<PackageReference Include="DevExpress.Mvvm" Version="24.2.*-*" />
48+
<PackageReference Include="DevExpress.Wpf.Accordion" Version="24.2.*-*" />
49+
<PackageReference Include="DevExpress.Wpf.Core" Version="24.2.*-*" />
50+
<PackageReference Include="DevExpress.Wpf.Reporting" Version="24.2.*-*" />
51+
<PackageReference Include="DevExpress.Wpf.Themes.All" Version="24.2.*-*" />
5252
</ItemGroup>
5353
<ItemGroup>
5454
<Compile Remove="Properties\AssemblyInfo.vb" />
5555
<Compile Remove="Properties\Resources.Designer.vb" />
5656
<Compile Remove="Properties\Settings.Designer.vb" />
5757
<EmbeddedResource Remove="Properties\Resources.resx" />
5858
</ItemGroup>
59-
</Project>
59+
</Project>

‎VB/ChildrenSelector/ChildrenSelector.vbproj‎

Lines changed: 11 additions & 11 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 ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
99
<OutputType>WinExe</OutputType>
1010
<RootNamespace></RootNamespace>
1111
<AssemblyName>DXApplication7</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
1515
<OptionExplicit>On</OptionExplicit>
@@ -57,14 +57,14 @@
5757
<Import Include="System" />
5858
</ItemGroup>
5959
<ItemGroup>
60-
<Reference Include="DevExpress.Drawing.v22.2, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
61-
<Reference Include="DevExpress.Printing.v22.2.Core, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
62-
<Reference Include="DevExpress.Data.v22.2, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
63-
<Reference Include="DevExpress.Mvvm.v22.2, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
64-
<Reference Include="DevExpress.Xpf.Accordion.v22.2, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
65-
<Reference Include="DevExpress.Xpf.CodeView.v22.2, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
66-
<Reference Include="DevExpress.Data.Desktop.v22.2, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
67-
<Reference Include="DevExpress.Xpf.Core.v22.2, Version=22.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
60+
<Reference Include="DevExpress.Drawing.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
61+
<Reference Include="DevExpress.Printing.v24.2.Core, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
62+
<Reference Include="DevExpress.Data.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
63+
<Reference Include="DevExpress.Mvvm.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
64+
<Reference Include="DevExpress.Xpf.Accordion.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
65+
<Reference Include="DevExpress.Xpf.CodeView.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
66+
<Reference Include="DevExpress.Data.Desktop.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
67+
<Reference Include="DevExpress.Xpf.Core.v24.2, Version=24.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
6868
<Reference Include="System" />
6969
<Reference Include="System.Data" />
7070
<Reference Include="System.Xml" />
@@ -132,4 +132,4 @@
132132
<Target Name="AfterBuild">
133133
</Target>
134134
-->
135-
</Project>
135+
</Project>

0 commit comments

Comments
 (0)