Skip to content

Commit 2524474

Browse files
Create 22.2.2+ branch
1 parent 6fdfb81 commit 2524474

File tree

4 files changed

+160
-144
lines changed

4 files changed

+160
-144
lines changed
Lines changed: 42 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project Sdk="Microsoft.NET.Sdk">
23
<PropertyGroup>
3-
<TargetFramework>net5.0-windows</TargetFramework>
4+
<TargetFramework>net6.0-windows</TargetFramework>
45
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
56
<OutputType>WinExe</OutputType>
67
<RootNamespace>ReportManagerServiceExample</RootNamespace>
78
<AssemblyName>ReportManagerServiceExample</AssemblyName>
8-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
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>
916
<UseWindowsForms>true</UseWindowsForms>
1017
<UseWPF>true</UseWPF>
1118
<Platforms>x86;AnyCPU</Platforms>
@@ -19,37 +26,37 @@
1926
<AppDesigner Include="Properties\" />
2027
</ItemGroup>
2128
<ItemGroup>
22-
<PackageReference Include="DevExpress.Charts" Version="21.1.*-*" />
23-
<PackageReference Include="DevExpress.Charts.Core" Version="21.1.*-*" />
24-
<PackageReference Include="DevExpress.CodeParser" Version="21.1.*-*" />
25-
<PackageReference Include="DevExpress.Data" Version="21.1.*-*" />
26-
<PackageReference Include="DevExpress.Data.Desktop" Version="21.1.*-*" />
27-
<PackageReference Include="DevExpress.DataAccess" Version="21.1.*-*" />
28-
<PackageReference Include="DevExpress.Diagram.Core" Version="21.1.*-*" />
29-
<PackageReference Include="DevExpress.Images" Version="21.1.*-*" />
30-
<PackageReference Include="DevExpress.Mvvm" Version="21.1.*-*" />
31-
<PackageReference Include="DevExpress.Office.Core" Version="21.1.*-*" />
32-
<PackageReference Include="DevExpress.Pdf.Core" Version="21.1.*-*" />
33-
<PackageReference Include="DevExpress.PivotGrid.Core" Version="21.1.*-*" />
34-
<PackageReference Include="DevExpress.Printing.Core" Version="21.1.*-*" />
35-
<PackageReference Include="DevExpress.Reporting.Core" Version="21.1.*-*" />
36-
<PackageReference Include="DevExpress.RichEdit.Core" Version="21.1.*-*" />
37-
<PackageReference Include="DevExpress.RichEdit.Export" Version="21.1.*-*" />
38-
<PackageReference Include="DevExpress.Sparkline.Core" Version="21.1.*-*" />
39-
<PackageReference Include="DevExpress.Utils" Version="21.1.*-*" />
40-
<PackageReference Include="DevExpress.Utils.UI" Version="21.1.*-*" />
41-
<PackageReference Include="DevExpress.Win.Printing" Version="21.1.*-*" />
42-
<PackageReference Include="DevExpress.Wpf.Core" Version="21.1.*-*" />
43-
<PackageReference Include="DevExpress.Wpf.Diagram" Version="21.1.*-*" />
44-
<PackageReference Include="DevExpress.Wpf.Docking" Version="21.1.*-*" />
45-
<PackageReference Include="DevExpress.Wpf.DocumentViewer.Core" Version="21.1.*-*" />
46-
<PackageReference Include="DevExpress.Wpf.ExpressionEditor" Version="21.1.*-*" />
47-
<PackageReference Include="DevExpress.Wpf.Grid.Core" Version="21.1.*-*" />
48-
<PackageReference Include="DevExpress.Wpf.LayoutControl" Version="21.1.*-*" />
49-
<PackageReference Include="DevExpress.Wpf.Printing" Version="21.1.*-*" />
50-
<PackageReference Include="DevExpress.Wpf.Reporting" Version="21.1.*-*" />
51-
<PackageReference Include="DevExpress.Wpf.Ribbon" Version="21.1.*-*" />
52-
<PackageReference Include="DevExpress.Wpf.Themes.Office2016Colorful" Version="21.1.*-*" />
53-
<PackageReference Include="DevExpress.Wpf.Themes.All" Version="21.1.*-*" />
29+
<PackageReference Include="DevExpress.Charts" Version="22.2.*-*" />
30+
<PackageReference Include="DevExpress.Charts.Core" Version="22.2.*-*" />
31+
<PackageReference Include="DevExpress.CodeParser" Version="22.2.*-*" />
32+
<PackageReference Include="DevExpress.Data" Version="22.2.*-*" />
33+
<PackageReference Include="DevExpress.Data.Desktop" Version="22.2.*-*" />
34+
<PackageReference Include="DevExpress.DataAccess" Version="22.2.*-*" />
35+
<PackageReference Include="DevExpress.Diagram.Core" Version="22.2.*-*" />
36+
<PackageReference Include="DevExpress.Images" Version="22.2.*-*" />
37+
<PackageReference Include="DevExpress.Mvvm" Version="22.2.*-*" />
38+
<PackageReference Include="DevExpress.Office.Core" Version="22.2.*-*" />
39+
<PackageReference Include="DevExpress.Pdf.Core" Version="22.2.*-*" />
40+
<PackageReference Include="DevExpress.PivotGrid.Core" Version="22.2.*-*" />
41+
<PackageReference Include="DevExpress.Printing.Core" Version="22.2.*-*" />
42+
<PackageReference Include="DevExpress.Reporting.Core" Version="22.2.*-*" />
43+
<PackageReference Include="DevExpress.RichEdit.Core" Version="22.2.*-*" />
44+
<PackageReference Include="DevExpress.RichEdit.Export" Version="22.2.*-*" />
45+
<PackageReference Include="DevExpress.Sparkline.Core" Version="22.2.*-*" />
46+
<PackageReference Include="DevExpress.Utils" Version="22.2.*-*" />
47+
<PackageReference Include="DevExpress.Utils.UI" Version="22.2.*-*" />
48+
<PackageReference Include="DevExpress.Win.Printing" Version="22.2.*-*" />
49+
<PackageReference Include="DevExpress.Wpf.Core" Version="22.2.*-*" />
50+
<PackageReference Include="DevExpress.Wpf.Diagram" Version="22.2.*-*" />
51+
<PackageReference Include="DevExpress.Wpf.Docking" Version="22.2.*-*" />
52+
<PackageReference Include="DevExpress.Wpf.DocumentViewer.Core" Version="22.2.*-*" />
53+
<PackageReference Include="DevExpress.Wpf.ExpressionEditor" Version="22.2.*-*" />
54+
<PackageReference Include="DevExpress.Wpf.Grid.Core" Version="22.2.*-*" />
55+
<PackageReference Include="DevExpress.Wpf.LayoutControl" Version="22.2.*-*" />
56+
<PackageReference Include="DevExpress.Wpf.Printing" Version="22.2.*-*" />
57+
<PackageReference Include="DevExpress.Wpf.Reporting" Version="22.2.*-*" />
58+
<PackageReference Include="DevExpress.Wpf.Ribbon" Version="22.2.*-*" />
59+
<PackageReference Include="DevExpress.Wpf.Themes.Office2016Colorful" Version="22.2.*-*" />
60+
<PackageReference Include="DevExpress.Wpf.Themes.All" Version="22.2.*-*" />
5461
</ItemGroup>
55-
</Project>
62+
</Project>

CS/ReportManagerServiceExample/ReportManagerServiceExample.csproj

Lines changed: 38 additions & 37 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.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -36,81 +36,82 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="DevExpress.Charts.v21.1.Core, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
39+
<Reference Include="DevExpress.Charts.v22.2.Core, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
4040
<SpecificVersion>False</SpecificVersion>
4141
</Reference>
42-
<Reference Include="DevExpress.DataAccess.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
42+
<Reference Include="DevExpress.DataAccess.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
4343
<SpecificVersion>False</SpecificVersion>
4444
</Reference>
45-
<Reference Include="DevExpress.Diagram.v21.1.Core, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
45+
<Reference Include="DevExpress.Diagram.v22.2.Core, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
4646
<SpecificVersion>False</SpecificVersion>
4747
</Reference>
48-
<Reference Include="DevExpress.Images.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
48+
<Reference Include="DevExpress.Images.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
4949
<SpecificVersion>False</SpecificVersion>
5050
</Reference>
51-
<Reference Include="DevExpress.Mvvm.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
52-
<Reference Include="DevExpress.PivotGrid.v21.1.Core, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
51+
<Reference Include="DevExpress.Mvvm.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
52+
<Reference Include="DevExpress.PivotGrid.v22.2.Core, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
5353
<SpecificVersion>False</SpecificVersion>
5454
</Reference>
55-
<Reference Include="DevExpress.Office.v21.1.Core, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
55+
<Reference Include="DevExpress.Office.v22.2.Core, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
5656
<SpecificVersion>False</SpecificVersion>
5757
</Reference>
58-
<Reference Include="DevExpress.RichEdit.v21.1.Core, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
58+
<Reference Include="DevExpress.RichEdit.v22.2.Core, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
5959
<SpecificVersion>False</SpecificVersion>
6060
</Reference>
61-
<Reference Include="DevExpress.Sparkline.v21.1.Core, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
61+
<Reference Include="DevExpress.Sparkline.v22.2.Core, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
6262
<SpecificVersion>False</SpecificVersion>
6363
</Reference>
64-
<Reference Include="DevExpress.Utils.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
65-
<Reference Include="DevExpress.Utils.v21.1.UI, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
66-
<Reference Include="DevExpress.Xpf.CodeView.v21.1" />
67-
<Reference Include="DevExpress.Data.Desktop.v21.1" />
68-
<Reference Include="DevExpress.Xpf.Core.v21.1" />
69-
<Reference Include="DevExpress.Data.v21.1" />
70-
<Reference Include="DevExpress.Xpf.ExpressionEditor.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
64+
<Reference Include="DevExpress.Utils.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
65+
<Reference Include="DevExpress.Utils.v22.2.UI, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
66+
<Reference Include="DevExpress.Xpf.CodeView.v22.2" />
67+
<Reference Include="DevExpress.Data.Desktop.v22.2" />
68+
<Reference Include="DevExpress.Xpf.Core.v22.2" />
69+
<Reference Include="DevExpress.Drawing.v22.2" />
70+
<Reference Include="DevExpress.Data.v22.2" />
71+
<Reference Include="DevExpress.Xpf.ExpressionEditor.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7172
<SpecificVersion>False</SpecificVersion>
7273
</Reference>
73-
<Reference Include="DevExpress.Xpf.DataAccess.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
74+
<Reference Include="DevExpress.Xpf.DataAccess.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7475
<SpecificVersion>False</SpecificVersion>
7576
</Reference>
76-
<Reference Include="DevExpress.Xpf.Diagram.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
77+
<Reference Include="DevExpress.Xpf.Diagram.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7778
<SpecificVersion>False</SpecificVersion>
7879
</Reference>
79-
<Reference Include="DevExpress.Xpf.Docking.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
80+
<Reference Include="DevExpress.Xpf.Docking.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8081
<SpecificVersion>False</SpecificVersion>
8182
</Reference>
82-
<Reference Include="DevExpress.Xpf.DocumentViewer.v21.1.Core, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
83+
<Reference Include="DevExpress.Xpf.DocumentViewer.v22.2.Core, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8384
<SpecificVersion>False</SpecificVersion>
8485
</Reference>
85-
<Reference Include="DevExpress.Xpf.Grid.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
86-
<Reference Include="DevExpress.Xpf.Grid.v21.1.Core, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
86+
<Reference Include="DevExpress.Xpf.Grid.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
87+
<Reference Include="DevExpress.Xpf.Grid.v22.2.Core, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8788
<SpecificVersion>False</SpecificVersion>
8889
</Reference>
89-
<Reference Include="DevExpress.Xpf.Layout.v21.1.Core, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
90+
<Reference Include="DevExpress.Xpf.Layout.v22.2.Core, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
9091
<SpecificVersion>False</SpecificVersion>
9192
</Reference>
92-
<Reference Include="DevExpress.Xpf.LayoutControl.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
93+
<Reference Include="DevExpress.Xpf.LayoutControl.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
9394
<SpecificVersion>False</SpecificVersion>
9495
</Reference>
95-
<Reference Include="DevExpress.Xpf.Printing.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
96+
<Reference Include="DevExpress.Xpf.Printing.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
9697
<SpecificVersion>False</SpecificVersion>
9798
</Reference>
98-
<Reference Include="DevExpress.Xpf.ReportDesigner.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
99+
<Reference Include="DevExpress.Xpf.ReportDesigner.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
99100
<SpecificVersion>False</SpecificVersion>
100101
</Reference>
101-
<Reference Include="DevExpress.Xpf.Ribbon.v21.1" />
102-
<Reference Include="DevExpress.Pdf.v21.1.Core" />
103-
<Reference Include="DevExpress.RichEdit.v21.1.Export" />
104-
<Reference Include="DevExpress.Printing.v21.1.Core" />
105-
<Reference Include="DevExpress.Xpf.Themes.Office2016Colorful.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
102+
<Reference Include="DevExpress.Xpf.Ribbon.v22.2" />
103+
<Reference Include="DevExpress.Pdf.v22.2.Core" />
104+
<Reference Include="DevExpress.RichEdit.v22.2.Export" />
105+
<Reference Include="DevExpress.Printing.v22.2.Core" />
106+
<Reference Include="DevExpress.Xpf.Themes.Office2016Colorful.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
106107
<SpecificVersion>False</SpecificVersion>
107108
</Reference>
108-
<Reference Include="DevExpress.XtraCharts.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
109+
<Reference Include="DevExpress.XtraCharts.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
109110
<SpecificVersion>False</SpecificVersion>
110111
</Reference>
111-
<Reference Include="DevExpress.XtraPrinting.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
112-
<Reference Include="DevExpress.CodeParser.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
113-
<Reference Include="DevExpress.XtraReports.v21.1, Version=21.1.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
112+
<Reference Include="DevExpress.XtraPrinting.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
113+
<Reference Include="DevExpress.CodeParser.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
114+
<Reference Include="DevExpress.XtraReports.v22.2, Version=22.2.2.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
114115
<Reference Include="Moq.Silverlight, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL" />
115116
<Reference Include="System" />
116117
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -197,4 +198,4 @@
197198
<Target Name="AfterBuild">
198199
</Target>
199200
-->
200-
</Project>
201+
</Project>

0 commit comments

Comments
 (0)