Skip to content

Commit 04f2633

Browse files
michelebastionemichelebastione
committed
Adding .NET 10 target framework
Updating packages, tests and workflows where necessary
1 parent c09cb8c commit 04f2633

File tree

13 files changed

+124
-119
lines changed

13 files changed

+124
-119
lines changed

‎.github/workflows/benchmark.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ jobs:
1818
- name: Setup .NET
1919
uses: actions/setup-dotnet@v4
2020
with:
21-
dotnet-version: 9.0.x
21+
dotnet-version: 10.0.x
2222
- name: Restore dependencies
2323
run: dotnet restore
2424
working-directory: ./benchmarks/MiniExcel.Benchmarks
2525
- name: Build
2626
run: dotnet build --no-restore
2727
working-directory: ./benchmarks/MiniExcel.Benchmarks
2828
- name: Benchmark
29-
run: dotnet run -c Release -f net9.0
29+
run: dotnet run -c Release -f net10.0
3030
working-directory: ./benchmarks/MiniExcel.Benchmarks
3131
env:
3232
BenchmarkMode: Automatic
@@ -48,15 +48,15 @@ jobs:
4848
- name: Setup .NET
4949
uses: actions/setup-dotnet@v4
5050
with:
51-
dotnet-version: 9.0.x
51+
dotnet-version: 10.0.x
5252
- name: Restore dependencies
5353
run: dotnet restore
5454
working-directory: ./benchmarks/MiniExcel.Benchmarks
5555
- name: Build
5656
run: dotnet build --no-restore
5757
working-directory: ./benchmarks/MiniExcel.Benchmarks
5858
- name: Benchmark
59-
run: dotnet run -c Release -f net9.0
59+
run: dotnet run -c Release -f net10.0
6060
working-directory: ./benchmarks/MiniExcel.Benchmarks
6161
env:
6262
BenchmarkMode: Automatic
@@ -78,15 +78,15 @@ jobs:
7878
- name: Setup .NET
7979
uses: actions/setup-dotnet@v4
8080
with:
81-
dotnet-version: 9.0.x
81+
dotnet-version: 10.0.x
8282
- name: Restore dependencies
8383
run: dotnet restore
8484
working-directory: ./benchmarks/MiniExcel.Benchmarks
8585
- name: Build
8686
run: dotnet build --no-restore
8787
working-directory: ./benchmarks/MiniExcel.Benchmarks
8888
- name: Benchmark
89-
run: dotnet run -c Release -f net9.0
89+
run: dotnet run -c Release -f net10.0
9090
working-directory: ./benchmarks/MiniExcel.Benchmarks
9191
env:
9292
BenchmarkMode: Automatic

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Setup .NET
4444
uses: actions/setup-dotnet@v4
4545
with:
46-
dotnet-version: 8.0.x
46+
dotnet-version: 10.0.x
4747

4848
- name: Restore dependencies
4949
run: dotnet restore
@@ -72,7 +72,7 @@ jobs:
7272
# uses a compiled language
7373

7474
- name: Manual build
75-
run: dotnet build MiniExcel.slnx --no-restore --configuration Release
75+
run: dotnet build MiniExcel.slnx -c Release -f net10.0
7676

7777
- name: Perform CodeQL Analysis
7878
uses: github/codeql-action/analyze@v3

‎MiniExcel.slnx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<Project Path="benchmarks\MiniExcel.Benchmarks\MiniExcel.Benchmarks.csproj" />
44
</Folder>
55
<Folder Name="/Docs and settings/">
6+
<File Path=".editorconfig" />
67
<File Path=".gitattributes" />
78
<File Path=".gitignore" />
89
<File Path="appveyor.yml" />
@@ -13,9 +14,7 @@
1314
<File Path="README.zh-CN.md" />
1415
<File Path=".github\workflows\benchmark.yml" />
1516
<File Path=".github\workflows\codeql-analysis.yml" />
16-
<File Path="src\Directory.Build.props" />
1717
<File Path="README-V2.md" />
18-
<File Path="src\Directory.Packages.props" />
1918
<File Path="miniexcel.publickey" />
2019
<File Path="src\icon.png" />
2120
<File Path="V2-Upgrade-Notes.md" />
@@ -26,9 +25,11 @@
2625
<File Path="docs\README.zh-Hant.md" />
2726
</Folder>
2827
<Folder Name="/src/">
28+
<File Path="src\Directory.Build.props" />
29+
<File Path="src\Directory.Packages.props" />
2930
<Project Path="src\MiniExcel.Core\MiniExcel.Core.csproj" />
3031
<Project Path="src\MiniExcel.Csv\MiniExcel.Csv.csproj" />
31-
<Project Path="src\MiniExcel\MiniExcel.csproj" Type="Classic C#" />
32+
<Project Path="src\MiniExcel\MiniExcel.csproj" />
3233
</Folder>
3334
<Folder Name="/tests/">
3435
<Project Path="tests/MiniExcel.Csv.Tests/MiniExcel.Csv.Tests.csproj" />

‎benchmarks/MiniExcel.Benchmarks/MiniExcel.Benchmarks.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
66
<Nullable>enable</Nullable>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<LangVersion>latest</LangVersion>
@@ -11,13 +11,13 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="BenchmarkDotNet" Version="0.15.0" />
14+
<PackageReference Include="BenchmarkDotNet" Version="0.15.6" />
1515
<PackageReference Include="ClosedXML" Version="0.105.0" />
1616
<PackageReference Include="ClosedXML.Report" Version="0.2.12" />
1717
<PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" />
1818
<PackageReference Include="EPPlus" Version="7.7.2" />
1919
<PackageReference Include="ExcelDataReader" Version="3.7.0" />
20-
<PackageReference Include="NPOI" Version="2.7.3" />
20+
<PackageReference Include="NPOI" Version="2.7.5" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
55
<Version>2.0.0-preview.1</Version>
66
<Nullable>enable</Nullable>
77
<ImplicitUsings>enable</ImplicitUsings>
8-
<LangVersion>13</LangVersion>
8+
<LangVersion>14</LangVersion>
99
</PropertyGroup>
1010

1111
<PropertyGroup>

‎src/Directory.Packages.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project>
22

33
<ItemGroup>
4-
<PackageReference Include="Zomp.SyncMethodGenerator" Version="1.6.2" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
4+
<PackageReference Include="Zomp.SyncMethodGenerator" Version="1.6.13" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"/>
55
</ItemGroup>
66

77
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
8-
<PackageReference Include="Microsoft.Bcl.Memory" Version="9.0.0" />
9-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
10-
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
8+
<PackageReference Include="Microsoft.Bcl.Memory" Version="10.0.0"/>
9+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0"/>
10+
<PackageReference Include="System.IO.Compression" Version="4.3.0"/>
1111
</ItemGroup>
1212

1313
<ItemGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
14-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
14+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
1515
</ItemGroup>
1616

1717
</Project>

‎tests/MiniExcel.Core.Tests/MiniExcel.Core.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7+
<NoWarn>$(NoWarn);IDE0017;IDE0034;IDE0037;IDE0039;IDE0042;IDE0044;IDE0051;IDE0052;IDE0059;IDE0060;IDE0063;IDE1006;xUnit1004;CA1806;CA1816;CA1822;CA1825;CA1849;CA2000;CA2007;CA2208</NoWarn>
78

89
<IsPackable>false</IsPackable>
10+
<IsTestProject>true</IsTestProject>
911
<SignAssembly>true</SignAssembly>
1012
<AssemblyOriginatorKeyFile>..\..\src\miniexcel.snk</AssemblyOriginatorKeyFile>
11-
<NoWarn>$(NoWarn);IDE0017;IDE0034;IDE0037;IDE0039;IDE0042;IDE0044;IDE0051;IDE0052;IDE0059;IDE0060;IDE0063;IDE1006;xUnit1004;CA1806;CA1816;CA1822;CA1825;CA1849;CA2000;CA2007;CA2208</NoWarn>
1213
<RootNamespace>MiniExcelLib.Tests</RootNamespace>
1314
</PropertyGroup>
1415

@@ -18,11 +19,11 @@
1819
<PackageReference Include="ExcelDataReader" Version="3.7.0" />
1920
<PackageReference Include="ExcelDataReader.DataSet" Version="3.7.0" />
2021
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
21-
<PackageReference Include="NPOI" Version="2.7.3" />
22+
<PackageReference Include="NPOI" Version="2.7.5" />
2223

23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
24-
<PackageReference Include="xunit" Version="2.5.3" />
25-
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
25+
<PackageReference Include="xunit" Version="2.9.3" />
26+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2627
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2728
<PrivateAssets>all</PrivateAssets>
2829
</PackageReference>

‎tests/MiniExcel.Core.Tests/MiniExcelIssueTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3255,7 +3255,7 @@ public void TestIssue763()
32553255
var path = PathHelper.GetFile("xlsx/TestIssue763.xlsx");
32563256
var rows = _excelImporter.QueryRange(path, startCell: "A3", endCell: "J3").ToArray();
32573257
Assert.Equal("A3", rows[0].A);
3258-
Assert.Equal(null, rows[0].J);
3258+
Assert.Null(rows[0].J);
32593259
}
32603260

32613261
/// <summary>
@@ -3350,8 +3350,8 @@ public void TestIssue771()
33503350
var rows = _excelImporter.Query(path.FilePath).ToList();
33513351

33523352
Assert.Equal("2025-1", rows[2].B);
3353-
Assert.Equal(null, rows[3].B);
3354-
Assert.Equal(null, rows[4].B);
3353+
Assert.Null(rows[3].B);
3354+
Assert.Null(rows[4].B);
33553355
Assert.Equal("2025-2", rows[5].B);
33563356
return;
33573357

@@ -3670,7 +3670,7 @@ public void TestIssue809()
36703670
var rows = _excelImporter.Query(path).ToList();
36713671

36723672
Assert.Equal(3, rows.Count);
3673-
Assert.Equal(null, rows[0].A);
3673+
Assert.Null(rows[0].A);
36743674
Assert.Equal(2, rows[2].B);
36753675
}
36763676

‎tests/MiniExcel.Core.Tests/MiniExcelOpenXmlTests.cs‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -196,28 +196,28 @@ public void CenterEmptyRowsQueryTest()
196196
Assert.Equal("d", rows[0].D);
197197

198198
Assert.Equal(1, rows[1].A);
199-
Assert.Equal(null, rows[1].B);
199+
Assert.Null(rows[1].B);
200200
Assert.Equal(3, rows[1].C);
201-
Assert.Equal(null, rows[1].D);
201+
Assert.Null(rows[1].D);
202202

203-
Assert.Equal(null, rows[2].A);
203+
Assert.Null(rows[2].A);
204204
Assert.Equal(2, rows[2].B);
205-
Assert.Equal(null, rows[2].C);
205+
Assert.Null(rows[2].C);
206206
Assert.Equal(4, rows[2].D);
207207

208-
Assert.Equal(null, rows[3].A);
209-
Assert.Equal(null, rows[3].B);
210-
Assert.Equal(null, rows[3].C);
211-
Assert.Equal(null, rows[3].D);
208+
Assert.Null(rows[3].A);
209+
Assert.Null(rows[3].B);
210+
Assert.Null(rows[3].C);
211+
Assert.Null(rows[3].D);
212212

213213
Assert.Equal(1, rows[4].A);
214-
Assert.Equal(null, rows[4].B);
214+
Assert.Null(rows[4].B);
215215
Assert.Equal(3, rows[4].C);
216-
Assert.Equal(null, rows[4].D);
216+
Assert.Null(rows[4].D);
217217

218-
Assert.Equal(null, rows[5].A);
218+
Assert.Null(rows[5].A);
219219
Assert.Equal(2, rows[5].B);
220-
Assert.Equal(null, rows[5].C);
220+
Assert.Null(rows[5].C);
221221
Assert.Equal(4, rows[5].D);
222222
}
223223

@@ -226,28 +226,28 @@ public void CenterEmptyRowsQueryTest()
226226
var rows = _excelImporter.Query(stream, useHeaderRow: true).ToList();
227227

228228
Assert.Equal(1, rows[0].a);
229-
Assert.Equal(null, rows[0].b);
229+
Assert.Null(rows[0].b);
230230
Assert.Equal(3, rows[0].c);
231-
Assert.Equal(null, rows[0].d);
231+
Assert.Null(rows[0].d);
232232

233-
Assert.Equal(null, rows[1].a);
233+
Assert.Null(rows[1].a);
234234
Assert.Equal(2, rows[1].b);
235-
Assert.Equal(null, rows[1].c);
235+
Assert.Null(rows[1].c);
236236
Assert.Equal(4, rows[1].d);
237237

238-
Assert.Equal(null, rows[2].a);
239-
Assert.Equal(null, rows[2].b);
240-
Assert.Equal(null, rows[2].c);
241-
Assert.Equal(null, rows[2].d);
238+
Assert.Null(rows[2].a);
239+
Assert.Null(rows[2].b);
240+
Assert.Null(rows[2].c);
241+
Assert.Null(rows[2].d);
242242

243243
Assert.Equal(1, rows[3].a);
244-
Assert.Equal(null, rows[3].b);
244+
Assert.Null(rows[3].b);
245245
Assert.Equal(3, rows[3].c);
246-
Assert.Equal(null, rows[3].d);
246+
Assert.Null(rows[3].d);
247247

248-
Assert.Equal(null, rows[4].a);
248+
Assert.Null(rows[4].a);
249249
Assert.Equal(2, rows[4].b);
250-
Assert.Equal(null, rows[4].c);
250+
Assert.Null(rows[4].c);
251251
Assert.Equal(4, rows[4].d);
252252
}
253253
}
@@ -259,15 +259,15 @@ public void TestEmptyRowsQuerySelfClosingTag()
259259
using var stream = File.OpenRead(path);
260260
var rows = _excelImporter.Query(stream).ToList();
261261

262-
Assert.Equal(null, rows[0].A);
262+
Assert.Null(rows[0].A);
263263
Assert.Equal(1, rows[1].A);
264-
Assert.Equal(null, rows[2].A);
264+
Assert.Null(rows[2].A);
265265
Assert.Equal(2, rows[3].A);
266-
Assert.Equal(null, rows[4].A);
267-
Assert.Equal(null, rows[5].A);
268-
Assert.Equal(null, rows[6].A);
269-
Assert.Equal(null, rows[7].A);
270-
Assert.Equal(null, rows[8].A);
266+
Assert.Null(rows[4].A);
267+
Assert.Null(rows[5].A);
268+
Assert.Null(rows[6].A);
269+
Assert.Null(rows[7].A);
270+
Assert.Null(rows[8].A);
271271
Assert.Equal(1, rows[9].A);
272272
}
273273

@@ -492,9 +492,9 @@ public void QuerySheetWithoutRAttribute()
492492
Assert.Equal(5, keys.Count);
493493

494494
Assert.Equal(1, rows[0].A);
495-
Assert.Equal(null, rows[0].C);
496-
Assert.Equal(null, rows[0].D);
497-
Assert.Equal(null, rows[0].E);
495+
Assert.Null(rows[0].C);
496+
Assert.Null(rows[0].D);
497+
Assert.Null(rows[0].E);
498498

499499
Assert.Equal(1, rows[1].A);
500500
Assert.Equal("\"<>+}{\\nHello World", rows[1].B);
@@ -661,8 +661,8 @@ public void SaveAsFileWithDimension()
661661
Assert.Equal(2, rows.Count);
662662
Assert.Equal(@"""<>+-*//}{\\n", rows[0].a);
663663
Assert.Equal(1234567890, rows[0].b);
664-
Assert.Equal(null, rows[0].c);
665-
Assert.Equal(null, rows[0].d);
664+
Assert.Null(rows[0].c);
665+
Assert.Null(rows[0].d);
666666
}
667667

668668
using (var stream = File.OpenRead(path))
@@ -675,7 +675,7 @@ public void SaveAsFileWithDimension()
675675
Assert.Equal("d", rows[0].D);
676676
}
677677

678-
_excelExporter.Export(path, table, printHeader: false, overwriteFile: true);
678+
_excelExporter.Export(path, table, printHeader: false, overwriteFile: true);
679679
Assert.Equal("A1:D2", SheetHelper.GetFirstSheetDimensionRefValue(path));
680680
}
681681

‎tests/MiniExcel.Csv.Tests/AsyncIssueTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,15 @@ public async Task Issue142()
197197
Assert.Equal("MyProperty5", rows[0].C);
198198
Assert.Equal("MyProperty2", rows[0].D);
199199
Assert.Equal("MyProperty6", rows[0].E);
200-
Assert.Equal(null, rows[0].F);
200+
Assert.Null(rows[0].F);
201201
Assert.Equal("MyProperty3", rows[0].G);
202202

203203
Assert.Equal("MyProperty4", rows[0].A);
204204
Assert.Equal("CustomColumnName", rows[0].B); //note
205205
Assert.Equal("MyProperty5", rows[0].C);
206206
Assert.Equal("MyProperty2", rows[0].D);
207207
Assert.Equal("MyProperty6", rows[0].E);
208-
Assert.Equal(null, rows[0].F);
208+
Assert.Null(rows[0].F);
209209
Assert.Equal("MyProperty3", rows[0].G);
210210
}
211211

0 commit comments

Comments
 (0)