Skip to content

Commit f2eb701

Browse files
traf72traf72
committed
Migrate to the newest version of Closed.XML
1 parent bc8e5f8 commit f2eb701

File tree

54 files changed

+86
-123
lines changed

Some content is hidden

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

54 files changed

+86
-123
lines changed

‎ExcelReportGenerator.Samples/ExcelReportGenerator.Samples.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net6.0-windows</TargetFramework>
66
<UseWindowsForms>true</UseWindowsForms>
77
<LangVersion>latest</LangVersion>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="SimpleInjector" Version="4.9.2" />
12-
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
11+
<PackageReference Include="SimpleInjector" Version="5.4.1" />
12+
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎ExcelReportGenerator.Samples/Program.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ private static void Main()
1414
{
1515
Ioc.Container = new Container();
1616
Ioc.Container.Register<DataProvider>(Lifestyle.Singleton);
17+
Ioc.Container.Options.ResolveUnregisteredConcreteTypes = true;
1718

1819
Application.EnableVisualStyles();
1920
Application.SetCompatibleTextRenderingDefault(false);

‎ExcelReportGenerator.Tests/CustomAsserts/ExcelAssert.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ public static void AreWorksheetsContentEquals(IXLWorksheet expected, IXLWorkshee
2929
if (expectedCell.HasFormula)
3030
{
3131
Assert.AreEqual(expectedCell.FormulaA1, actualCell.FormulaA1, $"Cell {expectedCell.Address} FormulaA1 failed.");
32-
//// For some reason sometimes the formulas "FormulaR1C1" are different although the formulas "FormulaA1" are match
33-
//Assert.AreEqual(expectedCell.FormulaR1C1, actualCell.FormulaR1C1, $"Cell {expectedCell.Address} FormulaR1C1 failed.");
32+
Assert.AreEqual(expectedCell.FormulaR1C1, actualCell.FormulaR1C1, $"Cell {expectedCell.Address} FormulaR1C1 failed.");
3433
Assert.AreEqual(expectedCell.FormulaReference, actualCell.FormulaReference, $"Cell {expectedCell.Address} FormulaReference failed.");
3534
}
3635
else
@@ -42,7 +41,7 @@ public static void AreWorksheetsContentEquals(IXLWorksheet expected, IXLWorkshee
4241
AreColumnsEquals(expectedCell.WorksheetColumn(), actualCell.WorksheetColumn(), $"Column {actualCell.WorksheetColumn().RangeAddress} {{0}} failed.");
4342
AreRowEquals(expectedCell.WorksheetRow(), actualCell.WorksheetRow(), $"Row {actualCell.WorksheetRow().RangeAddress} {{0}} failed.");
4443
AreCellsStyleEquals(expectedCell.Style, actualCell.Style, $"Cell {expectedCell.Address} Style {{0}} failed.");
45-
AreCellsCommentEquals(expectedCell.Comment, actualCell.Comment, $"Cell {expectedCell.Address} Comment {{0}} failed.");
44+
AreCellsCommentEquals(expectedCell.GetComment(), actualCell.GetComment(), $"Cell {expectedCell.Address} Comment {{0}} failed.");
4645
}
4746

4847
AreMergedRangesEquals(expected.MergedRanges, actual.MergedRanges);

‎ExcelReportGenerator.Tests/Excel/ExcelHelperTest.cs‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ public void TestCopyRange()
194194
range.LastCell().Style.Border.SetBottomBorder(XLBorderStyleValues.Thin);
195195

196196
ws.Cell(11, 9).Value = DateTime.Now;
197-
ws.Cell(11, 9).DataType = XLDataType.DateTime;
198197

199198
IXLRange newRange = ExcelHelper.CopyRange(range, ws.Cell(10, 8));
200199

@@ -211,7 +210,8 @@ public void TestCopyRange()
211210
Assert.AreEqual("RangeEnd", newRange.LastCell().Value.ToString());
212211
Assert.AreEqual(XLBorderStyleValues.Thin, newRange.FirstCell().Style.Border.TopBorder);
213212
Assert.AreEqual(XLBorderStyleValues.Thin, newRange.LastCell().Style.Border.BottomBorder);
214-
Assert.AreEqual(XLDataType.Text, ws.Cell(11, 9).DataType);
213+
Assert.AreEqual(XLDataType.Blank, ws.Cell(11, 9).DataType);
214+
Assert.AreEqual(string.Empty, ws.Cell(11, 9).Value.ToString());
215215

216216
range.Clear();
217217
IXLRange newRange2 = ExcelHelper.CopyRange(newRange, ws.Cell(11, 8));
@@ -248,8 +248,6 @@ public void TestCopyNamedRange()
248248
range.LastCell().Style.Border.SetBottomBorder(XLBorderStyleValues.Thin);
249249

250250
ws.Cell(11, 9).Value = DateTime.Now;
251-
ws.Cell(11, 9).DataType = XLDataType.DateTime;
252-
//ws.Cell(11, 9).DataType = XLCellValues.DateTime;
253251

254252
IXLNamedRange copiedNamedRange = ExcelHelper.CopyNamedRange(namedRange, ws.Cell(10, 8), "Copy");
255253
IXLRange newRange = copiedNamedRange.Ranges.ElementAt(0);
@@ -268,8 +266,8 @@ public void TestCopyNamedRange()
268266
Assert.AreEqual("RangeEnd", newRange.LastCell().Value.ToString());
269267
Assert.AreEqual(XLBorderStyleValues.Thin, newRange.FirstCell().Style.Border.TopBorder);
270268
Assert.AreEqual(XLBorderStyleValues.Thin, newRange.LastCell().Style.Border.BottomBorder);
271-
Assert.AreEqual(XLDataType.Text, ws.Cell(11, 9).DataType);
272-
//Assert.AreEqual(XLCellValues.Text, ws.Cell(11, 9).DataType);
269+
Assert.AreEqual(XLDataType.Blank, ws.Cell(11, 9).DataType);
270+
Assert.AreEqual(string.Empty, ws.Cell(11, 9).Value.ToString());
273271

274272
range.Clear();
275273
IXLNamedRange copiedNamedRange2 = ExcelHelper.CopyNamedRange(copiedNamedRange, ws.Cell(11, 8), "Copy2");
@@ -750,8 +748,6 @@ public void TestMoveRange()
750748
range.LastCell().Style.Border.SetBottomBorder(XLBorderStyleValues.Thin);
751749

752750
ws.Cell(11, 9).Value = DateTime.Now;
753-
ws.Cell(11, 9).DataType = XLDataType.DateTime;
754-
//ws.Cell(11, 9).DataType = XLCellValues.DateTime;
755751

756752
IXLRange movedRange = ExcelHelper.MoveRange(range, ws.Cell(10, 8));
757753

@@ -768,7 +764,8 @@ public void TestMoveRange()
768764
Assert.AreEqual("RangeEnd", movedRange.LastCell().Value.ToString());
769765
Assert.AreEqual(XLBorderStyleValues.Thin, movedRange.FirstCell().Style.Border.TopBorder);
770766
Assert.AreEqual(XLBorderStyleValues.Thin, movedRange.LastCell().Style.Border.BottomBorder);
771-
Assert.AreEqual(XLDataType.Text, ws.Cell(11, 9).DataType);
767+
Assert.AreEqual(XLDataType.Blank, ws.Cell(11, 9).DataType);
768+
Assert.AreEqual(string.Empty, ws.Cell(11, 9).Value.ToString());
772769

773770
IXLRange movedRange2 = ExcelHelper.MoveRange(movedRange, ws.Cell(11, 8));
774771

@@ -804,7 +801,6 @@ public void TestMoveNamedRange()
804801
range.LastCell().Style.Border.SetBottomBorder(XLBorderStyleValues.Thin);
805802

806803
ws.Cell(11, 9).Value = DateTime.Now;
807-
ws.Cell(11, 9).DataType = XLDataType.DateTime;
808804

809805
IXLNamedRange movedNamedRange = ExcelHelper.MoveNamedRange(namedRange, ws.Cell(10, 8));
810806
IXLRange movedRange = movedNamedRange.Ranges.ElementAt(0);
@@ -824,7 +820,8 @@ public void TestMoveNamedRange()
824820
Assert.AreEqual("RangeEnd", movedRange.LastCell().Value.ToString());
825821
Assert.AreEqual(XLBorderStyleValues.Thin, movedRange.FirstCell().Style.Border.TopBorder);
826822
Assert.AreEqual(XLBorderStyleValues.Thin, movedRange.LastCell().Style.Border.BottomBorder);
827-
Assert.AreEqual(XLDataType.Text, ws.Cell(11, 9).DataType);
823+
Assert.AreEqual(XLDataType.Blank, ws.Cell(11, 9).DataType);
824+
Assert.AreEqual(string.Empty, ws.Cell(11, 9).Value.ToString());
828825

829826
IXLNamedRange movedNamedRange2 = ExcelHelper.MoveNamedRange(movedNamedRange, ws.Cell(11, 8));
830827
IXLRange movedRange2 = movedNamedRange2.Ranges.ElementAt(0);

‎ExcelReportGenerator.Tests/ExcelReportGenerator.Tests.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
<LangVersion>8</LangVersion>
4+
<TargetFramework>net7.0</TargetFramework>
5+
<LangVersion>latest</LangVersion>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.3" />
11-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.3" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
14-
<PackageReference Include="NSubstitute" Version="4.2.1" />
15-
<PackageReference Include="NUnit" Version="3.12.0" />
16-
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
17-
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
14+
<PackageReference Include="NSubstitute" Version="5.0.0" />
15+
<PackageReference Include="NUnit" Version="3.13.3" />
16+
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
17+
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎ExcelReportGenerator.Tests/Rendering/Panels/ExcelPanels/ExcelDataSourcePanelTest.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ public void TestGroupResultVertical()
124124
ws.Cell(2, 3).Value = "Orange";
125125
ws.Cell(3, 3).Value = "Apple";
126126
ws.Cell(4, 3).Value = "Apple";
127-
ws.Cell(5, 3).Value = string.Empty;
128-
ws.Cell(6, 3).Value = null;
127+
ws.Cell(5, 3).Value = Blank.Value;
128+
ws.Cell(6, 3).Value = Blank.Value;
129129
ws.Cell(8, 3).Value = "Pear";
130130
ws.Cell(9, 3).Value = "Pear";
131131

132132
ws.Cell(2, 4).Value = true;
133133
ws.Cell(3, 4).Value = true;
134134
ws.Cell(4, 4).Value = 1;
135-
ws.Cell(5, 4).Value = null;
135+
ws.Cell(5, 4).Value = Blank.Value;
136136
ws.Cell(7, 4).Value = 0;
137137
ws.Cell(8, 4).Value = false;
138138
ws.Cell(9, 4).Value = false;
@@ -152,7 +152,7 @@ public void TestGroupResultVertical()
152152
ws.Cell(3, 6).Value = new DateTime(2018, 2, 20);
153153
ws.Cell(4, 6).Value = new DateTime(2018, 2, 20);
154154
ws.Cell(5, 6).Value = new DateTime(2018, 2, 18);
155-
ws.Cell(6, 6).Value = null;
155+
ws.Cell(6, 6).Value = Blank.Value;
156156
ws.Cell(8, 6).Value = new DateTime(2018, 2, 21);
157157
ws.Cell(9, 6).Value = new DateTime(2018, 2, 21).ToString();
158158

@@ -191,15 +191,15 @@ public void TestGroupResultHorizontal()
191191
ws.Cell(3, 2).Value = "Orange";
192192
ws.Cell(3, 3).Value = "Apple";
193193
ws.Cell(3, 4).Value = "Apple";
194-
ws.Cell(3, 5).Value = string.Empty;
195-
ws.Cell(3, 6).Value = null;
194+
ws.Cell(3, 5).Value = Blank.Value;
195+
ws.Cell(3, 6).Value = Blank.Value;
196196
ws.Cell(3, 8).Value = "Pear";
197197
ws.Cell(3, 9).Value = "Pear";
198198

199199
ws.Cell(4, 2).Value = true;
200200
ws.Cell(4, 3).Value = true;
201201
ws.Cell(4, 4).Value = 1;
202-
ws.Cell(4, 5).Value = null;
202+
ws.Cell(4, 5).Value = Blank.Value;
203203
ws.Cell(4, 7).Value = 0;
204204
ws.Cell(4, 8).Value = false;
205205
ws.Cell(4, 9).Value = false;
@@ -219,7 +219,7 @@ public void TestGroupResultHorizontal()
219219
ws.Cell(6, 3).Value = new DateTime(2018, 2, 20);
220220
ws.Cell(6, 4).Value = new DateTime(2018, 2, 20);
221221
ws.Cell(6, 5).Value = new DateTime(2018, 2, 18);
222-
ws.Cell(6, 6).Value = null;
222+
ws.Cell(6, 6).Value = Blank.Value;
223223
ws.Cell(6, 8).Value = new DateTime(2018, 2, 21);
224224
ws.Cell(6, 9).Value = new DateTime(2018, 2, 21).ToString();
225225

@@ -258,7 +258,7 @@ public void TestIfGroupByPropertyIsEmpty()
258258
ws.Cell(3, 3).Value = "Apple";
259259
ws.Cell(4, 3).Value = "Apple";
260260
ws.Cell(5, 3).Value = string.Empty;
261-
ws.Cell(6, 3).Value = null;
261+
ws.Cell(6, 3).Value = Blank.Value;
262262
ws.Cell(8, 3).Value = "Pear";
263263
ws.Cell(9, 3).Value = "Pear";
264264

‎ExcelReportGenerator.Tests/Rendering/Panels/ExcelPanels/PanelRenderTests/DataSourcePanelRenderTests/DataSourcePanelEmptyIEnumerableRenderTest.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ public void TestRenderEmptyIEnumerableVerticalCellsShift()
2424
range.Style.Border.SetLeftBorder(XLBorderStyleValues.Thin);
2525

2626
ws.Cell(4, 3).Style.Border.SetTopBorder(XLBorderStyleValues.Thin);
27-
ws.Cell(2, 4).DataType = XLDataType.Number;
28-
//ws.Cell(2, 4).DataType = XLCellValues.Number;
2927

3028
ws.Cell(2, 2).Value = "{di:Name}";
3129
ws.Cell(2, 3).Value = "{di:Date}";
@@ -69,8 +67,6 @@ public void TestRenderEmptyIEnumerableVerticalRowsShift()
6967
range.Style.Border.SetLeftBorder(XLBorderStyleValues.Thin);
7068

7169
ws.Cell(4, 3).Style.Border.SetTopBorder(XLBorderStyleValues.Thin);
72-
ws.Cell(2, 4).DataType = XLDataType.Number;
73-
//ws.Cell(2, 4).DataType = XLCellValues.Number;
7470

7571
ws.Cell(2, 2).Value = "{di:Name}";
7672
ws.Cell(2, 3).Value = "{di:Date}";
@@ -117,8 +113,6 @@ public void TestRenderEmptyIEnumerableVerticalNoShift()
117113
range.Style.Border.SetLeftBorder(XLBorderStyleValues.Thin);
118114

119115
ws.Cell(4, 3).Style.Border.SetTopBorder(XLBorderStyleValues.Thin);
120-
ws.Cell(2, 4).DataType = XLDataType.Number;
121-
//ws.Cell(2, 4).DataType = XLCellValues.Number;
122116

123117
ws.Cell(2, 2).Value = "{di:Name}";
124118
ws.Cell(2, 3).Value = "{di:Date}";
@@ -165,8 +159,6 @@ public void TestRenderEmptyIEnumerableHorizontalCellsShift()
165159
range.Style.Border.SetLeftBorder(XLBorderStyleValues.Thin);
166160

167161
ws.Cell(2, 6).Style.Border.SetLeftBorder(XLBorderStyleValues.Thin);
168-
ws.Cell(2, 4).DataType = XLDataType.Number;
169-
//ws.Cell(2, 4).DataType = XLCellValues.Number;
170162

171163
ws.Cell(2, 2).Value = "{di:Name}";
172164
ws.Cell(2, 3).Value = "{di:Date}";
@@ -213,8 +205,6 @@ public void TestRenderEmptyIEnumerableHorizontalRowsShift()
213205
range.Style.Border.SetLeftBorder(XLBorderStyleValues.Thin);
214206

215207
ws.Cell(2, 6).Style.Border.SetLeftBorder(XLBorderStyleValues.Thin);
216-
ws.Cell(2, 4).DataType = XLDataType.Number;
217-
//ws.Cell(2, 4).DataType = XLCellValues.Number;
218208

219209
ws.Cell(2, 2).Value = "{di:Name}";
220210
ws.Cell(2, 3).Value = "{di:Date}";
@@ -262,8 +252,6 @@ public void TestRenderEmptyIEnumerableHorizontalNoShift()
262252
range.Style.Border.SetLeftBorder(XLBorderStyleValues.Thin);
263253

264254
ws.Cell(2, 6).Style.Border.SetLeftBorder(XLBorderStyleValues.Thin);
265-
ws.Cell(2, 4).DataType = XLDataType.Number;
266-
//ws.Cell(2, 4).DataType = XLCellValues.Number;
267255

268256
ws.Cell(2, 2).Value = "{di:Name}";
269257
ws.Cell(2, 3).Value = "{di:Date}";

‎ExcelReportGenerator.Tests/Rendering/Panels/ExcelPanels/PanelRenderTests/DataSourcePanelRenderTests/DataSourcePanelIEnumerableRenderTest.cs‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ public void TestRenderIEnumerableVerticalCellsShift()
2525
range.FirstCell().Style.Border.SetBottomBorder(XLBorderStyleValues.Thin);
2626
range.FirstCell().Style.Border.SetLeftBorder(XLBorderStyleValues.Thin);
2727

28-
ws.Cell(2, 4).DataType = XLDataType.Number;
29-
//ws.Cell(2, 4).DataType = XLCellValues.Number;
30-
3128
ws.Cell(2, 2).Value = "{m:Concat(di:Name, m:Format(di:Date, dd.MM.yyyy))}";
3229
ws.Cell(2, 3).Value = "{di:Date}";
3330
ws.Cell(2, 4).Value = "{m:Multiply(di:Sum, 5)}";
@@ -68,9 +65,6 @@ public void TestRenderIEnumerableVerticalRowsShift()
6865
range.FirstCell().Style.Border.SetBottomBorder(XLBorderStyleValues.Thin);
6966
range.FirstCell().Style.Border.SetLeftBorder(XLBorderStyleValues.Thin);
7067

71-
ws.Cell(2, 4).DataType = XLDataType.Number;
72-
//ws.Cell(2, 4).DataType = XLCellValues.Number;
73-
7468
ws.Cell(2, 2).Value = "{di:Name}";
7569
ws.Cell(2, 3).Value = "{di:Date}";
7670
ws.Cell(2, 4).Value = "{di:Sum}";
@@ -116,9 +110,6 @@ public void TestRenderIEnumerableVerticalNoShift()
116110

117111
ws.Cell(3, 5).Style.Border.SetBottomBorder(XLBorderStyleValues.Thin);
118112

119-
ws.Cell(2, 4).DataType = XLDataType.Number;
120-
//ws.Cell(2, 4).DataType = XLCellValues.Number;
121-
122113
ws.Cell(2, 2).Value = "{di:Name}";
123114
ws.Cell(2, 3).Value = "{di:Date}";
124115
ws.Cell(2, 4).Value = "{di:Sum}";
@@ -173,9 +164,6 @@ public void TestRenderIEnumerableHorizontalCellsShift()
173164
range.FirstCell().Style.Border.SetBottomBorder(XLBorderStyleValues.Thin);
174165
range.FirstCell().Style.Border.SetLeftBorder(XLBorderStyleValues.Thin);
175166

176-
ws.Cell(2, 4).DataType = XLDataType.Number;
177-
//ws.Cell(2, 4).DataType = XLCellValues.Number;
178-
179167
ws.Cell(2, 2).Value = "{di:Name}";
180168
ws.Cell(2, 3).Value = "{di:Date}";
181169
ws.Cell(2, 4).Value = "{di:Sum}";
@@ -219,9 +207,6 @@ public void TestRenderIEnumerableHorizontalRowsShift()
219207
range.FirstCell().Style.Border.SetBottomBorder(XLBorderStyleValues.Thin);
220208
range.FirstCell().Style.Border.SetLeftBorder(XLBorderStyleValues.Thin);
221209

222-
ws.Cell(2, 4).DataType = XLDataType.Number;
223-
//ws.Cell(2, 4).DataType = XLCellValues.Number;
224-
225210
ws.Cell(2, 2).Value = "{di:Name}";
226211
ws.Cell(2, 3).Value = "{di:Date}";
227212
ws.Cell(2, 4).Value = "{di:Sum}";
@@ -266,9 +251,6 @@ public void TestRenderIEnumerableHorizontalNoShift()
266251
range.FirstCell().Style.Border.SetBottomBorder(XLBorderStyleValues.Thin);
267252
range.FirstCell().Style.Border.SetLeftBorder(XLBorderStyleValues.Thin);
268253

269-
ws.Cell(2, 4).DataType = XLDataType.Number;
270-
//ws.Cell(2, 4).DataType = XLCellValues.Number;
271-
272254
ws.Cell(2, 2).Value = "{di:Name}";
273255
ws.Cell(2, 3).Value = "{di:Date}";
274256
ws.Cell(2, 4).Value = "{di:Sum}";

0 commit comments

Comments
 (0)