diff --git a/Source/BNetServer/BNetServer.csproj b/Source/BNetServer/BNetServer.csproj
index 7251aff57..8cedbf1f7 100644
--- a/Source/BNetServer/BNetServer.csproj
+++ b/Source/BNetServer/BNetServer.csproj
@@ -4,6 +4,7 @@
Exe
BNetServer.Server
Red.ico
+ net9.0
diff --git a/Source/Framework/Cryptography/Ed25519/CryptoBytes.cs b/Source/Framework/Cryptography/Ed25519/CryptoBytes.cs
index d55477571..e02c7f698 100644
--- a/Source/Framework/Cryptography/Ed25519/CryptoBytes.cs
+++ b/Source/Framework/Cryptography/Ed25519/CryptoBytes.cs
@@ -262,10 +262,7 @@ namespace Framework.Cryptography.Ed25519
// Leading zero bytes get encoded as leading `1` characters
int leadingZeroCount = input.TakeWhile(c => c == '1').Count();
var leadingZeros = Enumerable.Repeat((byte)0, leadingZeroCount);
- var bytesWithoutLeadingZeros =
- intData.ToByteArray()
- .Reverse()// to big endian
- .SkipWhile(b => b == 0);//strip sign byte
+ var bytesWithoutLeadingZeros = intData.ToByteArray(true, true);
var result = leadingZeros.Concat(bytesWithoutLeadingZeros).ToArray();
return result;
}
diff --git a/Source/Framework/Framework.csproj b/Source/Framework/Framework.csproj
index 5ab19a5e7..17460f660 100644
--- a/Source/Framework/Framework.csproj
+++ b/Source/Framework/Framework.csproj
@@ -2,6 +2,7 @@
True
+ net9.0
diff --git a/Source/Framework/IO/Zlib/compress.cs b/Source/Framework/IO/Zlib/compress.cs
index e5242802a..fcc8461da 100644
--- a/Source/Framework/IO/Zlib/compress.cs
+++ b/Source/Framework/IO/Zlib/compress.cs
@@ -24,7 +24,9 @@ namespace Framework.IO
deflateStream.Flush();
}
buffer.WriteBytes(ms.ToArray());
- buffer.WriteBytes(BitConverter.GetBytes(adler32).Reverse().ToArray());
+ var adlerBytes = BitConverter.GetBytes(adler32);
+ adlerBytes.Reverse();
+ buffer.WriteBytes(adlerBytes);
return buffer.GetData();
}
diff --git a/Source/Framework/Util/Extensions.cs b/Source/Framework/Util/Extensions.cs
index 74733f5b8..d977c12ab 100644
--- a/Source/Framework/Util/Extensions.cs
+++ b/Source/Framework/Util/Extensions.cs
@@ -25,9 +25,9 @@ namespace System
public static string ToHexString(this byte[] byteArray, bool reverse = false)
{
if (reverse)
- return byteArray.Reverse().Aggregate("", (current, b) => current + b.ToString("X2"));
- else
- return byteArray.Aggregate("", (current, b) => current + b.ToString("X2"));
+ byteArray.Reverse();
+
+ return byteArray.Aggregate("", (current, b) => current + b.ToString("X2"));
}
public static byte[] ToByteArray(this string str, bool reverse = false)
@@ -40,7 +40,10 @@ namespace System
string temp = String.Concat(str[i * 2], str[i * 2 + 1]);
res[i] = Convert.ToByte(temp, 16);
}
- return reverse ? res.Reverse().ToArray() : res;
+ if (reverse)
+ res.Reverse();
+
+ return res;
}
public static byte[] ToByteArray(this string value, char separator)
diff --git a/Source/Game/Chat/Commands/DebugCommands.cs b/Source/Game/Chat/Commands/DebugCommands.cs
index 5f62ac050..83989a242 100644
--- a/Source/Game/Chat/Commands/DebugCommands.cs
+++ b/Source/Game/Chat/Commands/DebugCommands.cs
@@ -1449,4 +1449,4 @@ namespace Game.Chat
handler.SendSysMessage($"Map Id: {map.GetId()} Name: '{map.GetMapName()}' Instance Id: {map.GetInstanceId()} Highest Guid Creature: {map.GetMaxLowGuid(HighGuid.Creature)} GameObject: {map.GetMaxLowGuid(HighGuid.GameObject)}");
}
}
-}
+}
\ No newline at end of file
diff --git a/Source/Game/Game.csproj b/Source/Game/Game.csproj
index 13ee1f3a1..518fe8564 100644
--- a/Source/Game/Game.csproj
+++ b/Source/Game/Game.csproj
@@ -2,6 +2,7 @@
True
+ net9.0
diff --git a/Source/WorldServer/WorldServer.csproj b/Source/WorldServer/WorldServer.csproj
index 4a415b7c2..24b7a9e83 100644
--- a/Source/WorldServer/WorldServer.csproj
+++ b/Source/WorldServer/WorldServer.csproj
@@ -4,6 +4,7 @@
Exe
Blue.ico
WorldServer.Server
+ net9.0
diff --git a/default.props b/default.props
index 6406ab111..b8f4e01a9 100644
--- a/default.props
+++ b/default.props
@@ -2,7 +2,7 @@
../../Build/$(Configuration)/$(Platform)
- net8.0
+ net9.0
False
False
False