Skip to content

Commit b3e7169

Browse files
committed
Merge branch 'release/epplus8.5.1' into develop8
2 parents 825d7a4 + 438533e commit b3e7169

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/EPPlus/EPPlus.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@
559559
A list of fixed issues can be found here https://epplussoftware.com/docs/7.0/articles/fixedissues.html
560560

561561
Version history
562-
8.5.1 20260306 Minor bug fixes. See https://epplussoftware.com/Developers/MinorFeaturesAndIssues
562+
8.5.1 20260330 Minor bug fixes. See https://epplussoftware.com/Developers/MinorFeaturesAndIssues
563563
8.5.0 20260306 Minor features and bug fixes.
564564
8.4.2 20260204 Minor bug fixes.
565565
8.4.1 20260112 Minor bug fixes.

src/EPPlusTest/FormulaParsing/CancelCalculationTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace EPPlusTest.FormulaParsing
1313
[TestClass]
1414
public class CancelCalculationTests
1515
{
16-
const int WaitTimeMs = 150;
16+
const int WaitTimeMs = 50;
1717

1818
[TestMethod]
1919
public void CancelCalculation()
@@ -136,7 +136,7 @@ public void Calculate_WithToken_CompletesNormally_IsConsistent()
136136
Assert.IsFalse(package.Workbook.IsCalculationInconsistent);
137137
}
138138

139-
[TestMethod]
139+
[TestMethod,Ignore]
140140
public void CancelCalculation_WithHeavyNamedRanges()
141141
{
142142
using var package = new ExcelPackage();

0 commit comments

Comments
 (0)