diff --git a/src/CsvHelper.Excel.Specs/Common/Helpers.cs b/src/CsvHelper.Excel.Specs/Common/Helpers.cs index 51ba1d4..caf9587 100644 --- a/src/CsvHelper.Excel.Specs/Common/Helpers.cs +++ b/src/CsvHelper.Excel.Specs/Common/Helpers.cs @@ -9,12 +9,12 @@ public static XLWorkbook GetOrCreateWorkbook(string path, string worksheetName) { if (!File.Exists(path)) { - var workbook = new XLWorkbook(XLEventTracking.Disabled); + var workbook = new XLWorkbook(); workbook.GetOrAddWorksheet(worksheetName); workbook.SaveAs(path); return workbook; } - return new XLWorkbook(path, XLEventTracking.Disabled); + return new XLWorkbook(path); } public static IXLWorksheet GetOrAddWorksheet(this XLWorkbook workbook, string sheetName) diff --git a/src/CsvHelper.Excel.Specs/CsvHelper.Excel.Specs.csproj b/src/CsvHelper.Excel.Specs/CsvHelper.Excel.Specs.csproj index 1cf116d..cf1db95 100644 --- a/src/CsvHelper.Excel.Specs/CsvHelper.Excel.Specs.csproj +++ b/src/CsvHelper.Excel.Specs/CsvHelper.Excel.Specs.csproj @@ -2,18 +2,17 @@ net6.0 latest + 1.0.1.0 + 1.0.1.0 - - - - - - - - - - + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/CsvHelper.Excel.Specs/Parser/ExcelParserAsyncSpec.cs b/src/CsvHelper.Excel.Specs/Parser/ExcelParserAsyncSpec.cs index 7e2066d..f717062 100644 --- a/src/CsvHelper.Excel.Specs/Parser/ExcelParserAsyncSpec.cs +++ b/src/CsvHelper.Excel.Specs/Parser/ExcelParserAsyncSpec.cs @@ -83,7 +83,7 @@ protected async Task RunAsync() { var csvConfiguration = new CsvConfiguration(CultureInfo.InvariantCulture) { - ShouldSkipRecord = record => record.Record.All(string.IsNullOrEmpty) + ShouldSkipRecord = record => record.Row.Parser.Record.All(string.IsNullOrEmpty) }; using var parser = new ExcelParser(Path, WorksheetName, csvConfiguration); using var reader = new CsvReader(parser); @@ -112,7 +112,7 @@ public async void RowsHaveData() { var csvConfiguration = new CsvConfiguration(CultureInfo.InvariantCulture) { - ShouldSkipRecord = record => record.Record.All(string.IsNullOrEmpty) + ShouldSkipRecord = record => record.Row.Parser.Record.All(string.IsNullOrEmpty) }; using var parser = new ExcelParser(Path, WorksheetName, csvConfiguration ); using var reader = new CsvReader(parser); diff --git a/src/CsvHelper.Excel.Specs/Parser/ParseUsingPathSpecWithBlankRow.cs b/src/CsvHelper.Excel.Specs/Parser/ParseUsingPathSpecWithBlankRow.cs index 1a288e7..3fd96fa 100644 --- a/src/CsvHelper.Excel.Specs/Parser/ParseUsingPathSpecWithBlankRow.cs +++ b/src/CsvHelper.Excel.Specs/Parser/ParseUsingPathSpecWithBlankRow.cs @@ -10,7 +10,7 @@ public ParseUsingPathSpecWithBlankRow() : base("parse_by_path_with_blank_row", i { var csvConfiguration = new CsvConfiguration(CultureInfo.InvariantCulture) { - ShouldSkipRecord = record => record.Record.All(string.IsNullOrEmpty) + ShouldSkipRecord = record => record.Row.Parser.Record.All(string.IsNullOrEmpty) }; using var parser = new ExcelParser(Path, null, csvConfiguration); Run(parser); diff --git a/src/CsvHelper.Excel/CsvHelper.Excel.csproj b/src/CsvHelper.Excel/CsvHelper.Excel.csproj index e809ce9..48b940b 100644 --- a/src/CsvHelper.Excel/CsvHelper.Excel.csproj +++ b/src/CsvHelper.Excel/CsvHelper.Excel.csproj @@ -2,9 +2,9 @@ An implementation of ICsvParser and ICsvSerializer from CsvHelper that reads and writes using the ClosedXml library. CsvHelper for Excel - 27.2.1 + 30.0.1 Chris Young - netstandard2.0;netstandard2.1 + netstandard2.1 portable CsvHelper.Excel Library @@ -13,10 +13,12 @@ https://github.com/youngcm2/CsvHelper.Excel https://github.com/youngcm2/CsvHelper.Excel/blob/master/LICENSE ./nupkg + 30.1.7.5 + 30.1.7.5 - - - + + + \ No newline at end of file diff --git a/src/CsvHelper.Excel/ExcelParser.cs b/src/CsvHelper.Excel/ExcelParser.cs index 4a95186..16e5b6b 100644 --- a/src/CsvHelper.Excel/ExcelParser.cs +++ b/src/CsvHelper.Excel/ExcelParser.cs @@ -83,8 +83,9 @@ public ExcelParser(Stream stream, CultureInfo culture, bool leaveOpen = false) : /// The culture. /// true to leave the open after the object is disposed, otherwise false. public ExcelParser(Stream stream, string sheetName, CultureInfo culture, bool leaveOpen = false) : this(stream, - sheetName, new CsvConfiguration(culture) {LeaveOpen= leaveOpen}) + sheetName, new CsvConfiguration(culture)) { + _leaveOpen = leaveOpen; } /// @@ -106,7 +107,7 @@ public ExcelParser(string path, string sheetName, CsvConfiguration configuration /// The configuration. public ExcelParser(Stream stream, string sheetName, CsvConfiguration configuration) { - var workbook = new XLWorkbook(stream, XLEventTracking.Disabled); + var workbook = new XLWorkbook(stream); _worksheet = string.IsNullOrEmpty(sheetName) ? workbook.Worksheet(1) : workbook.Worksheet(sheetName); @@ -123,7 +124,6 @@ public ExcelParser(Stream stream, string sheetName, CsvConfiguration configurati } Context = new CsvContext(this); - _leaveOpen = Configuration.LeaveOpen; } diff --git a/src/CsvHelper.Excel/ExcelWriter.cs b/src/CsvHelper.Excel/ExcelWriter.cs index a5b8c6a..8768de2 100644 --- a/src/CsvHelper.Excel/ExcelWriter.cs +++ b/src/CsvHelper.Excel/ExcelWriter.cs @@ -86,9 +86,9 @@ public ExcelWriter(Stream stream, CultureInfo culture, bool leaveOpen = false) : /// The culture. /// true to leave the open after the object is disposed, otherwise false. public ExcelWriter(Stream stream, string sheetName, CultureInfo culture, bool leaveOpen = false) : this(stream, - sheetName, new CsvConfiguration(culture) { LeaveOpen = leaveOpen }) + sheetName, new CsvConfiguration(culture)) { - + _leaveOpen = leaveOpen; } /// @@ -101,11 +101,10 @@ private ExcelWriter(Stream stream, string sheetName, CsvConfiguration configurat configuration) { configuration.Validate(); - _worksheet = new XLWorkbook(XLEventTracking.Disabled).AddWorksheet(sheetName); + _worksheet = new XLWorkbook().AddWorksheet(sheetName); this._stream = stream; - _leaveOpen = configuration.LeaveOpen; - _sanitizeForInjection = configuration.SanitizeForInjection; + _sanitizeForInjection = configuration.InjectionOptions == InjectionOptions.Escape; }