Cherry pick branch 'genexuslabs:chore/security-package-updates' into beta

Author: claudiamurialdo

dotnet/src/dotnetcore/GxOffice/GxOffice.csproj

@@ -6,7 +6,6 @@
 		<RootNamespace>GxOffice</RootNamespace>
 		<PackageTags>Office Excel Poi</PackageTags>
 		<PackageId>GeneXus.Office.Core</PackageId>
-		<AcceptNPOIOSMFLicense>true</AcceptNPOIOSMFLicense>
 	</PropertyGroup>
 	<ItemGroup>
 		<Compile Include="..\..\dotnetframework\GxOffice\Constants.cs" Link="Constants.cs" />
@@ -43,9 +42,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
-		<PackageReference Include="NPOI" Version="2.8.0" />
+		<PackageReference Include="NPOI" Version="2.7.3" />
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-		<!-- Override NPOI's vulnerable transitive System.Security.Cryptography.Xml -->
+		<!-- Override NPOI's vulnerable transitives (NPOI 2.7.x still depends on these older versions) -->
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
 		<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.3" Condition="'$(TargetFramework)' == 'net8.0'" />
 		<PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.6" Condition="'$(TargetFramework)' == 'net10.0'" />
 	</ItemGroup>

dotnet/src/dotnetframework/GxOffice/GxOffice.csproj

@@ -5,15 +5,14 @@
 		<RootNamespace>GxOffice</RootNamespace>
 		<PackageTags>Office Excel Poi</PackageTags>
 		<PackageId>GeneXus.Office</PackageId>
-		<AcceptNPOIOSMFLicense>true</AcceptNPOIOSMFLicense>
-		<!-- NPOI 2.8.0 pulls SkiaSharp; on net462 its native libs land in content/ instead of runtimes/ and pack flags NU5100/NU5118. Consumers still get SkiaSharp transitively via NPOI. -->
-		<NoWarn>$(NoWarn);NU5100;NU5118</NoWarn>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
 		<PackageReference Include="EPPlus" Version="4.5.3.2" />
-		<PackageReference Include="NPOI" Version="2.8.0" />
+		<PackageReference Include="NPOI" Version="2.7.3" />
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+		<!-- Override NPOI's vulnerable transitive SixLabors.ImageSharp (2.1.x line; 3.x doesn't support net462) -->
+		<PackageReference Include="SixLabors.ImageSharp" Version="2.1.13" />
 	</ItemGroup>
 
 	<ItemGroup>

dotnet/src/dotnetframework/GxOffice/poi/xssf/ExcelCells.cs

@@ -2,7 +2,6 @@
 using System;
 using GeneXus.MSOffice.Excel.Style;
 using GeneXus.Utils;
-using NPOI.OOXML.XSSF.UserModel;
 using NPOI.OpenXmlFormats.Spreadsheet;
 using NPOI.SS.UserModel;
 using NPOI.SS.Util;
@@ -796,7 +795,7 @@ public void SetColor(long value)
 									rgb = new byte[] { (byte)red, (byte)green, (byte)blue }
 								};
 
-								newColor = new XSSFColor(ctColor, new DefaultIndexedColorMap());
+								newColor = new XSSFColor(ctColor);
 
 								newFont = (XSSFFont)pWorkbook.CreateFont();
 								CopyPropertiesFont(newFont, fontCell);
@@ -823,7 +822,7 @@ public void SetColor(long value)
 										rgb = new byte[] { (byte)red, (byte)green, (byte)blue }
 									};
 
-									newColor = new XSSFColor(ctColor, new DefaultIndexedColorMap());
+									newColor = new XSSFColor(ctColor);
 
 
 									newFont = (XSSFFont)pWorkbook.CreateFont();
@@ -1074,7 +1073,7 @@ private XSSFColor ToColor(ExcelColor color)
 				rgb = new byte[] { (byte)color.Red, (byte)color.Green, (byte)color.Blue }
 			};
 
-			return new XSSFColor(ctColor, new DefaultIndexedColorMap());
+			return new XSSFColor(ctColor);
 		}
 		private XSSFCellStyle ApplyNewCellStyle(XSSFCellStyle cellStyle, ExcelStyle newCellStyle)
 		{