Skip to content

Commit

Permalink
Merge pull request #21 from FastReports/detrav_branch
Browse files Browse the repository at this point in the history
* updated lincense for nuget packages fix #17
  • Loading branch information
Detrav authored Nov 2, 2018
2 parents d33b38e + 9e860ee commit a1c8ccf
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions FastReport.Core.Web/FastReport.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
<TargetFramework>netstandard2.0</TargetFramework>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>1.0.0</Version>

<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
<Authors>Fast Reports Inc.</Authors>
<Company>Fast Reports Inc.</Company>
<Description>FastReport.Net is a full-featured reporting solution for .Net Core 2.0.
Various report objects will allow your report to look exactly how you want it to: 13 types of bands, 25 types of barcodes, table object, diagram, maps, shapes, line, PolyLine, Polygon and many more.
FastReport.Net supports export to various popular formats, such as PDF/A, Excel, Word, Open Office, HTML, CSV, Json, XAML, ZPL, etc.
</Description>
<Copyright>Fast Reports Inc.</Copyright>
<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>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, reports, pdf, html, mvc, core</PackageTags>
Expand All @@ -27,12 +28,13 @@ FastReport.Net supports export to various popular formats, such as PDF/A, Excel,
<Choose>
<When Condition="'$(SolutionFileName)' == 'FastReport.OpenSource.sln'">
<PropertyGroup>
<PackageLicenseUrl>https://github.com/FastReports/FastReport/blob/master/LICENSE.md</PackageLicenseUrl>
<DefineConstants>OPENSOURCE;</DefineConstants>
<PackageId>FastReport.OpenSource.Web</PackageId>
<AssemblyOriginatorKeyFile>../FastReport.OpenSource.snk</AssemblyOriginatorKeyFile>
<Description>FastReport Open Source is an open source reporting solution for .Net Core 2.x and .Net Framework 4.x.
<Description>FastReport Open Source is an open source reporting solution for .Net Core 2.x and .Net Framework 4.x.
Various report objects will allow your report to look exactly how you want it to: 13 types of bands, 25 types of barcodes, table object, shapes, line, PolyLine, Polygon and many more.</Description>
<RepositoryUrl>https://github.com/FastReports/FastReport</RepositoryUrl>
<RepositoryUrl>https://github.com/FastReports/FastReport</RepositoryUrl>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)FastReport.OpenSource\FastReport.OpenSource.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion FastReport.OpenSource/FastReport.OpenSource.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<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>
<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</Product>
Expand Down

0 comments on commit a1c8ccf

Please sign in to comment.