Skip to content

Commit

Permalink
Merge pull request #694 from FastReports/sync_branch_2024.2.0
Browse files Browse the repository at this point in the history
FastReport.OpenSource 2024.2.0
  • Loading branch information
0legK authored Apr 8, 2024
2 parents 8ab6a8d + b653314 commit af3b68f
Show file tree
Hide file tree
Showing 81 changed files with 277 additions and 593 deletions.
14 changes: 14 additions & 0 deletions Demos/OpenSource/Console apps/PdfExport/PdfExport.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<Import Project="..\..\..\..\UsedPackages.version" />
<ItemGroup>
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
<PackageReference Include="FastReport.OpenSource.Export.PdfSimple" Version="$(FROSVersion)" />
</ItemGroup>

</Project>
25 changes: 25 additions & 0 deletions Demos/OpenSource/Console apps/PdfExport/PdfExport.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.421
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfExport", "PdfExport.csproj", "{380E2489-623D-4E0F-9E98-253FC2147DD6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{380E2489-623D-4E0F-9E98-253FC2147DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{380E2489-623D-4E0F-9E98-253FC2147DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{380E2489-623D-4E0F-9E98-253FC2147DD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{380E2489-623D-4E0F-9E98-253FC2147DD6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {64D0A985-754A-496D-A0AE-9A9D86DEA92D}
EndGlobalSection
EndGlobal
57 changes: 57 additions & 0 deletions Demos/OpenSource/Console apps/PdfExport/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
using FastReport;
using FastReport.Export.PdfSimple;
using FastReport.Utils;
using System;
using System.Data;
using System.Diagnostics;
using System.IO;

namespace PdfExport
{
class Program
{
static void Main(string[] args)
{
string reportsFolder = FindReportsFolder();

Report report = new Report();
report.Load(Path.Combine(reportsFolder, "Simple List.frx"));

DataSet data = new DataSet();
data.ReadXml(Path.Combine(reportsFolder, "nwind.xml"));

report.RegisterData(data, "NorthWind");

report.Prepare();

PDFSimpleExport pdfExport = new PDFSimpleExport();

pdfExport.Export(report, "Simple List.pdf");


}


public static string FindReportsFolder()
{
string FReportsFolder = "";
string thisFolder = Config.ApplicationFolder;

for (int i = 0; i < 7; i++)
{
string dir = Path.Combine(thisFolder, "Reports");
if (Directory.Exists(dir))
{
string rep_dir = Path.GetFullPath(dir);
if (System.IO.File.Exists(Path.Combine(rep_dir, "reports.xml")))
{
FReportsFolder = rep_dir;
break;
}
}
thisFolder = Path.Combine(thisFolder, @"..");
}
return FReportsFolder;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Import Project="..\..\..\..\UsedPackages.version" />
<ItemGroup>
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSWebVersion)" />
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Import Project="..\..\..\..\UsedPackages.version" />
<ItemGroup>
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSWebVersion)" />
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.1" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Import Project="..\..\..\..\UsedPackages.version" />
<ItemGroup>
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSWebVersion)" />
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSVersion)" />
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="6.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.7" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Import Project="..\..\..\..\UsedPackages.version" />
<ItemGroup>
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSWebVersion)" />
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Cors" Version="2.2.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="6.0.11" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Import Project="..\..\..\..\UsedPackages.version" />
<ItemGroup>
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSWebVersion)" />
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSVersion)" />
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="6.0.11" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.1" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Import Project="..\..\..\..\UsedPackages.version" />
<ItemGroup>
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSWebVersion)" />
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSVersion)" />
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="6.0.11" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.1" />
</ItemGroup>
Expand Down
26 changes: 0 additions & 26 deletions Extras/Core/FastReport.Data/Avalonia.props

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit af3b68f

Please sign in to comment.