Skip to content

Commit

Permalink
Upgrade dotnet zip due to CVE
Browse files Browse the repository at this point in the history
  • Loading branch information
bcssov committed Nov 14, 2024
1 parent e318c5b commit e13f58e
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
10 changes: 5 additions & 5 deletions Credits/Credits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@ licenseUrl:https://licenses.nuget.org/Apache-2.0
license Type:Apache-2.0

#########################
Package:DotNetZip
Version:1.16.0
project URL:https://github.com/haf/DotNetZip.Semverd
Description:A fork of the DotNetZip project without signing with a solution that compiles cleanly. This project aims to follow semver to avoid versioning conflicts. DotNetZip is a FAST, FREE class library and toolset for manipulating zip files. Use VB, C# or any .NET language to easily create, extract, or update zip files.
licenseUrl:https://raw.githubusercontent.com/haf/DotNetZip.Semverd/master/LICENSE
Package:ProDotNetZip
Version:1.18.0
project URL:https://github.com/mihula/ProDotNetZip
Description:A fork of the DotNetZip project without signing with a solution that compiles cleanly. This project aims to use only up-to-date references. DotNetZip is a FAST, FREE class library and toolset for manipulating zip files. Use VB, C# or any .NET language to easily create, extract, or update zip files.
licenseUrl:https://www.nuget.org/packages/ProDotNetZip/1.18.0/License
license Type:BSD, Apache, zlib and MIT

#########################
Expand Down
Binary file added References/Direct/ProDotNetZip.dll
Binary file not shown.
7 changes: 5 additions & 2 deletions References/Direct/Readme.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
1. Avalonia.HtmlRenderer
Source: https://github.com/bcssov/Avalonia.HtmlRenderer
Binaries built from: https://github.com/bcssov/Avalonia.HtmlRenderer
Had to build due to not being able to use custom fonts
2. LiteDB
Source: https://github.com/bcssov/LiteDB
Had to build to remove hardcoded document size limit
3. NWayland & Avalonia.Wayland
Source: https://github.com/bcssov/NWayland
Check Irony branch. The functionality is still a PR and not compatible with 0.10 (only 0.11 preview). Therefore the logic was ripped from there.
Depends on nuget: Wanhjor.ObjectInspector
Depends on nuget: Wanhjor.ObjectInspector
4. ProDotNet
Source: https://github.com/bcssov/ProDotNet
Built manually due to https://github.com/advisories/GHSA-xhg6-9j5j-w4vf vulnerabiity to apply a patch
Depends on nugets: System.Security.Permissions and System.Text.Encoding.CodePages
8 changes: 6 additions & 2 deletions src/IronyModManager.IO/IronyModManager.IO.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BCnEncoder.Net" Version="2.1.0" />
<PackageReference Include="DotNetZip" Version="1.16.0" />
<PackageReference Include="BCnEncoder.Net" Version="2.1.0" />
<PackageReference Include="Magick.NET-Q8-x64" Version="13.6.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" allowedVersions="$(MicrosoftExtensionsDependencyModelVersion)" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" allowedVersions="$(MicrosoftNETCorePlatformsVersion)" />
Expand All @@ -69,6 +68,8 @@
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="$(SixLaborsImageSharpDrawing)" allowedVersions="$(SixLaborsImageSharpDrawing)" />
<PackageReference Include="SixLabors.ImageSharp.Textures" Version="$(SixLaborsImageSharpTextures)" allowedVersions="$(SixLaborsImageSharpTextures)" />
<PackageReference Include="Steamworks.NET" Version="20.1.0" />
<PackageReference Include="System.Security.Permissions" Version="8.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageReference Include="UTF.Unknown" Version="2.5.1" />
</ItemGroup>

Expand All @@ -83,6 +84,9 @@
<Reference Include="LiteDB">
<HintPath>..\..\References\Direct\LiteDB.dll</HintPath>
</Reference>
<Reference Include="ProDotNetZip">
<HintPath>..\..\References\Direct\ProDotNetZip.dll</HintPath>
</Reference>
</ItemGroup>

</Project>

0 comments on commit e13f58e

Please sign in to comment.