Skip to content

Commit

Permalink
Merge pull request #688 from FastReports/sync_branch_2024.1.10
Browse files Browse the repository at this point in the history
FastReport.OpenSource 2024.1.10
  • Loading branch information
0legK authored Mar 22, 2024
2 parents 3325bef + 1967be1 commit 36daac6
Show file tree
Hide file tree
Showing 136 changed files with 1,343 additions and 1,859 deletions.
7 changes: 0 additions & 7 deletions Demos/OpenSource/FastReport.OpenSource.Demos.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Program.cs

This file was deleted.

This file was deleted.

56 changes: 0 additions & 56 deletions Demos/OpenSource/MVC/FastReport.OpenSource.MVC.3.1/Startup.cs

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 36daac6

Please sign in to comment.