diff --git a/.gitignore b/.gitignore index 220934cf..1b98e963 100644 --- a/.gitignore +++ b/.gitignore @@ -245,3 +245,5 @@ ModelManifest.xml # FAKE - F# Make .fake/ *.bak +package-lock.json +Demos/OpenSource/SPA/FastReport.OpenSource.Angular/ClientApp/.angular/ diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.6.0/FastReport.OpenSource.MVC.6.0.csproj b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.6.0/FastReport.OpenSource.MVC.6.0.csproj index 033325c9..ad0f7d99 100644 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.6.0/FastReport.OpenSource.MVC.6.0.csproj +++ b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.6.0/FastReport.OpenSource.MVC.6.0.csproj @@ -1,19 +1,20 @@  - net6.0 + net10.0 enable enable Demo.MVC.Net6 Debug;Release + - - + - + + diff --git a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.6.0/Program.cs b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.6.0/Program.cs index f363680f..5e5fbd1b 100644 --- a/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.6.0/Program.cs +++ b/Demos/OpenSource/MVC/FastReport.OpenSource.MVC.6.0/Program.cs @@ -11,6 +11,7 @@ public static void Main(string[] args) // Add services to the container. builder.Services.AddControllersWithViews(); builder.Services.AddSingleton(); + builder.Services.AddFastReport(); var app = builder.Build(); // Configure the HTTP request pipeline. diff --git a/Demos/OpenSource/SPA/FastReport.OpenSource.Angular/FastReport.OpenSource.Angular.csproj b/Demos/OpenSource/SPA/FastReport.OpenSource.Angular/FastReport.OpenSource.Angular.csproj index 6f6b86e5..6a46189c 100644 --- a/Demos/OpenSource/SPA/FastReport.OpenSource.Angular/FastReport.OpenSource.Angular.csproj +++ b/Demos/OpenSource/SPA/FastReport.OpenSource.Angular/FastReport.OpenSource.Angular.csproj @@ -1,7 +1,7 @@  - net6.0 + net10.0 enable false ClientApp\ @@ -12,14 +12,12 @@ - - - - + + - + @@ -29,6 +27,11 @@ + + + + + diff --git a/Demos/OpenSource/SPA/FastReport.OpenSource.Angular/Program.cs b/Demos/OpenSource/SPA/FastReport.OpenSource.Angular/Program.cs index d6927fe5..2dc72d02 100644 --- a/Demos/OpenSource/SPA/FastReport.OpenSource.Angular/Program.cs +++ b/Demos/OpenSource/SPA/FastReport.OpenSource.Angular/Program.cs @@ -9,6 +9,7 @@ public static void Main(string[] args) var builder = WebApplication.CreateBuilder(args); builder.Services.AddSingleton(); // Add services to the container. + builder.Services.AddFastReport(); builder.Services.AddControllersWithViews(); 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 52794dcc..0b085143 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 @@  - $(NetFrameworkMinimum);net6.0 + $(NetFrameworkMinimum);net10.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/Shared.props b/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/Shared.props index 953e4450..7f861f9f 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/Shared.props +++ b/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/Shared.props @@ -8,8 +8,8 @@ - - + + 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 95659cc4..64c099f2 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;net6.0 + net472;net10.0 true 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 19b02718..dd18dd23 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 @@ - $(NetFrameworkMinimum);net6.0 + $(NetFrameworkMinimum);net10.0 true 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 fee9aa70..4a61c892 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 @@ - $(NetFrameworkMinimum);net6.0 + $(NetFrameworkMinimum);net10.0 true 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 e3ee1964..10b92bd8 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 @@  - $(NetFrameworkMinimum);net6.0 + $(NetFrameworkMinimum);net10.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Excel/Shared.props b/Extras/Core/FastReport.Data/FastReport.Data.Excel/Shared.props index eb924423..764c4d9c 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Excel/Shared.props +++ b/Extras/Core/FastReport.Data/FastReport.Data.Excel/Shared.props @@ -8,9 +8,9 @@ - + - + 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 92256e31..e1a3886d 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 @@ - $(NetFrameworkMinimum);net6.0 + $(NetFrameworkMinimum);net10.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Firebird/Shared.props b/Extras/Core/FastReport.Data/FastReport.Data.Firebird/Shared.props index fc61c027..8041467e 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Firebird/Shared.props +++ b/Extras/Core/FastReport.Data/FastReport.Data.Firebird/Shared.props @@ -8,7 +8,7 @@ - + diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Ignite/FastReport.OpenSource.Data.Ignite.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Ignite/FastReport.OpenSource.Data.Ignite.csproj index aa351061..aedbb7c1 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Ignite/FastReport.OpenSource.Data.Ignite.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.Ignite/FastReport.OpenSource.Data.Ignite.csproj @@ -1,6 +1,6 @@ - $(NetFrameworkMinimum);net6.0 + $(NetFrameworkMinimum);net10.0 true 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 21ae298e..ee5448b7 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 @@ - $(NetFrameworkMinimum);net6.0 + $(NetFrameworkMinimum);net10.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Json/Shared.props b/Extras/Core/FastReport.Data/FastReport.Data.Json/Shared.props index 4d0e01ef..bb7e47de 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Json/Shared.props +++ b/Extras/Core/FastReport.Data/FastReport.Data.Json/Shared.props @@ -8,7 +8,7 @@ - + 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 eea2feb8..685824c4 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 @@ - $(NetFrameworkMinimum);net6.0 + $(NetFrameworkMinimum);net10.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 eea2feb8..685824c4 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 @@ - $(NetFrameworkMinimum);net6.0 + $(NetFrameworkMinimum);net10.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.MsSql/MsSqlDataConnection.cs b/Extras/Core/FastReport.Data/FastReport.Data.MsSql/MsSqlDataConnection.cs index 81c49536..dbd69762 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.MsSql/MsSqlDataConnection.cs +++ b/Extras/Core/FastReport.Data/FastReport.Data.MsSql/MsSqlDataConnection.cs @@ -1,9 +1,8 @@ +using Microsoft.Data.SqlClient; using System; using System.Collections.Generic; -using System.Text; using System.Data; using System.Data.Common; -using System.Data.SqlClient; namespace FastReport.Data { @@ -57,7 +56,7 @@ public override DbDataAdapter GetAdapter(string selectCommand, DbConnection conn { SqlParameter parameter = adapter.SelectCommand.Parameters.Add(p.Name, (SqlDbType)p.DataType, p.Size); object value = p.Value; - parameter.Direction = p.Direction; + parameter.Direction = ((p.Direction == 0) ? ParameterDirection.Input : p.Direction); if ((SqlDbType)p.DataType == SqlDbType.UniqueIdentifier && (value is Variant || value is String)) value = new Guid(value.ToString()); diff --git a/Extras/Core/FastReport.Data/FastReport.Data.MsSql/Shared.props b/Extras/Core/FastReport.Data/FastReport.Data.MsSql/Shared.props index 3c3523d6..886a7f93 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.MsSql/Shared.props +++ b/Extras/Core/FastReport.Data/FastReport.Data.MsSql/Shared.props @@ -8,7 +8,7 @@ - + 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 da8b0640..c0352a4c 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);net6.0 + $(NetFrameworkMinimum);net10.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.MySql/Shared.props b/Extras/Core/FastReport.Data/FastReport.Data.MySql/Shared.props index 6204b1ee..a002a491 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.MySql/Shared.props +++ b/Extras/Core/FastReport.Data/FastReport.Data.MySql/Shared.props @@ -8,7 +8,7 @@ - + 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 eea2feb8..685824c4 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 @@ - $(NetFrameworkMinimum);net6.0 + $(NetFrameworkMinimum);net10.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Odbc/Shared.props b/Extras/Core/FastReport.Data/FastReport.Data.Odbc/Shared.props index ee086584..429545c8 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Odbc/Shared.props +++ b/Extras/Core/FastReport.Data/FastReport.Data.Odbc/Shared.props @@ -8,7 +8,7 @@ - + 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 eea2feb8..685824c4 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 @@ - $(NetFrameworkMinimum);net6.0 + $(NetFrameworkMinimum);net10.0 true 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 061e00a6..1a3e79f5 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);net6.0 + $(NetFrameworkMinimum);net10.0 true 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 86caa3fc..36ad906a 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);net6.0 + $(NetFrameworkMinimum);net10.0 true diff --git a/Extras/Core/FastReport.Data/FastReport.Data.RavenDB/Shared.props b/Extras/Core/FastReport.Data/FastReport.Data.RavenDB/Shared.props index e678cb14..49244133 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.RavenDB/Shared.props +++ b/Extras/Core/FastReport.Data/FastReport.Data.RavenDB/Shared.props @@ -10,7 +10,7 @@ - + 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 eea2feb8..685824c4 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 @@ - $(NetFrameworkMinimum);net6.0 + $(NetFrameworkMinimum);net10.0 true 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 7d449e72..2eebee8e 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);net6.0 + $(NetFrameworkMinimum);net10.0 https://www.fast-report.com/products/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/Shared.props b/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/Shared.props index 33923589..c61f6b16 100644 --- a/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/Shared.props +++ b/Extras/Core/FastReport.Plugin/FastReport.Plugins.WebP/Shared.props @@ -8,7 +8,7 @@ - + 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 0f0769c0..4b9a2948 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,15 +1,15 @@  - net6.0 + net10.0 false - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Extras/OpenSource/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple.Tests/PdfSimpleExportTests.cs b/Extras/OpenSource/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple.Tests/PdfSimpleExportTests.cs index dbd01ef2..80b1c7c8 100644 --- a/Extras/OpenSource/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple.Tests/PdfSimpleExportTests.cs +++ b/Extras/OpenSource/FastReport.OpenSource.Export.PdfSimple/FastReport.OpenSource.Export.PdfSimple.Tests/PdfSimpleExportTests.cs @@ -1,4 +1,6 @@ using FastReport.Export.PdfSimple; +using FastReport.Export.PdfSimple.PdfObjects; +using System; using System.IO; using System.Text; using Xunit; @@ -71,10 +73,10 @@ public void TestExportPdfInfo() } #pragma warning disable xUnit2009 // Do not use boolean check to check for substrings - Assert.True(pdf.Contains("/Title (" + StringToPdfUnicode(export.Title) + ")")); - Assert.True(pdf.Contains("/Subject (" + StringToPdfUnicode(export.Subject) + ")")); - Assert.True(pdf.Contains("/Keywords (" + StringToPdfUnicode(export.Keywords) + ")")); - Assert.True(pdf.Contains("/Author (" + StringToPdfUnicode(export.Author) + ")")); + Assert.True(pdf.Contains("/Title <" + WriteHex(export.Title) + ">")); + Assert.True(pdf.Contains("/Subject <" + WriteHex(export.Subject) + ">")); + Assert.True(pdf.Contains("/Keywords <" + WriteHex(export.Keywords) + ">")); + Assert.True(pdf.Contains("/Author <" + WriteHex(export.Author) + ">")); #pragma warning restore xUnit2009 // Do not use boolean check to check for substrings } @@ -128,18 +130,33 @@ public void TestExportPdfImages() } - private string StringToPdfUnicode(string s) + private string WriteHex(string text) { - StringBuilder sb = new StringBuilder(); + var oResult = new StringBuilder(); + if (String.IsNullOrEmpty(text)) + return ""; + char[] chars = StringToPdfUnicode(text); + foreach (char c in chars) + { + oResult.Append(((byte)c).ToString("X2")); + } + return oResult.ToString(); + } + + private char[] StringToPdfUnicode(string s) + { + char[] result = new char[s.Length * 2 + 2]; + result[0] = (char)254; + result[1] = (char)255; + int i = 2; - Append(sb, (char)254); - Append(sb, (char)255); foreach (char c in s) { - Append(sb, (char)(c >> 8)); - Append(sb, (char)(c & 0xFF)); + result[i] = (char)(c >> 8); + result[i + 1] = (char)(c & 0xFF); + i += 2; } - return sb.ToString(); + return result; } private void Append(StringBuilder sb, char c) 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 a5e9edbf..e2cdeb7c 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 @@  - net6.0 + net10.0 diff --git a/FastReport.Compat/FastReport.Compat/FastReport.Compat.csproj b/FastReport.Compat/FastReport.Compat/FastReport.Compat.csproj index aa283714..519fa701 100644 --- a/FastReport.Compat/FastReport.Compat/FastReport.Compat.csproj +++ b/FastReport.Compat/FastReport.Compat/FastReport.Compat.csproj @@ -1,13 +1,13 @@  - net462;net6.0 + net462;net10.0 false LICENSE.md - $(TargetFrameworks);net6.0-windows7.0 + $(TargetFrameworks);net10.0-windows7.0 @@ -16,22 +16,22 @@ true - false + false - + - - - + + + - + diff --git a/FastReport.Core.Web/FastReport.OpenSource.Web.csproj b/FastReport.Core.Web/FastReport.OpenSource.Web.csproj index 766d3826..b1b2dd58 100644 --- a/FastReport.Core.Web/FastReport.OpenSource.Web.csproj +++ b/FastReport.Core.Web/FastReport.OpenSource.Web.csproj @@ -5,7 +5,7 @@ true - net6.0 + net10.0 OPENSOURCE; 1.0.0 FastReport MIT license.md @@ -20,7 +20,7 @@ - $(TargetFrameworks);net6.0-windows + $(TargetFrameworks);net10.0-windows @@ -51,13 +51,10 @@ - + - - - diff --git a/FastReport.OpenSource/FastReport.OpenSource.csproj b/FastReport.OpenSource/FastReport.OpenSource.csproj index 4e3cc157..e30a7ae8 100644 --- a/FastReport.OpenSource/FastReport.OpenSource.csproj +++ b/FastReport.OpenSource/FastReport.OpenSource.csproj @@ -1,12 +1,12 @@  - net6.0 + net10.0 9.0 - $(TargetFrameworks);net462;net6.0-windows + $(TargetFrameworks);net462;net10.0-windows @@ -69,9 +69,6 @@ - - - diff --git a/Pack/BuildScripts/buildScript.csproj b/Pack/BuildScripts/buildScript.csproj index aa2ab15f..dccd0191 100644 --- a/Pack/BuildScripts/buildScript.csproj +++ b/Pack/BuildScripts/buildScript.csproj @@ -2,18 +2,18 @@ Exe - net8.0 + net10.0 enable - - + + - + - + @@ -24,7 +24,7 @@ - + diff --git a/Tools/FastReport.Tests.OpenSource/FastReport.Tests.OpenSource.csproj b/Tools/FastReport.Tests.OpenSource/FastReport.Tests.OpenSource.csproj index 245acb3b..d57a7aaa 100644 --- a/Tools/FastReport.Tests.OpenSource/FastReport.Tests.OpenSource.csproj +++ b/Tools/FastReport.Tests.OpenSource/FastReport.Tests.OpenSource.csproj @@ -1,7 +1,7 @@  - net6.0 + net10.0 false @@ -11,13 +11,16 @@ - - - + + + all runtime; build; native; contentfiles; analyzers - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive +