Skip to content

Commit af3b68f

Browse files
0legK0legK
authored
Merge pull request #694 from FastReports/sync_branch_2024.2.0
FastReport.OpenSource 2024.2.0
2 parents 8ab6a8d + b653314 commit af3b68f

File tree

81 files changed

+277
-593
lines changed

Some content is hidden

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

81 files changed

+277
-593
lines changed

‎Demos/OpenSource/Console apps/PdfExport/PdfExport.csproj‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net6.0</TargetFramework>
6+
</PropertyGroup>
7+
8+
<Import Project="..\..\..\..\UsedPackages.version" />
9+
<ItemGroup>
10+
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
11+
<PackageReference Include="FastReport.OpenSource.Export.PdfSimple" Version="$(FROSVersion)" />
12+
</ItemGroup>
13+
14+
</Project>

‎Demos/OpenSource/Console apps/PdfExport/PdfExport.sln‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28307.421
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfExport", "PdfExport.csproj", "{380E2489-623D-4E0F-9E98-253FC2147DD6}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{380E2489-623D-4E0F-9E98-253FC2147DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{380E2489-623D-4E0F-9E98-253FC2147DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{380E2489-623D-4E0F-9E98-253FC2147DD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{380E2489-623D-4E0F-9E98-253FC2147DD6}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {64D0A985-754A-496D-A0AE-9A9D86DEA92D}
24+
EndGlobalSection
25+
EndGlobal

‎Demos/OpenSource/Console apps/PdfExport/Program.cs‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
using FastReport;
2+
using FastReport.Export.PdfSimple;
3+
using FastReport.Utils;
4+
using System;
5+
using System.Data;
6+
using System.Diagnostics;
7+
using System.IO;
8+
9+
namespace PdfExport
10+
{
11+
class Program
12+
{
13+
static void Main(string[] args)
14+
{
15+
string reportsFolder = FindReportsFolder();
16+
17+
Report report = new Report();
18+
report.Load(Path.Combine(reportsFolder, "Simple List.frx"));
19+
20+
DataSet data = new DataSet();
21+
data.ReadXml(Path.Combine(reportsFolder, "nwind.xml"));
22+
23+
report.RegisterData(data, "NorthWind");
24+
25+
report.Prepare();
26+
27+
PDFSimpleExport pdfExport = new PDFSimpleExport();
28+
29+
pdfExport.Export(report, "Simple List.pdf");
30+
31+
32+
}
33+
34+
35+
public static string FindReportsFolder()
36+
{
37+
string FReportsFolder = "";
38+
string thisFolder = Config.ApplicationFolder;
39+
40+
for (int i = 0; i < 7; i++)
41+
{
42+
string dir = Path.Combine(thisFolder, "Reports");
43+
if (Directory.Exists(dir))
44+
{
45+
string rep_dir = Path.GetFullPath(dir);
46+
if (System.IO.File.Exists(Path.Combine(rep_dir, "reports.xml")))
47+
{
48+
FReportsFolder = rep_dir;
49+
break;
50+
}
51+
}
52+
thisFolder = Path.Combine(thisFolder, @"..");
53+
}
54+
return FReportsFolder;
55+
}
56+
}
57+
}

‎Demos/OpenSource/MVC/FastReport.OpenSource.MVC.6.0/FastReport.OpenSource.MVC.6.0.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Import Project="..\..\..\..\UsedPackages.version" />
1111
<ItemGroup>
1212
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
13-
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSWebVersion)" />
13+
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSVersion)" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎Demos/OpenSource/MVC/FastReport.OpenSource.MVC.DataBase/FastReport.OpenSource.MVC.DataBase.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Import Project="..\..\..\..\UsedPackages.version" />
1111
<ItemGroup>
1212
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
13-
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSWebVersion)" />
13+
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSVersion)" />
1414
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.1" />
1515
</ItemGroup>
1616

‎Demos/OpenSource/SPA/FastReport.Core.React/FastReport.OpenSource.React.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<Import Project="..\..\..\..\UsedPackages.version" />
1818
<ItemGroup>
1919
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
20-
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSWebVersion)" />
20+
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSVersion)" />
2121
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="6.0.1" />
2222
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.7" />
2323
</ItemGroup>

‎Demos/OpenSource/SPA/FastReport.Core.Vue/FastReport.OpenSource.Vue.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Import Project="..\..\..\..\UsedPackages.version" />
1010
<ItemGroup>
1111
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
12-
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSWebVersion)" />
12+
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSVersion)" />
1313
<PackageReference Include="Microsoft.AspNetCore.Cors" Version="2.2.0" />
1414
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
1515
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="6.0.11" />

‎Demos/OpenSource/SPA/FastReport.OpenSource.Angular.OnlineDesigner/FastReport.OpenSource.Angular.OnlineDesigner.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Import Project="..\..\..\..\UsedPackages.version" />
1414
<ItemGroup>
1515
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
16-
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSWebVersion)" />
16+
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSVersion)" />
1717
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="6.0.11" />
1818
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.1" />
1919
</ItemGroup>

‎Demos/OpenSource/SPA/FastReport.OpenSource.Angular/FastReport.OpenSource.Angular.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Import Project="..\..\..\..\UsedPackages.version" />
1414
<ItemGroup>
1515
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
16-
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSWebVersion)" />
16+
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSVersion)" />
1717
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="6.0.11" />
1818
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.1" />
1919
</ItemGroup>

‎Extras/Core/FastReport.Data/Avalonia.props‎

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

0 commit comments

Comments
 (0)