Skip to content

Commit

Permalink
Merge pull request #137 from FastReports/sync_branch_637108811744169473
Browse files Browse the repository at this point in the history
* sync 12/2/2019
  • Loading branch information
Detrav authored Dec 2, 2019
2 parents f7a6545 + 5d1acbd commit 502d64f
Show file tree
Hide file tree
Showing 71 changed files with 2,263 additions and 1,317 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Target Name="CleanObjAndBin">
<!-- Remove obj folder -->
<RemoveDir Directories="$(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath)" />
<!-- Remove bin folder -->
<RemoveDir Directories="$(MSBuildProjectDirectory)\$(BaseOutputPath)" />
</Target>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Fast Reports Inc.</Copyright>
<Company>Fast Reports Inc.</Company>
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.Couchbase</Product>
<Description>Represents a connection to Couchbase server for FastReport.Net.</Description>
<PackageId>FastReport.Core.Data.Couchbase</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, Couchbase, connection, reports</PackageTags>
<Version>1.0.0</Version>
<Configurations>Debug;Release;</Configurations>
<AssemblyName>FastReport.Data.Couchbase</AssemblyName>
<RootNamespace>FastReport.Data</RootNamespace>
<PackageReleaseNotes></PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup>
<DefineConstants>FRCORE;</DefineConstants>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
<ProjectReference Include="..\FastReport.Data.Json\FastReport.Core.Data.Json.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Remove="CouchbaseConnectionEditor.cs" />
<Compile Remove="CouchbaseConnectionEditor.Designer.cs" />
<Compile Remove="CouchbaseConnectionEditor.resx" />
<Compile Remove="CouchbaseDataConnection.DesignExt.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="CouchbaseConnectionEditor.resx" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CouchbaseNetClient" Version="2.5.9" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.Entity.Design" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,75 +1,53 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Fast Reports Inc.</Copyright>
<Company>Fast Reports Inc.</Company>
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.Couchbase</Product>
<Description>Represents a connection to Couchbase server for FastReport.Net.</Description>
<PackageId>FastReport.Data.Couchbase</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, Couchbase, connection, reports</PackageTags>
<Version>1.0.0</Version>
<Configurations>Debug;Release;</Configurations>
<AssemblyName>FastReport.Data.Couchbase</AssemblyName>
<RootNamespace>FastReport.Data</RootNamespace>
<PackageReleaseNotes></PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<DefineConstants>FRCORE;</DefineConstants>
</PropertyGroup>


<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
<ProjectReference Include="..\FastReport.Data.Json\FastReport.Data.Json.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj"><PrivateAssets>all</PrivateAssets></ProjectReference>
<ProjectReference Include="..\FastReport.Data.Json\FastReport.Data.Json.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<Compile Remove="CouchbaseConnectionEditor.cs" />
<Compile Remove="CouchbaseConnectionEditor.Designer.cs" />
<Compile Remove="CouchbaseConnectionEditor.resx" />
<Compile Remove="CouchbaseDataConnection.DesignExt.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<EmbeddedResource Remove="CouchbaseConnectionEditor.resx" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="CouchbaseNetClient" Version="2.5.9" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.Entity.Design" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
<Compile Update="CouchbaseConnectionEditor.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="CouchbaseConnectionEditor.Designer.cs">
<DependentUpon>CouchbaseConnectionEditor.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
<EmbeddedResource Update="CouchbaseConnectionEditor.resx">
<DependentUpon>CouchbaseConnectionEditor.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>

<PropertyGroup>
<TargetFrameworks>net45</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Fast Reports Inc.</Copyright>
<Company>Fast Reports Inc.</Company>
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.Couchbase</Product>
<Description>Represents a connection to Couchbase server for FastReport.Net.</Description>
<PackageId>FastReport.Data.Couchbase</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, Couchbase, connection, reports</PackageTags>
<Version>1.0.0</Version>
<Configurations>Debug;Release;</Configurations>
<AssemblyName>FastReport.Data.Couchbase</AssemblyName>
<RootNamespace>FastReport.Data</RootNamespace>
<PackageReleaseNotes></PackageReleaseNotes>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CouchbaseNetClient" Version="2.5.9" />
<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj">
<PrivateAssets>all</PrivateAssets>
</ProjectReference>
<ProjectReference Include="..\FastReport.Data.Json\FastReport.Data.Json.csproj" />
</ItemGroup>
<ItemGroup >
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.Entity.Design" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup >
<Compile Update="CouchbaseConnectionEditor.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="CouchbaseConnectionEditor.Designer.cs">
<DependentUpon>CouchbaseConnectionEditor.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup >
<EmbeddedResource Update="CouchbaseConnectionEditor.resx">
<DependentUpon>CouchbaseConnectionEditor.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,58 +1,52 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net4.5</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Fast Reports Inc.</Copyright>
<Company>Fast Reports Inc.</Company>
<PackageLicenseUrl>https://github.com/FastReports/FastReport/blob/master/LICENSE.md</PackageLicenseUrl>
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.Couchbase</Product>
<Description>Represents a connection to Couchbase server for FastReport.Net.</Description>
<PackageId>FastReport.OpenSource.Data.Couchbase</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, Couchbase, connection, reports</PackageTags>
<Version>1.0.0</Version>
<Configurations>Debug;Release;</Configurations>
<AssemblyName>FastReport.Data.Couchbase</AssemblyName>
<RootNamespace>FastReport.Data</RootNamespace>
<PackageReleaseNotes></PackageReleaseNotes>
<RepositoryUrl>https://github.com/FastReports/FastReport</RepositoryUrl>
</PropertyGroup>

<PropertyGroup>
<DefineConstants>FRCORE;</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\FastReport.OpenSource\FastReport.OpenSource.csproj" />
<ProjectReference Include="..\FastReport.Data.Json\FastReport.OpenSource.Data.Json.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Remove="CouchbaseConnectionEditor.cs" />
<Compile Remove="CouchbaseConnectionEditor.Designer.cs" />
<Compile Remove="CouchbaseConnectionEditor.resx" />
<Compile Remove="CouchbaseDataConnection.DesignExt.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="CouchbaseConnectionEditor.resx" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="CouchbaseNetClient" Version="2.5.9" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.Entity.Design" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net4.5</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Fast Reports Inc.</Copyright>
<Company>Fast Reports Inc.</Company>
<PackageLicenseUrl>https://github.com/FastReports/FastReport/blob/master/LICENSE.md</PackageLicenseUrl>
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.Couchbase</Product>
<Description>Represents a connection to Couchbase server for FastReport.Net.</Description>
<PackageId>FastReport.OpenSource.Data.Couchbase</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, Couchbase, connection, reports</PackageTags>
<Version>1.0.0</Version>
<Configurations>Debug;Release;</Configurations>
<AssemblyName>FastReport.Data.Couchbase</AssemblyName>
<RootNamespace>FastReport.Data</RootNamespace>
<PackageReleaseNotes></PackageReleaseNotes>
<RepositoryUrl>https://github.com/FastReports/FastReport</RepositoryUrl>
</PropertyGroup>
<PropertyGroup>
<DefineConstants>FRCORE;</DefineConstants>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\FastReport.OpenSource\FastReport.OpenSource.csproj" />
<ProjectReference Include="..\FastReport.Data.Json\FastReport.OpenSource.Data.Json.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Remove="CouchbaseConnectionEditor.cs" />
<Compile Remove="CouchbaseConnectionEditor.Designer.cs" />
<Compile Remove="CouchbaseConnectionEditor.resx" />
<Compile Remove="CouchbaseDataConnection.DesignExt.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="CouchbaseConnectionEditor.resx" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CouchbaseNetClient" Version="2.5.9" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.Entity.Design" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Target Name="CleanObjAndBin">
<!-- Remove obj folder -->
<RemoveDir Directories="$(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath)" />
<!-- Remove bin folder -->
<RemoveDir Directories="$(MSBuildProjectDirectory)\$(BaseOutputPath)" />
</Target>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Fast Reports Inc.</Copyright>
<Company>Fast Reports Inc.</Company>
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.Firebird</Product>
<Description>Represents a connection to Firebird data for FastReport.Net.</Description>
<PackageId>FastReport.Core.Data.Firebird</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, Firebird, connection, reports</PackageTags>
<Version>1.0.0</Version>
<Configurations>Debug;Release;</Configurations>
<AssemblyName>FastReport.Data.Firebird</AssemblyName>
<RootNamespace>FastReport.Data</RootNamespace>
<PackageReleaseNotes>Initial release</PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup >
<DefineConstants>FRCORE;</DefineConstants>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Remove="FirebirdConnectionEditor.cs" />
<Compile Remove="FirebirdConnectionEditor.Designer.cs" />
<Compile Remove="FirebirdConnectionEditor.resx" />
<Compile Remove="FirebirdDataConnection.DesignExt.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="FirebirdConnectionEditor.resx" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.Entity.Design" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="6.6.0" />
</ItemGroup>
</Project>
Loading

0 comments on commit 502d64f

Please sign in to comment.