Skip to content

Commit eecc46e

Browse files
committed
Bump to .NET 10, update packages, bump version
1 parent f82b989 commit eecc46e

8 files changed

Lines changed: 20 additions & 17 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup .NET Core
2424
uses: actions/setup-dotnet@v6
2525
with:
26-
dotnet-version: 8.0.x
26+
dotnet-version: 10.0.x
2727

2828
- name: Build
2929
run: dotnet build -c Release ValvePak/ValvePak.sln

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<ProjectBaseVersion>4.0.0</ProjectBaseVersion>
3+
<ProjectBaseVersion>5.0.0</ProjectBaseVersion>
44
<ProjectVersion Condition="'$(GITHUB_RUN_NUMBER)' != ''">$(ProjectBaseVersion).$(GITHUB_RUN_NUMBER)</ProjectVersion>
55
<ProjectVersion Condition="'$(GITHUB_RUN_NUMBER)' == ''">$(ProjectBaseVersion).0</ProjectVersion>
66

ValvePak/ValvePak.Test/MemoryMapTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace Tests
99
{
1010
[TestFixture]
11-
public class MemoryMappedTest
11+
internal sealed class MemoryMappedTest
1212
{
1313
private static void VerifyKitten(Stream stream) => Assert.That(Convert.ToHexString(SHA256.HashData(stream)), Is.EqualTo("1C03B452FEE5274B0BC1FA1A866EE6C8FA0D43AA464C6BCFB3AB531F6E813081"));
1414
private static void VerifyProto(Stream stream) => Assert.That(Convert.ToHexString(SHA256.HashData(stream)), Is.EqualTo("FCC96AE59EE6BB9EEC4E16A50C928EFD3FB16E1CCA49E38BD2FA8391AB7936BE"));

ValvePak/ValvePak.Test/PackageTest.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Tests
1010
{
1111
[TestFixture]
12-
public class PackageTest
12+
internal sealed class PackageTest
1313
{
1414
[Test]
1515
public void ParseVPK()
@@ -615,8 +615,11 @@ public void IsSignatureValidReturnsFalseAfterDispose()
615615
var package = new Package();
616616
package.Read(path);
617617

618-
Assert.That(package.Signature, Is.Not.Null);
619-
Assert.That(package.PublicKey, Is.Not.Null);
618+
using (Assert.EnterMultipleScope())
619+
{
620+
Assert.That(package.Signature, Is.Not.Null);
621+
Assert.That(package.PublicKey, Is.Not.Null);
622+
}
620623

621624
package.Dispose();
622625

ValvePak/ValvePak.Test/ValvePak.Test.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<RollForward>LatestMajor</RollForward>
66
<IsTestProject>true</IsTestProject>
77
<SignAssembly>true</SignAssembly>
@@ -16,17 +16,17 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="coverlet.msbuild" Version="8.0.0">
19+
<PackageReference Include="coverlet.msbuild" Version="10.0.1">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
24-
<PackageReference Include="NUnit" Version="4.5.0" />
25-
<PackageReference Include="NUnit.Analyzers" Version="4.11.2">
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
24+
<PackageReference Include="NUnit" Version="4.6.1" />
25+
<PackageReference Include="NUnit.Analyzers" Version="4.14.0">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
</PackageReference>
29-
<PackageReference Include="NUnit3TestAdapter" Version="6.1.0">
29+
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0">
3030
<PrivateAssets>all</PrivateAssets>
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
</PackageReference>

ValvePak/ValvePak.Test/WriteTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Tests
88
{
99
[TestFixture]
10-
public class WriteTest
10+
internal sealed class WriteTest
1111
{
1212
[Test]
1313
public void CreateNewPackage()

ValvePak/ValvePak/Package.Save.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public void Write(Stream stream)
253253
using var fileTreeMD5 = MD5.Create();
254254
using var fullFileMD5 = MD5.Create();
255255

256-
stream.Read(buffer, 0, headerSize);
256+
stream.ReadExactly(buffer, 0, headerSize);
257257
fullFileMD5.TransformBlock(buffer, 0, headerSize, null, 0);
258258

259259
int bytesRead;

ValvePak/ValvePak/ValvePak.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<Product>Valve Pak Library</Product>
77
<Description>Fully fledged library to work with Valve's Pak (VPK) archives</Description>
@@ -19,8 +19,8 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Blake3" Version="2.2.0" />
23-
<PackageReference Include="System.IO.Hashing" Version="10.0.3" />
22+
<PackageReference Include="Blake3" Version="3.0.2" />
23+
<PackageReference Include="System.IO.Hashing" Version="10.0.10" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

0 commit comments

Comments
 (0)