Skip to content

Commit 7f3bf70

Browse files
committed
bump various packages
1 parent 4154782 commit 7f3bf70

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

Directory.Packages.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<ItemGroup>
3-
<PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.3.2" />
3+
<PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.4.0" />
44
<PackageVersion Include="Cyotek.Drawing.BitmapFont" Version="2.0.4" />
55
<PackageVersion Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
66
<PackageVersion Include="Google.FlatBuffers" Version="23.5.26" /> <!-- last version with .NET Standard 2.0 support -->
@@ -9,7 +9,7 @@
99
<PackageVersion Include="Magick.NET-Q8-AnyCPU" Version="13.9.0" />
1010
<PackageVersion Include="Menees.Analyzers" Version="3.2.2" />
1111
<PackageVersion Include="Meziantou.Analyzer" Version="2.0.163" />
12-
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
12+
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
1313
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
1414
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
1515
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
@@ -18,12 +18,12 @@
1818
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="8.0.4" />
1919
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
2020
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
21-
<PackageVersion Include="MSTest" Version="3.4.3" />
21+
<PackageVersion Include="MSTest" Version="3.7.1" />
2222
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
2323
<PackageVersion Include="Nullable" Version="1.3.1" />
2424
<PackageVersion Include="PolySharp" Version="1.15.0" />
2525
<PackageVersion Include="ppy.SDL2-CS" Version="1.0.630-alpha" /> <!-- last version with .NET Standard 2.0 support -->
26-
<PackageVersion Include="SharpCompress" Version="0.38.0" />
26+
<PackageVersion Include="SharpCompress" Version="0.39.0" />
2727
<PackageVersion Include="Silk.NET.OpenAL" Version="2.21.0" />
2828
<PackageVersion Include="Silk.NET.OpenAL.Extensions.Creative" Version="2.21.0" />
2929
<PackageVersion Include="Silk.NET.OpenAL.Extensions.Enumeration" Version="2.21.0" />
@@ -37,11 +37,11 @@
3737
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
3838
<PackageVersion Include="System.Drawing.Common" Version="6.0.0" />
3939
<PackageVersion Include="System.Drawing.Primitives" Version="4.3.0" />
40-
<PackageVersion Include="System.Memory" Version="4.5.5" />
40+
<PackageVersion Include="System.Memory" Version="4.6.0" />
4141
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
4242
<PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
4343
<PackageVersion Include="System.Resources.Extensions" Version="7.0.0" />
44-
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
44+
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
4545
<PackageVersion Include="System.Text.Json" Version="9.0.0" /> <!-- transitive dependency of Silk.NET; 8.0.0 generates build warnings -->
4646
<PackageVersion Include="Vortice.Direct3D11" Version="2.4.2" /> <!-- last version with .NET Standard 2.0 support -->
4747
<PackageVersion Include="Vortice.D3DCompiler" Version="2.4.2" /> <!-- last version with .NET Standard 2.0 support -->

src/BizHawk.Client.Common/SharpCompressDearchivalMethod.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ public bool CheckSignature(string fileName, out int offset, out bool isExecutabl
2121
offset = 0;
2222
isExecutable = false;
2323

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

2827
// 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.
@@ -47,9 +46,7 @@ public bool CheckSignature(Stream fileStream, string? filenameHint)
4746
if (!fileStream.CanRead || !fileStream.CanSeek) return false;
4847
long initialPosition = fileStream.Position;
4948

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

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

0 commit comments

Comments
 (0)