Skip to content

修复漏洞警告 #623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhangzw218 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修复漏洞警告 #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
8 changes: 5 additions & 3 deletions Magicodes.IE.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
1 change: 1 addition & 0 deletions sixlabors.lic
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Id=ctm_01m5y1880bdxvvvmnm1arc278t;Kind=Community;ExpiryDateUtc=2028-01-25T06:37:36.2647473Z;Key=Assembly:NaQJW11mohrpPAysOm48EhlnE7saTNDDE0W1u54EUZaxnhMLVYGDwpu/c9LrMxohvJHKjtl+IyCV+H1dpRQLeg==
17 changes: 9 additions & 8 deletions src/EPPlus/EPPlus/Magicodes.IE.EPPlus.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down