copy project assemblies to nuget package

.github/workflows/Build-Release.yml

@@ -34,6 +34,26 @@ jobs:
 
     - name: Restore dependencies
       run: dotnet restore ./src/EPPlus.sln
+
+    # --- SBOM ---
+    - name: Install CycloneDX
+      run: dotnet tool install --global CycloneDX
+    - name: Read version from csproj
+      id: read_version
+      run: |
+        $version = ([xml](Get-Content ./src/EPPlus/EPPlus.csproj)).Project.PropertyGroup.Version | Where-Object { $_ } | Select-Object -First 1
+        echo "VERSION=$version" >> $env:GITHUB_ENV
+      shell: pwsh
+    - name: Generate SBOM
+      run: dotnet CycloneDX ./src/EPPlus/EPPlus.csproj -o ./sbom -F Json -st Library -sv ${{ env.VERSION }} -fn epplus-${{ env.VERSION }}.sbom.json -imp ./src/EPPlus/sbom-metadata-template.xml
+    - name: Generate SHA-256 checksum for SBOM
+      run: |
+        $sbomFile = "./sbom/epplus-${{ env.VERSION }}.sbom.json"
+        $hash = (Get-FileHash -Path $sbomFile -Algorithm SHA256).Hash.ToLower()
+        "$hash  epplus-${{ env.VERSION }}.sbom.json" | Out-File -FilePath "./sbom/epplus-${{ env.VERSION }}.sbom.json.sha256" -Encoding utf8NoBOM
+      shell: pwsh
+    # --- SBOM ---
+
     - name: Build
       run: dotnet build ./src/EPPlus.sln --no-restore --configuration Release
     - name: Test

docs/articles/breakingchanges.md

@@ -216,8 +216,19 @@ Renaming worksheet's will now change the formula correctly to include single quo
 
 ### 8.0.2
 * Removed base class from ExcelVmlDrawingPosition and with that the Load, UpdateXml methods and the RowOff and ColOff properties as they were duplicates.
+### 8.5.0
+* Setting dataLabelPosition.Top on BarCharts corrupted the excel file when saved. Trying to set this now throws an error instead. 
+* NumberFormatToTextArgs.NumberFormat now returns the interface IExcelNumberFormat rather than the ExcelNumberFormatXml class. All public variables remain the same and it can be safely cast to ´ExcelNumberFormatXml´ as long as ´Package.Workbook.NumberFormatToTextHandler´ is null.
+
 
 ### 8.5.5
 * `ws.Cells["A1"].RichText` no longer sets cells with `null` to `string.empty`
 * .RichText no longer sets the cell or contents to be RichText automatically.
- This is instead done when properties such as; `.Text`, `.Add` or `.Insert` are set on the .RichText property.
+ This is instead done when properties such as; `.Text`, `.Add` or `.Insert` are set on the .RichText property.
+The misspelled enum eCompundLineStyle has been renamed eCompoundLineStyle.
+
+
+### 9.0.0
+The misspelled enum eCompundLineStyle has been renamed eCompoundLineStyle.
+The misspelled property on drawingFill `Transparancy`  has been renamed to `Transparency`
+The `Richtext.Baseline` property now always return that value in whole percent.

docs/articles/fixedissues.md

@@ -1,4 +1,6 @@
 # Features / Fixed issues - EPPlus 8
+## Version 9.0.0
+* Added 'Layout' property to 'ExcelChartTrendlineLabel' class.
 
 ## Version 8.6 1
 ### Features

src/.runsettings

@@ -16,5 +16,6 @@
 	    <DeleteDeploymentDirectoryAfterTestRunIsComplete>False</DeleteDeploymentDirectoryAfterTestRunIsComplete>
 	    <DeploymentEnabled>False</DeploymentEnabled>
 	    <ConsiderFixturesAsSpecialTests>False</ConsiderFixturesAsSpecialTests>
+		<OrderTestsByNameInClass>true</OrderTestsByNameInClass>
     </MSTest>
 </RunSettings>

src/Directory.Packages.props

@@ -3,9 +3,10 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
+    <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
-    <PackageVersion Include="MSTest" Version="3.10.2" />
+    <PackageVersion Include="MSTest" Version="3.10.4" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageVersion Include="System.Drawing.Common" Version="8.0.26" />
     <PackageVersion Include="System.Formats.Asn1" Version="8.0.2" />
@@ -17,9 +18,9 @@
   <ItemGroup>
     <PackageVersion Include="FakeItEasy" Version="8.0.0" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageVersion Include="MSTest.TestAdapter" Version="3.7.3" />
-    <PackageVersion Include="MSTest.TestFramework" Version="3.7.3" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="3.10.4" />
+    <PackageVersion Include="MSTest.TestFramework" Version="3.10.4" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 </Project>

src/EPPlus.DrawingRenderer.Tests/Chart/BarChartTests.cs

@@ -0,0 +1,83 @@
+using OfficeOpenXml;
+using OfficeOpenXml.Drawing.Chart;
+
+namespace EPPlus.Export.ImageRenderer.Tests.Chart
+{
+    [TestClass]
+    public class BarChartTests : TestBase
+    {
+        [TestMethod]
+        public void GenerateSvgForBarCharts1()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("BarChartForSvg.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+
+                //var ix = 1;
+                //var c = ws.Drawings[ix];
+                //var svg = c.ToSvg();
+                //SaveTextFileToWorkbook($"svg\\ChartForSvg_ind{ix++}.svg", svg);
+
+                var ix = 0;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = c.ToSvg(x => { x.Size.Width = 100; x.Size.Height = 100; });
+                    SaveTextFileToWorkbook($"svg\\BarChartForSvg_sheet1_{ix++}.svg", svg);
+                }
+            }
+        }
+        [TestMethod]
+        public void GenerateSvgForBarCharts2()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("BarChartForSvg.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[1];
+                var ix = 0;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\BarChartForSvg_sheet2_{ix++}.svg", svg);
+                }
+            }
+        }
+
+        [TestMethod]
+        public void DatalabelBarCharts()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("BarChartForSvgDatalabelsBasic.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+                var drawings = ws.Drawings;
+                var ix = 1;
+
+                for (int i = ix; i < drawings.Count; i++)
+                {
+                    var svg = drawings[i].ToSvg();
+                    SaveTextFileToWorkbook($"svg\\BarChartDataLabels{ix++}.svg", svg);
+                }
+            }
+        }
+
+
+        [TestMethod]
+        public void NegativeDatalabelBarCharts()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("negativeDatalabels.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+                var drawings = ws.Drawings;
+                var ix = 0;
+
+                for (int i = ix; i < drawings.Count; i++)
+                {
+                    var svg = drawings[i].ToSvg();
+                    SaveTextFileToWorkbook($"svg\\NegativeLabels{ix++}.svg", svg);
+                }
+            }
+        }
+    }
+}

src/EPPlus.DrawingRenderer.Tests/Chart/ColumnChartTests.cs

@@ -0,0 +1,57 @@
+using OfficeOpenXml;
+using OfficeOpenXml.Drawing.Chart;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EPPlus.Export.ImageRenderer.Tests.Chart
+{
+    [TestClass]
+    public class ColumnChartTests : TestBase
+    {
+        [TestMethod]
+        public void GenerateSvgForColumnCharts1()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("ColumnChartForSvg.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+
+                //var ix = 1;
+                //var c = ws.Drawings[ix];
+                //var svg = c.ToSvg();
+                //SaveTextFileToWorkbook($"svg\\ChartForSvg_ind{ix++}.svg", svg);
+
+                var ix = 0;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\ColumnChartForSvg_sheet1_{ix++}.svg", svg);
+                }
+            }
+        }
+        [TestMethod]
+        public void GenerateSvgForColumnCharts2()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("ColumnChartForSvg.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[1];
+
+                //var ix = 2;
+                //var c = ws.Drawings[ix];
+                //var svg = renderer.RenderDrawingToSvg(c);
+                //SaveTextFileToWorkbook($"svg\\ChartForSvg_ind{ix++}.svg", svg);
+
+                var ix = 0;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\ColumnChartForSvg_sheet2_{ix++}.svg", svg);
+                }
+            }
+        }
+    }
+}

src/EPPlus.DrawingRenderer.Tests/Chart/ComboChartTests.cs

@@ -0,0 +1,31 @@
+using OfficeOpenXml;
+using OfficeOpenXml.Drawing.Chart;
+
+namespace EPPlus.Export.ImageRenderer.Tests.Chart
+{
+    [TestClass]
+    public class ComboChartToSvgTests : TestBase
+    {
+        [TestMethod]
+        public void GenerateSvgForComboCharts_sheet1()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("ComboChart.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+
+                //var ix = 1;
+                //var c = ws.Drawings[ix];
+                //var svg = renderer.RenderDrawingToSvg(c);
+                //SaveTextFileToWorkbook($"svg\\ComboChart_Sheet1_{ix++}.svg", svg);
+
+                var ix = 0;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\ComboChart_sheet1_{ix++}.svg", svg);
+                }
+            }
+        }
+    }
+}

src/EPPlus.DrawingRenderer.Tests/Chart/ErrorbarsTests.cs

@@ -0,0 +1,70 @@
+using OfficeOpenXml;
+using OfficeOpenXml.Drawing.Chart;
+
+namespace EPPlus.Export.ImageRenderer.Tests.Chart
+{
+    [TestClass]
+    public class ErrorbarsTests : TestBase
+    {
+        [TestMethod]
+        public void GenerateSvgForErrorbars_Line_Sheet1()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("Errorbars.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+                //var ix = 4;
+                //var c = ws.Drawings[ix];
+                //var svg = c.ToSvg();
+                //SaveTextFileToWorkbook($"svg\\Error_sheet1_ind{ix++}.svg", svg);
+
+                var ix = 0;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\Errorbar_sheet1_{ix++}.svg", svg);
+                }
+            }
+        }
+        [TestMethod]
+        public void GenerateSvgForErrorbars_Column_Sheet2()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("Errorbars.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[1];
+                //var ix = 4;
+                //var c = ws.Drawings[ix];
+                //var svg = c.ToSvg();
+                //SaveTextFileToWorkbook($"svg\\Error_sheet1_ind{ix++}.svg", svg);
+
+                var ix = 0;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\Errorbar_sheet2_{ix++}.svg", svg);
+                }
+            }
+        }
+        [TestMethod]
+        public void GenerateSvgForErrorbars_Bar_Sheet3()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("Errorbars.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[2];
+                //var ix = 4;
+                //var c = ws.Drawings[ix];
+                //var svg = c.ToSvg();
+                //SaveTextFileToWorkbook($"svg\\Error_sheet1_ind{ix++}.svg", svg);
+
+                var ix = 0;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\Errorbar_sheet3_{ix++}.svg", svg);
+                }
+            }
+        }
+    }
+}