Merge branch 'develop9' into feature/emoji-fallback

Author: swmal

appveyor8.yml

@@ -1,4 +1,4 @@
-version: 8.4.1.{build}
+version: 8.4.2.{build}
 branches:
   only:
   - develop8
@@ -10,15 +10,15 @@ install:
     & $env:temp\dotnet-install.ps1 -Architecture x64 -Version '10.0.100' -InstallDir "$env:ProgramFiles\dotnet"
 init:
 - ps: >-
-    Update-AppveyorBuild -Version "8.4.1.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
+    Update-AppveyorBuild -Version "8.4.2.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
 
-    Write-Host "8.4.1.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
+    Write-Host "8.4.2.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
 dotnet_csproj:
   patch: true
   file: '**\*.csproj'
   version: '{version}'
-  assembly_version: 8.4.1.{build}
-  file_version: 8.4.1.{build}
+  assembly_version: 8.4.2.{build}
+  file_version: 8.4.2.{build}
 nuget:
   project_feed: true
 before_build:

docs/articles/fixedissues.md

@@ -1,4 +1,11 @@
 # Features / Fixed issues - EPPlus 8
+## Version 8.4.2
+* Fixed an issue where the ExcelRange.Text property could format negative values with double minus signs in rare cases.
+* Fixed a performance issue when using FollowDependencyChain = false in the Calculate method. With this option, EPPlus no longer calculates dependent cells or dynamic array formula spills.
+* Fixed an issue where the ExcelPowerQueryMetadataItem class parsed dates using the supplied culture instead of the invariant culture, which could cause an unhandled exception.
+* Fixed an issue where a workbook could become corrupt when EPPlus adjusted the XML ignorable namespace list.
+* Fixed an unhandled exception that occurred when saving a workbook containing a customXml property file without a schemaRefs file.
+
 ## Version 8.4.1
 * Fixes several issues related to expanding (spilling) and contracting dynamic array formulas.
 	* Changing cell dependencies were not taken into account when recalculating dirty cells from dynamic array formulas.

src/EPPlus.Export.ImageRenderer.Test/SvgPathTests.cs

@@ -511,10 +511,10 @@ public void GenerateSvgForCharts()
             {
                 var ws = p.Workbook.Worksheets[0];
                 var renderer = new EPPlusImageRenderer.ImageRenderer();
-                //var ix = 5;
+                //var ix = 0;
                 //var c = ws.Drawings[ix];
                 //var svg = renderer.RenderDrawingToSvg(c);
-                //SaveTextFileToWorkbook($"svg\\ChartForSvg{ix++}.svg", svg);
+                //SaveTextFileToWorkbook($"svg\\ChartForSvg_ind{ix++}.svg", svg);
                 var ix = 1;
                 foreach (ExcelChart c in ws.Drawings)
                 {
@@ -523,6 +523,27 @@ public void GenerateSvgForCharts()
                 }
             }
         }
+        [TestMethod]
+            public void GenerateSvgForLineCharts()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("LineChartRenderTest.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+                var renderer = new EPPlusImageRenderer.ImageRenderer();
+                //var ix = 1;
+                //var c = ws.Drawings[ix];
+                //var svg = renderer.RenderDrawingToSvg(c);
+                //SaveTextFileToWorkbook($"svg\\LineChartForSvg_Single{ix++}.svg", svg);
+                var ix = 1;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = renderer.RenderDrawingToSvg(c);
+                    SaveTextFileToWorkbook($"svg\\LineChartForSvg{ix++}.svg", svg);
+                }
+            }
+        }
+
         [TestMethod]
         public void GenerateSvgForCharts_sheet2()
         {

src/EPPlus.Export.ImageRenderer.Test/TestFontMeasurer.cs

@@ -1,16 +1,6 @@
-using EPPlusImageRenderer.RenderItems;
-using EPPlusImageRenderer.RenderItems.Shared;
-using EPPlusImageRenderer.Utils;
-using OfficeOpenXml;
-using OfficeOpenXml.Interfaces.Drawing.Text;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using OfficeOpenXml.Interfaces.Drawing.Text;
 using EPPlus.Fonts.OpenType;
 using EPPlus.Fonts.OpenType.Utils;
-using System.Security.Cryptography;
 using EPPlus.Fonts.OpenType.TrueTypeMeasurer.DataHolders;
 
 namespace TestProject1
@@ -174,27 +164,28 @@ public void LoremIpsum20Paragraphs()
 
             var savedStrings = SavedComparisonString.Split("\r\n");
 
-            List<string> differingStrings = new();
-
-            if (wrappedStrings.Count() > savedStrings.Count())
-                differingStrings = savedStrings.Except(wrappedStrings).ToList();
-            else
-                differingStrings = wrappedStrings.Except(savedStrings).ToList();
-
-            //INTENTIONAL COMMENT for easier debugging later.
-            //It is sometimes easier to compare files directly when debugging rather than looking through "differingStrings"
-            //bool writeFiles = true;
-
-            //if (/*differingStrings.Count() > 0*/ writeFiles)
-            //{
-            //    File.WriteAllText("C:\\temp\\LoremIpsum20_NEW.txt", string.Join("\r\n", wrappedStrings.ToArray()));
-            //    File.WriteAllText("C:\\temp\\LoremIpsum20_OLD.txt", SavedComparisonString);
-
-            //    var currStr = File.ReadAllText("C:\\temp\\LoremIpsum20_NEW.txt");
-            //    Assert.AreEqual(SavedComparisonString, currStr);
-            //}
+            List<string> faultyStrings = new();
+            List<string> excpectedStrings = new();
+            List<int> indiciesOfDifferingString = new();
+            
+            for (int i = 0; i < savedStrings.Count(); i++)
+            {
+                if(savedStrings[i] != wrappedStrings[i])
+                {
+                    indiciesOfDifferingString.Add(i);
+                    faultyStrings.Add(wrappedStrings[i]);
+                    excpectedStrings.Add(savedStrings[i]);
+                }
+            }
+
+            if(indiciesOfDifferingString.Count != 0)
+            {
+                //The start of indicies diverging
+                Assert.IsNull(indiciesOfDifferingString[0]);
+                Assert.AreEqual(faultyStrings[0], excpectedStrings[0]);
+            }
 
-            Assert.AreEqual(0, differingStrings.Count());
+            Assert.AreEqual(0, faultyStrings.Count);
         }
         [TestMethod]
         public void LoremIpsum20ParagraphsMultipleFragments()

src/EPPlus.Export.ImageRenderer.Test/TestTextContainer.cs

@@ -107,26 +107,26 @@ public void TestNonStandardFontSizesMultiLineLargeFontGoudyStout()
             Assert.AreEqual(expectedHeight, Math.Round(container.Height, 0));
         }
 
-        [TestMethod]
-        public void EnsureTextBodyAddsRunsCorrectly()
-        {
-            BoundingBox shapeRect = new BoundingBox();
+        //[TestMethod]
+        //public void EnsureTextBodyAddsRunsCorrectly()
+        //{
+        //    BoundingBox shapeRect = new BoundingBox();
 
-            shapeRect.Width = 20;
-            shapeRect.Height = 10;
+        //    shapeRect.Width = 20;
+        //    shapeRect.Height = 10;
 
-            FontMeasurerTrueType measurer = new FontMeasurerTrueType(12, "Aptos Narrow", FontSubFamily.Regular);
-            var body = new SvgTextBodyItem(shapeRect);
+        //    FontMeasurerTrueType measurer = new FontMeasurerTrueType(12, "Aptos Narrow", FontSubFamily.Regular);
+        //    var body = new SvgTextBodyItem(shapeRect);
 
-            body.Bounds.transform.Name = "TxtBody";
+        //    body.Bounds.Name = "TxtBody";
 
-            body.AddText("A new Paragraph", measurer);
-            body.AddText("Second paragraph", measurer);
+        //    body.AddText("A new Paragraph", measurer);
+        //    body.AddText("Second paragraph", measurer);
 
-            Assert.AreEqual(2, body.Paragraphs[0].Bounds.transform.ChildObjects.Count);
-            Assert.AreEqual(body.Bounds.transform.ChildObjects[0], body.Paragraphs[0].Bounds.transform);
+        //    Assert.AreEqual(2, body.Paragraphs[0].Bounds.Transform.ChildObjects.Count);
+        //    Assert.AreEqual(body.Bounds.Transform.ChildObjects[0], body.Paragraphs[0].Bounds.Transform);
 
-            Assert.AreEqual(shapeRect.transform, body.Bounds.transform.Parent);
-        }
+        //    Assert.AreEqual(shapeRect.Transform, body.Bounds.Transform.TopDrawingHandler);
+        //}
     }
 }