Skip to content

Commit ea6949f

Browse files
sergepilipchuksergepilipchuk
authored
Merge branch '24.2.1+' into sp-update-readme-24-2-1
2 parents ae7b2e5 + 5a540c0 commit ea6949f

File tree

4 files changed

+42
-41
lines changed

4 files changed

+42
-41
lines changed

‎CS/DXSample.csproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,52 +36,52 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="DevExpress.Drawing.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
39+
<Reference Include="DevExpress.Drawing.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
4040
<SpecificVersion>False</SpecificVersion>
4141
</Reference>
42-
<Reference Include="DevExpress.Data.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
42+
<Reference Include="DevExpress.Data.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
4343
<SpecificVersion>False</SpecificVersion>
4444
</Reference>
45-
<Reference Include="DevExpress.Mvvm.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
45+
<Reference Include="DevExpress.Mvvm.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
4646
<SpecificVersion>False</SpecificVersion>
4747
</Reference>
48-
<Reference Include="DevExpress.Pdf.v24.2.Core, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
48+
<Reference Include="DevExpress.Pdf.v24.2.Core, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
4949
<SpecificVersion>False</SpecificVersion>
5050
</Reference>
51-
<Reference Include="DevExpress.Office.v24.2.Core, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
51+
<Reference Include="DevExpress.Office.v24.2.Core, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
5252
<SpecificVersion>False</SpecificVersion>
5353
</Reference>
54-
<Reference Include="DevExpress.RichEdit.v24.2.Core, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
54+
<Reference Include="DevExpress.RichEdit.v24.2.Core, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
5555
<SpecificVersion>False</SpecificVersion>
5656
</Reference>
57-
<Reference Include="DevExpress.RichEdit.v24.2.Export, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
57+
<Reference Include="DevExpress.RichEdit.v24.2.Export, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
5858
<SpecificVersion>False</SpecificVersion>
5959
</Reference>
60-
<Reference Include="DevExpress.Printing.v24.2.Core, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
60+
<Reference Include="DevExpress.Printing.v24.2.Core, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
6161
<SpecificVersion>False</SpecificVersion>
6262
</Reference>
63-
<Reference Include="DevExpress.Xpf.CodeView.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
63+
<Reference Include="DevExpress.Xpf.CodeView.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
6464
<SpecificVersion>False</SpecificVersion>
6565
</Reference>
66-
<Reference Include="DevExpress.Data.Desktop.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
66+
<Reference Include="DevExpress.Data.Desktop.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
6767
<SpecificVersion>False</SpecificVersion>
6868
</Reference>
69-
<Reference Include="DevExpress.Xpf.Core.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
69+
<Reference Include="DevExpress.Xpf.Core.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7070
<SpecificVersion>False</SpecificVersion>
7171
</Reference>
72-
<Reference Include="DevExpress.Xpf.Grid.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
72+
<Reference Include="DevExpress.Xpf.Grid.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7373
<SpecificVersion>False</SpecificVersion>
7474
</Reference>
75-
<Reference Include="DevExpress.Xpf.Grid.v24.2.Core, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
75+
<Reference Include="DevExpress.Xpf.Grid.v24.2.Core, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7676
<SpecificVersion>False</SpecificVersion>
7777
</Reference>
78-
<Reference Include="DevExpress.Xpf.Controls.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
78+
<Reference Include="DevExpress.Xpf.Controls.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7979
<SpecificVersion>False</SpecificVersion>
8080
</Reference>
81-
<Reference Include="DevExpress.Xpf.Printing.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
81+
<Reference Include="DevExpress.Xpf.Printing.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8282
<SpecificVersion>False</SpecificVersion>
8383
</Reference>
84-
<Reference Include="DevExpress.Xpf.PropertyGrid.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
84+
<Reference Include="DevExpress.Xpf.PropertyGrid.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8585
<SpecificVersion>False</SpecificVersion>
8686
</Reference>
8787
<Reference Include="System" />

‎Readme.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ This example creates two Property Grid controls and displays them in tab contain
7474
</dx:DXTabControl>
7575
```
7676

77-
When the user selects a contact, the `PropertyGridControl` displays its properties and allows in-place editing.
77+
When a user selects a contact, the PropertyGridControl displays its properties. The user can edit each property value directly in the grid.
7878

7979
## Files to Review
8080

@@ -96,6 +96,7 @@ When the user selects a contact, the `PropertyGridControl` displays its properti
9696
* [WPF Data Grid – Specify Custom Content for Column Chooser Headers](https://github.com/DevExpress-Examples/wpf-data-grid-custom-content-for-column-chooser-headers)
9797

9898
<!-- feedback -->
99+
99100
## Does this example address your development requirements/objectives?
100101

101102
[<img src="https://www.devexpress.com/support/examples/i/yes-button.svg"/>](https://www.devexpress.com/support/examples/survey.xml?utm_source=github&utm_campaign=wpf-property-grid-display-object-properties&~~~was_helpful=yes) [<img src="https://www.devexpress.com/support/examples/i/no-button.svg"/>](https://www.devexpress.com/support/examples/survey.xml?utm_source=github&utm_campaign=wpf-property-grid-display-object-properties&~~~was_helpful=no)

‎VB/App.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Application x:Class="DXSample.App"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:dxc="http://schemas.devexpress.com/winfx/2008/xaml/core"
5-
StartupUri="MainWindow.xaml">
6-
<Application.Resources>
7-
</Application.Resources>
8-
</Application>
1+
<Application x:Class="DXSample.App"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:dxc="http://schemas.devexpress.com/winfx/2008/xaml/core"
5+
StartupUri="MainWindow.xaml">
6+
<Application.Resources>
7+
</Application.Resources>
8+
</Application>

‎VB/DXSample.vbproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,52 +38,52 @@
3838
<WarningLevel>4</WarningLevel>
3939
</PropertyGroup>
4040
<ItemGroup>
41-
<Reference Include="DevExpress.Drawing.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
41+
<Reference Include="DevExpress.Drawing.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
4242
<SpecificVersion>False</SpecificVersion>
4343
</Reference>
44-
<Reference Include="DevExpress.Data.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
44+
<Reference Include="DevExpress.Data.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
4545
<SpecificVersion>False</SpecificVersion>
4646
</Reference>
47-
<Reference Include="DevExpress.Mvvm.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
47+
<Reference Include="DevExpress.Mvvm.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
4848
<SpecificVersion>False</SpecificVersion>
4949
</Reference>
50-
<Reference Include="DevExpress.Pdf.v24.2.Core, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
50+
<Reference Include="DevExpress.Pdf.v24.2.Core, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
5151
<SpecificVersion>False</SpecificVersion>
5252
</Reference>
53-
<Reference Include="DevExpress.Office.v24.2.Core, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
53+
<Reference Include="DevExpress.Office.v24.2.Core, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
5454
<SpecificVersion>False</SpecificVersion>
5555
</Reference>
56-
<Reference Include="DevExpress.RichEdit.v24.2.Core, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
56+
<Reference Include="DevExpress.RichEdit.v24.2.Core, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
5757
<SpecificVersion>False</SpecificVersion>
5858
</Reference>
59-
<Reference Include="DevExpress.RichEdit.v24.2.Export, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
59+
<Reference Include="DevExpress.RichEdit.v24.2.Export, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
6060
<SpecificVersion>False</SpecificVersion>
6161
</Reference>
62-
<Reference Include="DevExpress.Printing.v24.2.Core, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
62+
<Reference Include="DevExpress.Printing.v24.2.Core, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
6363
<SpecificVersion>False</SpecificVersion>
6464
</Reference>
65-
<Reference Include="DevExpress.Xpf.CodeView.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
65+
<Reference Include="DevExpress.Xpf.CodeView.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
6666
<SpecificVersion>False</SpecificVersion>
6767
</Reference>
68-
<Reference Include="DevExpress.Data.Desktop.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
68+
<Reference Include="DevExpress.Data.Desktop.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
6969
<SpecificVersion>False</SpecificVersion>
7070
</Reference>
71-
<Reference Include="DevExpress.Xpf.Core.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
71+
<Reference Include="DevExpress.Xpf.Core.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7272
<SpecificVersion>False</SpecificVersion>
7373
</Reference>
74-
<Reference Include="DevExpress.Xpf.Grid.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
74+
<Reference Include="DevExpress.Xpf.Grid.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7575
<SpecificVersion>False</SpecificVersion>
7676
</Reference>
77-
<Reference Include="DevExpress.Xpf.Grid.v24.2.Core, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
77+
<Reference Include="DevExpress.Xpf.Grid.v24.2.Core, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7878
<SpecificVersion>False</SpecificVersion>
7979
</Reference>
80-
<Reference Include="DevExpress.Xpf.Controls.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
80+
<Reference Include="DevExpress.Xpf.Controls.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8181
<SpecificVersion>False</SpecificVersion>
8282
</Reference>
83-
<Reference Include="DevExpress.Xpf.Printing.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
83+
<Reference Include="DevExpress.Xpf.Printing.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8484
<SpecificVersion>False</SpecificVersion>
8585
</Reference>
86-
<Reference Include="DevExpress.Xpf.PropertyGrid.v24.2, Version=24.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
86+
<Reference Include="DevExpress.Xpf.PropertyGrid.v24.2, Version=24.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8787
<SpecificVersion>False</SpecificVersion>
8888
</Reference>
8989
<Reference Include="System" />

0 commit comments

Comments
 (0)