diff --git a/src/DoddleReport.OpenXml/DoddleReport.OpenXml.csproj b/src/DoddleReport.OpenXml/DoddleReport.OpenXml.csproj index 332751f..99efe1c 100644 --- a/src/DoddleReport.OpenXml/DoddleReport.OpenXml.csproj +++ b/src/DoddleReport.OpenXml/DoddleReport.OpenXml.csproj @@ -42,14 +42,19 @@ - - False - ..\packages\ClosedXML.0.68.1\lib\net40-client\ClosedXML.dll + + ..\packages\ClosedXML.0.92.1\lib\net40\ClosedXML.dll - - True - ..\packages\DocumentFormat.OpenXml.1.0\lib\DocumentFormat.OpenXml.dll + + ..\packages\DocumentFormat.OpenXml.2.7.2\lib\net40\DocumentFormat.OpenXml.dll + + ..\packages\ExcelNumberFormat.1.0.3\lib\net20\ExcelNumberFormat.dll + + + ..\packages\FastMember.Signed.1.3.0\lib\net40\FastMember.Signed.dll + + @@ -66,10 +71,8 @@ - - Designer - + diff --git a/src/DoddleReport.OpenXml/ExcelReportWriter.cs b/src/DoddleReport.OpenXml/ExcelReportWriter.cs index 20a4334..0cdb19b 100644 --- a/src/DoddleReport.OpenXml/ExcelReportWriter.cs +++ b/src/DoddleReport.OpenXml/ExcelReportWriter.cs @@ -176,12 +176,12 @@ protected virtual void RenderRow(int rowCount, ReportRow reportRow, IXLRow dataR field.DataStyle.CopyToXlStyle(cell.Style); if (field.DataType == typeof(bool)) { - cell.SetDataType(XLCellValues.Boolean); + cell.SetDataType(XLDataType.Boolean); cell.Value = reportRow[field]; } else if (field.DataType.IsNumericType()) { - cell.SetDataType(XLCellValues.Number); + cell.SetDataType(XLDataType.Number); if (!string.Equals("{0}", field.DataFormatString)) { cell.Style.NumberFormat.Format = GetOpenXmlDataFormatString(field.DataFormatString); @@ -194,7 +194,7 @@ protected virtual void RenderRow(int rowCount, ReportRow reportRow, IXLRow dataR } else if (field.DataType == typeof(DateTime) || field.DataType == typeof(DateTime?)) { - cell.SetDataType(XLCellValues.DateTime); + cell.SetDataType(XLDataType.DateTime); cell.Value = reportRow.GetFormattedValue(field); } else @@ -213,7 +213,7 @@ protected virtual void RenderRow(int rowCount, ReportRow reportRow, IXLRow dataR if (field.ShowTotals) { var cell = dataRow.Cell(colCount); - cell.SetDataType(XLCellValues.Number); + cell.SetDataType(XLDataType.Number); cell.FormulaA1 = string.Format(CultureInfo.InvariantCulture, "=SUM({0}{1}:{0}{2})", cell.Address.ColumnLetter, 2, rowCount - 1); if (!string.Equals("{0}", field.DataFormatString)) { diff --git a/src/DoddleReport.OpenXml/packages.config b/src/DoddleReport.OpenXml/packages.config index e93045d..109fb0b 100644 --- a/src/DoddleReport.OpenXml/packages.config +++ b/src/DoddleReport.OpenXml/packages.config @@ -1,5 +1,7 @@  - - + + + + \ No newline at end of file