Skip to content
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

Jump to bottom

Bump SharpZipLib from 1.3.3 to 1.4.2 #4152

Merged
merged 3 commits into from
Feb 24, 2023
Merged

Bump SharpZipLib from 1.3.3 to 1.4.2 #4152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11bdd56
Bump SharpZipLib from 1.3.3 to 1.4.2
dependabot[bot] Feb 23, 2023
354544c
Merge branch 'master' into dependabot/nuget/SharpZipLib-1.4.2
hhyyrylainen Feb 23, 2023
8b1b7ed
Switched the GZip stream implementation to the standard one
hhyyrylainen Feb 23, 2023
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 Thrive.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@
<Version>4.5.0</Version>
</PackageReference>
<PackageReference Include="SharpZipLib">
<Version>1.3.3</Version>
<Version>1.4.2</Version>
</PackageReference>
<PackageReference Include="Nito.Collections.Deque">
<Version>1.1.1</Version>
Expand Down
6 changes: 3 additions & 3 deletions src/saving/Save.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System.IO;
using System.IO.Compression;
using System.Text;
using Godot;
using ICSharpCode.SharpZipLib.GZip;
using ICSharpCode.SharpZipLib.Tar;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
Expand Down Expand Up @@ -249,7 +249,7 @@ private static void WriteDataToSaveFile(string target, string justInfo, string s
}

using var fileStream = new GodotFileStream(file);
using Stream gzoStream = new GZipOutputStream(fileStream);
using Stream gzoStream = new GZipStream(fileStream, CompressionLevel.Optimal);
using var tar = new TarOutputStream(gzoStream, Encoding.UTF8);

TarHelper.OutputEntry(tar, SAVE_INFO_JSON, Encoding.UTF8.GetBytes(justInfo));
Expand Down Expand Up @@ -356,7 +356,7 @@ private static (string? InfoStr, string? SaveStr, byte[]? Screenshot) LoadDataFr
throw new ArgumentException("couldn't open the file for reading");

using var stream = new GodotFileStream(reader);
using Stream gzoStream = new GZipInputStream(stream);
using Stream gzoStream = new GZipStream(stream, CompressionMode.Decompress);
using var tar = new TarInputStream(gzoStream, Encoding.UTF8);

TarEntry tarEntry;
Expand Down
6 changes: 3 additions & 3 deletions src/thriveopedia/fossilisation/FossilisedSpecies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Text;
using Godot;
using ICSharpCode.SharpZipLib.GZip;
using ICSharpCode.SharpZipLib.Tar;
using Newtonsoft.Json;
using Directory = Godot.Directory;
Expand Down Expand Up @@ -175,7 +175,7 @@ private static void WriteDataToFossilFile(string target, string justInfo, string
}

using var fileStream = new GodotFileStream(file);
using Stream gzoStream = new GZipOutputStream(fileStream);
using Stream gzoStream = new GZipStream(fileStream, CompressionLevel.Optimal);
using var tar = new TarOutputStream(gzoStream, Encoding.UTF8);

TarHelper.OutputEntry(tar, SAVE_INFO_JSON, Encoding.UTF8.GetBytes(justInfo));
Expand Down Expand Up @@ -240,7 +240,7 @@ private static (string? Info, string? Fossil, byte[]? PreviewImageData) LoadData
throw new ArgumentException("couldn't open the file for reading");

using var stream = new GodotFileStream(reader);
using Stream gzoStream = new GZipInputStream(stream);
using Stream gzoStream = new GZipStream(stream, CompressionMode.Decompress);
using var tar = new TarInputStream(gzoStream, Encoding.UTF8);

TarEntry tarEntry;
Expand Down