diff --git a/Demos/OpenSource/FastReport.OpenSource.Demos.sln b/Demos/OpenSource/FastReport.OpenSource.Demos.sln index 9a1a5f94..9b6bd567 100644 --- a/Demos/OpenSource/FastReport.OpenSource.Demos.sln +++ b/Demos/OpenSource/FastReport.OpenSource.Demos.sln @@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Angul EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Angular.OnlineDesigner", "SPA\FastReport.OpenSource.Angular.OnlineDesigner\FastReport.OpenSource.Angular.OnlineDesigner.csproj", "{3ECD074B-F901-4652-A5F8-9A75C1742A01}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.MVC.3.1", "MVC\FastReport.OpenSource.MVC.3.1\FastReport.OpenSource.MVC.3.1.csproj", "{1FC3D63E-3330-4682-86B1-B8AC33148434}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.MVC.6.0", "MVC\FastReport.OpenSource.MVC.6.0\FastReport.OpenSource.MVC.6.0.csproj", "{46EBA444-E129-4DE0-AAAC-D0B70A2B2C50}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.MVC.DataBase", "MVC\FastReport.OpenSource.MVC.DataBase\FastReport.OpenSource.MVC.DataBase.csproj", "{EE936C85-E2CB-4C60-99BD-D9C97EB512AA}" @@ -65,10 +63,6 @@ Global {3ECD074B-F901-4652-A5F8-9A75C1742A01}.Debug|Any CPU.Build.0 = Debug|Any CPU {3ECD074B-F901-4652-A5F8-9A75C1742A01}.Release|Any CPU.ActiveCfg = Release|Any CPU {3ECD074B-F901-4652-A5F8-9A75C1742A01}.Release|Any CPU.Build.0 = Release|Any CPU - {1FC3D63E-3330-4682-86B1-B8AC33148434}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FC3D63E-3330-4682-86B1-B8AC33148434}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FC3D63E-3330-4682-86B1-B8AC33148434}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FC3D63E-3330-4682-86B1-B8AC33148434}.Release|Any CPU.Build.0 = Release|Any CPU {46EBA444-E129-4DE0-AAAC-D0B70A2B2C50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {46EBA444-E129-4DE0-AAAC-D0B70A2B2C50}.Debug|Any CPU.Build.0 = Debug|Any CPU {46EBA444-E129-4DE0-AAAC-D0B70A2B2C50}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -110,7 +104,6 @@ Global {FBE1BD2F-6CDA-445A-AA80-BFA5B751605A} = {3BA9736B-3803-4CFB-B785-FDCC807CBEA4} {2FC677B2-A00D-46E2-B59B-91303739D0B3} = {3BA9736B-3803-4CFB-B785-FDCC807CBEA4} {3ECD074B-F901-4652-A5F8-9A75C1742A01} = {3BA9736B-3803-4CFB-B785-FDCC807CBEA4} - {1FC3D63E-3330-4682-86B1-B8AC33148434} = {BABE4B9D-8D3C-408C-A33E-3DC0C0F48A70} {46EBA444-E129-4DE0-AAAC-D0B70A2B2C50} = {BABE4B9D-8D3C-408C-A33E-3DC0C0F48A70} {EE936C85-E2CB-4C60-99BD-D9C97EB512AA} = {BABE4B9D-8D3C-408C-A33E-3DC0C0F48A70} {3379CA52-56E8-48F3-B94F-75612FA72E0B} = {7A3BB37B-9F8C-4E29-AF23-740BC51EAAF3} diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Controllers/HomeController.cs b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Controllers/HomeController.cs deleted file mode 100644 index cd1cebba..00000000 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Controllers/HomeController.cs +++ /dev/null @@ -1,138 +0,0 @@ -using Demo.MVC.NetCore31.Models; -using FastReport.Web; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Mvc; -using System.IO; -using MVC.Service; - -namespace Demo.MVC.NetCore31.Controllers -{ - [Route("")] - public class HomeController : Controller - { - readonly IWebHostEnvironment _hostingEnvironment; - readonly DataSetService _dataSetService; - public HomeController(IWebHostEnvironment hostingEnvironment, DataSetService dataSetService) - { - _hostingEnvironment = hostingEnvironment; - _dataSetService = dataSetService; - } - - [HttpGet("{reportIndex:int?}")] - public IActionResult Index(int? reportIndex = 0) - { - var model = new HomeModel() - { - WebReport = new WebReport(), - ReportsList = new[] - { - "Simple List", - "Labels", - "Master-Detail", - "Badges", - "Interactive Report, 2-in-1", - "Hyperlinks, Bookmarks", - "Outline", - "Complex (Hyperlinks, Outline, TOC)", - "Drill-Down Groups", - "Polygon", - "Barcode", - }, - }; - - var reportToLoad = model.ReportsList[0]; - if (reportIndex >= 0 && reportIndex < model.ReportsList.Length) - reportToLoad = model.ReportsList[reportIndex.Value]; - - model.WebReport.Report.Load(Path.Combine(_dataSetService.ReportsPath, $"{reportToLoad}.frx")); - - model.WebReport.Report.RegisterData(_dataSetService.DataSet, "NorthWind"); - - //model.WebReport.SinglePage = true; - - model.WebReport.Designer.Path = "/WebReportDesigner/index.html"; - //model.WebReport.Designer.SaveCallBack = "/SaveDesignedReport"; - model.WebReport.Designer.SaveMethod = (string reportID, string filename, string report) => - { - string webRootPath = _hostingEnvironment.WebRootPath; - - string pathToSave = Path.Combine(webRootPath, "DesignedReports", filename); - if (!Directory.Exists(pathToSave)) - Directory.CreateDirectory(Path.GetDirectoryName(pathToSave)); - - System.IO.File.WriteAllTextAsync(pathToSave, report); - - return "OK"; - }; - - - //Uncomment to use ToolbarCustomization - //ToolbarSettings toolbar = new ToolbarSettings() - //{ - // Color = Color.Red, - // DropDownMenuColor = Color.Red, - // DropDownMenuTextColor = Color.White, - // IconColor = IconColors.White, - // Position = Positions.Right, - // FontSettings = new Font("Arial", 14, FontStyle.Bold), - // Exports = new ExportMenuSettings() - // { - // ExportTypes = Exports.Pdf | Exports.Excel97 | Exports.Rtf - // } - //}; - //model.WebReport.Toolbar = toolbar; - - - // Uncomment to use Online Designer - //model.WebReport.Width = "1000"; - //model.WebReport.Height = "1000"; - //model.WebReport.Mode = WebReportMode.Designer; - - return View(model); - } - - [HttpGet("prepared/{file}")] - public IActionResult Prepared(string file) - { - var model = new HomeModel() - { - WebReport = new WebReport(), - ReportsList = new[] - { - "Simple List", - "Labels", - "Master-Detail", - "Badges", - "Interactive Report, 2-in-1", - "Hyperlinks, Bookmarks", - "Outline", - "Complex (Hyperlinks, Outline, TOC)", - "Drill-Down Groups", - "Mail Merge" - }, - }; - - model.WebReport.LoadPrepared(file); - - return View("Index", model); - } - - - // Call-back for save the designed report - [HttpPost("/SaveDesignedReport")] - public ActionResult SaveDesignedReport(string reportID, [FromQuery(Name = "reportUUID")] string reportName) - { - string webRootPath = _hostingEnvironment.WebRootPath; - - Stream reportForSave = Request.Body; - string pathToSave = Path.Combine(webRootPath, "DesignedReports", reportName); - if (!Directory.Exists(pathToSave)) - Directory.CreateDirectory(Path.GetDirectoryName(pathToSave)); - using (FileStream file = new FileStream(pathToSave, FileMode.Create)) - { - reportForSave.CopyToAsync(file); - } - return new OkResult(); - } - } -} diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/FastReport.OpenSource.MVC.3.1.csproj b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/FastReport.OpenSource.MVC.3.1.csproj deleted file mode 100644 index 4fd3a97e..00000000 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/FastReport.OpenSource.MVC.3.1.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netcoreapp3.1 - Demo.MVC.NetCore31 - Debug;Release - - - - - - - - - - - diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/FastReport.OpenSource.MVC.3.1.sln b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/FastReport.OpenSource.MVC.3.1.sln deleted file mode 100644 index e01dde2b..00000000 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/FastReport.OpenSource.MVC.3.1.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.4.33205.214 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.MVC.3.1", "FastReport.OpenSource.MVC.3.1.csproj", "{8B31C484-671A-4A3E-A5AA-A8AFC8462C89}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8B31C484-671A-4A3E-A5AA-A8AFC8462C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B31C484-671A-4A3E-A5AA-A8AFC8462C89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B31C484-671A-4A3E-A5AA-A8AFC8462C89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B31C484-671A-4A3E-A5AA-A8AFC8462C89}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {BFDB90B7-7FA2-4CF9-B6E6-175C83E41D75} - EndGlobalSection -EndGlobal diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Models/HomeModel.cs b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Models/HomeModel.cs deleted file mode 100644 index 0a09aefc..00000000 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Models/HomeModel.cs +++ /dev/null @@ -1,11 +0,0 @@ -using FastReport.Web; - -namespace Demo.MVC.NetCore31.Models -{ - public class HomeModel - { - public WebReport WebReport { get; set; } - public string[] ReportsList { get; set; } - - } -} diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Program.cs b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Program.cs deleted file mode 100644 index ec2c1c3f..00000000 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Program.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Hosting; - -namespace Demo.MVC.NetCore31 -{ - public class Program - { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }); - } -} diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Properties/launchSettings.json b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Properties/launchSettings.json deleted file mode 100644 index 5fbd0a61..00000000 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:59578", - "sslPort": 44324 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "Demo.MVC.NetCore31": { - "commandName": "Project", - "launchBrowser": true, - "applicationUrl": "https://localhost:5001;http://localhost:5000", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Startup.cs b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Startup.cs deleted file mode 100644 index e23b4903..00000000 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Startup.cs +++ /dev/null @@ -1,56 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using MVC.Service; - -namespace Demo.MVC.NetCore31 -{ - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - services.AddControllersWithViews(); - services.AddSingleton(); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - else - { - app.UseExceptionHandler("/Home/Error"); - // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. - app.UseHsts(); - } - app.UseHttpsRedirection(); - app.UseStaticFiles(); - - app.UseFastReport(); - - app.UseRouting(); - - app.UseAuthorization(); - - app.UseEndpoints(endpoints => - { - endpoints.MapControllerRoute( - name: "default", - pattern: "{controller=Home}/{action=Index}/{id?}"); - }); - } - } -} diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Views/Home/Index.cshtml b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Views/Home/Index.cshtml deleted file mode 100644 index 987ef8ef..00000000 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Views/Home/Index.cshtml +++ /dev/null @@ -1,27 +0,0 @@ -@model HomeModel - -
- FastReport.Web for OpenSource | .NET Core 3.1 - - - -
- -
- About FastReport.Net - Download Demo - Buy FastReport.Net -
- -
-
- @foreach (var item in Model.ReportsList.Select((value, i) => new { value, i })) - { - @item.value - } -
-
- @await Model.WebReport.Render() -
-
© @DateTime.Now.Year - Fast Reports, Inc.
-
\ No newline at end of file diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Views/Shared/_Layout.cshtml b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Views/Shared/_Layout.cshtml deleted file mode 100644 index 3e4d8b40..00000000 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - FastReport.Web for ASP.NET Core demo application NET5.0 - - - - -@RenderBody() - - \ No newline at end of file diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Views/_ViewImports.cshtml b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Views/_ViewImports.cshtml deleted file mode 100644 index 90ab686e..00000000 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Views/_ViewImports.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@using Demo.MVC.NetCore31 -@using Demo.MVC.NetCore31.Models -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Views/_ViewStart.cshtml b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Views/_ViewStart.cshtml deleted file mode 100644 index a5f10045..00000000 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/appsettings.Development.json b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/appsettings.Development.json deleted file mode 100644 index 8983e0fc..00000000 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/appsettings.Development.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - } -} diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/appsettings.json b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/appsettings.json deleted file mode 100644 index d9d9a9bf..00000000 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/appsettings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*" -} diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/wwwroot/css/site.css b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/wwwroot/css/site.css deleted file mode 100644 index eee9e3d2..00000000 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/wwwroot/css/site.css +++ /dev/null @@ -1,96 +0,0 @@ -body { - margin: 0px; - padding: 20px; - width: intrinsic; - width: -webkit-max-content; - width: -moz-max-content; - width: max-content; -} - -.title { - display: flex; - flex-direction: row; - justify-content: flex-start; - align-content: space-between; - align-items: center; - font-family: "Segoe UI",Arial,sans-serif; - font-size: 42px; - font-weight: 100; - padding-left: 20px; - padding-right: 20px; -} - -.title > a { - color: black; - text-decoration: none; - white-space: nowrap; -} - -.menu { - background-color: rgba(0, 0, 0, 0.65); - display: flex; - flex-wrap: wrap; - margin-top: 20px; - margin-bottom: 20px; - margin-right: 60px; - box-shadow: 0px 2px 20px -2px rgba(0, 0, 0, 0.2); -} - -.menu > a { - font-family: "Segoe UI",Arial,sans-serif; - font-size: 20px; - text-decoration: none; - padding: 3px 24px 5px 24px; - color: white; - white-space: nowrap; -} - -.menu > a:hover { - background-color: rgb(239, 67, 67); - box-shadow: 0px 2px 10px -2px rgba(0, 0, 0, 0.2); -} - -.container { - display: flex; -} - -.reports { - display: flex; - flex-direction: column; - flex-shrink: 0; -} - -.reports > a { - font-family: "Segoe UI",Arial,sans-serif; - font-size: 17px; - text-decoration: none; - padding: 3px 24px 4px 24px; - color: black; -} - -.reports > a:hover { - background-color: rgb(54, 173, 244); - box-shadow: 0px 2px 10px -2px rgba(0, 0, 0, 0.2); - color: white; -} - -.webreport { - padding-left: 20px; - padding-right: 24px; -} - -footer { - text-align: center; - font-family: "Segoe UI",Arial,sans-serif; - font-size: 13px; - padding-top: 15px; - margin-top: 20px; - opacity: 0.6; - border-top: 1px solid lightgray; -} - -.fr-logo { - margin-left: 175px; - margin-top: 0px; - height: 64px; -} \ No newline at end of file diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/wwwroot/favicon.ico b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/wwwroot/favicon.ico deleted file mode 100644 index 8a118549..00000000 Binary files a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/wwwroot/favicon.ico and /dev/null differ diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/wwwroot/logo.png b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/wwwroot/logo.png deleted file mode 100644 index 8204972e..00000000 Binary files a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/wwwroot/logo.png and /dev/null differ diff --git a/Extras/Core/FastReport.Data/Avalonia.props b/Extras/Core/FastReport.Data/Avalonia.props new file mode 100644 index 00000000..b9437052 --- /dev/null +++ b/Extras/Core/FastReport.Data/Avalonia.props @@ -0,0 +1,26 @@ + + + + https://www.fast-report.com/en/product/fast-report-avalonia/license + Debug;Release; + + + + + + ..\..\..\..\FastReport.Avalonia\FastReport.Avalonia.csproj + FastReport.Avalonia + + ..\..\..\..\FastReport.Forms.Avalonia\FastReport.Forms.Avalonia.csproj + FastReport.Forms.Avalonia + + + + + + + + + + + \ No newline at end of file diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/FastReport.Avalonia.Data.Cassandra.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/FastReport.Avalonia.Data.Cassandra.csproj new file mode 100644 index 00000000..1f05f8e7 --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/FastReport.Avalonia.Data.Cassandra.csproj @@ -0,0 +1,12 @@ + + + net6.0 + + + + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/FastReport.OpenSource.Data.Cassandra.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/FastReport.OpenSource.Data.Cassandra.csproj index 0880ce1d..52794dcc 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/FastReport.OpenSource.Data.Cassandra.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/FastReport.OpenSource.Data.Cassandra.csproj @@ -1,6 +1,6 @@  - netstandard2.0;$(NetFrameworkMinimum);netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.ClickHouse/FastReport.Avalonia.Data.ClickHouse.csproj b/Extras/Core/FastReport.Data/FastReport.Data.ClickHouse/FastReport.Avalonia.Data.ClickHouse.csproj new file mode 100644 index 00000000..1f05f8e7 --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.ClickHouse/FastReport.Avalonia.Data.ClickHouse.csproj @@ -0,0 +1,12 @@ + + + net6.0 + + + + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.ClickHouse/FastReport.OpenSource.Data.ClickHouse.csproj b/Extras/Core/FastReport.Data/FastReport.Data.ClickHouse/FastReport.OpenSource.Data.ClickHouse.csproj index 23f5eba6..95659cc4 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.ClickHouse/FastReport.OpenSource.Data.ClickHouse.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.ClickHouse/FastReport.OpenSource.Data.ClickHouse.csproj @@ -1,7 +1,7 @@  - net472;netstandard2.1;netcoreapp3.1 + net472;net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Couchbase/FastReport.Avalonia.Data.Couchbase.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Couchbase/FastReport.Avalonia.Data.Couchbase.csproj new file mode 100644 index 00000000..129e5b8b --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.Couchbase/FastReport.Avalonia.Data.Couchbase.csproj @@ -0,0 +1,12 @@ + + + net6.0 + + + + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Couchbase/FastReport.OpenSource.Data.Couchbase.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Couchbase/FastReport.OpenSource.Data.Couchbase.csproj index f51db75b..19b02718 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Couchbase/FastReport.OpenSource.Data.Couchbase.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.Couchbase/FastReport.OpenSource.Data.Couchbase.csproj @@ -1,6 +1,6 @@ - netstandard2.0;$(NetFrameworkMinimum);netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.ElasticSearch/FastReport.Avalonia.Data.ElasticSearch.csproj b/Extras/Core/FastReport.Data/FastReport.Data.ElasticSearch/FastReport.Avalonia.Data.ElasticSearch.csproj new file mode 100644 index 00000000..3e398e89 --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.ElasticSearch/FastReport.Avalonia.Data.ElasticSearch.csproj @@ -0,0 +1,12 @@ + + + net6.0 + + + + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.ElasticSearch/FastReport.OpenSource.Data.ElasticSearch.csproj b/Extras/Core/FastReport.Data/FastReport.Data.ElasticSearch/FastReport.OpenSource.Data.ElasticSearch.csproj index d0c9ec48..fee9aa70 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.ElasticSearch/FastReport.OpenSource.Data.ElasticSearch.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.ElasticSearch/FastReport.OpenSource.Data.ElasticSearch.csproj @@ -1,6 +1,6 @@ - netstandard2.0;$(NetFrameworkMinimum);netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Excel/FastReport.Avalonia.Data.Excel.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Excel/FastReport.Avalonia.Data.Excel.csproj new file mode 100644 index 00000000..1f05f8e7 --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.Excel/FastReport.Avalonia.Data.Excel.csproj @@ -0,0 +1,12 @@ + + + net6.0 + + + + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Excel/FastReport.OpenSource.Data.Excel.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Excel/FastReport.OpenSource.Data.Excel.csproj index bf6856d5..e3ee1964 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Excel/FastReport.OpenSource.Data.Excel.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.Excel/FastReport.OpenSource.Data.Excel.csproj @@ -1,6 +1,6 @@  - netstandard2.0;$(NetFrameworkMinimum);netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Firebird/FastReport.Avalonia.Data.Firebird.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Firebird/FastReport.Avalonia.Data.Firebird.csproj new file mode 100644 index 00000000..3e398e89 --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.Firebird/FastReport.Avalonia.Data.Firebird.csproj @@ -0,0 +1,12 @@ + + + net6.0 + + + + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Firebird/FastReport.OpenSource.Data.Firebird.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Firebird/FastReport.OpenSource.Data.Firebird.csproj index 6b4ce8c2..92256e31 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Firebird/FastReport.OpenSource.Data.Firebird.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.Firebird/FastReport.OpenSource.Data.Firebird.csproj @@ -1,6 +1,6 @@ - netstandard2.0;$(NetFrameworkMinimum);netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Json/FastReport.Avalonia.Data.Json.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Json/FastReport.Avalonia.Data.Json.csproj new file mode 100644 index 00000000..36a1ef63 --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.Json/FastReport.Avalonia.Data.Json.csproj @@ -0,0 +1,16 @@ + + + net6.0 + + + + + + + FRCORE; + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Json/FastReport.OpenSource.Data.Json.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Json/FastReport.OpenSource.Data.Json.csproj index 73ad2ca8..21ae298e 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Json/FastReport.OpenSource.Data.Json.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.Json/FastReport.OpenSource.Data.Json.csproj @@ -1,6 +1,6 @@ - netstandard2.0;$(NetFrameworkMinimum);netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Linter/FastReport.Avalonia.Data.Linter.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Linter/FastReport.Avalonia.Data.Linter.csproj new file mode 100644 index 00000000..3e398e89 --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.Linter/FastReport.Avalonia.Data.Linter.csproj @@ -0,0 +1,12 @@ + + + net6.0 + + + + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Linter/FastReport.OpenSource.Data.Linter.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Linter/FastReport.OpenSource.Data.Linter.csproj index f339d2e0..c423f252 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Linter/FastReport.OpenSource.Data.Linter.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.Linter/FastReport.OpenSource.Data.Linter.csproj @@ -1,6 +1,6 @@  - netstandard2.1;$(NetFrameworkMinimum);netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.MongoDB/FastReport.Avalonia.Data.MongoDB.csproj b/Extras/Core/FastReport.Data/FastReport.Data.MongoDB/FastReport.Avalonia.Data.MongoDB.csproj new file mode 100644 index 00000000..3e398e89 --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.MongoDB/FastReport.Avalonia.Data.MongoDB.csproj @@ -0,0 +1,12 @@ + + + net6.0 + + + + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.MongoDB/FastReport.OpenSource.Data.MongoDB.csproj b/Extras/Core/FastReport.Data/FastReport.Data.MongoDB/FastReport.OpenSource.Data.MongoDB.csproj index 5ac5b8f7..eea2feb8 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.MongoDB/FastReport.OpenSource.Data.MongoDB.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.MongoDB/FastReport.OpenSource.Data.MongoDB.csproj @@ -1,6 +1,6 @@ - netstandard2.0;$(NetFrameworkMinimum);netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.MsSql/FastReport.OpenSource.Data.MsSql.csproj b/Extras/Core/FastReport.Data/FastReport.Data.MsSql/FastReport.OpenSource.Data.MsSql.csproj index db5863be..eea2feb8 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.MsSql/FastReport.OpenSource.Data.MsSql.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.MsSql/FastReport.OpenSource.Data.MsSql.csproj @@ -1,6 +1,6 @@ - netstandard2.0;$(NetFrameworkMinimum) + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.MySql/FastReport.Avalonia.Data.MySql.csproj b/Extras/Core/FastReport.Data/FastReport.Data.MySql/FastReport.Avalonia.Data.MySql.csproj new file mode 100644 index 00000000..1f05f8e7 --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.MySql/FastReport.Avalonia.Data.MySql.csproj @@ -0,0 +1,12 @@ + + + net6.0 + + + + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.MySql/FastReport.OpenSource.Data.MySql.csproj b/Extras/Core/FastReport.Data/FastReport.Data.MySql/FastReport.OpenSource.Data.MySql.csproj index 4f2bc35f..da8b0640 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.MySql/FastReport.OpenSource.Data.MySql.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.MySql/FastReport.OpenSource.Data.MySql.csproj @@ -1,6 +1,6 @@ - $(NetFrameworkMinimum);netstandard2.0;netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Odbc/FastReport.Avalonia.Data.Odbc.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Odbc/FastReport.Avalonia.Data.Odbc.csproj new file mode 100644 index 00000000..c3418810 --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.Odbc/FastReport.Avalonia.Data.Odbc.csproj @@ -0,0 +1,12 @@ + + + net6.0 + + + + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Odbc/FastReport.OpenSource.Data.Odbc.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Odbc/FastReport.OpenSource.Data.Odbc.csproj index db5863be..eea2feb8 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Odbc/FastReport.OpenSource.Data.Odbc.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.Odbc/FastReport.OpenSource.Data.Odbc.csproj @@ -1,6 +1,6 @@ - netstandard2.0;$(NetFrameworkMinimum) + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.OracleODPCore/FastReport.Avalonia.Data.OracleODPCore.csproj b/Extras/Core/FastReport.Data/FastReport.Data.OracleODPCore/FastReport.Avalonia.Data.OracleODPCore.csproj new file mode 100644 index 00000000..d416e900 --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.OracleODPCore/FastReport.Avalonia.Data.OracleODPCore.csproj @@ -0,0 +1,12 @@ + + + net6.0 + + + + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.OracleODPCore/FastReport.OpenSource.Data.OracleODPCore.csproj b/Extras/Core/FastReport.Data/FastReport.Data.OracleODPCore/FastReport.OpenSource.Data.OracleODPCore.csproj index 5ac5b8f7..eea2feb8 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.OracleODPCore/FastReport.OpenSource.Data.OracleODPCore.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.OracleODPCore/FastReport.OpenSource.Data.OracleODPCore.csproj @@ -1,6 +1,6 @@ - netstandard2.0;$(NetFrameworkMinimum);netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Postgres/FastReport.Avalonia.Data.Postgres.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Postgres/FastReport.Avalonia.Data.Postgres.csproj new file mode 100644 index 00000000..bca893fb --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.Postgres/FastReport.Avalonia.Data.Postgres.csproj @@ -0,0 +1,12 @@ + + + net6.0 + + + + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Postgres/FastReport.OpenSource.Data.Postgres.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Postgres/FastReport.OpenSource.Data.Postgres.csproj index db08fa04..061e00a6 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Postgres/FastReport.OpenSource.Data.Postgres.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.Postgres/FastReport.OpenSource.Data.Postgres.csproj @@ -1,6 +1,6 @@ - $(NetFrameworkMinimum);netstandard2.0;netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.RavenDB/FastReport.Avalonia.Data.RavenDB.csproj b/Extras/Core/FastReport.Data/FastReport.Data.RavenDB/FastReport.Avalonia.Data.RavenDB.csproj new file mode 100644 index 00000000..d416e900 --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.RavenDB/FastReport.Avalonia.Data.RavenDB.csproj @@ -0,0 +1,12 @@ + + + net6.0 + + + + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.RavenDB/FastReport.OpenSource.Data.RavenDB.csproj b/Extras/Core/FastReport.Data/FastReport.Data.RavenDB/FastReport.OpenSource.Data.RavenDB.csproj index d375c3a4..86caa3fc 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.RavenDB/FastReport.OpenSource.Data.RavenDB.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.RavenDB/FastReport.OpenSource.Data.RavenDB.csproj @@ -1,6 +1,6 @@ - $(NetFrameworkMinimum);netstandard2.0;netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.SQLite/FastReport.Avalonia.Data.SQLite.csproj b/Extras/Core/FastReport.Data/FastReport.Data.SQLite/FastReport.Avalonia.Data.SQLite.csproj new file mode 100644 index 00000000..d416e900 --- /dev/null +++ b/Extras/Core/FastReport.Data/FastReport.Data.SQLite/FastReport.Avalonia.Data.SQLite.csproj @@ -0,0 +1,12 @@ + + + net6.0 + + + + + + + + + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.SQLite/FastReport.OpenSource.Data.SQLite.csproj b/Extras/Core/FastReport.Data/FastReport.Data.SQLite/FastReport.OpenSource.Data.SQLite.csproj index 5ac5b8f7..eea2feb8 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.SQLite/FastReport.OpenSource.Data.SQLite.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.SQLite/FastReport.OpenSource.Data.SQLite.csproj @@ -1,6 +1,6 @@ - netstandard2.0;$(NetFrameworkMinimum);netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 true diff --git a/Extras/Core/FastReport.Data/WPF.props b/Extras/Core/FastReport.Data/WPF.props index 02fa6b4f..bb5e5076 100644 --- a/Extras/Core/FastReport.Data/WPF.props +++ b/Extras/Core/FastReport.Data/WPF.props @@ -9,10 +9,10 @@ - ..\..\..\FastReport.WPF\FastReport.WPF.csproj + ..\..\..\..\FastReport.WPF\FastReport.WPF.csproj FastReport.WPF.Demo - ..\..\..\FastReport.Forms.WPF\src\FastReport.Forms.WPF.csproj + ..\..\..\..\FastReport.Forms.WPF\FastReport.Forms.WPF.csproj FastReport.Forms.WPF.Demo diff --git a/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.Core.Plugins.WebP.csproj b/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.Core.Plugins.WebP.csproj index cc9062d3..89c4dbf7 100644 --- a/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.Core.Plugins.WebP.csproj +++ b/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.Core.Plugins.WebP.csproj @@ -1,6 +1,6 @@ - $(NetFrameworkMinimum);netstandard2.0;netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 https://www.fast-report.com/en/product/fast-report-net/license Represents a plugin to extend PictureObject supports formats, for FastReport.Core. diff --git a/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.CoreWin.Plugins.WebP.csproj b/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.CoreWin.Plugins.WebP.csproj deleted file mode 100644 index 34e10fe3..00000000 --- a/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.CoreWin.Plugins.WebP.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - netcoreapp3.1 - https://www.fast-report.com/en/product/fast-report-net/license - - Represents a plugin to extend PictureObject supports formats, for FastReport.Net for .Net Core 3.1 and .Net 5 Windows. - This package will not be updated. The $(AssemblyName) package now includes a plugin for all versions of the FastReport product: FastReport .NET, FastReport.Core, FastReport.OpenSource, FastReport.CoreWin (.Net Core 3.1 and .Net 5 Windows). - - reporting, webp, image, reports - 1.0.0 - Debug;Release; - - - - - - - - - all - - - diff --git a/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.OpenSource.Plugins.WebP.csproj b/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.OpenSource.Plugins.WebP.csproj index 54b1042d..f6d4b520 100644 --- a/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.OpenSource.Plugins.WebP.csproj +++ b/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.OpenSource.Plugins.WebP.csproj @@ -1,6 +1,6 @@ - $(NetFrameworkMinimum);netstandard2.0;netcoreapp3.1 + $(NetFrameworkMinimum);net6.0 https://www.fast-report.com/en/product/fast-report-net/license Represents a plugin to extend PictureObject supports formats, for FastReport.OpenSource. diff --git a/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.Plugins.WebP.csproj b/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.Plugins.WebP.csproj index 51383d46..978f5adc 100644 --- a/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.Plugins.WebP.csproj +++ b/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/FastReport.Plugins.WebP.csproj @@ -1,9 +1,9 @@ - $(NetFrameworkMinimum) + $(NetFrameworkMinimum);net6.0-windows https://www.fast-report.com/en/product/fast-report-net/license - Represents a plugin to extend PictureObject supports formats. Shared Plugin for all versions of FastReport product: FastReport .NET, FastReport.Core, FastReport.OpenSource, FastReport.CoreWin (.Net Core 3.1 and .Net 5 Windows). + Represents a plugin to extend PictureObject supports formats. Shared Plugin for all versions of FastReport product: FastReport .NET, FastReport.Core, FastReport.OpenSource. Requirements: Any FastReport $(Version)+ package, NuGet Client 3.4.4+ diff --git a/Extras/OpenSource/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple.Tests/FastReport.OpenSource.Export.PdfSimple.Tests.csproj b/Extras/OpenSource/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple.Tests/FastReport.OpenSource.Export.PdfSimple.Tests.csproj index 472985cd..0f0769c0 100644 --- a/Extras/OpenSource/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple.Tests/FastReport.OpenSource.Export.PdfSimple.Tests.csproj +++ b/Extras/OpenSource/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple.Tests/FastReport.OpenSource.Export.PdfSimple.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 false diff --git a/Extras/OpenSource/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple.csproj b/Extras/OpenSource/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple.csproj index b80afb87..77ad6bfb 100644 --- a/Extras/OpenSource/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple.csproj +++ b/Extras/OpenSource/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + net6.0 diff --git a/FastReport.Base/AssemblyInitializer.cs b/FastReport.Base/AssemblyInitializer.cs index 09420d4f..8cbce047 100644 --- a/FastReport.Base/AssemblyInitializer.cs +++ b/FastReport.Base/AssemblyInitializer.cs @@ -110,7 +110,7 @@ public AssemblyInitializer() #if !COMMUNITY RegisteredObjects.AddCategory("ReportPage,Matrix", 142, 7, "Objects,Matrix"); RegisteredObjects.InternalAdd(typeof(MatrixObject), "ReportPage,Matrix", 142, 1); -#if !WPF +#if !(WPF || AVALONIA) RegisteredObjects.InternalAdd(typeof(CrossViewObject), "ReportPage,Matrix", 247, 2); #endif #else diff --git a/FastReport.Base/Barcode/BarcodeDatamatrix.cs b/FastReport.Base/Barcode/BarcodeDatamatrix.cs index bee658eb..04e5b8ea 100644 --- a/FastReport.Base/Barcode/BarcodeDatamatrix.cs +++ b/FastReport.Base/Barcode/BarcodeDatamatrix.cs @@ -1107,6 +1107,7 @@ internal override void Draw2DBarcode(IGraphics g, float kx, float ky) if (image == null) return; + Brush dark = new SolidBrush(Color); int stride = (width + 7) / 8; for (int k = 0; k < height; ++k) @@ -1117,11 +1118,12 @@ internal override void Draw2DBarcode(IGraphics g, float kx, float ky) int b = image[p + (j / 8)] & 0xff; b <<= j % 8; - Brush brush = (b & 0x80) == 0 ? Brushes.White : Brushes.Black; + Brush brush = (b & 0x80) == 0 ? Brushes.White : dark; g.FillRectangle(brush, j * PixelSize * kx, k * PixelSize * ky, PixelSize * kx, PixelSize * ky); } } + dark.Dispose(); } #endregion diff --git a/FastReport.Base/Barcode/BarcodeGS1.cs b/FastReport.Base/Barcode/BarcodeGS1.cs index 1bf1757d..38bf0359 100644 --- a/FastReport.Base/Barcode/BarcodeGS1.cs +++ b/FastReport.Base/Barcode/BarcodeGS1.cs @@ -142,19 +142,19 @@ protected void DrawLineBars(string data, IGraphics g, float zoom, RectangleF rec pen.Width = width; if (reversColor) - pen.Color = Color.Black; + pen.Color = Color; else pen.Color = Color.Transparent; if (separatorLine) { if (data[x] != '0') - pen.Color = Color.Black; + pen.Color = Color; } else { if ((x % 2 != 0 && !reversColor)) - pen.Color = Color.Black; + pen.Color = Color; if ((x % 2 != 0 && reversColor)) pen.Color = Color.Transparent; } diff --git a/FastReport.Base/Code/AssemblyDescriptor.cs b/FastReport.Base/Code/AssemblyDescriptor.cs index d5bb2227..67981c65 100644 --- a/FastReport.Base/Code/AssemblyDescriptor.cs +++ b/FastReport.Base/Code/AssemblyDescriptor.cs @@ -203,7 +203,7 @@ private void AddReferencedAssemblies(StringCollection assemblies, string default // fix for old reports with "System.Windows.Forms.DataVisualization" in referenced assemblies if (s.IndexOf("System.Windows.Forms.DataVisualization") != -1) s = "FastReport.DataVisualization"; -#if SKIA +#if (SKIA && !AVALONIA) if (s.IndexOf("FastReport.Compat") != -1) s = "FastReport.Compat.Skia"; if (s.IndexOf("FastReport.DataVisualization") != -1) diff --git a/FastReport.Base/Engine/ReportEngine.Pages.cs b/FastReport.Base/Engine/ReportEngine.Pages.cs index 4f38b41d..abb2918a 100644 --- a/FastReport.Base/Engine/ReportEngine.Pages.cs +++ b/FastReport.Base/Engine/ReportEngine.Pages.cs @@ -205,6 +205,7 @@ private bool StartFirstPage() CurY = PreparedPages.GetLastY(); else { + page.OnCreatePage(EventArgs.Empty); PreparedPages.AddPage(page); if (page.StartOnOddPage && (CurPage % 2) == 1) PreparedPages.AddPage(page); @@ -345,6 +346,7 @@ private void EndPage() private void StartPage() { + page.OnCreatePage(EventArgs.Empty); // apply Right to Left layout if needed if (Config.RightToLeft) { @@ -365,7 +367,7 @@ private void StartPage() ShowBand(page.Overlay); ShowPageHeader(); OnStateChanged(page, EngineState.PageStarted); - + columnStartY = CurY; StartColumn(); diff --git a/FastReport.Base/Export/ExportBase.cs b/FastReport.Base/Export/ExportBase.cs index 25330f6b..64f88418 100644 --- a/FastReport.Base/Export/ExportBase.cs +++ b/FastReport.Base/Export/ExportBase.cs @@ -278,7 +278,7 @@ private void OpenFile() Process proc = new Process(); proc.EnableRaisingEvents = false; -#if NETCOREAPP +#if (NETCOREAPP && !AVALONIA) proc.StartInfo.FileName = "cmd"; proc.StartInfo.Arguments = $"/c \"{fileName}\""; proc.StartInfo.CreateNoWindow = true; diff --git a/FastReport.Base/Preview/PreparedPages.cs b/FastReport.Base/Preview/PreparedPages.cs index 37132488..3bac06c7 100644 --- a/FastReport.Base/Preview/PreparedPages.cs +++ b/FastReport.Base/Preview/PreparedPages.cs @@ -236,20 +236,23 @@ public void AddSourcePage(ReportPage page) /// public void AddPage(ReportPage page) { - CurPage++; - if (CurPage >= Count || AddPageAction != AddPageAction.WriteOver) + if (page.Visible) { - PreparedPage preparedPage = new PreparedPage(page, this); - preparedPages.Add(preparedPage); + CurPage++; + if (CurPage >= Count || AddPageAction != AddPageAction.WriteOver) + { + PreparedPage preparedPage = new PreparedPage(page, this); + preparedPages.Add(preparedPage); - // upload previous page to the file cache if enabled - if (CanUploadToCache && Count > 1) - preparedPages[Count - 2].Upload(); + // upload previous page to the file cache if enabled + if (CanUploadToCache && Count > 1) + preparedPages[Count - 2].Upload(); - AddPageAction = AddPageAction.WriteOver; - CurPage = Count - 1; - Report.Engine.IncLogicalPageNumber(); - PageAdded?.Invoke(this, EventArgs.Empty); + AddPageAction = AddPageAction.WriteOver; + CurPage = Count - 1; + Report.Engine.IncLogicalPageNumber(); + PageAdded?.Invoke(this, EventArgs.Empty); + } } } diff --git a/FastReport.Base/Report.cs b/FastReport.Base/Report.cs index 7d37caeb..ad9c05b4 100644 --- a/FastReport.Base/Report.cs +++ b/FastReport.Base/Report.cs @@ -881,7 +881,7 @@ private string[] DefaultAssemblies "System.Xml.dll", "FastReport.Compat.dll", -#if !CROSSPLATFORM && !WPF +#if !CROSSPLATFORM && !(WPF || AVALONIA) "System.Windows.Forms.dll", #endif @@ -889,6 +889,10 @@ private string[] DefaultAssemblies "FastReport.Forms.WPF.dll", #endif +#if AVALONIA + "FastReport.Forms.Avalonia.dll", +#endif + #if CROSSPLATFORM || COREWIN "System.Drawing.Primitives", #endif @@ -2012,15 +2016,29 @@ public void SaveWithRandomData(string fileName) /// /// The stream to load from. /// - /// When you try to load the password-protected report, you will be asked - /// for a password. You also may specify the password in the - /// property before loading the report. In this case the report will load silently. + /// The stream must be seekable. + /// When you load a password-protected report, you should specify a password in the property, + /// otherwise you will get the . In this case you should ask for a password and try again: + /// + /// try + /// { + /// report.Load(stream); + /// } + /// catch (DecryptException) + /// { + /// report.Password = report.ShowPasswordForm(); // or use your own form to do this + /// report.Load(stream); + /// } + /// /// public void Load(Stream stream) { string password = Password; Clear(); + var saveStream = stream; + var saveStreamPos = stream.Position; + using (FRReader reader = new FRReader(this)) { List disposeList = new List(); @@ -2032,10 +2050,6 @@ public void Load(Stream stream) bool crypted = Crypter.IsStreamEncrypted(stream); if (crypted) { - if (String.IsNullOrEmpty(password)) - { - password = ShowPaswordForm(password); - } stream = Crypter.Decrypt(stream, password); disposeList.Add(stream); } @@ -2047,7 +2061,10 @@ public void Load(Stream stream) catch (Exception e) { if (crypted) + { + saveStream.Position = saveStreamPos; throw new DecryptException(); + } throw e; } finally diff --git a/FastReport.Base/ReportPage.cs b/FastReport.Base/ReportPage.cs index 0f4c9f09..ce0181e9 100644 --- a/FastReport.Base/ReportPage.cs +++ b/FastReport.Base/ReportPage.cs @@ -85,6 +85,7 @@ public partial class ReportPage : PageBase, IParent private ColumnFooterBand columnFooter; private PageFooterBand pageFooter; private OverlayBand overlay; + private string createPageEvent; private string startPageEvent; private string finishPageEvent; private string manualBuildEvent; @@ -102,6 +103,11 @@ public partial class ReportPage : PageBase, IParent #endregion #region Properties + + /// + /// This event occurs when the report engine create new page. On this stage can be modified page properties. + /// + public event EventHandler CreatePage; /// /// This event occurs when the report engine starts this page. /// @@ -658,6 +664,17 @@ public SubreportObject Subreport set { subreport = value; } } + /// + /// Gets or sets a script event name that will be fired when the report engine create new page. + /// On this stage can be modified page properties. + /// + [Category("Build")] + public string CreatePageEvent + { + get { return createPageEvent; } + set { createPageEvent = value; } + } + /// /// Gets or sets a script event name that will be fired when the report engine starts this page. /// @@ -955,6 +972,7 @@ public override void Assign(Base source) ResetPageNumber = src.ResetPageNumber; ExtraDesignWidth = src.ExtraDesignWidth; BackPage = src.BackPage; + CreatePageEvent = src.CreatePageEvent; StartOnOddPage = src.StartOnOddPage; StartPageEvent = src.StartPageEvent; FinishPageEvent = src.FinishPageEvent; @@ -1011,6 +1029,8 @@ public override void Serialize(FRWriter writer) writer.WriteBool("StartOnOddPage", StartOnOddPage); if (BackPage != c.BackPage) writer.WriteBool("BackPage", BackPage); + if (CreatePageEvent != c.CreatePageEvent) + writer.WriteStr("CreatePageEvent", CreatePageEvent); if (StartPageEvent != c.StartPageEvent) writer.WriteStr("StartPageEvent", StartPageEvent); if (FinishPageEvent != c.FinishPageEvent) @@ -1092,7 +1112,7 @@ public override void Draw(FRPaintEventArgs e) ReportComponentBase obj = c as ReportComponentBase; if (!IsPrinting) { -#if !MONO +#if !MONO || (WPF || AVALONIA) if (!obj.IsVisible(e)) continue; #endif @@ -1163,6 +1183,16 @@ public override void ExtractMacros() Watermark.Text = ExtractDefaultMacros(Watermark.Text); } + /// + /// This method fires the CreatePage event and the script code connected to the CreatePageEvent. + /// + public void OnCreatePage(EventArgs e) + { + if (CreatePage != null) + CreatePage(this, e); + InvokeEvent(CreatePageEvent, e); + } + /// /// This method fires the StartPage event and the script code connected to the StartPageEvent. /// diff --git a/FastReport.Base/Table/TableBase.cs b/FastReport.Base/Table/TableBase.cs index 1106ca06..656ec095 100644 --- a/FastReport.Base/Table/TableBase.cs +++ b/FastReport.Base/Table/TableBase.cs @@ -344,6 +344,9 @@ private void DrawCells(FRPaintEventArgs e, DrawCellProc proc) if (!IsInsideSpan(cell) && (!IsPrinting || cell.Printable)) { cell.SetPrinting(IsPrinting); +#if !MONO || (WPF || AVALONIA) + if (cell.IsVisible(e)) +#endif proc(e, cell); } @@ -490,15 +493,12 @@ public override void Draw(FRPaintEventArgs e) if (Config.RightToLeft) { DrawTableRtl(e); - // !! ����������� ������ !! - //Border.Draw(e, new RectangleF(FLeftRtl - Width + AbsLeft, AbsTop, Width, Height)); - Border.Draw(e, new RectangleF(AbsLeft, AbsTop, Width, Height)); } else { DrawTable(e); - Border.Draw(e, new RectangleF(AbsLeft, AbsTop, Width, Height)); } + Border.Draw(e, new RectangleF(AbsLeft, AbsTop, Width, Height)); DrawDesign(e); } diff --git a/FastReport.Base/Utils/Config.cs b/FastReport.Base/Utils/Config.cs index 046eee6f..600d7f02 100644 --- a/FastReport.Base/Utils/Config.cs +++ b/FastReport.Base/Utils/Config.cs @@ -20,6 +20,8 @@ public static partial class Config #elif MONO #if WPF const string CONFIG_NAME = "FastReport.WPF.config"; +#elif AVALONIA + const string CONFIG_NAME = "FastReport.Avalonia.config"; #else const string CONFIG_NAME = "FastReport.Mono.config"; #endif @@ -205,6 +207,7 @@ public static string Version /// /// Gets a PrivateFontCollection instance. /// + [Obsolete("Use FastReport.FontManager instead")] public static FRPrivateFontCollection PrivateFontCollection { get { return privateFontCollection; } @@ -267,6 +270,7 @@ public static CompilerSettings CompilerSettings /// public static async void CompilerWarmup() { + Report.EnsureInit(); await Task.Run(() => { new Report() { ScriptText = "using System; namespace FastReport { public class ReportScript {\r\n} }" }.Compile(); @@ -291,13 +295,9 @@ internal static string GetTempFolder() internal static void Init() { FIsRunningOnMono = Type.GetType("Mono.Runtime") != null; -#if SKIA - Topten.RichTextKit.FontFallback.CharacterMatcher = characterMatcher; -#endif - CheckWebMode(); -#if !CROSSPLATFORM +#if !CROSSPLATFORM || AVALONIA if (!WebMode) LoadConfig(); #endif @@ -535,7 +535,7 @@ private static void LoadPlugins() } // For CoreWin -#if COREWIN +#if (COREWIN || AVALONIA) LoadPluginsInCurrentFolder(); #endif } diff --git a/FastReport.Base/Utils/Converter.cs b/FastReport.Base/Utils/Converter.cs index aec102b0..c0eef714 100644 --- a/FastReport.Base/Utils/Converter.cs +++ b/FastReport.Base/Utils/Converter.cs @@ -72,12 +72,10 @@ public static string ToString(object value) return type.FullName; return type.AssemblyQualifiedName; } -#if true// | CROSSPLATFORM if (value is Font) { return new TypeConverters.FontConverter().ConvertToInvariantString(value); } -#endif if (value is System.Drawing.Imaging.ImageFormat) { var imageFormat = value as System.Drawing.Imaging.ImageFormat; @@ -131,40 +129,7 @@ public static object FromString(Type type, string value) return value.Split('\r'); } if (type == typeof(Font)) - { - Font font; - -#if FRCORE || COREWIN - // This patch made for "Wix Madefor Text" font - // We manually parse font description and create font - - String[] fontNameFields = value.Split(','); - if (Config.PrivateFontCollection.HasFont(fontNameFields[0])) - { - FontFamily fontFamily = new FontFamily(fontNameFields[0], Config.PrivateFontCollection.Collection); - fontNameFields[1] = fontNameFields[1].Replace("pt", ""); - float size = float.Parse(fontNameFields[1]); - if(fontNameFields.Length == 3) - { - fontNameFields[2] = fontNameFields[2].Replace("style=", ""); - FontStyle style = ((FontStyle)Enum.Parse(typeof(FontStyle), fontNameFields[2])); - font = new Font(fontFamily, size, style); - } - else - { - font = new Font(fontFamily, size); - } - } - else -#endif - { - font = new TypeConverters.FontConverter().ConvertFromInvariantString(value) as Font; - font = Config.PrivateFontCollection.CheckFamily(font); - } - - return font; - } - + return new TypeConverters.FontConverter().ConvertFromInvariantString(value) as Font; if (type == typeof(Color)) return new ColorConverter().ConvertFromInvariantString(value); return TypeDescriptor.GetConverter(type).ConvertFromInvariantString(value); diff --git a/FastReport.Base/Utils/DrawUtils.Win32.cs b/FastReport.Base/Utils/DrawUtils.Win32.cs deleted file mode 100644 index b809bf39..00000000 --- a/FastReport.Base/Utils/DrawUtils.Win32.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using System.Drawing; -using System.Runtime.InteropServices; -using System.Windows.Forms; - -namespace FastReport.Utils -{ - partial class DrawUtils - { -#if CROSSPLATFORM - static IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wParam, DrawingOptions drawingOptions) - { - return IntPtr.Zero; - } -#else - [DllImport("user32.dll")] - static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wParam, DrawingOptions drawingOptions); -#endif - - const int WM_PRINT = 0x317; - - [Flags] - enum DrawingOptions - { - PRF_CHECKVISIBLE = 0x01, - PRF_NONCLIENT = 0x02, - PRF_CLIENT = 0x04, - PRF_ERASEBKGND = 0x08, - PRF_CHILDREN = 0x10, - PRF_OWNED = 0x20 - } - - /// - /// Draws control to a bitmap. - /// - /// Control to draw. - /// Determines whether to draw control's children or not. - /// The bitmap. - public static Bitmap DrawToBitmap(Control control, bool children) - { - Bitmap bitmap = new Bitmap(control.Width, control.Height); - using (Graphics gr = Graphics.FromImage(bitmap)) - { - IntPtr hdc = gr.GetHdc(); - DrawingOptions options = DrawingOptions.PRF_ERASEBKGND | - DrawingOptions.PRF_CLIENT | DrawingOptions.PRF_NONCLIENT; - if (children) - options |= DrawingOptions.PRF_CHILDREN; - SendMessage(control.Handle, WM_PRINT, hdc, options); - gr.ReleaseHdc(hdc); - } - return bitmap; - } - } -} \ No newline at end of file diff --git a/FastReport.Base/Utils/DrawUtils.cs b/FastReport.Base/Utils/DrawUtils.cs index b8decd79..52ab86d3 100644 --- a/FastReport.Base/Utils/DrawUtils.cs +++ b/FastReport.Base/Utils/DrawUtils.cs @@ -14,7 +14,6 @@ internal enum MonoRendering public static partial class DrawUtils { private static Font FDefaultFont; - private static Font FDefault96Font; private static Font FDefaultReportFont; private static Font FDefaultTextObjectFont; private static Font FFixedFont; @@ -57,6 +56,20 @@ public static Font DefaultFont { if (FDefaultFont == null) { +#if AVALONIA + if (OperatingSystem.IsWindows()) + { + FDefaultFont = new Font("Segoe UI", 8.5f); + } + else if (OperatingSystem.IsMacOS()) + { + FDefaultFont = new Font("Helvetica Neue", 8.5f); + } + else if (OperatingSystem.IsLinux()) + { + FDefaultFont = new Font("Liberation Sans", 8.5f); + } +#else switch (System.Globalization.CultureInfo.CurrentCulture.TwoLetterISOLanguageName) { case "ja": @@ -75,9 +88,14 @@ public static Font DefaultFont #endif break; } +#endif } return FDefaultFont; } + set + { + FDefaultFont = value; + } } public static Font DefaultReportFont @@ -122,6 +140,19 @@ public static Font FixedFont if (FFixedFont == null) #if WPF FFixedFont = CreateFont("Consolas", 9); +#elif AVALONIA + if (OperatingSystem.IsWindows()) + { + FFixedFont = CreateFont("Lucida Console", 9); + } + else if (OperatingSystem.IsMacOS()) + { + FFixedFont = CreateFont("PT Mono", 9); + } + else if (OperatingSystem.IsLinux()) + { + FFixedFont = CreateFont("Liberation Mono", 9); + } #else FFixedFont = CreateFont("Courier New", 10); #endif @@ -129,36 +160,6 @@ public static Font FixedFont } } - public static Font Default96Font - { - get - { - if (FDefault96Font == null) - { - float sz = 96f / ScreenDpi; - switch (System.Globalization.CultureInfo.CurrentCulture.TwoLetterISOLanguageName) - { - case "ja": - FDefault96Font = CreateFont("MS UI Gothic", 9 * sz); - break; - - case "zh": - FDefault96Font = CreateFont("SimSun", 9 * sz); - break; - - default: -#if WPF - FDefault96Font = CreateFont("Segoe UI", 8.5f * sz); -#else - FDefault96Font = CreateFont("Tahoma", 8 * sz); -#endif - break; - } - } - return FDefault96Font; - } - } - internal static Font CreateFont(string familyName, float emSize, FontStyle style = FontStyle.Regular, GraphicsUnit unit = GraphicsUnit.Point, @@ -167,14 +168,15 @@ internal static Font CreateFont(string familyName, float emSize, { Font font = new Font(familyName, emSize, style, unit, gdiCharSet, gdiVerticalFont); -#if SKIA +// skia now handles Font instantiation correctly +/*#if SKIA if (font.Name != familyName) { // font family not found in installed fonts, search in the user fonts font = new Font(familyName, emSize, style, unit, gdiCharSet, gdiVerticalFont, Config.PrivateFontCollection.Collection); } -#endif - return font; +#endif*/ + return font; } public static SizeF MeasureString(string text) @@ -212,17 +214,6 @@ public static SizeF MeasureString(Graphics g, string text, Font font, RectangleF return rect.Size; } - public static void FloodFill(Bitmap bmp, int x, int y, Color color, Color replacementColor) - { - if (x < 0 || y < 0 || x >= bmp.Width || y >= bmp.Height || bmp.GetPixel(x, y) != color) - return; - bmp.SetPixel(x, y, replacementColor); - FloodFill(bmp, x - 1, y, color, replacementColor); - FloodFill(bmp, x + 1, y, color, replacementColor); - FloodFill(bmp, x, y - 1, color, replacementColor); - FloodFill(bmp, x, y + 1, color, replacementColor); - } - internal static MonoRendering GetMonoRendering(IGraphics printerGraphics) { if (FMonoRendering == MonoRendering.Undefined) diff --git a/FastReport.Base/Utils/FRPrivateFontCollection.cs b/FastReport.Base/Utils/FRPrivateFontCollection.cs index 51d3ea0b..f9053a4f 100644 --- a/FastReport.Base/Utils/FRPrivateFontCollection.cs +++ b/FastReport.Base/Utils/FRPrivateFontCollection.cs @@ -1,201 +1,15 @@ using System; -using System.Collections.Generic; -using System.IO; -using System.Runtime.InteropServices; -using System.Drawing.Text; -using System.Drawing; -using System.Linq; -#if SKIA -using static SkiaSharp.HarfBuzz.SKShaper; -using System.Diagnostics; -using FastReport.Fonts; -#endif namespace FastReport.Utils { /// /// A wrapper around PrivateFontCollection. /// + [Obsolete("Use FastReport.FontManager instead")] public partial class FRPrivateFontCollection { - private readonly PrivateFontCollection collection = TypeConverters.FontConverter.PrivateFontCollection; - private readonly Dictionary _fonts = new Dictionary(); + public bool AddFontFile(string filename) => FontManager.AddFont(filename); - - internal PrivateFontCollection Collection { get { return collection; } } - - /// - /// Gets the array of FontFamily objects associated with this collection. - /// - public FontFamily[] Families { get { return collection.Families; } } - - /// - /// Checks if the font name is contained in this collection. - /// - /// The name of the font. - /// true if the font is contained in this collection. - public bool HasFont(string fontName) - { - return _fonts.ContainsKey(fontName); - } - - /// - /// Returns the font's stream. - /// - /// The name of the font. - /// Either FileStream or MemoryStream containing font data. - public Stream GetFontStream(string fontName) - { - if (_fonts.TryGetValue(fontName, out var font)) - { - return font.GetFontStream(); - } - - return null; - } - - /// - /// Adds a font from the specified file to this collection. - /// - /// A System.String that contains the file name of the font to add. - /// true if the font is registered by application. - public bool AddFontFile(string filename) - { - bool success = false; - if (File.Exists(filename)) - { - // if (!FontFiles.ContainsValue(filename)) - if (!_fonts.Values.OfType().Any(fontFile => fontFile._filepath == filename)) - { - collection.AddFontFile(filename); - RegisterFontInternal(filename); - success = true; - } -#if DEBUG // Not so important information - else - { - Console.WriteLine("Font file '{0}' already present in collection", filename); - } -#endif - } -#if DEBUG - else - { - Console.WriteLine("Font file '{0}' not found", filename); - } -#endif - return success; - } - -#if SKIA - public void AddFontFromStream(Stream stream) - { - using (FontStream fs = new FontStream(stream)) - { - FontType font_type = TrueTypeCollection.CheckFontType(fs); - IList list = TrueTypeCollection.AddFontData(font_type, fs); - foreach (var ttf in list) - { - if (!_fonts.ContainsKey(ttf.FastName)) - { - stream.Position = 0; - var ms = new MemoryStream(); - stream.CopyTo(ms); - ms.Position = 0; - _fonts.Add(ttf.FastName, new FontFromStream(ms)); - } - else - Console.WriteLine("Font {0} already registered\n", ttf.FastName); - } - fs.LeaveOpen = true; - } - - stream.Position = 0; - collection.AddFont(stream); - stream.Position = 0; - } - - public void AddTempFontStream(Stream stream) - { - - } - -#endif - - /// - /// Adds a font contained in system memory to this collection. - /// - /// The memory address of the font to add. - /// The memory length of the font to add. - public void AddMemoryFont(IntPtr memory, int length) - { - collection.AddMemoryFont(memory, length); - string fontName = Families[Families.Length - 1].Name; - if (!_fonts.ContainsKey(fontName)) - _fonts.Add(fontName, new MemoryFont(memory, length)); - } - - private abstract class DictionaryFont - { - public abstract Stream GetFontStream(); - } - - private sealed class FontFromFile : DictionaryFont - { - internal readonly string _filepath; - - public FontFromFile(string filepath) - { - _filepath = filepath; - } - - public override Stream GetFontStream() - { - return new FileStream(_filepath, FileMode.Open, FileAccess.Read); - } - - public override string ToString() - { - return _filepath; - } - } - - private sealed class FontFromStream : DictionaryFont - { - private readonly Stream _stream; - - public FontFromStream(Stream stream) - { - _stream = stream; - } - - public override Stream GetFontStream() - { - var newStream = new MemoryStream(); - _stream.CopyTo(newStream); - _stream.Position = 0; - newStream.Position = 0; - return newStream; - } - } - - private sealed class MemoryFont : DictionaryFont - { - private readonly IntPtr Memory; - private readonly int Length; - - public MemoryFont(IntPtr memory, int length) - { - Memory = memory; - Length = length; - } - - public override Stream GetFontStream() - { - byte[] buffer = new byte[Length]; - Marshal.Copy(Memory, buffer, 0, Length); - return new MemoryStream(buffer); - } - } + public void AddMemoryFont(IntPtr memory, int length) => FontManager.AddFont(memory, length); } } diff --git a/FastReport.Base/Utils/FontManager.Gdi.cs b/FastReport.Base/Utils/FontManager.Gdi.cs new file mode 100644 index 00000000..6e7ce128 --- /dev/null +++ b/FastReport.Base/Utils/FontManager.Gdi.cs @@ -0,0 +1,43 @@ +// available in FR.OS, FR.NET, FR.WPF +#if !SKIA && !FRCORE && (!MONO || WPF) +using System; +using System.Diagnostics; +using System.Drawing.Text; +using System.IO; + +namespace FastReport +{ + public static partial class FontManager + { + /// + /// Adds a font from the specified file to this collection. + /// + /// A System.String that contains the file name of the font to add. + /// true if the font is registered by application. + public static bool AddFont(string filename) + { + bool success = false; + if (File.Exists(filename)) + { + PrivateFontCollection.AddFontFile(filename); + success = true; + } + else + { + Debug.WriteLine($"Font file '{filename}' not found"); + } + return success; + } + + /// + /// Adds a font contained in system memory to this collection. + /// + /// The memory address of the font to add. + /// The memory length of the font to add. + public static void AddFont(IntPtr memory, int length) + { + PrivateFontCollection.AddMemoryFont(memory, length); + } + } +} +#endif \ No newline at end of file diff --git a/FastReport.Base/Utils/FontManager.Internals.cs b/FastReport.Base/Utils/FontManager.Internals.cs new file mode 100644 index 00000000..bf00536f --- /dev/null +++ b/FastReport.Base/Utils/FontManager.Internals.cs @@ -0,0 +1,66 @@ +using System; +using System.Drawing; + +namespace FastReport +{ + public static partial class FontManager + { + // do not remove + private static readonly FontFamilyMatcher fontFamilyMatcher = new FontFamilyMatcher(); + + [Flags] + private enum SearchScope + { + Temporary = 0x1, + Private = 0x2, + Installed = 0x4, + + NonInstalled = Temporary | Private, + All = Temporary | Private | Installed + } + + // Defines a font substitute item. + private class FontSubstitute + { + private string[] _substituteList; + private FontFamily _substituteFamily; + + public string Name { get; } + + // null value indicates that no substitute found + public FontFamily SubstituteFamily => _substituteFamily ?? FindSubstituteFamily(SearchScope.NonInstalled); + + private FontFamily FindSubstituteFamily(SearchScope searchScope) + { + foreach (var item in _substituteList) + { + var family = FindFontFamily(item, searchScope); + if (family != null) + { + return family; + } + } + return null; + } + + public FontSubstitute(string name, params string[] substituteList) + { + Name = name; + _substituteList = substituteList; + // do initial search in installed fonts. Other collections should be checked later. + _substituteFamily = FindSubstituteFamily(SearchScope.Installed); + } + } + + // used in the FR FontConverter to look up family name in all font collections + private class FontFamilyMatcher : FastReport.TypeConverters.FontConverter.IFontFamilyMatcher + { + public FontFamilyMatcher() + { + FastReport.TypeConverters.FontConverter.FontFamilyMatcher = this; + } + + public FontFamily GetFontFamilyOrDefault(string name) => FontManager.GetFontFamilyOrDefault(name); + } + } +} diff --git a/FastReport.Base/Utils/FontManager.cs b/FastReport.Base/Utils/FontManager.cs new file mode 100644 index 00000000..ffaf2da0 --- /dev/null +++ b/FastReport.Base/Utils/FontManager.cs @@ -0,0 +1,143 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Drawing.Text; +using System.Linq; + +namespace FastReport +{ + /// + /// Contains font management methods and properties. + /// + public static partial class FontManager + { + // NOT THREAD SAFE! + private static PrivateFontCollection PrivateFontCollection { get; } = new PrivateFontCollection(); + + // NOT THREAD SAFE! + // Do not update PrivateFontCollection at realtime, you must update property value then dispose previous. + private static PrivateFontCollection TemporaryFontCollection { get; set; } = null; + + private static InstalledFontCollection InstalledFontCollection { get; } = new InstalledFontCollection(); + + private static List SubstituteFonts { get; } = new List(); + + /// + /// Gets all installed font families. + /// + /// + /// This method enumerates all font collections (PrivateFontCollection, TemporaryFontCollection, InstalledFontCollection) + /// and sorts the result. + /// + public static FontFamily[] AllFamilies + { + get + { + var families = new List(); + + families.AddRange(InstalledFontCollection.Families); + families.AddRange(PrivateFontCollection.Families); + if (TemporaryFontCollection != null) + { + families.AddRange(TemporaryFontCollection.Families); + } + + families.Sort((x, y) => x.Name.CompareTo(y.Name)); + return families.ToArray(); + } + } + + /// + /// Adds a new substitute font item. + /// + /// The original font name, e.g. "Arial" + /// The alternatives list, e.g. "Ubuntu Sans", "Liberation Sans", "Helvetica" + /// + /// Substitute font replaces the original font if it is not present on a machine. + /// For example, you may define "Helvetica Neue" substitute for "Arial". + /// + public static void AddSubstituteFont(string originalFontName, params string[] substituteFonts) + { + SubstituteFonts.Add(new FontSubstitute(originalFontName, substituteFonts)); + } + + /// + /// Removes substitute fonts for the given font. + /// + /// The original font name, e.g. "Arial" + public static void RemoveSubstituteFont(string originalFontName) + { + for (int i = 0; i < SubstituteFonts.Count; i++) + { + if (SubstituteFonts[i].Name == originalFontName) + { + SubstituteFonts.RemoveAt(i); + i--; + } + } + } + + /// + /// Clears all substitute fonts. + /// + public static void ClearSubstituteFonts() + { + SubstituteFonts.Clear(); + } + + /// + /// Finds a FontFamily by its name in specified font collections. + /// + /// The family name, e.g. "Arial". + /// Search scope. + /// The FontFamily instance if found; otherwise null. + private static FontFamily FindFontFamily(string name, SearchScope searchScope = SearchScope.All) + { + FontFamily family = null; + + if ((searchScope & SearchScope.Temporary) != 0) + { + family = Find(TemporaryFontCollection); + } + if ((searchScope & SearchScope.Private) != 0) + { + family ??= Find(PrivateFontCollection); + } + if ((searchScope & SearchScope.Installed) != 0) + { + family ??= Find(InstalledFontCollection); + } + return family; + + FontFamily Find(FontCollection collection) => + collection?.Families.Where(f => f.Name.Equals(name, StringComparison.OrdinalIgnoreCase)).FirstOrDefault(); + } + + /// + /// Finds a FontFamily by its name. + /// + /// The family name, e.g. "Arial". + /// The FontFamily instance if found; otherwise default FontFamily.GenericSansSerif. + internal static FontFamily GetFontFamilyOrDefault(string name) + { + var fontFamily = FindFontFamily(name); + + if (fontFamily == null) + { + // try to substitute + foreach (var item in SubstituteFonts) + { + if (item.Name == name) + { + // may be null! + fontFamily = item.SubstituteFamily; + break; + } + } + } + + // return default if not found + return fontFamily ?? FontFamily.GenericSansSerif; + } + } +} diff --git a/FastReport.Compat/src/Directory.Build.props b/FastReport.Compat/Directory.Build.props similarity index 80% rename from FastReport.Compat/src/Directory.Build.props rename to FastReport.Compat/Directory.Build.props index 3e2c97b2..0c96b5b1 100644 --- a/FastReport.Compat/src/Directory.Build.props +++ b/FastReport.Compat/Directory.Build.props @@ -3,7 +3,6 @@ $(MSBuildThisFileDirectory).. - $(MSBuildProjectDirectory)\bin Fast Reports Inc. FastReport FastReport.Compat @@ -11,14 +10,14 @@ LICENSE.md https://www.fast-report.com/en/product/fast-report-net reporting, reports, pdf, html, mvc, core - https://github.com/FastReports/FastReport.Compat + https://github.com/FastReports/FastReport GIT true Common compatible types for FastReport .Net, Core and Mono frlogo192.png true - $(SlnDir)\FastReport.OpenSource.snk + ..\..\FastReport.OpenSource.snk $(MSBuildThisFileDirectory)shared @@ -35,15 +34,15 @@ - + True - + True - + True false diff --git a/FastReport.Compat/FastReport.Compat.sln b/FastReport.Compat/FastReport.Compat.sln deleted file mode 100644 index 22ad9956..00000000 --- a/FastReport.Compat/FastReport.Compat.sln +++ /dev/null @@ -1,51 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.2.32519.379 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C137F644-DCB8-424D-A49D-4ABE28E4BA72}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.Compat", "src\FastReport.Compat\FastReport.Compat.csproj", "{9A315AD7-3470-426C-B0B2-B9ECFA76C64B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.Compat-Windows", "src\FastReport.Compat-Windows\FastReport.Compat-Windows.csproj", "{AB9F228F-5B37-436D-968F-37266B445B64}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.Compat.Skia", "src\FastReport.Compat.Skia\FastReport.Compat.Skia.csproj", "{C0A7385F-9AC6-4CC7-8BAA-E740F0C726D4}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Demo|Any CPU = Demo|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9A315AD7-3470-426C-B0B2-B9ECFA76C64B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A315AD7-3470-426C-B0B2-B9ECFA76C64B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A315AD7-3470-426C-B0B2-B9ECFA76C64B}.Demo|Any CPU.ActiveCfg = Release|Any CPU - {9A315AD7-3470-426C-B0B2-B9ECFA76C64B}.Demo|Any CPU.Build.0 = Release|Any CPU - {9A315AD7-3470-426C-B0B2-B9ECFA76C64B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A315AD7-3470-426C-B0B2-B9ECFA76C64B}.Release|Any CPU.Build.0 = Release|Any CPU - {AB9F228F-5B37-436D-968F-37266B445B64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB9F228F-5B37-436D-968F-37266B445B64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB9F228F-5B37-436D-968F-37266B445B64}.Demo|Any CPU.ActiveCfg = Release|Any CPU - {AB9F228F-5B37-436D-968F-37266B445B64}.Demo|Any CPU.Build.0 = Release|Any CPU - {AB9F228F-5B37-436D-968F-37266B445B64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB9F228F-5B37-436D-968F-37266B445B64}.Release|Any CPU.Build.0 = Release|Any CPU - {C0A7385F-9AC6-4CC7-8BAA-E740F0C726D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0A7385F-9AC6-4CC7-8BAA-E740F0C726D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0A7385F-9AC6-4CC7-8BAA-E740F0C726D4}.Demo|Any CPU.ActiveCfg = Demo|Any CPU - {C0A7385F-9AC6-4CC7-8BAA-E740F0C726D4}.Demo|Any CPU.Build.0 = Demo|Any CPU - {C0A7385F-9AC6-4CC7-8BAA-E740F0C726D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0A7385F-9AC6-4CC7-8BAA-E740F0C726D4}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {9A315AD7-3470-426C-B0B2-B9ECFA76C64B} = {C137F644-DCB8-424D-A49D-4ABE28E4BA72} - {AB9F228F-5B37-436D-968F-37266B445B64} = {C137F644-DCB8-424D-A49D-4ABE28E4BA72} - {C0A7385F-9AC6-4CC7-8BAA-E740F0C726D4} = {C137F644-DCB8-424D-A49D-4ABE28E4BA72} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {C3FF3494-9BB7-4A9B-BE84-B3A9AA93C2D3} - EndGlobalSection -EndGlobal diff --git a/FastReport.Compat/FastReport.Compat/FastReport.Compat.csproj b/FastReport.Compat/FastReport.Compat/FastReport.Compat.csproj new file mode 100644 index 00000000..5c9c8861 --- /dev/null +++ b/FastReport.Compat/FastReport.Compat/FastReport.Compat.csproj @@ -0,0 +1,39 @@ + + + + net462;net6.0;net6.0-windows7.0 + false + + true + false + + + + true + + + + + + + + + + + + + + + + + + + + WindowsForms/%(RecursiveDir)%(Filename)%(Extension) + + + DotNetClasses\UITypeEditor.cs + + + + \ No newline at end of file diff --git a/FastReport.Compat/FastReport.OpenSource.snk b/FastReport.Compat/FastReport.OpenSource.snk deleted file mode 100644 index 43376c7e..00000000 Binary files a/FastReport.Compat/FastReport.OpenSource.snk and /dev/null differ diff --git a/FastReport.Compat/Nuget/FastReport.Compat/buildTransitive/netcoreapp3.0/FastReport.Compat.targets b/FastReport.Compat/Nuget/FastReport.Compat/buildTransitive/netcoreapp3.0/FastReport.Compat.targets deleted file mode 100644 index eac500f5..00000000 --- a/FastReport.Compat/Nuget/FastReport.Compat/buildTransitive/netcoreapp3.0/FastReport.Compat.targets +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/FastReport.Compat/Nuget/_._ b/FastReport.Compat/Nuget/_._ deleted file mode 100644 index e69de29b..00000000 diff --git a/FastReport.Compat/Nuget/template.nuspec b/FastReport.Compat/Nuget/template.nuspec deleted file mode 100644 index f87989fa..00000000 --- a/FastReport.Compat/Nuget/template.nuspec +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/FastReport.Compat/UsedPackages.version b/FastReport.Compat/UsedPackages.version deleted file mode 100644 index 179a2d26..00000000 --- a/FastReport.Compat/UsedPackages.version +++ /dev/null @@ -1,17 +0,0 @@ - - - - - 2024.1.0 - - 2024.1.0 - - [4.7.3,) - - [3.3.1,) - - [3.3.1,) - - - - \ No newline at end of file diff --git a/FastReport.Compat/_Build_Compat_Packages.bat b/FastReport.Compat/_Build_Compat_Packages.bat deleted file mode 100644 index e0cb91b2..00000000 --- a/FastReport.Compat/_Build_Compat_Packages.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -setlocal ENABLEDELAYEDEXPANSION -rem HELP FOR THIS FILE -rem CLONE the fr if need -rem clear the fr if need -rem next run scripts from the fr tools -rem that's all - -ECHO TRY TO BUILD FR.Compat - -pushd .\build\Cake - dotnet run --target=PackCompat --solution-filename=FastReport.Compat.sln --config=Release --vers=2024.1.0 - dotnet run --target=PackCompatSkia --solution-filename=FastReport.Compat.sln --config=Release --vers=2024.1.0 -popd \ No newline at end of file diff --git a/FastReport.Compat/build_WPF.bat b/FastReport.Compat/build_WPF.bat deleted file mode 100644 index 1f66efc4..00000000 --- a/FastReport.Compat/build_WPF.bat +++ /dev/null @@ -1,2 +0,0 @@ -dotnet pack src\FastReport.Compat-Windows\FastReport.Compat.WPF.csproj --configuration=Release /p:Version=2024.1.0 -dotnet pack src\FastReport.Compat-Windows\FastReport.Compat.WPF.csproj --configuration=Demo /p:Version=2024.1.0 diff --git a/FastReport.Compat/frlogo192.png b/FastReport.Compat/frlogo192.png deleted file mode 100644 index 3d34b580..00000000 Binary files a/FastReport.Compat/frlogo192.png and /dev/null differ diff --git a/FastReport.Compat/src/shared/Compiler/CSharpCodeProvider.cs b/FastReport.Compat/shared/Compiler/CSharpCodeProvider.cs similarity index 100% rename from FastReport.Compat/src/shared/Compiler/CSharpCodeProvider.cs rename to FastReport.Compat/shared/Compiler/CSharpCodeProvider.cs diff --git a/FastReport.Compat/src/shared/Compiler/CodeDomProvider.cs b/FastReport.Compat/shared/Compiler/CodeDomProvider.cs similarity index 100% rename from FastReport.Compat/src/shared/Compiler/CodeDomProvider.cs rename to FastReport.Compat/shared/Compiler/CodeDomProvider.cs diff --git a/FastReport.Compat/src/shared/Compiler/CodeGenerator.cs b/FastReport.Compat/shared/Compiler/CodeGenerator.cs similarity index 100% rename from FastReport.Compat/src/shared/Compiler/CodeGenerator.cs rename to FastReport.Compat/shared/Compiler/CodeGenerator.cs diff --git a/FastReport.Compat/src/shared/Compiler/CompilationEventArgs.cs b/FastReport.Compat/shared/Compiler/CompilationEventArgs.cs similarity index 100% rename from FastReport.Compat/src/shared/Compiler/CompilationEventArgs.cs rename to FastReport.Compat/shared/Compiler/CompilationEventArgs.cs diff --git a/FastReport.Compat/src/shared/Compiler/CompilerError.cs b/FastReport.Compat/shared/Compiler/CompilerError.cs similarity index 100% rename from FastReport.Compat/src/shared/Compiler/CompilerError.cs rename to FastReport.Compat/shared/Compiler/CompilerError.cs diff --git a/FastReport.Compat/src/shared/Compiler/CompilerParameters.cs b/FastReport.Compat/shared/Compiler/CompilerParameters.cs similarity index 100% rename from FastReport.Compat/src/shared/Compiler/CompilerParameters.cs rename to FastReport.Compat/shared/Compiler/CompilerParameters.cs diff --git a/FastReport.Compat/src/shared/Compiler/CompilerResults.cs b/FastReport.Compat/shared/Compiler/CompilerResults.cs similarity index 100% rename from FastReport.Compat/src/shared/Compiler/CompilerResults.cs rename to FastReport.Compat/shared/Compiler/CompilerResults.cs diff --git a/FastReport.Compat/src/shared/Compiler/IAssemblyLoadResolver.cs b/FastReport.Compat/shared/Compiler/IAssemblyLoadResolver.cs similarity index 100% rename from FastReport.Compat/src/shared/Compiler/IAssemblyLoadResolver.cs rename to FastReport.Compat/shared/Compiler/IAssemblyLoadResolver.cs diff --git a/FastReport.Compat/src/shared/Compiler/TempFileCollection.cs b/FastReport.Compat/shared/Compiler/TempFileCollection.cs similarity index 100% rename from FastReport.Compat/src/shared/Compiler/TempFileCollection.cs rename to FastReport.Compat/shared/Compiler/TempFileCollection.cs diff --git a/FastReport.Compat/src/shared/Compiler/VBCodeProvider.cs b/FastReport.Compat/shared/Compiler/VBCodeProvider.cs similarity index 100% rename from FastReport.Compat/src/shared/Compiler/VBCodeProvider.cs rename to FastReport.Compat/shared/Compiler/VBCodeProvider.cs diff --git a/FastReport.Compat/src/shared/DotNetClasses/Color.Full.cs b/FastReport.Compat/shared/DotNetClasses/Color.Full.cs similarity index 100% rename from FastReport.Compat/src/shared/DotNetClasses/Color.Full.cs rename to FastReport.Compat/shared/DotNetClasses/Color.Full.cs diff --git a/FastReport.Compat/src/shared/DotNetClasses/GdiGraphics.cs b/FastReport.Compat/shared/DotNetClasses/GdiGraphics.cs similarity index 100% rename from FastReport.Compat/src/shared/DotNetClasses/GdiGraphics.cs rename to FastReport.Compat/shared/DotNetClasses/GdiGraphics.cs diff --git a/FastReport.Compat/src/shared/DotNetClasses/IGraphics.cs b/FastReport.Compat/shared/DotNetClasses/IGraphics.cs similarity index 100% rename from FastReport.Compat/src/shared/DotNetClasses/IGraphics.cs rename to FastReport.Compat/shared/DotNetClasses/IGraphics.cs diff --git a/FastReport.Compat/src/shared/DotNetClasses/UITypeEditor.cs b/FastReport.Compat/shared/DotNetClasses/UITypeEditor.cs similarity index 100% rename from FastReport.Compat/src/shared/DotNetClasses/UITypeEditor.cs rename to FastReport.Compat/shared/DotNetClasses/UITypeEditor.cs diff --git a/FastReport.Compat/src/shared/TypeConverters/Color.Core.cs b/FastReport.Compat/shared/TypeConverters/Color.Core.cs similarity index 100% rename from FastReport.Compat/src/shared/TypeConverters/Color.Core.cs rename to FastReport.Compat/shared/TypeConverters/Color.Core.cs diff --git a/FastReport.Compat/src/shared/TypeConverters/ColorConverter.cs b/FastReport.Compat/shared/TypeConverters/ColorConverter.cs similarity index 100% rename from FastReport.Compat/src/shared/TypeConverters/ColorConverter.cs rename to FastReport.Compat/shared/TypeConverters/ColorConverter.cs diff --git a/FastReport.Compat/shared/TypeConverters/FontConverter.IFontFamilyMatcher.cs b/FastReport.Compat/shared/TypeConverters/FontConverter.IFontFamilyMatcher.cs new file mode 100644 index 00000000..11dd5513 --- /dev/null +++ b/FastReport.Compat/shared/TypeConverters/FontConverter.IFontFamilyMatcher.cs @@ -0,0 +1,25 @@ +using System.ComponentModel; +using System.Drawing; +using System.Linq; + +namespace FastReport.TypeConverters +{ + public partial class FontConverter : TypeConverter + { + public static IFontFamilyMatcher FontFamilyMatcher { get; set; } = new DefaultFontFamilyMatcher(); + + public interface IFontFamilyMatcher + { + FontFamily GetFontFamilyOrDefault(string name); + } + + private class DefaultFontFamilyMatcher : IFontFamilyMatcher + { + public FontFamily GetFontFamilyOrDefault(string name) + { + var fontFamily = FontFamily.Families.Where(f => f.Name == name).FirstOrDefault(); + return fontFamily ?? FontFamily.GenericSansSerif; + } + } + } +} diff --git a/FastReport.Compat/src/shared/TypeConverters/FontConverter.cs b/FastReport.Compat/shared/TypeConverters/FontConverter.cs similarity index 83% rename from FastReport.Compat/src/shared/TypeConverters/FontConverter.cs rename to FastReport.Compat/shared/TypeConverters/FontConverter.cs index a213a541..14b28cd7 100644 --- a/FastReport.Compat/src/shared/TypeConverters/FontConverter.cs +++ b/FastReport.Compat/shared/TypeConverters/FontConverter.cs @@ -17,35 +17,15 @@ using System.Reflection; using System.Text; using System.Drawing; +using System.Linq; namespace FastReport.TypeConverters { - public class FontConverter : TypeConverter + public partial class FontConverter : TypeConverter { private const string StylePrefix = "style="; - [Obsolete] - public static FontConverter Instance = new FontConverter(); - - /// - /// Gets a PrivateFontCollection instance. - /// - /// - /// NOT THREAD SAFE! - /// - public static PrivateFontCollection PrivateFontCollection { get; } = new PrivateFontCollection(); - - /// - /// Do not update PrivateFontCollection at realtime, you must update property value then dispose previous. - /// - /// - /// NOT THREAD SAFE! - /// - public static PrivateFontCollection TemporaryFontCollection { get; set; } = null; - - public static InstalledFontCollection InstalledFontCollection { get; } = new InstalledFontCollection(); - /// public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) { @@ -246,11 +226,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c } } - var fontFamily = FindFontFamily(fontName, null); - - Font result = new Font(fontFamily, fontSize, fontStyle, units); - - return result; + var fontFamily = FontFamilyMatcher.GetFontFamilyOrDefault(fontName); + return new Font(fontFamily, fontSize, fontStyle, units); } private void ParseSizeTokens(string text, char separator, ref string size, ref string units) @@ -358,80 +335,12 @@ public override object CreateInstance(ITypeDescriptorContext context, IDictionar } else { - fontFamily = FindFontFamily(name, fontFamily); + fontFamily = FontFamilyMatcher.GetFontFamilyOrDefault(name); } return new Font(fontFamily, size, style, unit, charSet, vertical); } - private static FontFamily FindFontFamily(string name, FontFamily fontFamily) - { - FontCollection collection; - -#if SKIA - collection = TemporaryFontCollection; - - if (collection != null) - { - fontFamily = collection.FindInternalByGDIFontFamilyName(name); - } - - // font family not found in temp list - if (fontFamily == null) - { - collection = PrivateFontCollection; - fontFamily = collection.FindInternalByGDIFontFamilyName(name); - - // font family not found in private list - if (fontFamily == null) - { - collection = InstalledFontCollection; - fontFamily = collection.FindInternalByGDIFontFamilyName(name); - } - } -#else - collection = TemporaryFontCollection; - - if (collection != null) - { - foreach (FontFamily font in collection.Families) - { - if (name.Equals(font.Name, StringComparison.OrdinalIgnoreCase)) - { - return font; - } - } - } - - // font family not found in temp list - collection = PrivateFontCollection; - foreach (FontFamily font in collection.Families) - { - if (name.Equals(font.Name, StringComparison.OrdinalIgnoreCase)) - { - return font; - } - } - - // font family not found in private list - collection = InstalledFontCollection; - FontFamily[] privateFontList = collection.Families; - foreach (FontFamily font in privateFontList) - { - if (name.Equals(font.Name, StringComparison.OrdinalIgnoreCase)) - { - return font; - } - } - -#endif - - // font family not found in private fonts also - if (fontFamily == null) - fontFamily = FontFamily.GenericSansSerif; - return fontFamily; - } - /// public override bool GetCreateInstanceSupported(ITypeDescriptorContext context) { diff --git a/FastReport.Compat/src/shared/TypeConverters/SizeConverter.cs b/FastReport.Compat/shared/TypeConverters/SizeConverter.cs similarity index 100% rename from FastReport.Compat/src/shared/TypeConverters/SizeConverter.cs rename to FastReport.Compat/shared/TypeConverters/SizeConverter.cs diff --git a/FastReport.Compat/src/shared/WindowsForms/ComboBox.ObjectCollection.cs b/FastReport.Compat/shared/WindowsForms/ComboBox.ObjectCollection.cs similarity index 100% rename from FastReport.Compat/src/shared/WindowsForms/ComboBox.ObjectCollection.cs rename to FastReport.Compat/shared/WindowsForms/ComboBox.ObjectCollection.cs diff --git a/FastReport.Compat/src/shared/WindowsForms/ItemArray.cs b/FastReport.Compat/shared/WindowsForms/ItemArray.cs similarity index 100% rename from FastReport.Compat/src/shared/WindowsForms/ItemArray.cs rename to FastReport.Compat/shared/WindowsForms/ItemArray.cs diff --git a/FastReport.Compat/src/shared/WindowsForms/ListBox.ObjectCollection.cs b/FastReport.Compat/shared/WindowsForms/ListBox.ObjectCollection.cs similarity index 100% rename from FastReport.Compat/src/shared/WindowsForms/ListBox.ObjectCollection.cs rename to FastReport.Compat/shared/WindowsForms/ListBox.ObjectCollection.cs diff --git a/FastReport.Compat/src/shared/WindowsForms/ListBox.SelectedIndexCollection.cs b/FastReport.Compat/shared/WindowsForms/ListBox.SelectedIndexCollection.cs similarity index 100% rename from FastReport.Compat/src/shared/WindowsForms/ListBox.SelectedIndexCollection.cs rename to FastReport.Compat/shared/WindowsForms/ListBox.SelectedIndexCollection.cs diff --git a/FastReport.Compat/src/shared/WindowsForms/ListBox.SelectedObjectCollection.cs b/FastReport.Compat/shared/WindowsForms/ListBox.SelectedObjectCollection.cs similarity index 100% rename from FastReport.Compat/src/shared/WindowsForms/ListBox.SelectedObjectCollection.cs rename to FastReport.Compat/shared/WindowsForms/ListBox.SelectedObjectCollection.cs diff --git a/FastReport.Compat/src/shared/WindowsForms/WindowsFormsReplacement.BindingSource.cs b/FastReport.Compat/shared/WindowsForms/WindowsFormsReplacement.BindingSource.cs similarity index 100% rename from FastReport.Compat/src/shared/WindowsForms/WindowsFormsReplacement.BindingSource.cs rename to FastReport.Compat/shared/WindowsForms/WindowsFormsReplacement.BindingSource.cs diff --git a/FastReport.Compat/src/shared/WindowsForms/WindowsFormsReplacement.ListBindingHelper.cs b/FastReport.Compat/shared/WindowsForms/WindowsFormsReplacement.ListBindingHelper.cs similarity index 100% rename from FastReport.Compat/src/shared/WindowsForms/WindowsFormsReplacement.ListBindingHelper.cs rename to FastReport.Compat/shared/WindowsForms/WindowsFormsReplacement.ListBindingHelper.cs diff --git a/FastReport.Compat/src/shared/WindowsForms/WindowsFormsReplacement.cs b/FastReport.Compat/shared/WindowsForms/WindowsFormsReplacement.cs similarity index 100% rename from FastReport.Compat/src/shared/WindowsForms/WindowsFormsReplacement.cs rename to FastReport.Compat/shared/WindowsForms/WindowsFormsReplacement.cs diff --git a/FastReport.Compat/src/FastReport.Compat-Windows/FastReport.Compat-Windows.csproj b/FastReport.Compat/src/FastReport.Compat-Windows/FastReport.Compat-Windows.csproj deleted file mode 100644 index 170ec86c..00000000 --- a/FastReport.Compat/src/FastReport.Compat-Windows/FastReport.Compat-Windows.csproj +++ /dev/null @@ -1,42 +0,0 @@ - - - - net462;$(CustomTargetFrameworks) - $(DefineConstants);NETCOREWIN - true - FastReport.Compat - $(AssemblyName) - false - - - - $(TargetFrameworks);netcoreapp3.0;net5.0-windows7.0; - - - - - - - $(BaseOutputPath)\lib - - - - true - - - - $(BaseOutputPath)\build\$(TargetFramework)\lib\Win - - - - - - - - - - - - - - diff --git a/FastReport.Compat/src/FastReport.Compat/FastReport.Compat.csproj b/FastReport.Compat/src/FastReport.Compat/FastReport.Compat.csproj deleted file mode 100644 index 88c1572d..00000000 --- a/FastReport.Compat/src/FastReport.Compat/FastReport.Compat.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - netstandard2.0;netstandard2.1;netcoreapp3.0 - true - - - - $(BaseOutputPath)\lib - - - - $(BaseOutputPath)\build\$(TargetFramework)\lib\Any - - - - - - - - - - diff --git a/FastReport.Core.Web/FastReport.OpenSource.Web.csproj b/FastReport.Core.Web/FastReport.OpenSource.Web.csproj index 2e602b61..37197b9c 100644 --- a/FastReport.Core.Web/FastReport.OpenSource.Web.csproj +++ b/FastReport.Core.Web/FastReport.OpenSource.Web.csproj @@ -5,7 +5,7 @@ true - netcoreapp3.1;net6.0 + net6.0 OPENSOURCE; 1.0.0 FastReport MIT license.md diff --git a/FastReport.OpenSource.sln b/FastReport.OpenSource.sln index 26f5e20d..f5f65b45 100644 --- a/FastReport.OpenSource.sln +++ b/FastReport.OpenSource.sln @@ -51,15 +51,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.MVC.6 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Angular", "Demos\OpenSource\SPA\FastReport.OpenSource.Angular\FastReport.OpenSource.Angular.csproj", "{C2DF96FD-5AED-47A8-99BD-696919ABFE0A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.MVC.3.1", "Demos\OpenSource\MVC\FastReport.OpenSource.MVC.3.1\FastReport.OpenSource.MVC.3.1.csproj", "{320FE53B-1775-4DD2-8D2B-AB468B2839FA}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{A1827297-EAD4-413D-BA8D-811F5FF6125D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Plugins.WebP", "Extras\Core\FastReport.Plugin\FastReport.Plugins.WebP\FastReport.OpenSource.Plugins.WebP.csproj", "{28005ED3-3E5B-443F-A054-C74A45BE3C4C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Data.Odbc", "Extras\Core\FastReport.Data\FastReport.Data.Odbc\FastReport.OpenSource.Data.Odbc.csproj", "{7C97A904-620B-49A5-9000-41452DA11BB3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.Compat", "FastReport.Compat\src\FastReport.Compat\FastReport.Compat.csproj", "{00AF18F4-89D0-434A-82C2-C8A8A43F008C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.Compat", "FastReport.Compat\FastReport.Compat\FastReport.Compat.csproj", "{00AF18F4-89D0-434A-82C2-C8A8A43F008C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -194,12 +192,6 @@ Global {C2DF96FD-5AED-47A8-99BD-696919ABFE0A}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2DF96FD-5AED-47A8-99BD-696919ABFE0A}.Release|Any CPU.ActiveCfg = Release|Any CPU {C2DF96FD-5AED-47A8-99BD-696919ABFE0A}.Release|Any CPU.Build.0 = Release|Any CPU - {320FE53B-1775-4DD2-8D2B-AB468B2839FA}.Academic|Any CPU.ActiveCfg = Debug|Any CPU - {320FE53B-1775-4DD2-8D2B-AB468B2839FA}.Academic|Any CPU.Build.0 = Debug|Any CPU - {320FE53B-1775-4DD2-8D2B-AB468B2839FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {320FE53B-1775-4DD2-8D2B-AB468B2839FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {320FE53B-1775-4DD2-8D2B-AB468B2839FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {320FE53B-1775-4DD2-8D2B-AB468B2839FA}.Release|Any CPU.Build.0 = Release|Any CPU {28005ED3-3E5B-443F-A054-C74A45BE3C4C}.Academic|Any CPU.ActiveCfg = Debug|Any CPU {28005ED3-3E5B-443F-A054-C74A45BE3C4C}.Academic|Any CPU.Build.0 = Debug|Any CPU {28005ED3-3E5B-443F-A054-C74A45BE3C4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -242,7 +234,6 @@ Global {43BC1122-E846-406F-AA7D-737E8AC5AA6E} = {898AF8DC-11C3-4640-B60C-5D8CBF2F29CF} {477DA8DC-5CF9-4DCC-B616-3182735048A3} = {8E9E75EB-2ABC-4CC1-8AA0-C11DEE54A152} {C2DF96FD-5AED-47A8-99BD-696919ABFE0A} = {8E9E75EB-2ABC-4CC1-8AA0-C11DEE54A152} - {320FE53B-1775-4DD2-8D2B-AB468B2839FA} = {8E9E75EB-2ABC-4CC1-8AA0-C11DEE54A152} {A1827297-EAD4-413D-BA8D-811F5FF6125D} = {CCF32DAC-85D9-43D4-A4A7-72626A13D806} {28005ED3-3E5B-443F-A054-C74A45BE3C4C} = {A1827297-EAD4-413D-BA8D-811F5FF6125D} {7C97A904-620B-49A5-9000-41452DA11BB3} = {898AF8DC-11C3-4640-B60C-5D8CBF2F29CF} diff --git a/FastReport.OpenSource/FastReport.OpenSource.csproj b/FastReport.OpenSource/FastReport.OpenSource.csproj index d59f5b2f..78081f32 100644 --- a/FastReport.OpenSource/FastReport.OpenSource.csproj +++ b/FastReport.OpenSource/FastReport.OpenSource.csproj @@ -1,17 +1,14 @@  - - netstandard2.0 - + + net6.0 + 9.0 + $(TargetFrameworks);net462 - - $(TargetFrameworks);netstandard2.1 - - true true @@ -60,7 +57,7 @@ - TRACE;DOTNET_4 + TRACE;DOTNET_4;READONLY_STRUCTS $(DefineConstants);DEBUG; @@ -70,10 +67,6 @@ $(DefineConstants);CROSSPLATFORM - - - $(DefineConstants);READONLY_STRUCTS - @@ -82,17 +75,6 @@ - - - - - - - - - - - @@ -130,4 +112,9 @@ + + + + + \ No newline at end of file diff --git a/FastReport.OpenSource/Report.Core.cs b/FastReport.OpenSource/Report.Core.cs index a12addab..a18353cc 100644 --- a/FastReport.OpenSource/Report.Core.cs +++ b/FastReport.OpenSource/Report.Core.cs @@ -14,16 +14,6 @@ private void ClearPreparedPages() preparedPages.Clear(); } - /// - /// Does nothing - /// - /// - /// password - private string ShowPaswordForm(string password) - { - return password; - } - /// /// Does nothing /// diff --git a/FastReport.OpenSource/Utils/FRPrivateFontCollection.OpenSource.cs b/FastReport.OpenSource/Utils/FRPrivateFontCollection.OpenSource.cs deleted file mode 100644 index e0de5e60..00000000 --- a/FastReport.OpenSource/Utils/FRPrivateFontCollection.OpenSource.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Drawing; - -namespace FastReport.Utils -{ - /// - /// A wrapper around PrivateFontCollection. - /// - partial class FRPrivateFontCollection - { - private void RegisterFontInternal(string filename) - { - string fontName = Families[Families.Length - 1].Name; - if (!_fonts.ContainsKey(fontName)) - _fonts.Add(fontName, new FontFromFile(filename)); -#if DEBUG - else - Console.WriteLine("Font \"{0}\" already present in collection.\n Files:\n {1}\n {2}\n", fontName, _fonts[fontName], filename); -#endif - } - - internal Font CheckFamily(Font font) - { -#if DEBUG - if (font.OriginalFontName != null && font.Name != font.OriginalFontName) - { - Console.WriteLine("Font '{0}' was substituted with {1}", font.OriginalFontName, font.Name); - } -#endif - return font; - } - } -} diff --git a/FastReport/Resources/bo.png b/FastReport/Resources/bo.png new file mode 100644 index 00000000..51861d49 Binary files /dev/null and b/FastReport/Resources/bo.png differ diff --git a/FastReport/Resources/en.xml b/FastReport/Resources/en.xml index 8e90021f..1d968074 100644 --- a/FastReport/Resources/en.xml +++ b/FastReport/Resources/en.xml @@ -2897,6 +2897,7 @@ + diff --git a/Localization/Russian.frl b/Localization/Russian.frl index f1400884..482e0caa 100644 --- a/Localization/Russian.frl +++ b/Localization/Russian.frl @@ -2664,6 +2664,7 @@ + diff --git a/Pack/BuildScripts/CakeAPI/CakeAPI.cs b/Pack/BuildScripts/CakeAPI/CakeAPI.cs index 0521d151..ee30c62b 100644 --- a/Pack/BuildScripts/CakeAPI/CakeAPI.cs +++ b/Pack/BuildScripts/CakeAPI/CakeAPI.cs @@ -1,15 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.CompilerServices; +using System.Runtime.CompilerServices; using Cake.Core; using Cake.Core.IO; using Cake.Core.Diagnostics; using Cake.Core.Tooling; -using Cake.Common.IO; using Cake.Common.Tools.NuGet; -using Cake.Common.Tools.NuGet.Pack; -using Cake.Common.Tools.MSBuild; using Cake.Common.Solution.Project; using Cake.Common.Xml; using Cake.Core.Configuration; @@ -22,16 +16,12 @@ using Cake.Incubator.GlobbingExtensions; using static Cake.Incubator.Project.ProjectParserExtensions; #endif -using Cake.Common.Tools.DotNet.Pack; using Cake.Common.Tools.DotNet.Test; using Cake.Common.Tools.DotNet.Restore; -using Cake.Common.Tools.DotNet; -using Cake.Common.Tools.DotNet.MSBuild; using Cake.Common.Tools.NuGet.Restore; -using Cake.Core.Annotations; using Cake.Common; using Cake.Common.Tools.SignTool; -using Cake.Common.Tools.DotNet.Build; +using Cake.Common.Tools.DotNet.Run; namespace CakeScript; @@ -70,6 +60,18 @@ public static void MSBuild(FilePath solution, Action configurat public static void MSBuild(FilePath solution, MSBuildSettings settings) => Context.MSBuild(solution, settings); + public static void DotNetRun(string project) + => Context.DotNetRun(project); + + public static void DotNetRun(string project, ProcessArgumentBuilder arguments) + => Context.DotNetRun(project, arguments); + + public static void DotNetRun(string project, ProcessArgumentBuilder arguments, DotNetRunSettings settings) + => Context.DotNetRun(project, arguments, settings); + + public static void DotNetRun(string project, DotNetRunSettings settings) + => Context.DotNetRun(project, settings); + public static void DotNetClean(string project) => Context.DotNetClean(project); diff --git a/Pack/BuildScripts/Tasks/BaseTasks.cs b/Pack/BuildScripts/Tasks/BaseTasks.cs index fb9f47f4..053a1c1d 100644 --- a/Pack/BuildScripts/Tasks/BaseTasks.cs +++ b/Pack/BuildScripts/Tasks/BaseTasks.cs @@ -1,158 +1,209 @@ -using System; -using System.IO; -using System.Collections.Generic; -using System.Linq; -using static CakeScript.Startup; +using static CakeScript.Startup; using static CakeScript.CakeAPI; -using Cake.Common.Tools.DotNet.MSBuild; -namespace CakeScript +namespace CakeScript; + +partial class Program { - partial class Program + bool IsDemo = true; + bool IsRelease = false; + bool IsProfessional = false; + bool IsDebug = false; + bool IsTest = false; + + string config = Argument("config", "Debug"); + string solutionDirectory = Argument("solution-directory", ""); + readonly string solutionFilename = Argument("solution-filename", "FastReport.Net.sln"); + readonly string version = Argument("vers", "1.0.0.0"); + string outdir = Argument("out-dir", ""); + readonly string pluginsRelativePath = Path.Combine("Extras", "Core", "FastReport.Data"); + readonly bool NuGetSpecialDirectorySort = Argument("nugetSpecialDirectorySort", false); + + readonly string[] Plugins_Core = new[] + { + "Postgres", + "MsSql", + "MySql", + "Json", + "Couchbase", + "MongoDB", + "OracleODPCore", + "RavenDB", + "SQLite", + "ClickHouse", + "Firebird", + "Excel", + "Cassandra", + "Odbc", + }; + + internal string SolutionFile => Path.Combine(solutionDirectory, solutionFilename); + + string PackDir => Path.Combine(solutionDirectory, "Pack"); + + internal string PluginsDir => Path.Combine(solutionDirectory, pluginsRelativePath); + + public Program(string[] args) { - bool IsDemo = true; - bool IsRelease = false; - bool IsProfessional = false; - bool IsDebug = false; - bool IsTest = false; - - string config = Argument("config", "Debug"); - string solutionDirectory = Argument("solution-directory", ""); - readonly string solutionFilename = Argument("solution-filename", "FastReport.Net.sln"); - readonly string version = Argument("vers", "1.0.0.0"); - string outdir = Argument("out-dir", ""); - readonly string pluginsRelativePath = Path.Combine("Extras", "Core", "FastReport.Data"); - - readonly string[] Plugins_Core = new[] - { - "Postgres", - "MsSql", - "MySql", - "Json", - "Couchbase", - "MongoDB", - "OracleODPCore", - "RavenDB", - "SQLite", - "ClickHouse", - "Firebird", - "Excel", - "Cassandra", - "Odbc", - }; - - internal string SolutionFile => Path.Combine(solutionDirectory, solutionFilename); - - string PackDir => Path.Combine(solutionDirectory, "Pack"); - - internal string PluginsDir => Path.Combine(solutionDirectory, pluginsRelativePath); - - public Program(string[] args) - { - - } - public void Init() - { - IsDebug = config.ToLower() == "debug"; - IsDemo = config.ToLower() == "demo"; - IsRelease = config.ToLower() == "release"; - IsProfessional = config.ToLower() == "professional"; - IsTest = config.ToLower() == "test"; + } + + public void Init() + { + IsDebug = config.ToLower() == "debug"; + IsDemo = config.ToLower() == "demo"; + IsRelease = config.ToLower() == "release"; + IsProfessional = config.ToLower() == "professional"; + IsTest = config.ToLower() == "test"; - Information($"CONFIG: {config}"); - } + Information($"CONFIG: {config}"); + } - [DependsOn(nameof(Init))] - public void Prepare() + [DependsOn(nameof(Init))] + public void Prepare() + { + if (String.IsNullOrWhiteSpace(solutionDirectory)) { - if (String.IsNullOrWhiteSpace(solutionDirectory)) - { - var dir = Directory.GetCurrentDirectory(); + var dir = Directory.GetCurrentDirectory(); - try + try + { + for (int i = 0; i < 7; i++) { - for (int i = 0; i < 7; i++) + var find_path = Path.Combine(dir, solutionFilename); + if (File.Exists(find_path)) { - var find_path = Path.Combine(dir, solutionFilename); - if (File.Exists(find_path)) - { - solutionDirectory = dir; - break; - } - dir = Path.GetDirectoryName(dir); + solutionDirectory = dir; + break; } - } - catch - { + dir = Path.GetDirectoryName(dir); } } - if (String.IsNullOrWhiteSpace(solutionDirectory)) - throw new FileNotFoundException($"File `{solutionFilename}` was not found!"); - solutionDirectory = Path.GetFullPath(solutionDirectory); - if (!solutionDirectory.EndsWith(Path.DirectorySeparatorChar)) - solutionDirectory += Path.DirectorySeparatorChar.ToString(); - - Information($"solutionDirectory: {solutionDirectory}"); - } - - - [DependsOn(nameof(Prepare))] - public void PrepareNuget() - { - if (String.IsNullOrWhiteSpace(outdir)) - { - outdir = Path.Combine(solutionDirectory, "fr_nuget"); - } - else if (!Path.IsPathRooted(outdir)) + catch { - outdir = Path.Combine(solutionDirectory, outdir); } + } + if (String.IsNullOrWhiteSpace(solutionDirectory)) + throw new FileNotFoundException($"File `{solutionFilename}` was not found!"); + solutionDirectory = Path.GetFullPath(solutionDirectory); + if (!solutionDirectory.EndsWith(Path.DirectorySeparatorChar)) + solutionDirectory += Path.DirectorySeparatorChar.ToString(); - if (!Directory.Exists(outdir)) - Directory.CreateDirectory(outdir); + Information($"solutionDirectory: {solutionDirectory}"); + } - Information($"outdir: {outdir}"); - } - [DependsOn(nameof(Prepare))] - public void Clean() + [DependsOn(nameof(Prepare))] + public void PrepareNuget() + { + if (String.IsNullOrWhiteSpace(outdir)) { - string solutionFile = SolutionFile; - DotNetMSBuild(solutionFile, new DotNetMSBuildSettings() - .SetConfiguration(config) - .WithTarget("CleanObjAndBin") - .WithProperty("SolutionDir", solutionDirectory) - .WithProperty("SolutionFileName", solutionFilename)); - - DotNetClean(solutionFile); + outdir = Path.Combine(solutionDirectory, "fr_nuget"); } - - public static void Default() + else if (!Path.IsPathRooted(outdir)) { - Information("Use: "); - Information(" --name=value"); + outdir = Path.Combine(solutionDirectory, outdir); + } + + if (!Directory.Exists(outdir)) + Directory.CreateDirectory(outdir); - Information(""); + Information($"outdir: {outdir}"); + } - Information("|> --target= - change task, see the task with command cake --tree. Core, Plugins, Test-Connectors."); - Information("|> --config= - change config. Debug, Release, Demo."); - Information("|> --vers= - change version"); - Information("|> --solution-directory= - change solution directory"); - Information("|> --solution-filename= - change solution file name"); - Information("|> --out-dir= - change output dir for packages"); - Information(""); - Information("OR: if you want to run 'Debug' mode, please add [Debug] attribute to your method"); + [DependsOn(nameof(Prepare))] + public void Clean() + { + string solutionFile = SolutionFile; + DotNetMSBuild(solutionFile, new DotNetMSBuildSettings() + .SetConfiguration(config) + .WithTarget("CleanObjAndBin") + .WithProperty("SolutionDir", solutionDirectory) + .WithProperty("SolutionFileName", solutionFilename)); + + DotNetClean(solutionFile); + } - } + public static void Default() + { + Information("Use: "); + Information(" --name=value"); + + Information(""); + + Information("|> --target= - change task, see the task with command cake --tree. Core, Plugins, Test-Connectors."); + Information("|> --config= - change config. Debug, Release, Demo."); + Information("|> --vers= - change version"); + Information("|> --solution-directory= - change solution directory"); + Information("|> --solution-filename= - change solution file name"); + Information("|> --out-dir= - change output dir for packages"); + Information(""); + Information("OR: if you want to run 'Debug' mode, please add [Debug] attribute to your method"); + + } + + internal string GetVersion() + { + string versionNum = $"{version}-{GetVersionSuffix()}"; + if (IsRelease) + versionNum = version; + return versionNum; + } + + + internal string GetVersionSuffix() + { + if (IsRelease) + return string.Empty; - internal string GetVersion() + return config.ToLower(); + } + + + private string GetDirNameByProject(string project) + { + const string DEMO_DIR = "forAll"; + const string NET_STD_DIR = "net"; + const string NET_ENT_DIR = "net_ent"; + const string MONO_DIR = "mono"; + + if (IsDemo) + return DEMO_DIR; + + return project switch { - string versionNum = version + "-" + config.ToLower(); - if (IsRelease) - versionNum = version; - return versionNum; - } + "FastReport.Localization" => DEMO_DIR, + "FastReport.Compat" => DEMO_DIR, + "FastReport.DataVisualization" => DEMO_DIR, + //"FastReport.Core" => NET_STD_DIR, + //"FastReport.Web" => NET_STD_DIR, + //"FastReport.SkiaDrawing" => NET_STD_DIR, + //"FastReport.Compat.Skia" => NET_STD_DIR, + //"FastReport.DataVisualization.Skia" => NET_STD_DIR, + //"FastReport.Core.Skia" => NET_STD_DIR, + //"FastReport.Web.Skia" => NET_STD_DIR, + "FastReport.Blazor.Wasm" => NET_ENT_DIR, + "FastReport.Mono" => MONO_DIR, + _ => NET_STD_DIR, + //_ => throw new NotImplementedException($"Unknown project {project}") + }; + } + + internal string GetOutdir(string projectOrPath) + { + if (!NuGetSpecialDirectorySort) + return outdir; + + string project; + var firstExtSymbol = Path.GetExtension(projectOrPath)[1]; // ".csproj" or ".**" + if (char.IsUpper(firstExtSymbol)) + // it's a project + project = projectOrPath; + else + project = Path.GetFileNameWithoutExtension(projectOrPath); + + var additionDir = GetDirNameByProject(project); + return Path.Combine(outdir, additionDir); } } diff --git a/Pack/BuildScripts/Tasks/Constants.cs b/Pack/BuildScripts/Tasks/Constants.cs index 640f02dc..1cd3f8dd 100644 --- a/Pack/BuildScripts/Tasks/Constants.cs +++ b/Pack/BuildScripts/Tasks/Constants.cs @@ -1,5 +1,4 @@ - -namespace CakeScript; +namespace CakeScript; partial class Program { @@ -19,10 +18,11 @@ partial class Program const string tfmNet5win7 = "net5.0-windows7.0"; const string tfmNet6win7 = "net6.0-windows7.0"; const string tfmNet6 = "net6.0"; + const string tfmNet8 = "net8.0"; const string tfmNet40 = "net40"; const string tfmNet45 = "net45"; const string tfmNet452 = "net452"; const string tfmNet462 = "net462"; - + const string tfmNet472 = "net472"; } diff --git a/Pack/BuildScripts/Tasks/LocalizationPackage.cs b/Pack/BuildScripts/Tasks/LocalizationPackage.cs index b37242b1..adfd7f6f 100644 --- a/Pack/BuildScripts/Tasks/LocalizationPackage.cs +++ b/Pack/BuildScripts/Tasks/LocalizationPackage.cs @@ -1,83 +1,65 @@ #region USING -using System; -using System.IO; -using Cake.Core.IO; -using Cake.Core.Diagnostics; -using Cake.Core.Tooling; -using Cake.Common.IO; -using Cake.Common.Solution.Project; using Path = System.IO.Path; - -using System.Collections.Generic; -using System.Linq; - using static CakeScript.CakeAPI; using static CakeScript.Startup; -using Cake.Common.Tools.NuGet.Pack; -using Cake.Common.Tools.MSBuild; #endregion -namespace CakeScript +namespace CakeScript; + +partial class Program { - partial class Program + [DependsOn(nameof(PrepareNuget))] + public void FastReportLocalization() { - [DependsOn(nameof(PrepareNuget))] - public void FastReportLocalization() - { - string packDir = PackDir; - string packFRLocalizationDir = Path.Combine(packDir, "FastReport.Localization"); - string localizationDir = Path.Combine(solutionDirectory, "Localization"); + const string projName = "FastReport.Localization"; + string packDir = PackDir; + string packFRLocalizationDir = Path.Combine(packDir, projName); + string localizationDir = Path.Combine(solutionDirectory, "Localization"); - if (!Directory.Exists(localizationDir)) - throw new Exception("'Localization' directory wasn't found on path: " + localizationDir); + if (!Directory.Exists(localizationDir)) + throw new Exception("'Localization' directory wasn't found on path: " + localizationDir); - string tempDir = Path.Combine(packFRLocalizationDir, "tmp"); - if (DirectoryExists(tempDir)) + string tempDir = Path.Combine(packFRLocalizationDir, "tmp"); + if (DirectoryExists(tempDir)) + { + DeleteDirectory(tempDir, new DeleteDirectorySettings { - DeleteDirectory(tempDir, new DeleteDirectorySettings - { - Force = true, - Recursive = true - }); - } - CreateDirectory(tempDir); - - Information($"{Environment.NewLine}FastReport.Localization pack...", ConsoleColor.DarkMagenta); - - var packFiles = new[] { - //new NuSpecContent{Source = Path.Combine(packDir, NET_LICENSE), Target = ""}, - new NuSpecContent{Source = Path.Combine(packDir, FRLOGO192PNG), Target = ""}, - new NuSpecContent{Source = Path.Combine(packDir, MIT_LICENSE), Target = ""}, - new NuSpecContent{Source = Path.Combine(packFRLocalizationDir, "**", "*.*"), Target = ""}, - new NuSpecContent{Source = Path.Combine(localizationDir, "*.frl"), - Target = Path.Combine("build", "Localization")} - }; + Force = true, + Recursive = true + }); + } + CreateDirectory(tempDir); - // generate nuspec - var nuGetPackSettings = new NuGetPackSettings - { - Id = "FastReport.Localization", - Authors = new[] { "Fast Reports Inc." }, - Owners = new[] { "Fast Reports Inc." }, - Description = "FastReport.Localization includes localization files for FastReport .NET, FastReport.Core, FastReport.CoreWin, FastReport.Mono and FastReport.OpenSource", - ProjectUrl = new Uri("https://www.fast-report.com/en/product/fast-report-net"), - Icon = FRLOGO192PNG, - //IconUrl = new Uri("https://www.fast-report.com/download/images/frlogo-big.png"), - License = new NuSpecLicense { Type = "file", Value = MIT_LICENSE }, - //LicenseUrl = new Uri(project.PackageLicenseUrl), // The licenseUrl and license elements cannot be used together. - Tags = new[] { "fastreport", "localization" , "frl"}, - //FrameworkAssemblies = frameworkAssemblies, - }; + Information($"{Environment.NewLine}FastReport.Localization pack...", ConsoleColor.DarkMagenta); - nuGetPackSettings.Version = version; - nuGetPackSettings.BasePath = tempDir; - nuGetPackSettings.OutputDirectory = outdir; - nuGetPackSettings.Files = packFiles; + var packFiles = new[] { + new NuSpecContent{Source = Path.Combine(packDir, FRLOGO192PNG), Target = ""}, + new NuSpecContent{Source = Path.Combine(packDir, MIT_LICENSE), Target = ""}, + new NuSpecContent{Source = Path.Combine(packFRLocalizationDir, "**", "*.*"), Target = ""}, + new NuSpecContent{Source = Path.Combine(localizationDir, "*.frl"), + Target = Path.Combine("build", "Localization")} + }; - // pack - NuGetPack(nuGetPackSettings); - } + // generate nuspec + var nuGetPackSettings = new NuGetPackSettings + { + Id = projName, + Authors = new[] { "Fast Reports Inc." }, + Owners = new[] { "Fast Reports Inc." }, + Description = "FastReport.Localization includes localization files for FastReport .NET, FastReport.Core, FastReport.WPF, FastReport.Mono and FastReport.OpenSource", + ProjectUrl = new Uri("https://www.fast-report.com/en/product/fast-report-net"), + Icon = FRLOGO192PNG, + License = new NuSpecLicense { Type = "file", Value = MIT_LICENSE }, + Tags = new[] { "fastreport", "localization" , "frl"}, + Version = version, + BasePath = tempDir, + OutputDirectory = GetOutdir(projName), + Files = packFiles, + }; + // pack + NuGetPack(nuGetPackSettings); } + } diff --git a/Pack/BuildScripts/Tasks/OpenSourceTasks.cs b/Pack/BuildScripts/Tasks/OpenSourceTasks.cs index 506ee45f..161f30ab 100644 --- a/Pack/BuildScripts/Tasks/OpenSourceTasks.cs +++ b/Pack/BuildScripts/Tasks/OpenSourceTasks.cs @@ -1,121 +1,100 @@ -#region USING -using System; -using System.IO; -using Cake.Core.IO; -using Cake.Core.Diagnostics; -using Cake.Core.Tooling; -using Cake.Common.IO; -using Cake.Common.Solution.Project; -using Path = System.IO.Path; - -using System.Collections.Generic; -using System.Linq; - +using Path = System.IO.Path; using static CakeScript.CakeAPI; -using static CakeScript.Startup; -using Cake.Common.Tools.NuGet.Pack; -using Cake.Common.Tools.MSBuild; -using Cake.Common.Tools.DotNet.MSBuild; -using Cake.Common.Tools.DotNet.Pack; -#endregion +namespace CakeScript; -namespace CakeScript +partial class Program { - partial class Program + readonly string[] projects_OpenSource = new [] { - readonly string[] projects_OpenSource = new [] - { - Path.Combine("FastReport.OpenSource", "FastReport.OpenSource.csproj"), - Path.Combine("FastReport.Core.Web", "FastReport.OpenSource.Web.csproj"), - Path.Combine("Extras", "OpenSource", "FastReport.OpenSource.Export.PdfSimple", "FastReport.OpenSource.Export.PdfSimple", "FastReport.OpenSource.Export.PdfSimple.csproj") - }; + Path.Combine("FastReport.OpenSource", "FastReport.OpenSource.csproj"), + Path.Combine("FastReport.Core.Web", "FastReport.OpenSource.Web.csproj"), + Path.Combine("Extras", "OpenSource", "FastReport.OpenSource.Export.PdfSimple", "FastReport.OpenSource.Export.PdfSimple", "FastReport.OpenSource.Export.PdfSimple.csproj") + }; + + //[Debug] + [DependsOn(nameof(Prepare))] + public void BuildOpenSource() + { + string versionNum = GetVersion(); - //[Debug] - [DependsOn(nameof(Prepare))] - public void BuildOpenSource() + foreach (var csproj in projects_OpenSource) { - string versionNum = GetVersion(); + var proj_path = Path.Combine(solutionDirectory, csproj); - foreach (var csproj in projects_OpenSource) - { - var proj_path = Path.Combine(solutionDirectory, csproj); - - DotNetClean(proj_path); - } + DotNetClean(proj_path); + } - foreach (var csproj in projects_OpenSource) - { - var proj_path = Path.Combine(solutionDirectory, csproj); + foreach (var csproj in projects_OpenSource) + { + var proj_path = Path.Combine(solutionDirectory, csproj); - DotNetRestore(proj_path); + DotNetRestore(proj_path); - DotNetMSBuild(proj_path, new DotNetMSBuildSettings() - .SetConfiguration(config) - .WithTarget("Build") - .WithProperty("SolutionDir", solutionDirectory) - .WithProperty("SolutionFileName", solutionFilename) - .WithProperty("Version", versionNum) - ); - } + DotNetMSBuild(proj_path, new DotNetMSBuildSettings() + .SetConfiguration(config) + .WithTarget("Build") + .WithProperty("SolutionDir", solutionDirectory) + .WithProperty("SolutionFileName", solutionFilename) + .WithProperty("Version", versionNum) + ); } + } - [DependsOn(nameof(BuildOpenSource))] - [DependsOn(nameof(PrepareNuget))] - public void PackOpenSource() + [DependsOn(nameof(BuildOpenSource))] + [DependsOn(nameof(PrepareNuget))] + public void PackOpenSource() + { + string versionNum = GetVersion(); + + DotNetPackSettings settings = new DotNetPackSettings { - string versionNum = GetVersion(); - - DotNetPackSettings settings = new DotNetPackSettings - { - Configuration = config, - NoBuild = true, - NoRestore = true, - OutputDirectory = outdir, - IncludeSymbols = true, - SymbolPackageFormat = "snupkg" - }; - - if (IsDebug) - { - settings.IncludeSource = true; - } - - settings.MSBuildSettings = new DotNetMSBuildSettings() - .WithProperty("SolutionDir", solutionDirectory) - .WithProperty("SolutionFileName", solutionFilename) - .WithProperty("Version", versionNum); + Configuration = config, + NoBuild = true, + NoRestore = true, + OutputDirectory = outdir, + IncludeSymbols = true, + SymbolPackageFormat = "snupkg" + }; - foreach (var proj in projects_OpenSource) - { - DotNetPack(Path.Combine(solutionDirectory, proj), settings); - } + if (IsDebug) + { + settings.IncludeSource = true; } - [Obsolete] - [DependsOn(nameof(BuildOpenSource))] - [DependsOn(nameof(PrepareNuget))] - public void PackOpenSourcePlugins() + settings.MSBuildSettings = new DotNetMSBuildSettings() + .WithProperty("SolutionDir", solutionDirectory) + .WithProperty("SolutionFileName", solutionFilename) + .WithProperty("Version", versionNum); + + foreach (var proj in projects_OpenSource) { - DotNetPackSettings settings = new DotNetPackSettings - { - Configuration = config, - NoRestore = true, - OutputDirectory = outdir - }; - - string pluginsDirPath = PluginsDir; - foreach (var proj in Plugins_Core) - { - string proj_path = Path.Combine(pluginsDirPath, $"FastReport.Data.{proj}", $"FastReport.OpenSource.Data.{proj}.csproj"); - - DotNetRestore(proj_path); - - DotNetPack(proj_path, settings); - } + DotNetPack(Path.Combine(solutionDirectory, proj), settings); } + } + [Obsolete] + [DependsOn(nameof(BuildOpenSource))] + [DependsOn(nameof(PrepareNuget))] + public void PackOpenSourcePlugins() + { + DotNetPackSettings settings = new DotNetPackSettings + { + Configuration = config, + NoRestore = true, + OutputDirectory = outdir + }; + + string pluginsDirPath = PluginsDir; + foreach (var proj in Plugins_Core) + { + string proj_path = Path.Combine(pluginsDirPath, $"FastReport.Data.{proj}", $"FastReport.OpenSource.Data.{proj}.csproj"); + DotNetRestore(proj_path); + + DotNetPack(proj_path, settings); + } } + } diff --git a/Pack/BuildScripts/Tasks/Tests.cs b/Pack/BuildScripts/Tasks/Tests.cs index 58d73651..58fdacd8 100644 --- a/Pack/BuildScripts/Tasks/Tests.cs +++ b/Pack/BuildScripts/Tasks/Tests.cs @@ -1,21 +1,5 @@ -#region USING -using System.IO; -using Cake.Core.IO; -using Cake.Core.Diagnostics; -using Cake.Core.Tooling; -using Cake.Common.IO; -using Cake.Common.Solution.Project; -using Path = System.IO.Path; - -using static CakeScript.CakeAPI; -using static CakeScript.Startup; -using Cake.Common.Tools.NuGet.Pack; -using Cake.Common.Tools.MSBuild; -using Cake.Common.Tools.DotNet.MSBuild; -using Cake.Common.Tools.DotNet.Pack; +using static CakeScript.CakeAPI; using Cake.Common.Tools.DotNet.Test; -#endregion - namespace CakeScript; @@ -48,6 +32,5 @@ public void Tests() //dotnet build "%~dp0..\FastReport.Tests.Data.Core.sln" - c Release //pushd % ~dp0FastReport.Tests.Data.Core //dotnet test FastReport.Tests.Data.Core.sln - } } diff --git a/Pack/BuildScripts/Tools/DebugAttribute.cs b/Pack/BuildScripts/Tools/DebugAttribute.cs index ee9dd630..97412059 100644 --- a/Pack/BuildScripts/Tools/DebugAttribute.cs +++ b/Pack/BuildScripts/Tools/DebugAttribute.cs @@ -1,21 +1,17 @@ -using System; -using System.Reflection; + +namespace CakeScript; -namespace CakeScript +[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] +internal class DebugAttribute : Attribute { - [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] - internal class DebugAttribute : Attribute - { - public string Args { get; set; } - - public DebugAttribute() - { - } + public string Args { get; init; } - public DebugAttribute(string args) - { - Args = args; - } + public DebugAttribute() + { + } + public DebugAttribute(string args) + { + Args = args; } } \ No newline at end of file diff --git a/Pack/BuildScripts/Tools/DependsOnAttribute.cs b/Pack/BuildScripts/Tools/DependsOnAttribute.cs index 72a5ee4e..0647fc30 100644 --- a/Pack/BuildScripts/Tools/DependsOnAttribute.cs +++ b/Pack/BuildScripts/Tools/DependsOnAttribute.cs @@ -1,22 +1,19 @@ -using System; -using System.Reflection; + +namespace CakeScript; -namespace CakeScript +[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] +internal class DependsOnAttribute : Attribute { - [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] - internal class DependsOnAttribute : Attribute - { - public string DependsTask { get; } + public string DependsTask { get; } - public DependsOnAttribute(string dependsTask) - { - DependsTask = dependsTask; - } + public DependsOnAttribute(string dependsTask) + { + DependsTask = dependsTask; + } - //public DependsOnAttribute(string dependsTask, bool condition) - //{ + //public DependsOnAttribute(string dependsTask, bool condition) + //{ - //} + //} - } } \ No newline at end of file diff --git a/Pack/BuildScripts/Tools/Graph.cs b/Pack/BuildScripts/Tools/Graph.cs index 64b006e6..de1247ec 100644 --- a/Pack/BuildScripts/Tools/Graph.cs +++ b/Pack/BuildScripts/Tools/Graph.cs @@ -1,123 +1,118 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Xml.Linq; -using System.Reflection; +using System.Reflection; -namespace CakeScript +namespace CakeScript; + +internal class Graph { - internal class Graph + internal sealed class GraphTask : IEquatable { - internal class GraphTask : IEquatable - { - public string Name { get; } - - public MethodInfo Method { get; } + public string Name { get; } - public ICollection Parents { get; } = new List(); + public MethodInfo Method { get; } - public GraphTask(string name, MethodInfo method, IEnumerable parents) - { - Name = name; - Method = method; - foreach (var parent in parents) - Parents.Add(parent); - } + public ICollection Parents { get; } = new List(); - public override bool Equals(object obj) - { - if (obj is GraphTask graphTask) - return Equals(graphTask); + public GraphTask(string name, MethodInfo method, IEnumerable parents) + { + Name = name; + Method = method; + foreach (var parent in parents) + Parents.Add(parent); + } - return base.Equals(obj); - } + public override bool Equals(object obj) + { + if (obj is GraphTask graphTask) + return Equals(graphTask); - public override int GetHashCode() - { - return Name.GetHashCode(); - } + return base.Equals(obj); + } - public bool Equals(GraphTask other) - { - if (other is null) - return false; - return Name.Equals(other.Name); - } + public override int GetHashCode() + { + return Name.GetHashCode(); } - public static Graph CreateTree(MethodInfo startMethod) + public bool Equals(GraphTask other) { - ArgumentNullException.ThrowIfNull(startMethod, nameof(startMethod)); + if (other is null) + return false; + return Name.Equals(other.Name); + } + } - var startTask = GetTask(startMethod); + public static Graph CreateTree(MethodInfo startMethod) + { + ArgumentNullException.ThrowIfNull(startMethod, nameof(startMethod)); - return new Graph(startTask); - } + var startTask = GetTask(startMethod); + + return new Graph(startTask); + } - private static GraphTask GetTask(MethodInfo method) + private static GraphTask GetTask(MethodInfo method) + { + var dependencies = GetDependencies(method); + var graphTaskList = new List(); + foreach(var dependencyMethod in dependencies) { - var dependencies = GetDependencies(method); - var graphTaskList = new List(); - foreach(var dependencyMethod in dependencies) - { - graphTaskList.Add(GetTask(dependencyMethod)); - } - return new GraphTask(method.Name, method, graphTaskList); + graphTaskList.Add(GetTask(dependencyMethod)); } + return new GraphTask(method.Name, method, graphTaskList); + } - private static IEnumerable GetDependencies(MethodInfo method) + private static IEnumerable GetDependencies(MethodInfo method) + { + var attributes = method.GetCustomAttributes(); + foreach(var attribute in attributes) { - var attributes = method.GetCustomAttributes(); - foreach(var attribute in attributes) - { - var dependsTask = attribute.DependsTask; - yield return Startup.GetMethod(dependsTask); + var dependsTask = attribute.DependsTask; + yield return Startup.GetMethod(dependsTask); - } } + } - public IEnumerable Run() + public IEnumerable Run() + { + if(sortedTasks == null) { - if(sortedTasks == null) - { - SpreadRays(StartTask, 0); + SpreadRays(StartTask, 0); - sortedTasks = tasks - .OrderByDescending(task => task.Item2) - .Select(task => task.Item1); - } - return sortedTasks; + sortedTasks = tasks + .OrderByDescending(task => task.Item2) + .Select(task => task.Item1); } + return sortedTasks; + } - - readonly List<(GraphTask, int)> tasks = new List<(GraphTask, int)>(); - private IEnumerable sortedTasks; + + readonly List<(GraphTask, int)> tasks = new List<(GraphTask, int)>(); + private IEnumerable sortedTasks; - private readonly GraphTask StartTask; + private readonly GraphTask StartTask; - void SpreadRays(GraphTask task, int depth) - { - tasks.Add((task, depth)); + void SpreadRays(GraphTask task, int depth) + { + tasks.Add((task, depth)); - foreach (var parent in task.Parents) + foreach (var parent in task.Parents) + { + // check if this parent exist => we try rewrite + var existItem = tasks.Find(taskWithDepth => taskWithDepth.Item1.Equals(parent)); + if (existItem != (null, default)) { - // check if this parent exist => we try rewrite - var existItem = tasks.Find(taskWithDepth => taskWithDepth.Item1.Equals(parent)); - if (existItem != (null, default)) - { - if (existItem.Item2 < depth + 1) - tasks.Remove(existItem); // remove - else // they are equals or greater => do nothing - continue; - } - - SpreadRays(parent, depth + 1); + if (existItem.Item2 < depth + 1) + tasks.Remove(existItem); // remove + else // they are equals or greater => do nothing + continue; } - } - private Graph(GraphTask startTask) - { - StartTask = startTask; + SpreadRays(parent, depth + 1); } } + + private Graph(GraphTask startTask) + { + StartTask = startTask; + } } diff --git a/Pack/BuildScripts/Tools/Startup.cs b/Pack/BuildScripts/Tools/Startup.cs index 4896a07c..3fbaf401 100644 --- a/Pack/BuildScripts/Tools/Startup.cs +++ b/Pack/BuildScripts/Tools/Startup.cs @@ -1,237 +1,246 @@ -using Cake.Common.Tools.NuGet.Pack; -using System; -using System.Reflection; -using System.Linq; -using System.Collections.Generic; -using System.Text; +using System.Reflection; using System.Diagnostics; using Cake.Core; -namespace CakeScript +namespace CakeScript; + +static class Startup { - static class Startup - { - static readonly Dictionary Args = new Dictionary(); + static readonly Dictionary Args = new Dictionary(); - private static MethodInfo targetMethod; + private static MethodInfo targetMethod; - public static bool IsTargetMethod + public static bool IsTargetMethod + { + get { - get - { - var stackTrace = new StackTrace(false); - var frame = stackTrace.GetFrame(1); - var callMethod = frame.GetMethod(); + var stackTrace = new StackTrace(false); + var frame = stackTrace.GetFrame(1); + var callMethod = frame.GetMethod(); - bool result = callMethod == targetMethod; - return result; - } + bool result = callMethod == targetMethod; + return result; } + } - public static async Task Main(string[] args) - { - ParseArgs(args); + public static async Task Main(string[] args) + { + ParseArgs(args); - var target = string.Empty; - if (Args.ContainsKey("target")) - { - target = Args["target"]; - } + var target = string.Empty; + if (Args.TryGetValue("target", out string value)) + { + target = value; + } #if DEBUG - if(string.IsNullOrEmpty(target)) - { - targetMethod = GetDebugTask(); - if (targetMethod != null) - { - var debugArgs = GetDebugArgs(targetMethod); - ParseArgs(debugArgs); - var graph = Graph.CreateTree(targetMethod); - - await RunTree(graph, args); - return; - } - } -#endif - - if (!string.IsNullOrEmpty(target)) + if(string.IsNullOrEmpty(target)) + { + targetMethod = GetDebugTask(); + if (targetMethod != null) { - targetMethod = GetMethod(target); - + var debugArgs = GetDebugArgs(targetMethod); + ParseArgs(debugArgs); var graph = Graph.CreateTree(targetMethod); await RunTree(graph, args); + return; } - else - Program.Default(); - } +#endif - private static string[] GetDebugArgs(MethodInfo method) + if (!string.IsNullOrEmpty(target)) { - var args = method.GetCustomAttribute().Args; - if (string.IsNullOrEmpty(args)) - return Array.Empty(); + targetMethod = GetMethod(target); - //TODO: whitespace in path, for example "path="D:/Program Files"" - return args.Split(' '); - } + var graph = Graph.CreateTree(targetMethod); - private static void ParseArgs(string[] args) - { - foreach (var argument in args) - { - if (string.IsNullOrEmpty(argument) || !argument.StartsWith("--")) - continue; + await RunTree(graph, args); + } + else + Program.Default(); - if (argument == "--tree") - { - ViewAllTasks(); - return; - } + } - var splitted = argument.Split('=', 2); + private static string[] GetDebugArgs(MethodInfo method) + { + var args = method.GetCustomAttribute().Args; + if (string.IsNullOrEmpty(args)) + return Array.Empty(); - var arg = splitted[0].Remove(0, 2); - var value = splitted[1].Trim('"'); - Args.Add(arg, value); - } - } + //TODO: whitespace in path, for example "path="D:/Program Files"" + return args.Split(' '); + } - private static void ViewAllTasks() + private static void ParseArgs(string[] args) + { + foreach (var argument in args) { - var allTasks = typeof(Program) - .GetMethods(BindingFlags.Public | BindingFlags.Instance) - .Where(methodInfo => methodInfo.DeclaringType == typeof(Program)) - .OrderBy(methodInfo => methodInfo.Name[0]); + if (string.IsNullOrEmpty(argument) || !argument.StartsWith("--")) + continue; - foreach(var task in allTasks) + if (argument == "--tree") { - Information(task.Name); + ViewAllTasks(); + return; } - } - private static MethodInfo GetDebugTask() - { - var debugTask = typeof(Program) - .GetMethods() - .Where(method => method.GetCustomAttribute() != null) - .FirstOrDefault(); + var splitted = argument.Split('=', 2); - return debugTask; + var arg = splitted[0].Remove(0, 2); + var value = splitted[1]?.Trim('"'); + Args.Add(arg, value); } + } - public static MethodInfo GetMethod(string methodName) - { - var methods = typeof(Program).GetMethods(); - foreach (var method in methods) - { - if (method.Name.Equals(methodName)) - { - return method; - } - } + private static void ViewAllTasks() + { + var allTasks = typeof(Program) + .GetMethods(BindingFlags.Public | BindingFlags.Instance) + .Where(methodInfo => methodInfo.DeclaringType == typeof(Program)) + .OrderBy(methodInfo => methodInfo.Name[0]); - throw new Exception($"Method with {methodName} name wasn't found!"); + foreach(var task in allTasks) + { + Information(task.Name); } + } - private static async Task RunTree(Graph graph, string[] args) - { - var sortedTasks = graph.Run(); - var prog = new Program(args); + private static MethodInfo GetDebugTask() + { + var debugTask = typeof(Program) + .GetMethods() + .Where(method => method.GetCustomAttribute() != null) + .FirstOrDefault(); + + return debugTask; + } - foreach (var sortedTask in sortedTasks) + public static MethodInfo GetMethod(string methodName) + { + var methods = typeof(Program).GetMethods(); + foreach (var method in methods) + { + if (method.Name.Equals(methodName)) { - await RunTaskWrapper(sortedTask, prog); + return method; } } - private static async Task RunTaskWrapper(Graph.GraphTask sortedTask, object instance) - { - const string separator = "============================="; - Console.WriteLine(separator); - Console.WriteLine($" {sortedTask.Name}"); - - try - { - object result = sortedTask.Method.Invoke(instance, Array.Empty()); + throw new Exception($"Method with {methodName} name wasn't found!"); + } - if (result is Task taskResult) - { - await taskResult.ConfigureAwait(false); - } - } - catch (CakeException e) - { - Environment.Exit(e.ExitCode); - } + private static async Task RunTree(Graph graph, string[] args) + { + var sortedTasks = graph.Run(); + var prog = new Program(args); - Information($" {sortedTask.Name} finished", ConsoleColor.Green); - Console.WriteLine(separator); - Console.WriteLine(); + foreach (var sortedTask in sortedTasks) + { + await RunTaskWrapper(sortedTask, prog); } + } + private static async Task RunTaskWrapper(Graph.GraphTask sortedTask, object instance) + { + const string separator = "============================="; + Console.WriteLine(separator); + Console.WriteLine($" {sortedTask.Name}"); - public static void Information(object info) + try { - if (info is NuSpecDependency dep) + object result = sortedTask.Method.Invoke(instance, Array.Empty()); + + if (result is Task taskResult) { - Console.WriteLine($"ID: {dep.Id}, VERSION: {dep.Version}, TFM: {dep.TargetFramework}"); + await taskResult.ConfigureAwait(false); } - else - Information(info.ToString()); } - - public static void Information(string info) + catch (CakeException e) { - Console.WriteLine(info); + Environment.Exit(e.ExitCode); } - public static void Information(object info, ConsoleColor color) - { - Console.ForegroundColor = color; - Information(info); - Console.ResetColor(); - } + Information($" {sortedTask.Name} finished", ConsoleColor.Green); + Console.WriteLine(separator); + Console.WriteLine(); + } + - public static void Information(string info, ConsoleColor color) + public static void Information(object info) + { + if (info is NuSpecDependency dep) { - Console.ForegroundColor = color; - Information(info); - Console.ResetColor(); + Console.WriteLine($"ID: {dep.Id}, VERSION: {dep.Version}, TFM: {dep.TargetFramework}"); } + else + Information(info.ToString()); + } - public static void Warning(object info) - => Information(info, ConsoleColor.Yellow); + public static void Information(string info) + { + Console.WriteLine(info); + } - public static void Warning(string info) - => Information(info, ConsoleColor.Yellow); + public static void Information(object info, ConsoleColor color) + { + Console.ForegroundColor = color; + Information(info); + Console.ResetColor(); + } - public static void Error(string info) - => Information(info, ConsoleColor.Red); + public static void Information(string info, ConsoleColor color) + { + Console.ForegroundColor = color; + Information(info); + Console.ResetColor(); + } - public static bool HasArgument(string argument) - { - if (Args.ContainsKey(argument)) - return true; + public static void Warning(object info) + => Information(info, ConsoleColor.Yellow); - return false; - } + public static void Warning(string info) + => Information(info, ConsoleColor.Yellow); - public static string Argument(string argument) - { - if (Args.ContainsKey(argument)) - return Args[argument]; + public static void Error(string info) + => Information(info, ConsoleColor.Red); - throw new Exception($"Argument '{argument}' not found"); - } + public static bool HasArgument(string argument) + { + if (Args.ContainsKey(argument)) + return true; - public static string Argument(string argument, string defaultValue) + return false; + } + + public static string Argument(string argument) + { + if (Args.TryGetValue(argument, out string value)) + return value; + + throw new Exception($"Argument '{argument}' not found"); + } + + public static string Argument(string argument, string defaultValue) + { + if (Args.TryGetValue(argument, out string value)) + return value; + else + return defaultValue; + } + + public static T Argument(string argument, T defaultValue) + { + if (Args.TryGetValue(argument, out string value)) { - if (Args.ContainsKey(argument)) - return Args[argument]; - else - return defaultValue; + var type = typeof(T); + // special case for bool + if (defaultValue is bool && string.IsNullOrEmpty(value)) + return (T)(object)true; + + return (T)Convert.ChangeType(value, type); } + else + return defaultValue; } } diff --git a/Pack/BuildScripts/buildScript.csproj b/Pack/BuildScripts/buildScript.csproj index f589e2ba..389a5b64 100644 --- a/Pack/BuildScripts/buildScript.csproj +++ b/Pack/BuildScripts/buildScript.csproj @@ -2,18 +2,28 @@ Exe - net7.0 + net8.0 enable - - - + + + - + + + + + + + + + + + diff --git a/Pack/FastReport.OpenSource/build/FastReport.OpenSource.props b/Pack/FastReport.OpenSource/build/FastReport.OpenSource.props index 0156899c..4547d33d 100644 --- a/Pack/FastReport.OpenSource/build/FastReport.OpenSource.props +++ b/Pack/FastReport.OpenSource/build/FastReport.OpenSource.props @@ -4,6 +4,7 @@ <_FRProductType>FastReport.OpenSource <_FR_GraphicsEngine>GDIPlus + <_FRProductTypeWithEngine>$(_FRProductType).$(_FR_GraphicsEngine) \ No newline at end of file diff --git a/Tools/FastReport.Tests.OpenSource/FastReport.Tests.OpenSource.csproj b/Tools/FastReport.Tests.OpenSource/FastReport.Tests.OpenSource.csproj index 526bcf69..245acb3b 100644 --- a/Tools/FastReport.Tests.OpenSource/FastReport.Tests.OpenSource.csproj +++ b/Tools/FastReport.Tests.OpenSource/FastReport.Tests.OpenSource.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 false diff --git a/UsedPackages.version b/UsedPackages.version index 17f8513e..ebdafb95 100644 --- a/UsedPackages.version +++ b/UsedPackages.version @@ -1,53 +1,40 @@  - + + + + 2024.1.9 + 2024.1.9 + 2024.1.9 + 2024.1.9 - [2024.1.0] + 2.88.6 + 2.88.6 - [2024.1.0] - [2024.1.6] + + [11.0.6,) + 2024.1.9 - [2024.1.0] - [2024.1.6] - - - 2024.1.5 - 2024.1.5 - 2024.1.2 - 2024.1.0 - 2024.1.0 + [4.0.1,) + [4.0.1,) - [4.7.3,) - - - [4.5.0,) - 4.7.0 - - 4.7.0 - - - 4.7.0 - - - 4.7.0 - - 2024.1.5 + 2024.1.9 - 2024.1.5 + 2024.1.9 - 2023.2.16 + 2024.1.7 - 2023.2.16 + 2024.1.7