Skip to content

Commit 7cf2307

Browse files
sergepilipchuksergepilipchuk
authored
Merge pull request #1 from DevExpress-Examples/sp-24.2.1+
Update CS and VB code
2 parents b753463 + f652cb6 commit 7cf2307

File tree

9 files changed

+158
-503
lines changed

9 files changed

+158
-503
lines changed

‎CS/DXSample.Net5.sln‎ renamed to ‎CS/DXSample.Net.sln‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 16
3-
VisualStudioVersion = 15.0.26403.7
4-
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DXSample", "DXSample\DXSample.Net5.csproj", "{7FE492DD-641F-4B65-9F05-638C5E434906}"
6-
EndProject
7-
Global
8-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9-
Debug|Any CPU = Debug|Any CPU
10-
Release|Any CPU = Release|Any CPU
11-
EndGlobalSection
12-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13-
{7FE492DD-641F-4B65-9F05-638C5E434906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14-
{7FE492DD-641F-4B65-9F05-638C5E434906}.Debug|Any CPU.Build.0 = Debug|Any CPU
15-
{7FE492DD-641F-4B65-9F05-638C5E434906}.Release|Any CPU.ActiveCfg = Release|Any CPU
16-
{7FE492DD-641F-4B65-9F05-638C5E434906}.Release|Any CPU.Build.0 = Release|Any CPU
17-
EndGlobalSection
18-
GlobalSection(SolutionProperties) = preSolution
19-
HideSolutionNode = FALSE
20-
EndGlobalSection
21-
EndGlobal
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio 16
3+
VisualStudioVersion = 15.0.26403.7
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DXSample", "DXSample\DXSample.Net.csproj", "{7FE492DD-641F-4B65-9F05-638C5E434906}"
6+
EndProject
7+
Global
8+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9+
Debug|Any CPU = Debug|Any CPU
10+
Release|Any CPU = Release|Any CPU
11+
EndGlobalSection
12+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13+
{7FE492DD-641F-4B65-9F05-638C5E434906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14+
{7FE492DD-641F-4B65-9F05-638C5E434906}.Debug|Any CPU.Build.0 = Debug|Any CPU
15+
{7FE492DD-641F-4B65-9F05-638C5E434906}.Release|Any CPU.ActiveCfg = Release|Any CPU
16+
{7FE492DD-641F-4B65-9F05-638C5E434906}.Release|Any CPU.Build.0 = Release|Any CPU
17+
EndGlobalSection
18+
GlobalSection(SolutionProperties) = preSolution
19+
HideSolutionNode = FALSE
20+
EndGlobalSection
21+
EndGlobal

‎CS/DXSample.sln‎

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

‎CS/DXSample/DXSample.Net5.csproj‎ renamed to ‎CS/DXSample/DXSample.Net.csproj‎

Lines changed: 56 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,56 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk">
3-
<PropertyGroup>
4-
<TargetFramework>net8.0-windows</TargetFramework>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6-
<OutputType>WinExe</OutputType>
7-
<RootNamespace>DXSample</RootNamespace>
8-
<AssemblyName>DXSample</AssemblyName>
9-
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
10-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
11-
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
12-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
14-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
15-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
16-
<UseWindowsForms>true</UseWindowsForms>
17-
<UseWPF>true</UseWPF>
18-
<Platforms>x86;AnyCPU</Platforms>
19-
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
20-
<DefaultItemExcludes>obj*/**</DefaultItemExcludes>
21-
</PropertyGroup>
22-
<ItemGroup>
23-
<AppDesigner Include="Properties\" />
24-
</ItemGroup>
25-
<ItemGroup>
26-
<Resource Include="Data\EmployeesWithPhoto.xml" />
27-
</ItemGroup>
28-
<ItemGroup>
29-
<Resource Include="Images\Person_Female.png" />
30-
<Resource Include="Images\Person_Male.png" />
31-
</ItemGroup>
32-
<ItemGroup>
33-
<Resource Include="Images\Administration.png" />
34-
<Resource Include="Images\Inventory.png" />
35-
<Resource Include="Images\Manufacturing.png" />
36-
<Resource Include="Images\Quality.png" />
37-
<Resource Include="Images\Research.png" />
38-
<Resource Include="Images\Sales.png" />
39-
</ItemGroup>
40-
<ItemGroup>
41-
<PackageReference Include="DevExpress.Data" Version="24.2.*-*" />
42-
<PackageReference Include="DevExpress.Data.Desktop" Version="24.2.*-*" />
43-
<PackageReference Include="DevExpress.Mvvm" Version="24.2.*-*" />
44-
<PackageReference Include="DevExpress.Office.Core" Version="24.2.*-*" />
45-
<PackageReference Include="DevExpress.Printing.Core" Version="24.2.*-*" />
46-
<PackageReference Include="DevExpress.RichEdit.Core" Version="24.2.*-*" />
47-
<PackageReference Include="DevExpress.RichEdit.Export" 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.LayoutControl" Version="24.2.*-*" />
51-
<PackageReference Include="DevExpress.Wpf.Reporting" Version="24.2.*-*" />
52-
<PackageReference Include="DevExpress.Wpf.Themes.Office2016White" Version="24.2.*-*" />
53-
<PackageReference Include="DevExpress.Wpf.Themes.All" Version="24.2.*-*" />
54-
</ItemGroup>
55-
</Project>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
3+
<PropertyGroup>
4+
<TargetFrameworks>net8.0-windows;net472</TargetFrameworks>
5+
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6+
<OutputType>WinExe</OutputType>
7+
<RootNamespace>DXSample</RootNamespace>
8+
<AssemblyName>DXSample</AssemblyName>
9+
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
10+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
11+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
12+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
14+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
15+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
16+
<UseWindowsForms>true</UseWindowsForms>
17+
<UseWPF>true</UseWPF>
18+
<Platforms>x86;AnyCPU</Platforms>
19+
<!--<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>-->
20+
<DefaultItemExcludes>obj*/**</DefaultItemExcludes>
21+
</PropertyGroup>
22+
<ItemGroup>
23+
<AppDesigner Include="Properties\" />
24+
</ItemGroup>
25+
<ItemGroup>
26+
<Resource Include="Data\EmployeesWithPhoto.xml" />
27+
</ItemGroup>
28+
<ItemGroup>
29+
<Resource Include="Images\Person_Female.png" />
30+
<Resource Include="Images\Person_Male.png" />
31+
</ItemGroup>
32+
<ItemGroup>
33+
<Resource Include="Images\Administration.png" />
34+
<Resource Include="Images\Inventory.png" />
35+
<Resource Include="Images\Manufacturing.png" />
36+
<Resource Include="Images\Quality.png" />
37+
<Resource Include="Images\Research.png" />
38+
<Resource Include="Images\Sales.png" />
39+
</ItemGroup>
40+
<ItemGroup>
41+
<PackageReference Include="DevExpress.Data" Version="24.2.*-*" />
42+
<PackageReference Include="DevExpress.Data.Desktop" Version="24.2.*-*" />
43+
<PackageReference Include="DevExpress.Mvvm" Version="24.2.*-*" />
44+
<PackageReference Include="DevExpress.Office.Core" Version="24.2.*-*" />
45+
<PackageReference Include="DevExpress.Printing.Core" Version="24.2.*-*" />
46+
<PackageReference Include="DevExpress.RichEdit.Core" Version="24.2.*-*" />
47+
<PackageReference Include="DevExpress.RichEdit.Export" 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.LayoutControl" Version="24.2.*-*" />
51+
<PackageReference Include="DevExpress.Wpf.Reporting" Version="24.2.*-*" />
52+
<PackageReference Include="DevExpress.Wpf.Themes.Office2016White" Version="24.2.*-*" />
53+
<PackageReference Include="DevExpress.Wpf.Themes.All" Version="24.2.*-*" />
54+
<Reference Include="System.Web" Condition="$(TargetFramework) == 'net472'" />
55+
</ItemGroup>
56+
</Project>

‎CS/DXSample/DXSample.csproj‎

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

‎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/128640180/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/T508360)
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/DXSample.Net5.sln‎ renamed to ‎VB/DXSample.Net.sln‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 16
3-
VisualStudioVersion = 15.0.26403.7
4-
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DXSample", "DXSample\DXSample.Net5.vbproj", "{7FE492DD-641F-4B65-9F05-638C5E434906}"
6-
EndProject
7-
Global
8-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9-
Debug|Any CPU = Debug|Any CPU
10-
Release|Any CPU = Release|Any CPU
11-
EndGlobalSection
12-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13-
{7FE492DD-641F-4B65-9F05-638C5E434906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14-
{7FE492DD-641F-4B65-9F05-638C5E434906}.Debug|Any CPU.Build.0 = Debug|Any CPU
15-
{7FE492DD-641F-4B65-9F05-638C5E434906}.Release|Any CPU.ActiveCfg = Release|Any CPU
16-
{7FE492DD-641F-4B65-9F05-638C5E434906}.Release|Any CPU.Build.0 = Release|Any CPU
17-
EndGlobalSection
18-
GlobalSection(SolutionProperties) = preSolution
19-
HideSolutionNode = FALSE
20-
EndGlobalSection
21-
EndGlobal
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio 16
3+
VisualStudioVersion = 15.0.26403.7
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DXSample", "DXSample\DXSample.Net.vbproj", "{7FE492DD-641F-4B65-9F05-638C5E434906}"
6+
EndProject
7+
Global
8+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9+
Debug|Any CPU = Debug|Any CPU
10+
Release|Any CPU = Release|Any CPU
11+
EndGlobalSection
12+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13+
{7FE492DD-641F-4B65-9F05-638C5E434906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14+
{7FE492DD-641F-4B65-9F05-638C5E434906}.Debug|Any CPU.Build.0 = Debug|Any CPU
15+
{7FE492DD-641F-4B65-9F05-638C5E434906}.Release|Any CPU.ActiveCfg = Release|Any CPU
16+
{7FE492DD-641F-4B65-9F05-638C5E434906}.Release|Any CPU.Build.0 = Release|Any CPU
17+
EndGlobalSection
18+
GlobalSection(SolutionProperties) = preSolution
19+
HideSolutionNode = FALSE
20+
EndGlobalSection
21+
EndGlobal

0 commit comments

Comments
 (0)