Skip to content

Commit 502d64f

Browse files
DetravDetrav
authored
Merge pull request #137 from FastReports/sync_branch_637108811744169473
* sync 12/2/2019
2 parents f7a6545 + 5d1acbd commit 502d64f

File tree

71 files changed

+2263
-1317
lines changed

Some content is hidden

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

71 files changed

+2263
-1317
lines changed

‎Demos/OpenSource/SPAOnlineDesigner/ClientApp/package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Extras/Core/FastReport.Data/FastReport.Data.Couchbase/Directory.Build.targets‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<Target Name="CleanObjAndBin">
5+
<!-- Remove obj folder -->
6+
<RemoveDir Directories="$(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath)" />
7+
<!-- Remove bin folder -->
8+
<RemoveDir Directories="$(MSBuildProjectDirectory)\$(BaseOutputPath)" />
9+
</Target>
10+
11+
</Project>

‎Extras/Core/FastReport.Data/FastReport.Data.Couchbase/FastReport.Core.Data.Couchbase.csproj‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
4+
<SignAssembly>true</SignAssembly>
5+
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
6+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
7+
<Copyright>Fast Reports Inc.</Copyright>
8+
<Company>Fast Reports Inc.</Company>
9+
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
10+
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
11+
<Authors>Fast Reports Inc.</Authors>
12+
<Product>FastReport.Data.Couchbase</Product>
13+
<Description>Represents a connection to Couchbase server for FastReport.Net.</Description>
14+
<PackageId>FastReport.Core.Data.Couchbase</PackageId>
15+
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
16+
<PackageTags>reporting, Couchbase, connection, reports</PackageTags>
17+
<Version>1.0.0</Version>
18+
<Configurations>Debug;Release;</Configurations>
19+
<AssemblyName>FastReport.Data.Couchbase</AssemblyName>
20+
<RootNamespace>FastReport.Data</RootNamespace>
21+
<PackageReleaseNotes></PackageReleaseNotes>
22+
</PropertyGroup>
23+
<PropertyGroup>
24+
<DefineConstants>FRCORE;</DefineConstants>
25+
</PropertyGroup>
26+
<ItemGroup>
27+
<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
28+
<ProjectReference Include="..\FastReport.Data.Json\FastReport.Core.Data.Json.csproj" />
29+
</ItemGroup>
30+
<ItemGroup>
31+
<Compile Remove="CouchbaseConnectionEditor.cs" />
32+
<Compile Remove="CouchbaseConnectionEditor.Designer.cs" />
33+
<Compile Remove="CouchbaseConnectionEditor.resx" />
34+
<Compile Remove="CouchbaseDataConnection.DesignExt.cs" />
35+
</ItemGroup>
36+
<ItemGroup>
37+
<EmbeddedResource Remove="CouchbaseConnectionEditor.resx" />
38+
</ItemGroup>
39+
<ItemGroup>
40+
<PackageReference Include="CouchbaseNetClient" Version="2.5.9" />
41+
</ItemGroup>
42+
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
43+
<Reference Include="System" />
44+
<Reference Include="System.Data" />
45+
<Reference Include="System.Data.Entity.Design" />
46+
<Reference Include="System.Design" />
47+
<Reference Include="System.Drawing" />
48+
<Reference Include="System.Windows.Forms" />
49+
<Reference Include="System.Xml" />
50+
</ItemGroup>
51+
</Project>

‎Extras/Core/FastReport.Data/FastReport.Data.Couchbase/FastReport.Data.Couchbase.csproj‎

Lines changed: 51 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,53 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
5-
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
6-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
7-
<Copyright>Fast Reports Inc.</Copyright>
8-
<Company>Fast Reports Inc.</Company>
9-
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
10-
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
11-
<Authors>Fast Reports Inc.</Authors>
12-
<Product>FastReport.Data.Couchbase</Product>
13-
<Description>Represents a connection to Couchbase server for FastReport.Net.</Description>
14-
<PackageId>FastReport.Data.Couchbase</PackageId>
15-
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
16-
<PackageTags>reporting, Couchbase, connection, reports</PackageTags>
17-
<Version>1.0.0</Version>
18-
<Configurations>Debug;Release;</Configurations>
19-
<AssemblyName>FastReport.Data.Couchbase</AssemblyName>
20-
<RootNamespace>FastReport.Data</RootNamespace>
21-
<PackageReleaseNotes></PackageReleaseNotes>
22-
</PropertyGroup>
23-
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
24-
<DefineConstants>FRCORE;</DefineConstants>
25-
</PropertyGroup>
26-
27-
28-
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
29-
<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
30-
<ProjectReference Include="..\FastReport.Data.Json\FastReport.Data.Json.csproj" />
31-
</ItemGroup>
32-
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
33-
<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj"><PrivateAssets>all</PrivateAssets></ProjectReference>
34-
<ProjectReference Include="..\FastReport.Data.Json\FastReport.Data.Json.csproj" />
35-
</ItemGroup>
36-
37-
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
38-
<Compile Remove="CouchbaseConnectionEditor.cs" />
39-
<Compile Remove="CouchbaseConnectionEditor.Designer.cs" />
40-
<Compile Remove="CouchbaseConnectionEditor.resx" />
41-
<Compile Remove="CouchbaseDataConnection.DesignExt.cs" />
42-
</ItemGroup>
43-
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
44-
<EmbeddedResource Remove="CouchbaseConnectionEditor.resx" />
45-
</ItemGroup>
46-
47-
<ItemGroup>
48-
<PackageReference Include="CouchbaseNetClient" Version="2.5.9" />
49-
</ItemGroup>
50-
51-
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
52-
<Reference Include="System" />
53-
<Reference Include="System.Data" />
54-
<Reference Include="System.Data.Entity.Design" />
55-
<Reference Include="System.Design" />
56-
<Reference Include="System.Drawing" />
57-
<Reference Include="System.Windows.Forms" />
58-
<Reference Include="System.Xml" />
59-
</ItemGroup>
60-
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
61-
<Compile Update="CouchbaseConnectionEditor.cs">
62-
<SubType>UserControl</SubType>
63-
</Compile>
64-
<Compile Update="CouchbaseConnectionEditor.Designer.cs">
65-
<DependentUpon>CouchbaseConnectionEditor.cs</DependentUpon>
66-
</Compile>
67-
</ItemGroup>
68-
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
69-
<EmbeddedResource Update="CouchbaseConnectionEditor.resx">
70-
<DependentUpon>CouchbaseConnectionEditor.cs</DependentUpon>
71-
<SubType>Designer</SubType>
72-
</EmbeddedResource>
73-
</ItemGroup>
74-
2+
<PropertyGroup>
3+
<TargetFrameworks>net45</TargetFrameworks>
4+
<SignAssembly>true</SignAssembly>
5+
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
6+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
7+
<Copyright>Fast Reports Inc.</Copyright>
8+
<Company>Fast Reports Inc.</Company>
9+
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
10+
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
11+
<Authors>Fast Reports Inc.</Authors>
12+
<Product>FastReport.Data.Couchbase</Product>
13+
<Description>Represents a connection to Couchbase server for FastReport.Net.</Description>
14+
<PackageId>FastReport.Data.Couchbase</PackageId>
15+
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
16+
<PackageTags>reporting, Couchbase, connection, reports</PackageTags>
17+
<Version>1.0.0</Version>
18+
<Configurations>Debug;Release;</Configurations>
19+
<AssemblyName>FastReport.Data.Couchbase</AssemblyName>
20+
<RootNamespace>FastReport.Data</RootNamespace>
21+
<PackageReleaseNotes></PackageReleaseNotes>
22+
</PropertyGroup>
23+
<ItemGroup>
24+
<PackageReference Include="CouchbaseNetClient" Version="2.5.9" />
25+
<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj">
26+
<PrivateAssets>all</PrivateAssets>
27+
</ProjectReference>
28+
<ProjectReference Include="..\FastReport.Data.Json\FastReport.Data.Json.csproj" />
29+
</ItemGroup>
30+
<ItemGroup >
31+
<Reference Include="System" />
32+
<Reference Include="System.Data" />
33+
<Reference Include="System.Data.Entity.Design" />
34+
<Reference Include="System.Design" />
35+
<Reference Include="System.Drawing" />
36+
<Reference Include="System.Windows.Forms" />
37+
<Reference Include="System.Xml" />
38+
</ItemGroup>
39+
<ItemGroup >
40+
<Compile Update="CouchbaseConnectionEditor.cs">
41+
<SubType>UserControl</SubType>
42+
</Compile>
43+
<Compile Update="CouchbaseConnectionEditor.Designer.cs">
44+
<DependentUpon>CouchbaseConnectionEditor.cs</DependentUpon>
45+
</Compile>
46+
</ItemGroup>
47+
<ItemGroup >
48+
<EmbeddedResource Update="CouchbaseConnectionEditor.resx">
49+
<DependentUpon>CouchbaseConnectionEditor.cs</DependentUpon>
50+
<SubType>Designer</SubType>
51+
</EmbeddedResource>
52+
</ItemGroup>
7553
</Project>

‎Extras/Core/FastReport.Data/FastReport.Data.Couchbase/FastReport.OpenSource.Data.Couchbase.csproj‎

Lines changed: 50 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,52 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net4.5</TargetFrameworks>
5-
<SignAssembly>true</SignAssembly>
6-
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
7-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
8-
<Copyright>Fast Reports Inc.</Copyright>
9-
<Company>Fast Reports Inc.</Company>
10-
<PackageLicenseUrl>https://github.com/FastReports/FastReport/blob/master/LICENSE.md</PackageLicenseUrl>
11-
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
12-
<Authors>Fast Reports Inc.</Authors>
13-
<Product>FastReport.Data.Couchbase</Product>
14-
<Description>Represents a connection to Couchbase server for FastReport.Net.</Description>
15-
<PackageId>FastReport.OpenSource.Data.Couchbase</PackageId>
16-
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
17-
<PackageTags>reporting, Couchbase, connection, reports</PackageTags>
18-
<Version>1.0.0</Version>
19-
<Configurations>Debug;Release;</Configurations>
20-
<AssemblyName>FastReport.Data.Couchbase</AssemblyName>
21-
<RootNamespace>FastReport.Data</RootNamespace>
22-
<PackageReleaseNotes></PackageReleaseNotes>
23-
<RepositoryUrl>https://github.com/FastReports/FastReport</RepositoryUrl>
24-
</PropertyGroup>
25-
26-
<PropertyGroup>
27-
<DefineConstants>FRCORE;</DefineConstants>
28-
</PropertyGroup>
29-
30-
<ItemGroup>
31-
<ProjectReference Include="..\..\..\..\FastReport.OpenSource\FastReport.OpenSource.csproj" />
32-
<ProjectReference Include="..\FastReport.Data.Json\FastReport.OpenSource.Data.Json.csproj" />
33-
</ItemGroup>
34-
35-
<ItemGroup>
36-
<Compile Remove="CouchbaseConnectionEditor.cs" />
37-
<Compile Remove="CouchbaseConnectionEditor.Designer.cs" />
38-
<Compile Remove="CouchbaseConnectionEditor.resx" />
39-
<Compile Remove="CouchbaseDataConnection.DesignExt.cs" />
40-
</ItemGroup>
41-
<ItemGroup>
42-
<EmbeddedResource Remove="CouchbaseConnectionEditor.resx" />
43-
</ItemGroup>
44-
45-
<ItemGroup>
46-
<PackageReference Include="CouchbaseNetClient" Version="2.5.9" />
47-
</ItemGroup>
48-
49-
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
50-
<Reference Include="System" />
51-
<Reference Include="System.Data" />
52-
<Reference Include="System.Data.Entity.Design" />
53-
<Reference Include="System.Design" />
54-
<Reference Include="System.Drawing" />
55-
<Reference Include="System.Windows.Forms" />
56-
<Reference Include="System.Xml" />
57-
</ItemGroup>
2+
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.0;net4.5</TargetFrameworks>
4+
<SignAssembly>true</SignAssembly>
5+
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
6+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
7+
<Copyright>Fast Reports Inc.</Copyright>
8+
<Company>Fast Reports Inc.</Company>
9+
<PackageLicenseUrl>https://github.com/FastReports/FastReport/blob/master/LICENSE.md</PackageLicenseUrl>
10+
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
11+
<Authors>Fast Reports Inc.</Authors>
12+
<Product>FastReport.Data.Couchbase</Product>
13+
<Description>Represents a connection to Couchbase server for FastReport.Net.</Description>
14+
<PackageId>FastReport.OpenSource.Data.Couchbase</PackageId>
15+
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
16+
<PackageTags>reporting, Couchbase, connection, reports</PackageTags>
17+
<Version>1.0.0</Version>
18+
<Configurations>Debug;Release;</Configurations>
19+
<AssemblyName>FastReport.Data.Couchbase</AssemblyName>
20+
<RootNamespace>FastReport.Data</RootNamespace>
21+
<PackageReleaseNotes></PackageReleaseNotes>
22+
<RepositoryUrl>https://github.com/FastReports/FastReport</RepositoryUrl>
23+
</PropertyGroup>
24+
<PropertyGroup>
25+
<DefineConstants>FRCORE;</DefineConstants>
26+
</PropertyGroup>
27+
<ItemGroup>
28+
<ProjectReference Include="..\..\..\..\FastReport.OpenSource\FastReport.OpenSource.csproj" />
29+
<ProjectReference Include="..\FastReport.Data.Json\FastReport.OpenSource.Data.Json.csproj" />
30+
</ItemGroup>
31+
<ItemGroup>
32+
<Compile Remove="CouchbaseConnectionEditor.cs" />
33+
<Compile Remove="CouchbaseConnectionEditor.Designer.cs" />
34+
<Compile Remove="CouchbaseConnectionEditor.resx" />
35+
<Compile Remove="CouchbaseDataConnection.DesignExt.cs" />
36+
</ItemGroup>
37+
<ItemGroup>
38+
<EmbeddedResource Remove="CouchbaseConnectionEditor.resx" />
39+
</ItemGroup>
40+
<ItemGroup>
41+
<PackageReference Include="CouchbaseNetClient" Version="2.5.9" />
42+
</ItemGroup>
43+
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
44+
<Reference Include="System" />
45+
<Reference Include="System.Data" />
46+
<Reference Include="System.Data.Entity.Design" />
47+
<Reference Include="System.Design" />
48+
<Reference Include="System.Drawing" />
49+
<Reference Include="System.Windows.Forms" />
50+
<Reference Include="System.Xml" />
51+
</ItemGroup>
5852
</Project>

‎Extras/Core/FastReport.Data/FastReport.Data.Firebird/Directory.Build.targets‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<Target Name="CleanObjAndBin">
5+
<!-- Remove obj folder -->
6+
<RemoveDir Directories="$(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath)" />
7+
<!-- Remove bin folder -->
8+
<RemoveDir Directories="$(MSBuildProjectDirectory)\$(BaseOutputPath)" />
9+
</Target>
10+
11+
</Project>

‎Extras/Core/FastReport.Data/FastReport.Data.Firebird/FastReport.Core.Data.Firebird.csproj‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
4+
<SignAssembly>true</SignAssembly>
5+
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
6+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
7+
<Copyright>Fast Reports Inc.</Copyright>
8+
<Company>Fast Reports Inc.</Company>
9+
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
10+
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
11+
<Authors>Fast Reports Inc.</Authors>
12+
<Product>FastReport.Data.Firebird</Product>
13+
<Description>Represents a connection to Firebird data for FastReport.Net.</Description>
14+
<PackageId>FastReport.Core.Data.Firebird</PackageId>
15+
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
16+
<PackageTags>reporting, Firebird, connection, reports</PackageTags>
17+
<Version>1.0.0</Version>
18+
<Configurations>Debug;Release;</Configurations>
19+
<AssemblyName>FastReport.Data.Firebird</AssemblyName>
20+
<RootNamespace>FastReport.Data</RootNamespace>
21+
<PackageReleaseNotes>Initial release</PackageReleaseNotes>
22+
</PropertyGroup>
23+
<PropertyGroup >
24+
<DefineConstants>FRCORE;</DefineConstants>
25+
</PropertyGroup>
26+
<ItemGroup>
27+
<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
28+
</ItemGroup>
29+
<ItemGroup>
30+
<Compile Remove="FirebirdConnectionEditor.cs" />
31+
<Compile Remove="FirebirdConnectionEditor.Designer.cs" />
32+
<Compile Remove="FirebirdConnectionEditor.resx" />
33+
<Compile Remove="FirebirdDataConnection.DesignExt.cs" />
34+
</ItemGroup>
35+
<ItemGroup>
36+
<EmbeddedResource Remove="FirebirdConnectionEditor.resx" />
37+
</ItemGroup>
38+
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
39+
<Reference Include="System" />
40+
<Reference Include="System.Data" />
41+
<Reference Include="System.Data.Entity.Design" />
42+
<Reference Include="System.Design" />
43+
<Reference Include="System.Drawing" />
44+
<Reference Include="System.Windows.Forms" />
45+
<Reference Include="System.Xml" />
46+
</ItemGroup>
47+
<ItemGroup>
48+
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="6.6.0" />
49+
</ItemGroup>
50+
</Project>

0 commit comments

Comments
 (0)