Skip to content
This repository was archived by the owner on Nov 14, 2022. It is now read-only.

Commit 388a7aa

Browse files
authored
Bumped DocumentFormat.OpenXml from 2.11.3 -> 2.15.0
Bumped Janitor.Fody 1.6.8 -> 1.9.0 Bumped ExcelNumberFormat 1.0.10 -> 1.1.0 Bumped System.Drawing.Common 4.5.0 -> 6.0.0
2 parents 2a44da3 + de864d5 commit 388a7aa

File tree

10 files changed

+30
-24
lines changed

10 files changed

+30
-24
lines changed

ClosedXML/ClosedXML.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Version Condition="'$(CURRENT_VERSION)' == ''">0.0.1</Version>
1313
<AssemblyVersion>$(Version)</AssemblyVersion>
1414
<FileVersion>$(Version)</FileVersion>
15-
<PackageVersion>$(Version)-Prerelease</PackageVersion>
15+
<PackageVersion>$(Version)</PackageVersion>
1616
<PackageReleaseNotes>$(LAST_COMMIT_MESSAGE)</PackageReleaseNotes>
1717
<Description>ClosedXML is a .NET library for reading, manipulating and writing Excel 2007+ (.xlsx, .xlsm) files. It aims to provide an intuitive and user-friendly interface to dealing with the underlying OpenXML API.</Description>
1818
<Copyright>MIT</Copyright>
@@ -23,7 +23,7 @@
2323
<Configurations>Debug;Release</Configurations>
2424
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2525
<SignAssembly>true</SignAssembly>
26-
<Optimize>true</Optimize>
26+
<Optimize Condition="'$(GITHUB_ACTIONS)' == 'true'">true</Optimize>
2727
<AssemblyOriginatorKeyFile>ClosedXML.snk</AssemblyOriginatorKeyFile>
2828
<DefineConstants>$(DefineConstants);RELEASE;STRONGNAME</DefineConstants>
2929
<PublishRepositoryUrl>true</PublishRepositoryUrl>

ClosedXML/Excel/Cells/XLCell.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ public XLDataType DataType
11211121
break;
11221122

11231123
case Boolean b:
1124-
_cellValue = b ? "True" : "False";
1124+
_cellValue = b ? "true" : "false";
11251125
break;
11261126

11271127
default:
@@ -1504,7 +1504,7 @@ public Boolean IsEmpty(Boolean includeFormats)
15041504

15051505
public Boolean IsEmpty(XLCellsUsedOptions options)
15061506
{
1507-
if (options.HasFlag (XLCellsUsedOptions.Contents))
1507+
if (options.HasFlag(XLCellsUsedOptions.Contents))
15081508
{
15091509
if (InnerText.Length > 0)
15101510
return false;
@@ -3096,9 +3096,11 @@ public XLCell CellRight(Int32 step)
30963096

30973097
#endregion XLCell Right
30983098

3099-
public Boolean HasFormula { get { return !String.IsNullOrWhiteSpace(FormulaA1); } }
3099+
public Boolean HasFormula
3100+
{ get { return !String.IsNullOrWhiteSpace(FormulaA1); } }
31003101

3101-
public Boolean HasArrayFormula { get { return FormulaA1.StartsWith("{"); } }
3102+
public Boolean HasArrayFormula
3103+
{ get { return FormulaA1.StartsWith("{"); } }
31023104

31033105
public IXLRangeAddress FormulaReference { get; set; }
31043106

ClosedXML/Excel/XLWorkbook_Save.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5209,6 +5209,8 @@ var r in
52095209
valueCalculated = ((int)xlCell.CachedValue).ToInvariantString();
52105210
else if (xlCell.CachedValue is double)
52115211
valueCalculated = ((double)xlCell.CachedValue).ToInvariantString();
5212+
else if (xlCell.CachedValue is bool)
5213+
valueCalculated = ((bool)xlCell.CachedValue).ToInvariantString().ToLowerInvariant();
52125214
else
52135215
valueCalculated = xlCell.CachedValue.ToString();
52145216

ClosedXML/Extensions/ObjectExtensions.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ public static string ObjectToInvariantString(this object value)
126126
case DateTime d:
127127
return d.ToString(CultureInfo.InvariantCulture);
128128

129+
case Boolean b:
130+
return b.ToString(CultureInfo.InvariantCulture).ToLowerInvariant();
131+
129132
default:
130133
return value.ToString();
131134
}

ClosedXML_Tests/Excel/CalcEngine/FormulaCachingTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,6 @@ public void CachedValueToExternalWorkbook()
358358
}
359359

360360
[Test]
361-
[Ignore("TODO Fix before marking nuget package as stable")]
362361
public void ChangingDataTypeChangesCachedValue()
363362
{
364363
using (var wb = new XLWorkbook())
@@ -381,7 +380,7 @@ public void ChangingDataTypeChangesCachedValue()
381380

382381
cell.DataType = XLDataType.Number;
383382
Assert.AreEqual(value, (double)cell.CachedValue, 1e-10);
384-
Assert.AreEqual("0.15625", cell.GetFormattedString());
383+
Assert.AreEqual("03:45", cell.GetFormattedString());
385384

386385
cell.DataType = XLDataType.TimeSpan;
387386
Assert.AreEqual(TimeSpan.FromDays(value), (TimeSpan)cell.CachedValue);

ClosedXML_Tests/Excel/Cells/XLCellTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
using ClosedXML.Excel;
2+
using NUnit.Framework;
13
using System;
24
using System.Collections.Generic;
35
using System.Data;
46
using System.Globalization;
57
using System.IO;
68
using System.Linq;
79
using System.Threading;
8-
using ClosedXML.Excel;
9-
using NUnit.Framework;
1010

1111
namespace ClosedXML_Tests
1212
{
@@ -476,7 +476,7 @@ public void TryGetValue_Boolean_False()
476476
public void TryGetValue_Boolean_Good()
477477
{
478478
var ws = new XLWorkbook().Worksheets.Add("Sheet1");
479-
var cell = ws.Cell("A1").SetValue("True");
479+
var cell = ws.Cell("A1").SetValue("true");
480480
var success = cell.TryGetValue(out bool outValue);
481481
Assert.IsTrue(success);
482482
Assert.IsTrue(outValue);

ClosedXML_Tests/Excel/Globalization/GlobalizationTests.cs

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@ namespace ClosedXML_Tests.Excel.Globalization
88
[TestFixture]
99
public class GlobalizationTests
1010
{
11-
[Ignore("TODO Fix before marking nuget package as stable")]
1211
[Test]
13-
[TestCase("A1*10", 1230d)]
14-
[TestCase("A1/10", 12.3)]
15-
[TestCase("A1&\" cells\"", "123 cells")]
16-
[TestCase("A1&\"000\"", "123000")]
17-
[TestCase("ISNUMBER(A1)", true)]
18-
[TestCase("ISBLANK(A1)", false)]
19-
[TestCase("DATE(2018,1,28)", 43128d)]
20-
public void LoadFormulaCachedValue(string formula, object expectedValue)
12+
[TestCase("A1*10", 1230d, "1230")]
13+
[TestCase("A1/10", 12.3, "12.3")]
14+
[TestCase("A1&\" cells\"", "123 cells", "123 cells")]
15+
[TestCase("A1&\"000\"", "123000", "123000")]
16+
[TestCase("ISNUMBER(A1)", true, "true")]
17+
[TestCase("ISBLANK(A1)", false, "false")]
18+
[TestCase("DATE(2018,1,28)", 43128d, "43128")]
19+
public void LoadFormulaCachedValue(string formula, object expectedValue, string expectedInnerText)
2120
{
2221
Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("ru-RU");
2322

@@ -37,9 +36,11 @@ public void LoadFormulaCachedValue(string formula, object expectedValue)
3736
using (XLWorkbook book2 = new XLWorkbook(ms))
3837
{
3938
var ws = book2.Worksheet(1);
40-
var storedValueA2 = ws.Cell("A2").CachedValue;
41-
Assert.IsFalse(ws.Cell("A2").NeedsRecalculation);
42-
Assert.AreEqual(expectedValue, storedValueA2);
39+
var cellA2 = (XLCell)ws.Cell("A2");
40+
41+
Assert.That(cellA2.InnerText, Is.EqualTo(expectedInnerText));
42+
Assert.That(cellA2.CachedValue, Is.EqualTo(expectedValue));
43+
Assert.That(cellA2.NeedsRecalculation, Is.False);
4344
}
4445
}
4546
}

ClosedXML_Tests/Excel/Loading/LoadingTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ public void CanRoundTripSheetProtectionForObjects()
334334
}
335335

336336
[Test]
337-
[Ignore("TODO Fix before marking nuget package as stable")]
338337
[TestCase("A1*10", 1230)]
339338
[TestCase("A1/10", 12.3)]
340339
[TestCase("A1&\" cells\"", "123 cells")]
538 Bytes
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)