From b3708ceefe526bba11f16d0aeb093a470ca8389c Mon Sep 17 00:00:00 2001 From: Rick Kramer Date: Thu, 13 Apr 2023 10:58:42 -0500 Subject: [PATCH 1/2] Corrected LeaveOpen bug on parser. Use CsvConfiguration object instead of IParserConfiguration interface. --- src/CsvHelper.Excel/CsvHelper.Excel.csproj | 2 +- src/CsvHelper.Excel/CsvHelper.Excel.csproj.user | 6 ++++++ src/CsvHelper.Excel/ExcelParser.cs | 2 +- .../PublishProfiles/FolderProfile.pubxml | 14 ++++++++++++++ .../PublishProfiles/FolderProfile.pubxml.user | 10 ++++++++++ 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 src/CsvHelper.Excel/CsvHelper.Excel.csproj.user create mode 100644 src/CsvHelper.Excel/Properties/PublishProfiles/FolderProfile.pubxml create mode 100644 src/CsvHelper.Excel/Properties/PublishProfiles/FolderProfile.pubxml.user diff --git a/src/CsvHelper.Excel/CsvHelper.Excel.csproj b/src/CsvHelper.Excel/CsvHelper.Excel.csproj index e809ce9..193fb88 100644 --- a/src/CsvHelper.Excel/CsvHelper.Excel.csproj +++ b/src/CsvHelper.Excel/CsvHelper.Excel.csproj @@ -2,7 +2,7 @@ An implementation of ICsvParser and ICsvSerializer from CsvHelper that reads and writes using the ClosedXml library. CsvHelper for Excel - 27.2.1 + 27.2.2 Chris Young netstandard2.0;netstandard2.1 portable diff --git a/src/CsvHelper.Excel/CsvHelper.Excel.csproj.user b/src/CsvHelper.Excel/CsvHelper.Excel.csproj.user new file mode 100644 index 0000000..d2dbeca --- /dev/null +++ b/src/CsvHelper.Excel/CsvHelper.Excel.csproj.user @@ -0,0 +1,6 @@ + + + + <_LastSelectedProfileId>C:\Users\rkramer\source\repos\rkramer1964\CsvHelper.Excel\src\CsvHelper.Excel\Properties\PublishProfiles\FolderProfile.pubxml + + \ No newline at end of file diff --git a/src/CsvHelper.Excel/ExcelParser.cs b/src/CsvHelper.Excel/ExcelParser.cs index 4a95186..063c539 100644 --- a/src/CsvHelper.Excel/ExcelParser.cs +++ b/src/CsvHelper.Excel/ExcelParser.cs @@ -123,7 +123,7 @@ public ExcelParser(Stream stream, string sheetName, CsvConfiguration configurati } Context = new CsvContext(this); - _leaveOpen = Configuration.LeaveOpen; + _leaveOpen = configuration.LeaveOpen; // use the csvconfiguration instead of the IParserConfiguration interface as LeaveOpen was removed in CsvHelper 30.0.0 } diff --git a/src/CsvHelper.Excel/Properties/PublishProfiles/FolderProfile.pubxml b/src/CsvHelper.Excel/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 0000000..2e73e29 --- /dev/null +++ b/src/CsvHelper.Excel/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,14 @@ + + + + + Release + Any CPU + bin\Release\netstandard2.0\publish\ + FileSystem + <_TargetId>Folder + netstandard2.0 + + \ No newline at end of file diff --git a/src/CsvHelper.Excel/Properties/PublishProfiles/FolderProfile.pubxml.user b/src/CsvHelper.Excel/Properties/PublishProfiles/FolderProfile.pubxml.user new file mode 100644 index 0000000..ed2257c --- /dev/null +++ b/src/CsvHelper.Excel/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -0,0 +1,10 @@ + + + + + True|2023-04-12T20:07:47.8368790Z;True|2023-04-12T15:07:35.6608090-05:00;False|2023-04-12T15:05:06.1012503-05:00; + + + \ No newline at end of file From 5bb3be8aaabdf444905ab655e7162178334adeb0 Mon Sep 17 00:00:00 2001 From: Rick Kramer Date: Thu, 21 Dec 2023 10:15:18 -0600 Subject: [PATCH 2/2] Fix codacy complaint --- src/CsvHelper.Excel/ExcelParser.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CsvHelper.Excel/ExcelParser.cs b/src/CsvHelper.Excel/ExcelParser.cs index 063c539..e36f9fa 100644 --- a/src/CsvHelper.Excel/ExcelParser.cs +++ b/src/CsvHelper.Excel/ExcelParser.cs @@ -123,7 +123,10 @@ public ExcelParser(Stream stream, string sheetName, CsvConfiguration configurati } Context = new CsvContext(this); - _leaveOpen = configuration.LeaveOpen; // use the csvconfiguration instead of the IParserConfiguration interface as LeaveOpen was removed in CsvHelper 30.0.0 + if (configuration != null) + { + _leaveOpen = configuration.LeaveOpen; // use the csvconfiguration instead of the IParserConfiguration interface as LeaveOpen was removed in CsvHelper 30.0.0 + } }