diff --git a/.github/workflows/build_and_publish.yml b/.github/workflows/build_and_publish.yml
index 904ca4d..955a0f3 100644
--- a/.github/workflows/build_and_publish.yml
+++ b/.github/workflows/build_and_publish.yml
@@ -12,7 +12,7 @@ jobs:
matrix:
project: [Headerer]
runtime: [win-x86, win-x64, win-arm64, linux-x64, linux-arm64, osx-x64]
- framework: [net8.0] #[net20, net35, net40, net452, net472, net48, netcoreapp3.1, net5.0, net6.0, net7.0, net8.0]
+ framework: [net9.0] #[net20, net35, net40, net452, net472, net48, netcoreapp3.1, net5.0, net6.0, net7.0, net8.0, net9.0]
conf: [Debug] #[Release, Debug]
steps:
@@ -21,7 +21,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
- dotnet-version: 8.0.x
+ dotnet-version: 9.0.x
- name: Restore dependencies
run: dotnet restore
diff --git a/.github/workflows/build_nupkg.yml b/.github/workflows/build_nupkg.yml
index 9dea338..616b980 100644
--- a/.github/workflows/build_nupkg.yml
+++ b/.github/workflows/build_nupkg.yml
@@ -16,10 +16,16 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
- dotnet-version: 8.0.x
+ dotnet-version: 9.0.x
- name: Restore dependencies
run: dotnet restore
+
+ - name: Build library
+ run: dotnet build
+
+ - name: Run tests
+ run: dotnet test
- name: Pack
run: dotnet pack
diff --git a/.github/workflows/check_pr.yml b/.github/workflows/check_pr.yml
index bba92af..9d421c5 100644
--- a/.github/workflows/check_pr.yml
+++ b/.github/workflows/check_pr.yml
@@ -11,7 +11,10 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
- dotnet-version: 8.0.x
+ dotnet-version: 9.0.x
- name: Build
- run: dotnet build
\ No newline at end of file
+ run: dotnet build
+
+ - name: Run tests
+ run: dotnet test
\ No newline at end of file
diff --git a/Headerer/Extract.cs b/Headerer/Extract.cs
index 07095b5..fb1604c 100644
--- a/Headerer/Extract.cs
+++ b/Headerer/Extract.cs
@@ -42,7 +42,7 @@ namespace Headerer
using var fs = File.OpenRead(file);
int startOffset = int.Parse(rule.StartOffset ?? "0");
byte[] hbin = new byte[startOffset];
- fs.Read(hbin, 0, startOffset);
+ int bytes = fs.Read(hbin, 0, startOffset);
hstr = ByteArrayExtensions.ByteArrayToString(hbin)!;
}
catch
diff --git a/Headerer/Headerer.csproj b/Headerer/Headerer.csproj
index eda0b25..5df90c2 100644
--- a/Headerer/Headerer.csproj
+++ b/Headerer/Headerer.csproj
@@ -1,8 +1,8 @@
-
+
- net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0
+ net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0
Exe
false
false
@@ -28,11 +28,11 @@
win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64
-
+
win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64
- net6.0;net7.0;net8.0
+ net6.0;net7.0;net8.0;net9.0
@@ -40,9 +40,9 @@
-
-
-
+
+
+
diff --git a/SabreTools.Skippers.Test/SabreTools.Skippers.Test.csproj b/SabreTools.Skippers.Test/SabreTools.Skippers.Test.csproj
index 8ef1dbb..f56f188 100644
--- a/SabreTools.Skippers.Test/SabreTools.Skippers.Test.csproj
+++ b/SabreTools.Skippers.Test/SabreTools.Skippers.Test.csproj
@@ -1,25 +1,25 @@
-
- net6.0;net8.0
- false
-
+
+ net6.0;net8.0;net9.0
+ false
+
-
-
-
+
+
+
-
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
-
-
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
-
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
-
+
\ No newline at end of file
diff --git a/SabreTools.Skippers/SabreTools.Skippers.csproj b/SabreTools.Skippers/SabreTools.Skippers.csproj
index 63ce46c..00fc1f0 100644
--- a/SabreTools.Skippers/SabreTools.Skippers.csproj
+++ b/SabreTools.Skippers/SabreTools.Skippers.csproj
@@ -1,43 +1,46 @@
-
-
- net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0
- false
- false
- latest
- enable
- true
- true
- 1.1.3
+
+
+ net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0
+ false
+ false
+ latest
+ enable
+ true
+ true
+ 1.1.3
-
- Matt Nadareski
- Copyright (c)2016-2024 Matt Nadareski
- https://github.com/SabreTools/
- README.md
- https://github.com/SabreTools/SabreTools.Skippers
- git
- skippers headers game
- MIT
-
+
+ Matt Nadareski
+ Copyright (c)2016-2024 Matt Nadareski
+ https://github.com/SabreTools/
+ README.md
+ https://github.com/SabreTools/SabreTools.Skippers
+ git
+ skippers headers game
+ MIT
+
-
-
- win-x86;win-x64
-
-
- win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64
-
-
- win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64
-
-
- net6.0;net7.0;net8.0
-
+
+
+ win-x86;win-x64
+
+
+ win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64
+
+
+ win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64
+
+
+ net6.0;net7.0;net8.0;net9.0
+
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/SabreTools.Skippers/Tests/AndTest.cs b/SabreTools.Skippers/Tests/AndTest.cs
index 575cd98..9a4eaca 100644
--- a/SabreTools.Skippers/Tests/AndTest.cs
+++ b/SabreTools.Skippers/Tests/AndTest.cs
@@ -111,7 +111,7 @@ namespace SabreTools.Skippers.Tests
{
// Then apply the mask if it exists
byte[] read = new byte[_mask.Length];
- input.Read(read, 0, _mask.Length);
+ int bytes = input.Read(read, 0, _mask.Length);
byte[] masked = new byte[_mask.Length];
for (int i = 0; i < read.Length; i++)
diff --git a/SabreTools.Skippers/Tests/OrTest.cs b/SabreTools.Skippers/Tests/OrTest.cs
index f077168..aacb956 100644
--- a/SabreTools.Skippers/Tests/OrTest.cs
+++ b/SabreTools.Skippers/Tests/OrTest.cs
@@ -111,7 +111,7 @@ namespace SabreTools.Skippers.Tests
{
// Then apply the mask if it exists
byte[] read = new byte[_mask.Length];
- input.Read(read, 0, _mask.Length);
+ int bytes = input.Read(read, 0, _mask.Length);
byte[] masked = new byte[_mask.Length];
for (int i = 0; i < read.Length; i++)
diff --git a/SabreTools.Skippers/Tests/XorTest.cs b/SabreTools.Skippers/Tests/XorTest.cs
index 1c3d5ca..e25fca0 100644
--- a/SabreTools.Skippers/Tests/XorTest.cs
+++ b/SabreTools.Skippers/Tests/XorTest.cs
@@ -111,7 +111,7 @@ namespace SabreTools.Skippers.Tests
{
// Then apply the mask if it exists
byte[] read = new byte[_mask.Length];
- input.Read(read, 0, _mask.Length);
+ int bytes = input.Read(read, 0, _mask.Length);
byte[] masked = new byte[_mask.Length];
for (int i = 0; i < read.Length; i++)
diff --git a/publish-nix.sh b/publish-nix.sh
index facb00a..187f9ec 100644
--- a/publish-nix.sh
+++ b/publish-nix.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# This batch file assumes the following:
-# - .NET 8.0 (or newer) SDK is installed and in PATH
+# - .NET 9.0 (or newer) SDK is installed and in PATH
# - zip is installed and in PATH
# - Git is installed and in PATH
#
@@ -44,18 +44,18 @@ echo " No archive (-a) $NO_ARCHIVE"
echo " "
# Create the build matrix arrays
-FRAMEWORKS=("net8.0")
+FRAMEWORKS=("net9.0")
RUNTIMES=("win-x86" "win-x64" "win-arm64" "linux-x64" "linux-arm64" "osx-x64" "osx-arm64")
# Use expanded lists, if requested
if [ $USE_ALL = true ]; then
- FRAMEWORKS=("net48" "netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0") # TODO: Support all frameworks
+ FRAMEWORKS=("net48" "netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0" "net9.0") # TODO: Support all frameworks
fi
# Create the filter arrays
-SINGLE_FILE_CAPABLE=("net5.0" "net6.0" "net7.0" "net8.0")
-VALID_APPLE_FRAMEWORKS=("net6.0" "net7.0" "net8.0")
-VALID_CROSS_PLATFORM_FRAMEWORKS=("netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0")
+SINGLE_FILE_CAPABLE=("net5.0" "net6.0" "net7.0" "net8.0" "net9.0")
+VALID_APPLE_FRAMEWORKS=("net6.0" "net7.0" "net8.0" "net9.0")
+VALID_CROSS_PLATFORM_FRAMEWORKS=("netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0" "net9.0")
VALID_CROSS_PLATFORM_RUNTIMES=("win-arm64" "linux-x64" "linux-arm64" "osx-x64" "osx-arm64")
# Only build if requested
diff --git a/publish-win.ps1 b/publish-win.ps1
index f26d576..6eb2881 100644
--- a/publish-win.ps1
+++ b/publish-win.ps1
@@ -1,5 +1,5 @@
# This batch file assumes the following:
-# - .NET 8.0 (or newer) SDK is installed and in PATH
+# - .NET 9.0 (or newer) SDK is installed and in PATH
# - 7-zip commandline (7z.exe) is installed and in PATH
# - Git for Windows is installed and in PATH
#
@@ -35,18 +35,18 @@ Write-Host " No archive (-NoArchive) $NO_ARCHIVE"
Write-Host " "
# Create the build matrix arrays
-$FRAMEWORKS = @('net8.0')
+$FRAMEWORKS = @('net9.0')
$RUNTIMES = @('win-x86', 'win-x64', 'win-arm64', 'linux-x64', 'linux-arm64', 'osx-x64', 'osx-arm64')
# Use expanded lists, if requested
if ($USE_ALL.IsPresent) {
- $FRAMEWORKS = @('net48', 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0') # TODO: Support all frameworks
+ $FRAMEWORKS = @('net48', 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0') # TODO: Support all frameworks
}
# Create the filter arrays
-$SINGLE_FILE_CAPABLE = @('net5.0', 'net6.0', 'net7.0', 'net8.0')
-$VALID_APPLE_FRAMEWORKS = @('net6.0', 'net7.0', 'net8.0')
-$VALID_CROSS_PLATFORM_FRAMEWORKS = @('netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0')
+$SINGLE_FILE_CAPABLE = @('net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0')
+$VALID_APPLE_FRAMEWORKS = @('net6.0', 'net7.0', 'net8.0', 'net9.0')
+$VALID_CROSS_PLATFORM_FRAMEWORKS = @('netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0')
$VALID_CROSS_PLATFORM_RUNTIMES = @('win-arm64', 'linux-x64', 'linux-arm64', 'osx-x64', 'osx-arm64')
# Only build if requested