Skip to content

Commit 5eb86de

Browse files
Merge pull request #515 from FastReports/sync_branch_2023.1.0
fixed plugins build
2 parents 43667df + 745a573 commit 5eb86de

File tree

2 files changed

+42
-3
lines changed

2 files changed

+42
-3
lines changed

Extras/Core/FastReport.Data/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
2-
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
2+
<!--<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />-->
33

44
<PropertyGroup>
55
<NetFrameworkMinimum>net462</NetFrameworkMinimum>

FastReport.OpenSource.sln

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29201.188
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.4.33110.190
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource", "FastReport.OpenSource\FastReport.OpenSource.csproj", "{62667265-5E09-444D-8218-244DE84804A7}"
77
EndProject
@@ -45,6 +45,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Data.
4545
EndProject
4646
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Data.Firebird", "Extras\Core\FastReport.Data\FastReport.Data.Firebird\FastReport.OpenSource.Data.Firebird.csproj", "{2DB7A38A-4E08-4411-8AE0-D85DED02C2DE}"
4747
EndProject
48+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Data.Cassandra", "Extras\Core\FastReport.Data\FastReport.Data.Cassandra\FastReport.OpenSource.Data.Cassandra.csproj", "{32A6139B-F913-457D-9913-3CFC1C7990AB}"
49+
EndProject
50+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Data.ElasticSearch", "Extras\Core\FastReport.Data\FastReport.Data.ElasticSearch\FastReport.OpenSource.Data.ElasticSearch.csproj", "{C766181C-FB64-4204-BFAF-BECE1E5218DD}"
51+
EndProject
52+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReport.OpenSource.Data.Excel", "Extras\Core\FastReport.Data\FastReport.Data.Excel\FastReport.OpenSource.Data.Excel.csproj", "{43BC1122-E846-406F-AA7D-737E8AC5AA6E}"
53+
EndProject
4854
Global
4955
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5056
Academic|Any CPU = Academic|Any CPU
@@ -234,6 +240,36 @@ Global
234240
{2DB7A38A-4E08-4411-8AE0-D85DED02C2DE}.Release|Any CPU.Build.0 = Release|Any CPU
235241
{2DB7A38A-4E08-4411-8AE0-D85DED02C2DE}.WinForms|Any CPU.ActiveCfg = Debug|Any CPU
236242
{2DB7A38A-4E08-4411-8AE0-D85DED02C2DE}.WinForms|Any CPU.Build.0 = Debug|Any CPU
243+
{32A6139B-F913-457D-9913-3CFC1C7990AB}.Academic|Any CPU.ActiveCfg = Debug|Any CPU
244+
{32A6139B-F913-457D-9913-3CFC1C7990AB}.Academic|Any CPU.Build.0 = Debug|Any CPU
245+
{32A6139B-F913-457D-9913-3CFC1C7990AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
246+
{32A6139B-F913-457D-9913-3CFC1C7990AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
247+
{32A6139B-F913-457D-9913-3CFC1C7990AB}.Demo|Any CPU.ActiveCfg = Debug|Any CPU
248+
{32A6139B-F913-457D-9913-3CFC1C7990AB}.Demo|Any CPU.Build.0 = Debug|Any CPU
249+
{32A6139B-F913-457D-9913-3CFC1C7990AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
250+
{32A6139B-F913-457D-9913-3CFC1C7990AB}.Release|Any CPU.Build.0 = Release|Any CPU
251+
{32A6139B-F913-457D-9913-3CFC1C7990AB}.WinForms|Any CPU.ActiveCfg = Debug|Any CPU
252+
{32A6139B-F913-457D-9913-3CFC1C7990AB}.WinForms|Any CPU.Build.0 = Debug|Any CPU
253+
{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Academic|Any CPU.ActiveCfg = Debug|Any CPU
254+
{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Academic|Any CPU.Build.0 = Debug|Any CPU
255+
{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
256+
{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
257+
{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Demo|Any CPU.ActiveCfg = Debug|Any CPU
258+
{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Demo|Any CPU.Build.0 = Debug|Any CPU
259+
{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
260+
{C766181C-FB64-4204-BFAF-BECE1E5218DD}.Release|Any CPU.Build.0 = Release|Any CPU
261+
{C766181C-FB64-4204-BFAF-BECE1E5218DD}.WinForms|Any CPU.ActiveCfg = Debug|Any CPU
262+
{C766181C-FB64-4204-BFAF-BECE1E5218DD}.WinForms|Any CPU.Build.0 = Debug|Any CPU
263+
{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Academic|Any CPU.ActiveCfg = Debug|Any CPU
264+
{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Academic|Any CPU.Build.0 = Debug|Any CPU
265+
{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
266+
{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
267+
{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Demo|Any CPU.ActiveCfg = Debug|Any CPU
268+
{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Demo|Any CPU.Build.0 = Debug|Any CPU
269+
{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
270+
{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.Release|Any CPU.Build.0 = Release|Any CPU
271+
{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.WinForms|Any CPU.ActiveCfg = Debug|Any CPU
272+
{43BC1122-E846-406F-AA7D-737E8AC5AA6E}.WinForms|Any CPU.Build.0 = Debug|Any CPU
237273
EndGlobalSection
238274
GlobalSection(SolutionProperties) = preSolution
239275
HideSolutionNode = FALSE
@@ -255,6 +291,9 @@ Global
255291
{01DA6786-77D4-4457-BF33-E204F0C9E155} = {CCF32DAC-85D9-43D4-A4A7-72626A13D806}
256292
{BDB7D5CB-8DD2-48DB-BA81-FDDC88135B35} = {898AF8DC-11C3-4640-B60C-5D8CBF2F29CF}
257293
{2DB7A38A-4E08-4411-8AE0-D85DED02C2DE} = {898AF8DC-11C3-4640-B60C-5D8CBF2F29CF}
294+
{32A6139B-F913-457D-9913-3CFC1C7990AB} = {898AF8DC-11C3-4640-B60C-5D8CBF2F29CF}
295+
{C766181C-FB64-4204-BFAF-BECE1E5218DD} = {898AF8DC-11C3-4640-B60C-5D8CBF2F29CF}
296+
{43BC1122-E846-406F-AA7D-737E8AC5AA6E} = {898AF8DC-11C3-4640-B60C-5D8CBF2F29CF}
258297
EndGlobalSection
259298
GlobalSection(ExtensibilityGlobals) = postSolution
260299
SolutionGuid = {DFBB1F5B-F03E-4BCB-AFEE-A45A2C4D5BB8}

0 commit comments

Comments
 (0)