Skip to content

Commit

Permalink
bump various packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Morilli committed Jan 16, 2025
1 parent 4154782 commit 7f3bf70
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
12 changes: 6 additions & 6 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<ItemGroup>
<PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.3.2" />
<PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.4.0" />
<PackageVersion Include="Cyotek.Drawing.BitmapFont" Version="2.0.4" />
<PackageVersion Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
<PackageVersion Include="Google.FlatBuffers" Version="23.5.26" /> <!-- last version with .NET Standard 2.0 support -->
Expand All @@ -9,7 +9,7 @@
<PackageVersion Include="Magick.NET-Q8-AnyCPU" Version="13.9.0" />
<PackageVersion Include="Menees.Analyzers" Version="3.2.2" />
<PackageVersion Include="Meziantou.Analyzer" Version="2.0.163" />
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
Expand All @@ -18,12 +18,12 @@
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="8.0.4" />
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageVersion Include="MSTest" Version="3.4.3" />
<PackageVersion Include="MSTest" Version="3.7.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Nullable" Version="1.3.1" />
<PackageVersion Include="PolySharp" Version="1.15.0" />
<PackageVersion Include="ppy.SDL2-CS" Version="1.0.630-alpha" /> <!-- last version with .NET Standard 2.0 support -->
<PackageVersion Include="SharpCompress" Version="0.38.0" />
<PackageVersion Include="SharpCompress" Version="0.39.0" />
<PackageVersion Include="Silk.NET.OpenAL" Version="2.21.0" />
<PackageVersion Include="Silk.NET.OpenAL.Extensions.Creative" Version="2.21.0" />
<PackageVersion Include="Silk.NET.OpenAL.Extensions.Enumeration" Version="2.21.0" />
Expand All @@ -37,11 +37,11 @@
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="System.Drawing.Common" Version="6.0.0" />
<PackageVersion Include="System.Drawing.Primitives" Version="4.3.0" />
<PackageVersion Include="System.Memory" Version="4.5.5" />
<PackageVersion Include="System.Memory" Version="4.6.0" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
<PackageVersion Include="System.Resources.Extensions" Version="7.0.0" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.0" /> <!-- transitive dependency of Silk.NET; 8.0.0 generates build warnings -->
<PackageVersion Include="Vortice.Direct3D11" Version="2.4.2" /> <!-- last version with .NET Standard 2.0 support -->
<PackageVersion Include="Vortice.D3DCompiler" Version="2.4.2" /> <!-- last version with .NET Standard 2.0 support -->
Expand Down
7 changes: 2 additions & 5 deletions src/BizHawk.Client.Common/SharpCompressDearchivalMethod.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ public bool CheckSignature(string fileName, out int offset, out bool isExecutabl
offset = 0;
isExecutable = false;

bool isArchive = ArchiveFactory.IsArchive(fileName, out var type);
if (!isArchive) return false;
if (!ArchiveFactory.IsArchive(fileName, out var type)) return false;
if (type is not ArchiveType.Tar) return true; // not expecting false positives from anything but .tar for now

// SharpCompress seems to overzealously flag files it thinks are the in original .tar format, so we'll check for false positives. This affects 0.24.0, and the latest at time of writing, 0.27.1.
Expand All @@ -47,9 +46,7 @@ public bool CheckSignature(Stream fileStream, string? filenameHint)
if (!fileStream.CanRead || !fileStream.CanSeek) return false;
long initialPosition = fileStream.Position;

bool isArchive = ArchiveFactory.IsArchive(fileStream, out var type);
fileStream.Seek(initialPosition, SeekOrigin.Begin);
if (!isArchive) return false;
if (!ArchiveFactory.IsArchive(fileStream, out var type)) return false;
if (type is not ArchiveType.Tar) return true; // not expecting false positives from anything but .tar for now

// as above, SharpCompress seems to overzealously flag files it thinks are the in original .tar format, so we'll check for false positives
Expand Down

0 comments on commit 7f3bf70

Please sign in to comment.