From 160a0851573b3b4e51639d6b0f267c4865b02149 Mon Sep 17 00:00:00 2001
From: Tretiner <alexandirina@inbox.ru>
Date: Sat, 28 Sep 2024 21:20:11 +0500
Subject: [PATCH] Fix mod name parse and add net9

---
 SoulstormReplayReader.Core/Extensions/Extensions.cs        | 7 -------
 .../SoulstormReplayReader.Core.csproj                      | 6 +++---
 SoulstormReplayReader.Core/SsReplayReader.cs               | 2 +-
 .../SoulstormReplayReader.Playground.csproj                | 2 +-
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/SoulstormReplayReader.Core/Extensions/Extensions.cs b/SoulstormReplayReader.Core/Extensions/Extensions.cs
index 8eed57d..8fb2d32 100644
--- a/SoulstormReplayReader.Core/Extensions/Extensions.cs
+++ b/SoulstormReplayReader.Core/Extensions/Extensions.cs
@@ -19,13 +19,6 @@ public static class Extensions
         (list[i1], list[i2]) = (list[i2], list[i1]);
     }
 
-    public static Span<byte> TrimEnd(this Span<byte> span, byte val = 0)
-    {
-        var i = span.Length - 1;
-        while (i > 0 && span[i--] == val) ;
-        return span[..i];
-    }
-
     public static ExBinaryReader NextAsciiStringMustEqual(this ExBinaryReader binReader, ReadOnlySpan<byte> text)
     {
         if (!binReader.IsNextAsciiStringEquals(text))
diff --git a/SoulstormReplayReader.Core/SoulstormReplayReader.Core.csproj b/SoulstormReplayReader.Core/SoulstormReplayReader.Core.csproj
index c1f4b7e..7972ffc 100644
--- a/SoulstormReplayReader.Core/SoulstormReplayReader.Core.csproj
+++ b/SoulstormReplayReader.Core/SoulstormReplayReader.Core.csproj
@@ -4,13 +4,13 @@
         <PackageId>SoulstormReplayReader.Core</PackageId>
         <Authors>Bununic</Authors>
         <Company>Dowonline</Company>
-        <Version>1.0.5</Version>
+        <Version>1.0.6.1</Version>
     </PropertyGroup>
 
     <PropertyGroup>
         <OutputType>Library</OutputType>
-        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
-        <LangVersion>12.0</LangVersion>
+        <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
+        <LangVersion>12</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Platforms>AnyCPU</Platforms>
     </PropertyGroup>
diff --git a/SoulstormReplayReader.Core/SsReplayReader.cs b/SoulstormReplayReader.Core/SsReplayReader.cs
index 3f95e48..1416211 100644
--- a/SoulstormReplayReader.Core/SsReplayReader.cs
+++ b/SoulstormReplayReader.Core/SsReplayReader.cs
@@ -91,7 +91,7 @@ public sealed class SsReplayReader(Stream stream) : IDisposable
         Replay.Version = (ReplayVersion)_binaryReader.ReadInt32();
 
         var modNameSpan = _binaryReader.ReadBytes(stackalloc byte[32]);
-        Replay.ModName = Encoding.ASCII.GetString(modNameSpan.TrimEnd());
+        Replay.ModName = Encoding.ASCII.GetString(modNameSpan.TrimEnd<byte>(0));
 
         _binaryReader // relic chunky
             .Skip(44)
diff --git a/SoulstormReplayReader.Playground/SoulstormReplayReader.Playground.csproj b/SoulstormReplayReader.Playground/SoulstormReplayReader.Playground.csproj
index eac181f..09ee198 100644
--- a/SoulstormReplayReader.Playground/SoulstormReplayReader.Playground.csproj
+++ b/SoulstormReplayReader.Playground/SoulstormReplayReader.Playground.csproj
@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <None Include="TestReplays/*" CopyToOutputDirectory="PreserveNewest"/>
+        <None Include="TestReplays/**" CopyToOutputDirectory="PreserveNewest"/>
     </ItemGroup>
 
 </Project>