Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@

<ItemGroup>
<ProjectReference Include="..\..\..\EPPlus\src\EPPlus\EPPlus.csproj" />
<ProjectReference Include="..\EPPlus.DrawingRenderer\EPPlus.DrawingRenderer.csproj" />
<ProjectReference Include="..\EPPlus.Fonts.OpenType\EPPlus.Fonts.OpenType.csproj" />
<ProjectReference Include="..\EPPlus.Graphics\EPPlus.Graphics.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
41 changes: 30 additions & 11 deletions src/EPPlus/EPPlus.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<FileVersion>8.6.1.0</FileVersion>
<Version>8.6.1</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<!-- Include the referenced project binaries in the generated NuGet package -->
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeReferencedProjectsInPackage</TargetsForTfmSpecificBuildOutput>
<PackageProjectUrl>https://epplussoftware.com</PackageProjectUrl>
<Authors>EPPlus Software AB</Authors>
<PackageLicenseFile>license.md</PackageLicenseFile>
Expand Down Expand Up @@ -35,7 +37,7 @@
* New functions:
* GROUPBY, PIVOTBY, TRIMRANGE, WRAPROWS, WRAPCOLS, USDOLLAR, CODE, ENCODEURL, ISFORMULA
* Support for [Trim reference operator](https://github.com/EPPlusSoftware/EPPlus/wiki/Trim-reference-operator).
* Minor bug fixes.
* Minor bug fixes.

## Version 8.5.4
* Minor bug fixes.
Expand Down Expand Up @@ -723,15 +725,32 @@
<PackageIcon>EPPlusLogo.png</PackageIcon>
<PackageIconUrl />
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\EPPlus.DrawingRenderer\EPPlus.DrawingRenderer.csproj" />
<ProjectReference Include="..\EPPlus.Export.Pdf\EPPlus.Export.Pdf.csproj" />
<ProjectReference Include="..\EPPlus.Fonts.OpenType\EPPlus.Fonts.OpenType.csproj" />
<ProjectReference Include="..\EPPlus.Graphics\EPPlus.Graphics.csproj" />
<!-- PrivateAssets="compile" keeps these referenced binaries out of the generated
.nuspec as <dependency> entries, while still letting them flow at runtime so
consuming projects (e.g. test projects) get the DLLs copied to their output. -->
<ProjectReference Include="..\EPPlus.DrawingRenderer\EPPlus.DrawingRenderer.csproj" PrivateAssets="compile" />
<ProjectReference Include="..\EPPlus.Export.Pdf\EPPlus.Export.Pdf.csproj" PrivateAssets="compile" />
<ProjectReference Include="..\EPPlus.Fonts.OpenType\EPPlus.Fonts.OpenType.csproj" PrivateAssets="compile" />
<ProjectReference Include="..\EPPlus.Graphics\EPPlus.Graphics.csproj" PrivateAssets="compile" />
<!-- EPPlus.Interfaces is published as its own NuGet package and must remain a dependency. -->
<ProjectReference Include="..\EPPlus.Interfaces\EPPlus.Interfaces.csproj" />
</ItemGroup>


<!-- Collect the compiled binaries of the referenced (private) projects and place them
in lib/<tfm>/ inside the NuGet package, next to EPPlus.dll. Uses ReferenceCopyLocalPaths
so the correct per-target-framework output is picked up in the multi-target build. -->
<Target Name="IncludeReferencedProjectsInPackage">
<ItemGroup>
<BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('Extension', '.dll'))"
Condition="'%(FileName)' == 'EPPlus.DrawingRenderer'
Or '%(FileName)' == 'EPPlus.Export.Pdf'
Or '%(FileName)' == 'EPPlus.Fonts.OpenType'
Or '%(FileName)' == 'EPPlus.Graphics'" />
</ItemGroup>
</Target>

<PropertyGroup Condition="'$(Platform)'=='AnyCPU'">
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\EPPlus.xml</DocumentationFile>
</PropertyGroup>
Expand Down Expand Up @@ -780,7 +799,7 @@
<Reference Include="System.Threading.Tasks" />
<PackageReference Include="System.ComponentModel.Annotations" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
<PackageReference Include="System.Security.Cryptography.Xml" />
<PackageReference Include="System.Security.Cryptography.Xml" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net35' and '$(TargetFramework)' != 'net462' and '$(TargetFramework)' != 'net9.0' and '$(TargetFramework)' != 'net10.0'">
Expand Down Expand Up @@ -827,7 +846,7 @@
<EmbeddedResource Include="resources\fontsize.zip" />
<EmbeddedResource Include="resources\TextMetrics.zip" />
<EmbeddedResource Include="resources\SignatureLineTemplates.zip">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -855,10 +874,10 @@
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
<None Update="resources\SignatureLineStampTemplate.emf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="resources\SignatureLineTemplate.emf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
</Project>
1 change: 1 addition & 0 deletions src/EPPlusTest/EPPlus.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\EPPlus.Fonts.OpenType\EPPlus.Fonts.OpenType.csproj" />
<ProjectReference Include="..\EPPlus.Interfaces\EPPlus.Interfaces.csproj" />
<ProjectReference Include="..\EPPlus.System.Drawing\EPPlus.System.Drawing.csproj" />
<ProjectReference Include="..\EPPlus\EPPlus.csproj" />
Expand Down
Loading