From 0669706124699d1cbe636e9ef36d5b6ebf676106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BF=97=E7=82=9C?= <745787360@qq.com>
Date: Tue, 27 Oct 2026 15:07:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BC=8F=E6=B4=9E=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Directory.Build.props                        | 20 +++++++++++++++++++-
 Magicodes.IE.sln                             |  8 +++++---
 sixlabors.lic                                |  1 +
 src/EPPlus/EPPlus/Magicodes.IE.EPPlus.csproj | 17 +++++++++--------
 4 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 sixlabors.lic

diff --git a/Directory.Build.props b/Directory.Build.props
index 2f86edb5..c2fb7eb5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -30,7 +30,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>2.9.0</Version>
+    <Version>2.9.0.1</Version>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <NoWarn>1701;1702;CS1591;CS1573;1591;NU1507;NU5119</NoWarn>
@@ -58,6 +58,24 @@
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
+  <!--
+    Six Labors / ImageSharp 许可证接入
+
+    ImageSharp 3.2.0 起在编译前执行许可证校验（SixLabors_ValidateLicense），
+    Release 构建必须提供 key，Debug 配置下仅告警不阻断。
+
+    把 Six Labors 下发的 sixlabors.lic 放到仓库根目录即可自动生效；
+    也可改用环境变量 SixLaborsLicenseKey 注入（CI 场景）。
+
+    OSS 项目可申请 assembly-scoped community key，官方明确允许直接提交到
+    公开仓库，因此该文件无需加入 .gitignore。
+
+    文件不存在时本属性不生效，不影响 Debug 构建。
+  -->
+  <PropertyGroup Condition="Exists('$(MSBuildThisFileDirectory)sixlabors.lic')">
+    <SixLaborsLicenseFile>$(MSBuildThisFileDirectory)sixlabors.lic</SixLaborsLicenseFile>
+  </PropertyGroup>
+
   <ItemGroup Condition="'$(IsPackable)' != 'false' AND '$(ManagePackageVersionsCentrally)' != 'false'">
     <PackageReference Include="Microsoft.SourceLink.GitHub">
       <PrivateAssets>all</PrivateAssets>
diff --git a/Magicodes.IE.sln b/Magicodes.IE.sln
index c5b08c82..120f998c 100644
--- a/Magicodes.IE.sln
+++ b/Magicodes.IE.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
+# Visual Studio Version 18
+VisualStudioVersion = 18.10.12217.157 stable
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magicodes.IE.Core", "src\Magicodes.ExporterAndImporter.Core\Magicodes.IE.Core.csproj", "{ECF7AB74-BE8D-4E61-968E-6DB1E182154F}"
 EndProject
@@ -12,6 +12,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7164789B-598A-46A6-BCBE-24CE10F93D53}"
 	ProjectSection(SolutionItems) = preProject
 		azure-pipelines.yml = azure-pipelines.yml
+		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 		.github\workflows\docfx.yml = .github\workflows\docfx.yml
 		.github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml
 		README.md = README.md
@@ -179,7 +181,7 @@ Global
 		{C50261E6-D543-4B60-BEC7-9E16E2287AA4} = {151F53D1-0E7B-4397-8E5E-1DAC6F2078D3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		RESX_SortFileContentOnSave = True
 		SolutionGuid = {6C8A9654-6F23-451B-AE83-8C7D534A7A3C}
+		RESX_SortFileContentOnSave = True
 	EndGlobalSection
 EndGlobal
diff --git a/sixlabors.lic b/sixlabors.lic
new file mode 100644
index 00000000..1d80e118
--- /dev/null
+++ b/sixlabors.lic
@@ -0,0 +1 @@
+Id=ctm_01m5y1880bdxvvvmnm1arc278t;Kind=Community;ExpiryDateUtc=2028-01-25T06:37:36.2647473Z;Key=Assembly:NaQJW11mohrpPAysOm48EhlnE7saTNDDE0W1u54EUZaxnhMLVYGDwpu/c9LrMxohvJHKjtl+IyCV+H1dpRQLeg==
\ No newline at end of file
diff --git a/src/EPPlus/EPPlus/Magicodes.IE.EPPlus.csproj b/src/EPPlus/EPPlus/Magicodes.IE.EPPlus.csproj
index 667e5712..92edce1e 100644
--- a/src/EPPlus/EPPlus/Magicodes.IE.EPPlus.csproj
+++ b/src/EPPlus/EPPlus/Magicodes.IE.EPPlus.csproj
@@ -61,26 +61,27 @@
 	</ItemGroup>
 
 		<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-			<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
-			<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.3" />
+			<!-- Security backport on the 3.x line. Release builds require sixlabors.lic. -->
+			<PackageReference Include="SixLabors.ImageSharp" Version="3.2.0" />
+			<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.5" />
 			<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
 		</ItemGroup>
 
 		<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-			<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
-			<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.2" />
+			<PackageReference Include="SixLabors.ImageSharp" Version="3.2.0" />
+			<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.3" />
 			<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
 		</ItemGroup>
 
 		<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-			<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
-			<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
+			<PackageReference Include="SixLabors.ImageSharp" Version="3.2.0" />
+			<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.2" />
 			<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
 		</ItemGroup>
 
 		<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
-			<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
-			<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.0" />
+			<PackageReference Include="SixLabors.ImageSharp" Version="3.2.0" />
+			<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.14" />
 			<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.0" />
 		</ItemGroup>
 	<ItemGroup>