From 9a2fb7e2b28bda8dbc3f64b09959459214728760 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Fri, 20 Jan 2023 09:25:12 -0500 Subject: [PATCH] Upgraded to Net 7.0 --- Source/Framework/Framework.csproj | 4 ++-- .../Framework/RecastDetour/Detour/DetourNavMeshBuilder.cs | 4 ++-- Source/Game/Warden/WardenWin.cs | 6 +++--- default.props | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/Framework/Framework.csproj b/Source/Framework/Framework.csproj index 6ced4276d..0d74947e5 100644 --- a/Source/Framework/Framework.csproj +++ b/Source/Framework/Framework.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/Source/Framework/RecastDetour/Detour/DetourNavMeshBuilder.cs b/Source/Framework/RecastDetour/Detour/DetourNavMeshBuilder.cs index 5ba50d1da..3b36b62df 100644 --- a/Source/Framework/RecastDetour/Detour/DetourNavMeshBuilder.cs +++ b/Source/Framework/RecastDetour/Detour/DetourNavMeshBuilder.cs @@ -205,8 +205,8 @@ public static partial class Detour bytes.AddRange(BitConverter.GetBytes(vertBase)); bytes.AddRange(BitConverter.GetBytes(triBase)); - bytes.AddRange(BitConverter.GetBytes(vertCount)); - bytes.AddRange(BitConverter.GetBytes(triCount)); + bytes.Add(vertCount); + bytes.Add(triCount); return bytes.ToArray(); } diff --git a/Source/Game/Warden/WardenWin.cs b/Source/Game/Warden/WardenWin.cs index 483595363..cfd8d81c5 100644 --- a/Source/Game/Warden/WardenWin.cs +++ b/Source/Game/Warden/WardenWin.cs @@ -81,7 +81,7 @@ namespace Game Request.Function1[1] = 0x000218C0; // 0x00400000 + 0x000218C0 SFileGetFileSize Request.Function1[2] = 0x00022530; // 0x00400000 + 0x00022530 SFileReadFile Request.Function1[3] = 0x00022910; // 0x00400000 + 0x00022910 SFileCloseFile - Request.CheckSumm1 = BuildChecksum(BitConverter.GetBytes(Request.Unk1), 20); + Request.CheckSumm1 = BuildChecksum(new byte[] { Request.Unk1 }, 20); Request.Command2 = WardenOpcodes.SmsgModuleInitialize; Request.Size2 = 8; @@ -90,7 +90,7 @@ namespace Game Request.String_library2 = 0; Request.Function2 = 0x00419D40; // 0x00400000 + 0x00419D40 FrameScript::GetText Request.Function2_set = 1; - Request.CheckSumm2 = BuildChecksum(BitConverter.GetBytes(Request.Unk2), 8); + Request.CheckSumm2 = BuildChecksum(new byte[] { Request.Unk2 }, 8); Request.Command3 = WardenOpcodes.SmsgModuleInitialize; Request.Size3 = 8; @@ -99,7 +99,7 @@ namespace Game Request.String_library3 = 0; Request.Function3 = 0x0046AE20; // 0x00400000 + 0x0046AE20 PerformanceCounter Request.Function3_set = 1; - Request.CheckSumm3 = BuildChecksum(BitConverter.GetBytes(Request.Unk5), 8); + Request.CheckSumm3 = BuildChecksum(new byte[] { Request.Unk5 }, 8); Warden3DataServer packet = new(); packet.Data = EncryptData(Request); diff --git a/default.props b/default.props index b09477bd0..a8e106b48 100644 --- a/default.props +++ b/default.props @@ -2,7 +2,7 @@ ../../Build/$(Configuration)/$(Platform) - net6.0 + net7.0 False False False