Skip to content
New issue

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

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

Already on GitHub? # to your account

升级Microsoft.IO.RecyclableMemoryStream 到 3.0.1 解决跟NPOI冲突等问题 #572

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/EPPlus/EPPlus/Magicodes.IE.EPPlus.csproj
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.1.1" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
<PackageReference Include="SkiaSharp" Version="2.88.6" />
</ItemGroup>

27 changes: 15 additions & 12 deletions src/EPPlus/EPPlus/Utils/RecyclableMemoryStream.cs
Original file line number Diff line number Diff line change
@@ -6,18 +6,21 @@ namespace OfficeOpenXml.Utils
{
public static class RecyclableMemoryStream
{
private static readonly Lazy<RecyclableMemoryStreamManager> recyclableMemoryStreamManager = new Lazy<RecyclableMemoryStreamManager>();
private static RecyclableMemoryStreamManager RecyclableMemoryStreamManager
{
get
{
var recyclableMemoryStream = recyclableMemoryStreamManager.Value;
recyclableMemoryStream.MaximumFreeSmallPoolBytes = 64 * 1024 * 1024;
recyclableMemoryStream.MaximumFreeLargePoolBytes = 64 * 1024 * 32;
recyclableMemoryStream.AggressiveBufferReturn = true;
return recyclableMemoryStream;
}
}
private static readonly Lazy<RecyclableMemoryStreamManager> recyclableMemoryStreamManager = new Lazy<RecyclableMemoryStreamManager>(() =>
{
var option = new RecyclableMemoryStreamManager.Options();
option.MaximumSmallPoolFreeBytes = 64 * 1024 * 1024;
option.MaximumLargePoolFreeBytes = 64 * 1024 * 32;
option.AggressiveBufferReturn = true;
return new RecyclableMemoryStreamManager(option);
});
private static RecyclableMemoryStreamManager RecyclableMemoryStreamManager
{
get
{
return recyclableMemoryStreamManager.Value;
}
}
private const string TagSource = "Magicodes.EPPlus";

internal static MemoryStream GetStream()
Loading