Skip to content

Commit 9b5069b

Browse files
MilchRatchetMilchRatchet
authored
Merge pull request #137 from MilchRatchet/dev-ci-deps-update
Update dependencies and CI.
2 parents 2cff994 + 393eef0 commit 9b5069b

9 files changed

Lines changed: 35 additions & 65 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 15 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
release_name: ${{ steps.get-version.outputs.release_name }}
1010
steps:
1111
- uses: actions/checkout@master
12-
- uses: actions/setup-dotnet@v1
12+
- uses: actions/setup-dotnet@v5
1313
with:
1414
dotnet-version: '8.0.x'
1515

@@ -32,18 +32,18 @@ jobs:
3232
- run: cd /tmp/out-linux/ && zip -r /tmp/zips/replanetizer-${{steps.get-version.outputs.release_name}}-linux-x64.zip replanetizer
3333
name: Zip up Replanetizer for Linux
3434

35-
- uses: actions/upload-artifact@v4
35+
- uses: actions/upload-artifact@v7
3636
name: Upload zips to GitHub actions artifact storage
3737
with:
3838
name: replanetizer-${{steps.get-version.outputs.release_name}}-linux-x64.zip
3939
path: /tmp/zips/replanetizer-${{steps.get-version.outputs.release_name}}-linux-x64.zip
4040

4141
build_windows:
42-
runs-on: windows-2025
42+
runs-on: windows-2025-vs2026
4343
needs: [build_linux]
4444
steps:
4545
- uses: actions/checkout@master
46-
- uses: actions/setup-dotnet@v1
46+
- uses: actions/setup-dotnet@v5
4747
with:
4848
dotnet-version: '8.0.x'
4949

@@ -62,18 +62,18 @@ jobs:
6262
- run: Compress-Archive -Path /tmp/out-win/replanetizer -DestinationPath /tmp/zips/replanetizer-${{needs.build_linux.outputs.release_name}}-win-x64.zip
6363
name: Zip up Replanetizer for Windows
6464

65-
- uses: actions/upload-artifact@v4
65+
- uses: actions/upload-artifact@v7
6666
name: Upload zips to GitHub actions artifact storage
6767
with:
6868
name: replanetizer-${{needs.build_linux.outputs.release_name}}-win-x64.zip
6969
path: /tmp/zips/replanetizer-${{needs.build_linux.outputs.release_name}}-win-x64.zip
7070

7171
build_macos:
72-
runs-on: macos-15
72+
runs-on: macos-26
7373
needs: [build_linux]
7474
steps:
7575
- uses: actions/checkout@master
76-
- uses: actions/setup-dotnet@v1
76+
- uses: actions/setup-dotnet@v5
7777
with:
7878
dotnet-version: '8.0.x'
7979

@@ -92,7 +92,7 @@ jobs:
9292
- run: cd /tmp/out-osx/ && zip -r /tmp/zips/replanetizer-${{needs.build_linux.outputs.release_name}}-osx-x64.zip replanetizer
9393
name: Zip up Replanetizer for Mac
9494

95-
- uses: actions/upload-artifact@v4
95+
- uses: actions/upload-artifact@v7
9696
name: Upload zips to GitHub actions artifact storage
9797
with:
9898
name: replanetizer-${{needs.build_linux.outputs.release_name}}-osx-x64.zip
@@ -104,51 +104,21 @@ jobs:
104104
if: github.ref == 'refs/heads/master'
105105
steps:
106106
- name: Download all workflow run artifacts
107-
uses: actions/download-artifact@v4
107+
uses: actions/download-artifact@v7
108108
with:
109109
path: ./
110110

111111
- name: Create Release
112-
id: create_release
113112
if: github.ref == 'refs/heads/master'
114-
uses: actions/create-release@master
113+
uses: softprops/action-gh-release@v2
115114
env:
116115
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
117116
with:
118117
tag_name: ${{needs.build_linux.outputs.release_name}}
119-
release_name: v${{needs.build_linux.outputs.release_name}}
118+
name: v${{needs.build_linux.outputs.release_name}}
120119
draft: false
121120
prerelease: false
122-
123-
- name: Upload Release Asset Linux
124-
if: github.ref == 'refs/heads/master'
125-
uses: actions/upload-release-asset@v1.0.1
126-
env:
127-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
128-
with:
129-
upload_url: ${{ steps.create_release.outputs.upload_url }}
130-
asset_name: replanetizer-${{needs.build_linux.outputs.release_name}}-linux-x64.zip
131-
asset_path: replanetizer-${{needs.build_linux.outputs.release_name}}-linux-x64.zip/replanetizer-${{needs.build_linux.outputs.release_name}}-linux-x64.zip
132-
asset_content_type: application/zip
133-
134-
- name: Upload Release Asset Windows
135-
if: github.ref == 'refs/heads/master'
136-
uses: actions/upload-release-asset@v1.0.1
137-
env:
138-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
139-
with:
140-
upload_url: ${{ steps.create_release.outputs.upload_url }}
141-
asset_name: replanetizer-${{needs.build_linux.outputs.release_name}}-win-x64.zip
142-
asset_path: replanetizer-${{needs.build_linux.outputs.release_name}}-win-x64.zip/replanetizer-${{needs.build_linux.outputs.release_name}}-win-x64.zip
143-
asset_content_type: application/zip
144-
145-
- name: Upload Release Asset macOS
146-
if: github.ref == 'refs/heads/master'
147-
uses: actions/upload-release-asset@v1.0.1
148-
env:
149-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
150-
with:
151-
upload_url: ${{ steps.create_release.outputs.upload_url }}
152-
asset_name: replanetizer-${{needs.build_linux.outputs.release_name}}-osx-x64.zip
153-
asset_path: replanetizer-${{needs.build_linux.outputs.release_name}}-osx-x64.zip/replanetizer-${{needs.build_linux.outputs.release_name}}-osx-x64.zip
154-
asset_content_type: application/zip
121+
files: |
122+
replanetizer-${{needs.build_linux.outputs.release_name}}-linux-x64.zip/replanetizer-${{needs.build_linux.outputs.release_name}}-linux-x64.zip
123+
replanetizer-${{needs.build_linux.outputs.release_name}}-win-x64.zip/replanetizer-${{needs.build_linux.outputs.release_name}}-win-x64.zip
124+
replanetizer-${{needs.build_linux.outputs.release_name}}-osx-x64.zip/replanetizer-${{needs.build_linux.outputs.release_name}}-osx-x64.zip

‎LibReplanetizer.Tests/LibReplanetizer.Tests.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
10+
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="10.0.8" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
1112
<PackageReference Include="xunit" Version="2.9.3" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
13+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1314
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1415
<PrivateAssets>all</PrivateAssets>
1516
</PackageReference>
16-
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
17+
<PackageReference Include="Xunit.SkippableFact" Version="1.5.61" />
1718
</ItemGroup>
1819

1920
<ItemGroup>

‎LibReplanetizer.Tests/Tests/Integration/FrameFixtureTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ public void Frame_GetRotationMatrix_ReturnsSomething()
6767
Skip.If(frame == null, "No animation frames found in this level.");
6868
// Bone 0 may or may not have a rotation, but should not throw.
6969
var mat = frame!.GetRotationMatrix(0);
70-
Assert.NotNull(mat);
7170
}
7271
}
7372
}

‎LibReplanetizer.Tests/Tests/LevelObjects/GameplayObjectTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void Constructor_ParsesVertexBuffer()
3737
float[] w = { 0.25f, 0.75f };
3838
byte[] block = BuildSplineBlock(pts, w);
3939

40-
var spline = new Spline(block, 0);
40+
var spline = new Spline(block, 0, 0);
4141

4242
Assert.Equal(6, spline.vertexBuffer.Length);
4343
Assert.Equal(1f, spline.vertexBuffer[0]);
@@ -53,7 +53,7 @@ public void Constructor_ParsesWValues()
5353
float[] w = { 0.1f, 0.9f };
5454
byte[] block = BuildSplineBlock(pts, w);
5555

56-
var spline = new Spline(block, 0);
56+
var spline = new Spline(block, 0, 0);
5757

5858
Assert.Equal(w[0], spline.wVals[0]);
5959
Assert.Equal(w[1], spline.wVals[1]);
@@ -66,7 +66,7 @@ public void ToByteArray_RoundTrip_MatchesOriginal()
6666
float[] w = { 0f, 0.5f, 1f };
6767
byte[] original = BuildSplineBlock(pts, w);
6868

69-
var spline = new Spline(original, 0);
69+
var spline = new Spline(original, 0, 0);
7070
byte[] serialized = spline.ToByteArray();
7171

7272
Assert.Equal(original, serialized);
@@ -77,7 +77,7 @@ public void GetVertex_ReturnsCorrectVector()
7777
{
7878
float[][] pts = { new[] { 1f, 2f, 3f }, new[] { 7f, 8f, 9f } };
7979
float[] w = { 0f, 1f };
80-
var spline = new Spline(BuildSplineBlock(pts, w), 0);
80+
var spline = new Spline(BuildSplineBlock(pts, w), 0, 0);
8181

8282
var v = spline.GetVertex(1);
8383

@@ -89,7 +89,7 @@ public void SetVertex_UpdatesVertexBuffer()
8989
{
9090
float[][] pts = { new[] { 0f, 0f, 0f } };
9191
float[] w = { 0f };
92-
var spline = new Spline(BuildSplineBlock(pts, w), 0);
92+
var spline = new Spline(BuildSplineBlock(pts, w), 0, 0);
9393

9494
spline.SetVertex(0, new Vector3(5f, 6f, 7f));
9595

‎LibReplanetizer.Tests/Tests/LevelObjects/MobyShrubTieTerrainTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ public void RC2_ToByteArray_PreservesModelId()
384384
[Fact]
385385
public void DefaultConstructor_SetsGame_RaC1()
386386
{
387-
var moby = new Moby();
387+
var moby = new Moby(GameType.RaC1);
388388
// We can verify pVars is initialised (not null)
389389
Assert.NotNull(moby.pVars);
390390
Assert.Empty(moby.pVars);
@@ -393,7 +393,7 @@ public void DefaultConstructor_SetsGame_RaC1()
393393
[Fact]
394394
public void DefaultConstructor_SpawnTypeIsZero()
395395
{
396-
var moby = new Moby();
396+
var moby = new Moby(GameType.RaC1);
397397
Assert.False(moby.spawnBeforeMissionCompletion);
398398
Assert.False(moby.spawnAfterMissionCompletion);
399399
Assert.False(moby.isCrate);

‎LibReplanetizer.Tests/Tests/LevelObjects/MobyTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ private static Moby MobyWithSpawnType(int spawnType)
2121
// Use the protected-setter via the public property.
2222
// Moby cannot be constructed without a byte block and model list, so
2323
// we rely on the object initialiser with default values.
24-
var moby = new Moby();
24+
var moby = new Moby(GameType.RaC1);
2525
moby.spawnType = spawnType;
2626
return moby;
2727
}

‎LibReplanetizer.Tests/Tests/LevelObjects/ShapeObjectTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private static Spline DummySpline()
3737
WriteFloat(splineBlock, 0x14, 0f);
3838
WriteFloat(splineBlock, 0x18, 0f);
3939
WriteFloat(splineBlock, 0x1C, 0f);
40-
return new Spline(splineBlock, 0);
40+
return new Spline(splineBlock, 0, 0);
4141
}
4242

4343
[Fact]

‎LibReplanetizer/LibReplanetizer.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
<ItemGroup>
99
<PackageReference Include="ImGui.NET" Version="1.91.6.1" />
10-
<PackageReference Include="NLog" Version="6.0.4" />
10+
<PackageReference Include="NLog" Version="6.1.3" />
1111
<PackageReference Include="OpenTK.Mathematics" Version="4.9.4" />
12-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
13-
<PackageReference Include="System.Resources.Extensions" Version="9.0.9" />
12+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
13+
<PackageReference Include="System.Resources.Extensions" Version="10.0.8" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎Replanetizer/Replanetizer.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939

4040
<ItemGroup>
4141
<PackageReference Include="ImGui.NET" Version="1.91.6.1" />
42-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
43-
<PackageReference Include="NLog" Version="6.0.4" />
42+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
43+
<PackageReference Include="NLog" Version="6.1.3" />
4444
<PackageReference Include="OpenTK" Version="4.9.4" />
4545
<PackageReference Include="OpenTK.Mathematics" Version="4.9.4" />
4646
<PackageReference Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="4.9.4" />
47-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
48-
<PackageReference Include="System.Resources.Extensions" Version="9.0.9" />
47+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
48+
<PackageReference Include="System.Resources.Extensions" Version="10.0.8" />
4949
</ItemGroup>
5050

5151
<ItemGroup>

0 commit comments

Comments
 (0)