mylesmarkevich/JWLMerge
1
0
Fork 0
mirror of https://github.com/AntonyCorbett/JWLMerge synced 2026-01-17 02:04:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

updated closedxml

Browse Source
This commit is contained in:
Antony Corbett
2023-02-21 17:01:22 +00:00
parent 219bbe382a
commit 4f04a87f66
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JWLMerge.BackupFileServices/BackupFileService.cs
View File

@@ -712,7 +712,7 @@ public sealed class BackupFileService : IBackupFileService
database.UserMarks.RemoveAll(x => userMarksToRemove.Contains(x.UserMarkId));
}
private int SortBibleNotes(ImportExportServices.Models.BibleNoteForImportExport x, ImportExportServices.Models.BibleNoteForImportExport y)
private int SortBibleNotes(BibleNoteForImportExport x, BibleNoteForImportExport y)
{
if (x.BookNumber != y.BookNumber)
{

2
JWLMerge.ExcelServices/ExcelService.cs
View File

@@ -88,13 +88,11 @@ namespace JWLMerge.ExcelServices
private static void SetCellStringValue(IXLWorksheet worksheet, int row, int col, string? value)
{
worksheet.Cell(row, col).DataType = XLDataType.Text;
worksheet.Cell(row, col).SetValue(value ?? string.Empty);
}
private static void SetCellIntegerValue(IXLWorksheet worksheet, int row, int col, int? value)
{
worksheet.Cell(row, col).DataType = XLDataType.Number;
worksheet.Cell(row, col).SetValue(value);
}

2
JWLMerge.ExcelServices/JWLMerge.ExcelServices.csproj
View File

@@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="ClosedXML" Version="0.95.4" />
<PackageReference Include="ClosedXML" Version="0.100.3" />
</ItemGroup>
<ItemGroup>

5
JWLMerge.Tests/JWLMerge.Tests.csproj
View File

@@ -17,7 +17,10 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
<PackageReference Include="coverlet.collector" Version="1.3.0" />
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>

4
JWLMerge/Services/FileOpenSaveService.cs
View File

@@ -42,12 +42,12 @@ namespace JWLMerge.Services
return ImportExportFileType.Unknown;
}
if (string.Equals(ext, "txt", StringComparison.OrdinalIgnoreCase))
if (string.Equals(ext, ".txt", StringComparison.OrdinalIgnoreCase))
{
return ImportExportFileType.Text;
}
if (string.Equals(ext, "xlsx", StringComparison.OrdinalIgnoreCase))
if (string.Equals(ext, ".xlsx", StringComparison.OrdinalIgnoreCase))
{
return ImportExportFileType.Excel;
}