Merge fixes develop8

Author: JanKallman

src/EPPlus.Export.ImageRenderer/EPPlus.Export.ImageRenderer.csproj

@@ -57,27 +57,19 @@
 		<Reference Include="System.Security" />
 		<Reference Include="System.Xml" />
 		<Reference Include="System.Threading.Tasks" />
-		<PackageReference Include="System.ComponentModel.Annotations" />
 		<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
-		<PackageReference Include="System.Security.Cryptography.Xml" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' != 'net35' and '$(TargetFramework)' != 'net462' and '$(TargetFramework)' != 'net9.0'">
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
 		<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
-		<PackageReference Include="System.Security.Cryptography.Pkcs" />
 		<PackageReference Include="System.ComponentModel.Annotations" />
-		<PackageReference Include="System.Text.Encoding.CodePages" />
-		<PackageReference Include="System.Security.Cryptography.Xml" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" VersionOverride="9.0.3" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" VersionOverride="9.0.15" />
 		<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
-		<PackageReference Include="System.Security.Cryptography.Pkcs" VersionOverride="9.0.3" />
 		<PackageReference Include="System.ComponentModel.Annotations" />
-		<PackageReference Include="System.Text.Encoding.CodePages" VersionOverride="9.0.3" />
-		<PackageReference Include="System.Security.Cryptography.Xml" VersionOverride="9.0.3" />
 	</ItemGroup>
 
   <ItemGroup>

src/EPPlus/Drawing/Chart/ExcelChartStandardSerie.cs

@@ -730,7 +730,6 @@ public void CreateCache()
                 var node = GetTopNode(DataLabelSerie, extPath);
                 DataLabelRangeSource.CreateCache(node);
             }
-            }
         }
         internal void CreateCache(string address, XmlNode node)
         {

src/EPPlusTest/Issues/ConditionalFormattingIssues.cs

@@ -1,6 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OfficeOpenXml;
-using OfficeOpenXml.Compatibility.System.Drawing;
 using OfficeOpenXml.ConditionalFormatting;
 using OfficeOpenXml.ConditionalFormatting.Contracts;
 using OfficeOpenXml.Style;

src/EPPlusTest/Issues/WorksheetIssues.cs

@@ -1150,22 +1150,5 @@ public void Issue2325()
             });
             Assert.IsTrue(ex.Message.Contains("Strict Open XML"));
         }
-
-        [TestMethod]
-        public void InsertAndShift_ShouldNotThrow_WhenArrayIsFull()
-        {
-            using var package = new ExcelPackage();
-            var sheet = package.Workbook.Worksheets.Add("Sheet1");
-
-            // Fill 7 columns with formatting to trigger the boundary condition
-            for (int col = 1; col <= 7; col++)
-            {
-                sheet.Column(col).Width = 15;
-            }
-
-            // These two inserts should not throw ArgumentException
-            sheet.InsertColumn(3, 1);
-            sheet.InsertColumn(5, 1);
-        }
     }
 }