Skip to content

Commit 8ba5cc3

Browse files
committed
Merged develop8 -> develop9 and fixed conflicts
2 parents 3d53103 + 5ff050e commit 8ba5cc3

41 files changed

Lines changed: 1073 additions & 204 deletions

Some content is hidden

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

SECURITY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ We publish detailed security information including vulnerability disclosures, au
3131
## See Also
3232

3333
- [EPPlus versioning](https://github.com/EPPlusSoftware/EPPlus/wiki/Releases-versioning)
34+
- [Security-considerations-when-calculating-formulas](https://github.com/EPPlusSoftware/EPPlus/wiki/Security-considerations-when-calculating-formulas)

appveyor8.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 8.6.1.{build}
1+
version: 8.6.3.{build}
22
branches:
33
only:
44
- develop8
@@ -10,15 +10,15 @@ install:
1010
& $env:temp\dotnet-install.ps1 -Architecture x64 -Version '10.0.100' -InstallDir "$env:ProgramFiles\dotnet"
1111
init:
1212
- ps: >-
13-
Update-AppveyorBuild -Version "8.6.1.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
13+
Update-AppveyorBuild -Version "8.6.3.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
1414
15-
Write-Host "8.6.1.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
15+
Write-Host "8.6.3.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
1616
dotnet_csproj:
1717
patch: true
1818
file: '**\*.csproj'
1919
version: '{version}'
20-
assembly_version: 8.6.1.{build}
21-
file_version: 8.6.1.{build}
20+
assembly_version: 8.6.3.{build}
21+
file_version: 8.6.3.{build}
2222
nuget:
2323
project_feed: true
2424
before_build:

docs/articles/fixedissues.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
# Features / Fixed issues - EPPlus 8
2-
## Version 9.0.0
3-
* Added 'Layout' property to 'ExcelChartTrendlineLabel' class.
4-
2+
## Version 8.6.3
3+
### Security
4+
* Updated System.Security.Cryptography.Xml to address five security vulnerabilities in the .NET XML signing dependency: four denial of service vulnerabilities (CVE-2026-47302, CVE-2026-50525, CVE-2026-50527, CVE-2026-50648) and one security feature bypass (CVE-2026-47304). The package is updated to 8.0.4 (.NET Framework, .NET 8 and .NET Standard), 9.0.18 (.NET 9) and 10.0.10 (.NET 10).
5+
## Version 8.6 2
6+
### Minor features and fixed issues
7+
* Added property ´AlwaysRefreshImageFunction´ to ´ParsingConfiguration´, to disable download of external content in the calculation of the IMAGE function.
8+
* Fixed unhandled ´InvalidOperationException´ when loading an icon set conditional formatting with formula cfvo from extLst.
9+
* Fixed an issue where the SEARCH function did not handle arrays in the third argument.
10+
* Fixed ´NullReferenceException´ in GetStyleId after multiple ´InsertColumn´ calls.
11+
* AppVersion in ´OfficeProperties´ can now be set to null, to remove the value.
12+
* Fixed drawing hyperlink reassignment crash and tooltip setting. (Fix by Lieven De Foor)
13+
* Adds a WrappedTextAutofitMode property to ExcelTextSettings, backed by a new eWrappedTextAutofitMode enum, giving control over how cells with WrapText enabled contribute to column width in AutoFitColumns(). (Thanks to Lieven De Foor)
14+
* Fixed ´KeyNotFoundException´ / ´ArgumentException´ on drawing rename and removal. (Fix by Lieven De Foor)
15+
* Fixed unhandled ´IndexOutOfRangeException´ when importing text using the ´ExcelRangeBase.LoadFromText´ method, when text file has more columns than specified ´DataTypes´ argument. (Fix by Lieven De Foor)
16+
* Fixed an issue when positioning shapes in charts.
517
## Version 8.6 1
618
### Features
719
* 3 new functions:

src/Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
1111
<PackageVersion Include="System.Drawing.Common" Version="8.0.26" />
1212
<PackageVersion Include="System.Formats.Asn1" Version="8.0.2" />
13-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
14-
<PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.3" />
13+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
14+
<PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.4" />
1515
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
1616
<PackageVersion Include="System.Text.Json" Version="8.0.6" />
1717
</ItemGroup>

src/EPPlus.Fonts.OpenType/Integration/OpenTypeFontTextMeasurer.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ public OpenTypeFontTextMeasurer(ITextShaper shaper, ShapingOptions options = nul
4242
/// Controls whether multi-line text (with CR/LF/CRLF) should be measured.
4343
/// </summary>
4444
public bool MeasureWrappedTextCells { get; set; }
45+
public eWrappedTextAutofitMode WrappedTextAutofitMode
46+
{
47+
get;
48+
set;
49+
}
4550

4651
/// <summary>
4752
/// Measures text width and height.

src/EPPlus.Interfaces/Drawing/Text/ITextMeasurer.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Date Author Change
1111
1/4/2021 EPPlus Software AB EPPlus Interfaces 1.0
1212
*************************************************************************************************/
1313

14+
using System;
15+
1416
namespace OfficeOpenXml.Interfaces.Drawing.Text
1517
{
1618
/// <summary>
@@ -31,9 +33,15 @@ public interface ITextMeasurer
3133
/// <returns></returns>
3234
TextMeasurement MeasureText(string text, MeasurementFont font);
3335
/// <summary>
34-
/// If the text measurer should measure wrap text cells.
35-
/// Only CR, LF or CRLF should be considered.
36+
/// If the text measurer should measure wrapped text cells.
3637
/// </summary>
38+
[Obsolete("Use WrappedTextAutofitMode instead. This property will be removed in a future major version.")]
3739
bool MeasureWrappedTextCells { get; set; }
40+
41+
/// <summary>
42+
/// Determines how cells with WrapText enabled are measured when calculating
43+
/// column width in AutoFitColumns. Default is <see cref="eWrappedTextAutofitMode.Skip"/>.
44+
/// </summary>
45+
eWrappedTextAutofitMode WrappedTextAutofitMode { get; set; }
3846
}
3947
}
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*************************************************************************************************
2+
Required Notice: Copyright (C) EPPlus Software AB.
3+
This software is licensed under PolyForm Noncommercial License 1.0.0
4+
and may only be used for noncommercial purposes
5+
https://polyformproject.org/licenses/noncommercial/1.0.0/
6+
7+
A commercial license to use this software can be purchased at https://epplussoftware.com
8+
*************************************************************************************************
9+
Date Author Change
10+
*************************************************************************************************
11+
1/4/2021 EPPlus Software AB Added wrapped text autofit mode
12+
*************************************************************************************************/
13+
namespace OfficeOpenXml.Interfaces.Drawing.Text
14+
{
15+
/// <summary>
16+
/// Determines how cells with WrapText enabled are measured when calculating
17+
/// column width in AutoFitColumns.
18+
/// </summary>
19+
public enum eWrappedTextAutofitMode
20+
{
21+
/// <summary>
22+
/// Cells with WrapText enabled are ignored when calculating column width.
23+
/// This is the default and matches the behaviour of earlier versions.
24+
/// </summary>
25+
Skip = 0,
26+
/// <summary>
27+
/// The entire cell text is measured as a single line, ignoring wrapping.
28+
/// </summary>
29+
FullText = 1,
30+
/// <summary>
31+
/// The text is split on explicit line breaks (CR, LF, CRLF) and the width
32+
/// of the widest resulting line determines the cell's contribution to the
33+
/// column width.
34+
/// </summary>
35+
SplitNewLine = 2,
36+
/// <summary>
37+
/// The text is split on whitespace (space, tab, and line breaks) and on
38+
/// hyphen characters (U+002D hyphen-minus and U+2010 hyphen). The width of
39+
/// the widest resulting segment determines the cell's contribution to the
40+
/// column width. Hyphens are visible and their width is included in the
41+
/// segment they terminate; whitespace is not. Note: this yields the minimum
42+
/// column width at which no single word overflows, and is not a simulation
43+
/// of Excel's line wrapping.
44+
/// </summary>
45+
SplitWord = 3
46+
}
47+
}

src/EPPlus.Interfaces/EPPlus.Interfaces.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>net10.0;net9.0;net8.0;netstandard2.1;netstandard2.0;net462</TargetFrameworks>
4-
<AssemblyVersion>8.4.0.0</AssemblyVersion>
5-
<FileVersion>8.4.0.0</FileVersion>
6-
<Version>8.4.0</Version>
4+
<AssemblyVersion>8.6.2.0</AssemblyVersion>
5+
<FileVersion>8.6.2.0</FileVersion>
6+
<Version>8.6.2</Version>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
88
<PackageLicenseFile>license.md</PackageLicenseFile>
99
<RepositoryType>git</RepositoryType>

src/EPPlus.System.Drawing/Drawing/Text/SystemDrawingTextMeasurer.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,19 @@ public class SystemDrawingTextMeasurer : ITextMeasurer, IDisposable
1212
/// If the text measurer should measure wrap text cells.
1313
/// Only CR, LF or CRLF should be considered.
1414
/// </summary>
15+
#pragma warning disable 618
1516
public bool MeasureWrappedTextCells
1617
{
1718
get;
1819
set;
1920
}
21+
#pragma warning restore 618
22+
public eWrappedTextAutofitMode WrappedTextAutofitMode
23+
{
24+
get;
25+
set;
26+
}
27+
2028
public SystemDrawingTextMeasurer()
2129
{
2230
if (Environment.OSVersion.Platform == PlatformID.Win32NT &&

src/EPPlus.System.Drawing/EPPlus.System.Drawing.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net10.0;net9.0;net8.0;netstandard2.1;netstandard2.0;net462</TargetFrameworks>
5-
<AssemblyVersion>8.4.0.0</AssemblyVersion>
6-
<FileVersion>8.4.0.0</FileVersion>
7-
<Version>8.4.0</Version>
5+
<AssemblyVersion>8.6.2.0</AssemblyVersion>
6+
<FileVersion>8.6.2.0</FileVersion>
7+
<Version>8.6.2</Version>
88
<SignAssembly>true</SignAssembly>
99
<PackageLicenseFile>license.md</PackageLicenseFile>
1010
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

0 commit comments

Comments
 (0)