Skip to content

Commit a32ab93

Browse files
transition to System.Text.Json
1 parent 79f7f4c commit a32ab93

File tree

6 files changed

+94
-100
lines changed

6 files changed

+94
-100
lines changed

CS/CustomFunctionForExpressionEditorExample/CustomFunctionForExpressionEditorExample.csproj

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
44
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -34,123 +34,120 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="DevExpress.Charts.v23.1.Core">
37+
<Reference Include="DevExpress.Charts.v24.2.Core">
3838
<SpecificVersion>False</SpecificVersion>
3939
</Reference>
40-
<Reference Include="DevExpress.CodeParser.v23.1">
40+
<Reference Include="DevExpress.CodeParser.v24.2">
4141
<SpecificVersion>False</SpecificVersion>
4242
</Reference>
43-
<Reference Include="DevExpress.Data.Desktop.v23.1">
43+
<Reference Include="DevExpress.Data.Desktop.v24.2">
4444
<SpecificVersion>False</SpecificVersion>
4545
</Reference>
46-
<Reference Include="DevExpress.Drawing.v23.1">
46+
<Reference Include="DevExpress.Drawing.v24.2">
4747
<SpecificVersion>False</SpecificVersion>
4848
</Reference>
49-
<Reference Include="DevExpress.Data.v23.1">
49+
<Reference Include="DevExpress.Data.v24.2">
5050
<SpecificVersion>False</SpecificVersion>
5151
</Reference>
52-
<Reference Include="DevExpress.DataAccess.v23.1">
52+
<Reference Include="DevExpress.DataAccess.v24.2">
5353
<SpecificVersion>False</SpecificVersion>
5454
</Reference>
55-
<Reference Include="DevExpress.DataAccess.v23.1.UI">
55+
<Reference Include="DevExpress.DataAccess.v24.2.UI">
5656
<SpecificVersion>False</SpecificVersion>
5757
</Reference>
58-
<Reference Include="DevExpress.Diagram.v23.1.Core">
58+
<Reference Include="DevExpress.Diagram.v24.2.Core">
5959
<SpecificVersion>False</SpecificVersion>
6060
</Reference>
61-
<Reference Include="DevExpress.Images.v23.1">
61+
<Reference Include="DevExpress.Images.v24.2">
6262
<SpecificVersion>False</SpecificVersion>
6363
</Reference>
64-
<Reference Include="DevExpress.Office.v23.1.Core">
64+
<Reference Include="DevExpress.Office.v24.2.Core">
6565
<SpecificVersion>False</SpecificVersion>
6666
</Reference>
67-
<Reference Include="DevExpress.Pdf.v23.1.Core">
67+
<Reference Include="DevExpress.Pdf.v24.2.Core">
6868
<SpecificVersion>False</SpecificVersion>
6969
</Reference>
70-
<Reference Include="DevExpress.Pdf.v23.1.Drawing">
70+
<Reference Include="DevExpress.Pdf.v24.2.Drawing">
7171
<SpecificVersion>False</SpecificVersion>
7272
</Reference>
73-
<Reference Include="DevExpress.PivotGrid.v23.1.Core">
73+
<Reference Include="DevExpress.PivotGrid.v24.2.Core">
7474
<SpecificVersion>False</SpecificVersion>
7575
</Reference>
76-
<Reference Include="DevExpress.Printing.v23.1.Core">
76+
<Reference Include="DevExpress.Printing.v24.2.Core">
7777
<SpecificVersion>False</SpecificVersion>
7878
</Reference>
79-
<Reference Include="DevExpress.RichEdit.v23.1.Core">
79+
<Reference Include="DevExpress.RichEdit.v24.2.Core">
8080
<SpecificVersion>False</SpecificVersion>
8181
</Reference>
82-
<Reference Include="DevExpress.RichEdit.v23.1.Export">
82+
<Reference Include="DevExpress.RichEdit.v24.2.Export">
8383
<SpecificVersion>False</SpecificVersion>
8484
</Reference>
85-
<Reference Include="DevExpress.Sparkline.v23.1.Core">
85+
<Reference Include="DevExpress.Sparkline.v24.2.Core">
8686
<SpecificVersion>False</SpecificVersion>
8787
</Reference>
88-
<Reference Include="DevExpress.Utils.v23.1">
88+
<Reference Include="DevExpress.Utils.v24.2">
8989
<SpecificVersion>False</SpecificVersion>
9090
</Reference>
91-
<Reference Include="DevExpress.Utils.v23.1.UI">
91+
<Reference Include="DevExpress.Utils.v24.2.UI">
9292
<SpecificVersion>False</SpecificVersion>
9393
</Reference>
94-
<Reference Include="DevExpress.Xpo.v23.1">
94+
<Reference Include="DevExpress.Xpo.v24.2">
9595
<SpecificVersion>False</SpecificVersion>
9696
</Reference>
97-
<Reference Include="DevExpress.XtraBars.v23.1">
97+
<Reference Include="DevExpress.XtraBars.v24.2">
9898
<SpecificVersion>False</SpecificVersion>
9999
</Reference>
100-
<Reference Include="DevExpress.XtraCharts.v23.1">
100+
<Reference Include="DevExpress.XtraCharts.v24.2">
101101
<SpecificVersion>False</SpecificVersion>
102102
</Reference>
103-
<Reference Include="DevExpress.XtraCharts.v23.1.Extensions">
103+
<Reference Include="DevExpress.XtraCharts.v24.2.Extensions">
104104
<SpecificVersion>False</SpecificVersion>
105105
</Reference>
106-
<Reference Include="DevExpress.XtraCharts.v23.1.Wizard">
106+
<Reference Include="DevExpress.XtraCharts.v24.2.Wizard">
107107
<SpecificVersion>False</SpecificVersion>
108108
</Reference>
109-
<Reference Include="DevExpress.XtraDiagram.v23.1">
109+
<Reference Include="DevExpress.XtraDiagram.v24.2">
110110
<SpecificVersion>False</SpecificVersion>
111111
</Reference>
112-
<Reference Include="DevExpress.XtraEditors.v23.1">
112+
<Reference Include="DevExpress.XtraEditors.v24.2">
113113
<SpecificVersion>False</SpecificVersion>
114114
</Reference>
115-
<Reference Include="DevExpress.XtraGauges.v23.1.Core">
115+
<Reference Include="DevExpress.XtraGauges.v24.2.Core">
116116
<SpecificVersion>False</SpecificVersion>
117117
</Reference>
118-
<Reference Include="DevExpress.XtraGrid.v23.1">
118+
<Reference Include="DevExpress.XtraGrid.v24.2">
119119
<SpecificVersion>False</SpecificVersion>
120120
</Reference>
121-
<Reference Include="DevExpress.XtraLayout.v23.1">
121+
<Reference Include="DevExpress.XtraLayout.v24.2">
122122
<SpecificVersion>False</SpecificVersion>
123123
</Reference>
124-
<Reference Include="DevExpress.XtraNavBar.v23.1">
124+
<Reference Include="DevExpress.XtraNavBar.v24.2">
125125
<SpecificVersion>False</SpecificVersion>
126126
</Reference>
127-
<Reference Include="DevExpress.XtraPivotGrid.v23.1">
127+
<Reference Include="DevExpress.XtraPivotGrid.v24.2">
128128
<SpecificVersion>False</SpecificVersion>
129129
</Reference>
130-
<Reference Include="DevExpress.XtraPrinting.v23.1">
130+
<Reference Include="DevExpress.XtraPrinting.v24.2">
131131
<SpecificVersion>False</SpecificVersion>
132132
</Reference>
133-
<Reference Include="DevExpress.XtraReports.v23.1">
133+
<Reference Include="DevExpress.XtraReports.v24.2">
134134
<SpecificVersion>False</SpecificVersion>
135135
</Reference>
136-
<Reference Include="DevExpress.XtraReports.v23.1.CodeCompletion">
136+
<Reference Include="DevExpress.XtraReports.v24.2.CodeCompletion">
137137
<SpecificVersion>False</SpecificVersion>
138138
</Reference>
139-
<Reference Include="DevExpress.XtraReports.v23.1.Extensions">
139+
<Reference Include="DevExpress.XtraReports.v24.2.Extensions">
140140
<SpecificVersion>False</SpecificVersion>
141141
</Reference>
142-
<Reference Include="DevExpress.XtraRichEdit.v23.1">
142+
<Reference Include="DevExpress.XtraRichEdit.v24.2">
143143
<SpecificVersion>False</SpecificVersion>
144144
</Reference>
145-
<Reference Include="DevExpress.XtraTreeList.v23.1">
145+
<Reference Include="DevExpress.XtraTreeList.v24.2">
146146
<SpecificVersion>False</SpecificVersion>
147147
</Reference>
148-
<Reference Include="DevExpress.XtraVerticalGrid.v23.1">
148+
<Reference Include="DevExpress.XtraVerticalGrid.v24.2">
149149
<SpecificVersion>False</SpecificVersion>
150150
</Reference>
151-
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
152-
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
153-
</Reference>
154151
<Reference Include="System" />
155152
<Reference Include="System.Configuration" />
156153
<Reference Include="System.Core" />
@@ -209,7 +206,6 @@
209206
<DependentUpon>XtraReport1.cs</DependentUpon>
210207
</EmbeddedResource>
211208
<None Include="App.config" />
212-
<None Include="packages.config" />
213209
<None Include="Properties\Settings.settings">
214210
<Generator>SettingsSingleFileGenerator</Generator>
215211
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -220,6 +216,11 @@
220216
<DesignTimeSharedInput>True</DesignTimeSharedInput>
221217
</Compile>
222218
</ItemGroup>
219+
<ItemGroup>
220+
<PackageReference Include="System.Text.Json">
221+
<Version>8.0.4</Version>
222+
</PackageReference>
223+
</ItemGroup>
223224
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
224225
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
225226
Other similar extension points exist, see Microsoft.Common.targets.
@@ -228,4 +229,4 @@
228229
<Target Name="AfterBuild">
229230
</Target>
230231
-->
231-
</Project>
232+
</Project>

CS/CustomFunctionForExpressionEditorExample/Form1.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@
126126
<metadata name="xrDesignDockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127127
<value>506, 17</value>
128128
</metadata>
129-
<assembly alias="DevExpress.Utils.v23.1" name="DevExpress.Utils.v23.1" />
130-
<data name="xrDesignDockManager1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v23.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
129+
<assembly alias="DevExpress.Utils.v24.2" name="DevExpress.Utils.v24.2" />
130+
<data name="xrDesignDockManager1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v24.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
131131
<value>
132132
AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMC4yLCBWZXJzaW9uPTIwLjIu
133133
OC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAAAChE

CS/CustomFunctionForExpressionEditorExample/packages.config

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

0 commit comments

Comments
 (0)