Skip to content

Commit e7afa3f

Browse files
authored
Merge pull request #748 from FastReports/sync_branch_2025.2.0
* sync 4/7/2025 version: 2025.2.0
2 parents 030a1e9 + d1ab2b2 commit e7afa3f

File tree

285 files changed

+7068
-39562
lines changed

Some content is hidden

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

285 files changed

+7068
-39562
lines changed

Demos/OpenSource/FastReport.OpenSource.Demos.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Vue",
1717
EndProject
1818
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Angular", "SPA\FastReport.OpenSource.Angular\FastReport.OpenSource.Angular.csproj", "{2FC677B2-A00D-46E2-B59B-91303739D0B3}"
1919
EndProject
20-
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}"
21-
EndProject
2220
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}"
2321
EndProject
2422
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}"
@@ -59,10 +57,6 @@ Global
5957
{2FC677B2-A00D-46E2-B59B-91303739D0B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
6058
{2FC677B2-A00D-46E2-B59B-91303739D0B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
6159
{2FC677B2-A00D-46E2-B59B-91303739D0B3}.Release|Any CPU.Build.0 = Release|Any CPU
62-
{3ECD074B-F901-4652-A5F8-9A75C1742A01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63-
{3ECD074B-F901-4652-A5F8-9A75C1742A01}.Debug|Any CPU.Build.0 = Debug|Any CPU
64-
{3ECD074B-F901-4652-A5F8-9A75C1742A01}.Release|Any CPU.ActiveCfg = Release|Any CPU
65-
{3ECD074B-F901-4652-A5F8-9A75C1742A01}.Release|Any CPU.Build.0 = Release|Any CPU
6660
{46EBA444-E129-4DE0-AAAC-D0B70A2B2C50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6761
{46EBA444-E129-4DE0-AAAC-D0B70A2B2C50}.Debug|Any CPU.Build.0 = Debug|Any CPU
6862
{46EBA444-E129-4DE0-AAAC-D0B70A2B2C50}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -103,7 +97,6 @@ Global
10397
{1CF6C405-AFAC-403B-A029-2D6F5109EE33} = {3BA9736B-3803-4CFB-B785-FDCC807CBEA4}
10498
{FBE1BD2F-6CDA-445A-AA80-BFA5B751605A} = {3BA9736B-3803-4CFB-B785-FDCC807CBEA4}
10599
{2FC677B2-A00D-46E2-B59B-91303739D0B3} = {3BA9736B-3803-4CFB-B785-FDCC807CBEA4}
106-
{3ECD074B-F901-4652-A5F8-9A75C1742A01} = {3BA9736B-3803-4CFB-B785-FDCC807CBEA4}
107100
{46EBA444-E129-4DE0-AAAC-D0B70A2B2C50} = {BABE4B9D-8D3C-408C-A33E-3DC0C0F48A70}
108101
{EE936C85-E2CB-4C60-99BD-D9C97EB512AA} = {BABE4B9D-8D3C-408C-A33E-3DC0C0F48A70}
109102
{3379CA52-56E8-48F3-B94F-75612FA72E0B} = {7A3BB37B-9F8C-4E29-AF23-740BC51EAAF3}

Demos/OpenSource/SPA/FastReport.OpenSource.Angular.OnlineDesigner/.gitignore

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

Demos/OpenSource/SPA/FastReport.OpenSource.Angular.OnlineDesigner/App_Data/Master-Detail.frx

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

0 commit comments

Comments
 (0)