Skip to content

Commit 415d6ed

Browse files
andreylepikhovandreylepikhov
committed
auto sync for version 2022.2
1 parent 64ca2ed commit 415d6ed

File tree

62 files changed

+894
-1340
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+894
-1340
lines changed

‎DevExpress.Examples.Reports.CustomControls.sln

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.1.32228.430
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{B93879CB-8AA6-42DA-AB6C-1F611F00ED33}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExpress.XtraReports.CustomControls.Design", "DevExpress.XtraReports.CustomControls.Design\DevExpress.XtraReports.CustomControls.Design.csproj", "{C09DF935-6895-4F40-9735-9116AFC9B852}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExpress.XtraReports.CustomControls.SwissQRBill", "DevExpress.XtraReports.CustomControls.SwissQRBill\DevExpress.XtraReports.CustomControls.SwissQRBill.csproj", "{AE25D787-4EA5-40FD-B799-4EBF740C5264}"
11+
EndProject
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExpress.XtraReports.CustomControls.RoundedControls", "DevExpress.XtraReports.CustomControls.RoundedControls\DevExpress.XtraReports.CustomControls.RoundedControls.csproj", "{E220A149-9D65-4454-8623-E07344BE2186}"
13+
EndProject
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomControlExample.Report", "Examples\CustomControlExample.Report\CustomControlExample.Report.csproj", "{8D0A462E-4749-4B4C-A2CA-208CAD5A627F}"
15+
EndProject
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomControlExample.AspNetCore", "Examples\CustomControlExample.AspNetCore\CustomControlExample.AspNetCore.csproj", "{6C7BE117-76EC-46DF-8141-73E28ADF0F10}"
17+
EndProject
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomControlExample.Win", "Examples\CustomControlExample.Win\CustomControlExample.Win.csproj", "{92609F23-F32E-46E8-A60F-377DC3C4B109}"
19+
EndProject
20+
Global
21+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
22+
Debug|Any CPU = Debug|Any CPU
23+
DebugTest|Any CPU = DebugTest|Any CPU
24+
Release|Any CPU = Release|Any CPU
25+
EndGlobalSection
26+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
27+
{C09DF935-6895-4F40-9735-9116AFC9B852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28+
{C09DF935-6895-4F40-9735-9116AFC9B852}.Debug|Any CPU.Build.0 = Debug|Any CPU
29+
{C09DF935-6895-4F40-9735-9116AFC9B852}.DebugTest|Any CPU.ActiveCfg = Debug|Any CPU
30+
{C09DF935-6895-4F40-9735-9116AFC9B852}.DebugTest|Any CPU.Build.0 = Debug|Any CPU
31+
{C09DF935-6895-4F40-9735-9116AFC9B852}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{C09DF935-6895-4F40-9735-9116AFC9B852}.Release|Any CPU.Build.0 = Release|Any CPU
33+
{AE25D787-4EA5-40FD-B799-4EBF740C5264}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{AE25D787-4EA5-40FD-B799-4EBF740C5264}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{AE25D787-4EA5-40FD-B799-4EBF740C5264}.DebugTest|Any CPU.ActiveCfg = Debug|Any CPU
36+
{AE25D787-4EA5-40FD-B799-4EBF740C5264}.DebugTest|Any CPU.Build.0 = Debug|Any CPU
37+
{AE25D787-4EA5-40FD-B799-4EBF740C5264}.Release|Any CPU.ActiveCfg = Release|Any CPU
38+
{AE25D787-4EA5-40FD-B799-4EBF740C5264}.Release|Any CPU.Build.0 = Release|Any CPU
39+
{E220A149-9D65-4454-8623-E07344BE2186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40+
{E220A149-9D65-4454-8623-E07344BE2186}.Debug|Any CPU.Build.0 = Debug|Any CPU
41+
{E220A149-9D65-4454-8623-E07344BE2186}.DebugTest|Any CPU.ActiveCfg = Debug|Any CPU
42+
{E220A149-9D65-4454-8623-E07344BE2186}.DebugTest|Any CPU.Build.0 = Debug|Any CPU
43+
{E220A149-9D65-4454-8623-E07344BE2186}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{E220A149-9D65-4454-8623-E07344BE2186}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{8D0A462E-4749-4B4C-A2CA-208CAD5A627F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46+
{8D0A462E-4749-4B4C-A2CA-208CAD5A627F}.Debug|Any CPU.Build.0 = Debug|Any CPU
47+
{8D0A462E-4749-4B4C-A2CA-208CAD5A627F}.DebugTest|Any CPU.ActiveCfg = Debug|Any CPU
48+
{8D0A462E-4749-4B4C-A2CA-208CAD5A627F}.DebugTest|Any CPU.Build.0 = Debug|Any CPU
49+
{8D0A462E-4749-4B4C-A2CA-208CAD5A627F}.Release|Any CPU.ActiveCfg = Release|Any CPU
50+
{8D0A462E-4749-4B4C-A2CA-208CAD5A627F}.Release|Any CPU.Build.0 = Release|Any CPU
51+
{6C7BE117-76EC-46DF-8141-73E28ADF0F10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52+
{6C7BE117-76EC-46DF-8141-73E28ADF0F10}.Debug|Any CPU.Build.0 = Debug|Any CPU
53+
{6C7BE117-76EC-46DF-8141-73E28ADF0F10}.DebugTest|Any CPU.ActiveCfg = Debug|Any CPU
54+
{6C7BE117-76EC-46DF-8141-73E28ADF0F10}.DebugTest|Any CPU.Build.0 = Debug|Any CPU
55+
{6C7BE117-76EC-46DF-8141-73E28ADF0F10}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{6C7BE117-76EC-46DF-8141-73E28ADF0F10}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{92609F23-F32E-46E8-A60F-377DC3C4B109}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58+
{92609F23-F32E-46E8-A60F-377DC3C4B109}.Debug|Any CPU.Build.0 = Debug|Any CPU
59+
{92609F23-F32E-46E8-A60F-377DC3C4B109}.DebugTest|Any CPU.ActiveCfg = Debug|Any CPU
60+
{92609F23-F32E-46E8-A60F-377DC3C4B109}.DebugTest|Any CPU.Build.0 = Debug|Any CPU
61+
{92609F23-F32E-46E8-A60F-377DC3C4B109}.Release|Any CPU.ActiveCfg = Release|Any CPU
62+
{92609F23-F32E-46E8-A60F-377DC3C4B109}.Release|Any CPU.Build.0 = Release|Any CPU
63+
EndGlobalSection
64+
GlobalSection(SolutionProperties) = preSolution
65+
HideSolutionNode = FALSE
66+
EndGlobalSection
67+
GlobalSection(NestedProjects) = preSolution
68+
{8D0A462E-4749-4B4C-A2CA-208CAD5A627F} = {B93879CB-8AA6-42DA-AB6C-1F611F00ED33}
69+
{6C7BE117-76EC-46DF-8141-73E28ADF0F10} = {B93879CB-8AA6-42DA-AB6C-1F611F00ED33}
70+
{92609F23-F32E-46E8-A60F-377DC3C4B109} = {B93879CB-8AA6-42DA-AB6C-1F611F00ED33}
71+
EndGlobalSection
72+
GlobalSection(ExtensibilityGlobals) = postSolution
73+
SolutionGuid = {1CCA3F25-6EC7-477A-8668-9F3AD2404F80}
74+
EndGlobalSection
75+
EndGlobal

‎DevExpress.Examples.Reports.Win.CustomControls.sln

-57
This file was deleted.

‎DevExpress.XtraReports.CustomControls.Design/DevExpress.XtraReports.CustomControls.Design.csproj

+10-102
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{C09DF935-6895-4F40-9735-9116AFC9B852}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>DevExpress.XtraReports.CustomControls.Design</RootNamespace>
11-
<AssemblyName>DevExpress.XtraReports.CustomControls.Design</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<Deterministic>true</Deterministic>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
3+
<TargetFrameworks>net6.0-windows;net4.5.2</TargetFrameworks>
324
</PropertyGroup>
335
<ItemGroup>
34-
<Reference Include="DevExpress.Charts.v22.2.Core">
35-
<SpecificVersion>False</SpecificVersion>
36-
</Reference>
37-
<Reference Include="DevExpress.Data.v22.2">
38-
<SpecificVersion>False</SpecificVersion>
39-
</Reference>
40-
<Reference Include="DevExpress.DataAccess.v22.2">
41-
<SpecificVersion>False</SpecificVersion>
42-
</Reference>
43-
<Reference Include="DevExpress.Office.v22.2.Core">
44-
<SpecificVersion>False</SpecificVersion>
45-
</Reference>
46-
<Reference Include="DevExpress.Pdf.v22.2.Core">
47-
<SpecificVersion>False</SpecificVersion>
48-
</Reference>
49-
<Reference Include="DevExpress.PivotGrid.v22.2.Core">
50-
<SpecificVersion>False</SpecificVersion>
51-
</Reference>
52-
<Reference Include="DevExpress.Printing.v22.2.Core">
53-
<SpecificVersion>False</SpecificVersion>
54-
</Reference>
55-
<Reference Include="DevExpress.RichEdit.v22.2.Core">
56-
<SpecificVersion>False</SpecificVersion>
57-
</Reference>
58-
<Reference Include="DevExpress.Sparkline.v22.2.Core">
59-
<SpecificVersion>False</SpecificVersion>
60-
</Reference>
61-
<Reference Include="DevExpress.Utils.v22.2">
62-
<SpecificVersion>False</SpecificVersion>
63-
</Reference>
64-
<Reference Include="DevExpress.Utils.v22.2.UI">
65-
<SpecificVersion>False</SpecificVersion>
66-
</Reference>
67-
<Reference Include="DevExpress.Xpo.v22.2">
68-
<SpecificVersion>False</SpecificVersion>
69-
</Reference>
70-
<Reference Include="DevExpress.XtraCharts.v22.2">
71-
<SpecificVersion>False</SpecificVersion>
72-
</Reference>
73-
<Reference Include="DevExpress.XtraEditors.v22.2">
74-
<SpecificVersion>False</SpecificVersion>
75-
</Reference>
76-
<Reference Include="DevExpress.XtraGauges.v22.2.Core">
77-
<SpecificVersion>False</SpecificVersion>
78-
</Reference>
79-
<Reference Include="DevExpress.XtraPrinting.v22.2">
80-
<SpecificVersion>False</SpecificVersion>
81-
</Reference>
82-
<Reference Include="DevExpress.XtraReports.v22.2">
83-
<SpecificVersion>False</SpecificVersion>
84-
</Reference>
85-
<Reference Include="DevExpress.XtraReports.v22.2.Extensions">
86-
<SpecificVersion>False</SpecificVersion>
87-
</Reference>
88-
<Reference Include="DevExpress.Drawing.v22.2">
89-
<SpecificVersion>False</SpecificVersion>
90-
</Reference>
6+
<PackageReference Include="DevExpress.Win.Reporting" Version="22.2.*-*" />
7+
</ItemGroup>
8+
<ItemGroup>
9+
<Folder Include="Properties\" />
10+
</ItemGroup>
11+
<ItemGroup>
9112
<Reference Include="System" />
9213
<Reference Include="System.Core" />
9314
<Reference Include="System.Design" />
@@ -100,20 +21,7 @@
10021
<Reference Include="System.Xml" />
10122
</ItemGroup>
10223
<ItemGroup>
103-
<Compile Include="CustomControlToolBoxRegistrator.cs" />
104-
<Compile Include="Properties\AssemblyInfo.cs" />
105-
<Compile Include="XRSwissQRBillDesigner.cs" />
106-
<Compile Include="XRSwissQRBillDesignerActionList.cs" />
107-
</ItemGroup>
108-
<ItemGroup>
109-
<ProjectReference Include="..\DevExpress.XtraReports.CustomControls.RoundedControls\DevExpress.XtraReports.CustomControls.RoundedControls.csproj">
110-
<Project>{ef6a2523-3ab5-48b6-990f-1672ec72db1c}</Project>
111-
<Name>DevExpress.XtraReports.CustomControls.RoundedControls</Name>
112-
</ProjectReference>
113-
<ProjectReference Include="..\DevExpress.XtraReports.CustomControls.SwissQRBill\DevExpress.XtraReports.CustomControls.SwissQRBill.csproj">
114-
<Project>{ae25d787-4ea5-40fd-b799-4ebf740c5264}</Project>
115-
<Name>DevExpress.XtraReports.CustomControls.SwissQRBill</Name>
116-
</ProjectReference>
24+
<ProjectReference Include="..\DevExpress.XtraReports.CustomControls.RoundedControls\DevExpress.XtraReports.CustomControls.RoundedControls.csproj" />
25+
<ProjectReference Include="..\DevExpress.XtraReports.CustomControls.SwissQRBill\DevExpress.XtraReports.CustomControls.SwissQRBill.csproj" />
11726
</ItemGroup>
118-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
11927
</Project>

‎DevExpress.XtraReports.CustomControls.Design/Properties/AssemblyInfo.cs

-36
This file was deleted.

0 commit comments

Comments
 (0)