Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -245,3 +245,5 @@ ModelManifest.xml
# FAKE - F# Make
.fake/
*.bak
package-lock.json
Demos/OpenSource/SPA/FastReport.OpenSource.Angular/ClientApp/.angular/
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>Demo.MVC.Net6</RootNamespace>
<Configurations>Debug;Release</Configurations>
</PropertyGroup>
<Import Project="..\..\..\..\UsedPackages.version" />

<ItemGroup>
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSVersion)" />
<Compile Include="..\..\_Shared\DataSetService.cs" />
</ItemGroup>

<ItemGroup>
<Compile Include ="..\..\_Shared\DataSetService.cs" />
<ProjectReference Include="..\..\..\..\FastReport.Core.Web\FastReport.OpenSource.Web.csproj" />
<ProjectReference Include="..\..\..\..\FastReport.OpenSource\FastReport.OpenSource.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public static void Main(string[] args)
// Add services to the container.
builder.Services.AddControllersWithViews();
builder.Services.AddSingleton<DataSetService>();
builder.Services.AddFastReport();
var app = builder.Build();

// Configure the HTTP request pipeline.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<SpaRoot>ClientApp\</SpaRoot>
Expand All @@ -12,14 +12,12 @@

<Import Project="..\..\..\..\UsedPackages.version" />
<ItemGroup>
<PackageReference Include="FastReport.OpenSource" Version="$(FROSVersion)" />
<PackageReference Include="FastReport.OpenSource.Web" Version="$(FROSVersion)" />
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="6.0.11" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.1" />
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
<Compile Include ="..\..\_Shared\DataSetService.cs" />
<Compile Include="..\..\_Shared\DataSetService.cs" />
</ItemGroup>

<ItemGroup>
Expand All @@ -29,6 +27,11 @@
<None Include="$(SpaRoot)**" Exclude="$(SpaRoot)node_modules\**" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\FastReport.Core.Web\FastReport.OpenSource.Web.csproj" />
<ProjectReference Include="..\..\..\..\FastReport.OpenSource\FastReport.OpenSource.csproj" />
</ItemGroup>

<Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
<!-- Ensure Node.js is installed -->
<Exec Command="node --version" ContinueOnError="true">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public static void Main(string[] args)
var builder = WebApplication.CreateBuilder(args);
builder.Services.AddSingleton<DataSetService>();
// Add services to the container.
builder.Services.AddFastReport();

builder.Services.AddControllersWithViews();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>

<Crossplatform>true</Crossplatform>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<Import Project="..\Connections.props" />

<ItemGroup>
<PackageReference Include="CassandraCSharpDriver" Version="3.17.1" />
<PackageReference Include="Newtonsoft.Json" Version="[13.0.3,)" />
<PackageReference Include="CassandraCSharpDriver" Version="3.22.0" />
<PackageReference Include="Newtonsoft.Json" Version="[13.0.4,)" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net10.0</TargetFrameworks>

<Crossplatform>true</Crossplatform>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>

<Crossplatform>true</Crossplatform>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>

<Crossplatform>true</Crossplatform>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>

<Crossplatform>true</Crossplatform>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<Import Project="..\Connections.props" />

<ItemGroup>
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
<PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" />
<PackageReference Include="SpreadsheetLight" Version="3.5.0" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Include="System.Drawing.Common" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>

<Crossplatform>true</Crossplatform>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Import Project="..\Connections.props" />

<ItemGroup>
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.0.0" />
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.3.4" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>
<Crossplatform>true</Crossplatform>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>

<Crossplatform>true</Crossplatform>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Import Project="..\Connections.props" />

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="[13.0.3,)" />
<PackageReference Include="Newtonsoft.Json" Version="[13.0.4,)" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>
<Crossplatform>true</Crossplatform>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>
<Crossplatform>true</Crossplatform>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Import Project="..\Connections.props" />

<ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="4.9.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>
<Crossplatform>true</Crossplatform>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Import Project="..\Connections.props" />

<ItemGroup>
<PackageReference Include="MySqlConnector" Version="[2.4.0,)" />
<PackageReference Include="MySqlConnector" Version="[2.5.0,)" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>
<Crossplatform>true</Crossplatform>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Import Project="..\Connections.props" />

<ItemGroup>
<PackageReference Include="System.Data.Odbc" Version="6.0.0" />
<PackageReference Include="System.Data.Odbc" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>
<Crossplatform>true</Crossplatform>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>
<Crossplatform>true</Crossplatform>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>
<Crossplatform>true</Crossplatform>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="RavenDB.Client" Version="4.0.6" />
<PackageReference Include="System.Text.RegularExpressions" Version="[4.3.1,)" />
<PackageReference Include="Newtonsoft.Json" Version="[13.0.3,)" />
<PackageReference Include="Newtonsoft.Json" Version="[13.0.4,)" />
<PackageReference Include="System.Net.Http" Version="[4.3.4,)" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>
<Crossplatform>true</Crossplatform>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetFrameworkMinimum);net6.0</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkMinimum);net10.0</TargetFrameworks>
<PackageLicenseUrl>https://www.fast-report.com/products/fast-report-net/license</PackageLicenseUrl>
<Description>
Represents a plugin to extend PictureObject supports formats, for FastReport.OpenSource.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Import Project="..\Plugins.props" />

<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.88.6" />
<PackageReference Include="SkiaSharp" Version="3.119.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading