From ccaca1ccd5ac5c8769306704a71e563372ffc74a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20K=C3=B6nig?= Date: Thu, 1 Feb 2024 05:23:51 +0100 Subject: [PATCH] .NET 8 update. --- CypherCore.sln | 88 +++++--------------- Source/BNetServer/BNetServer.csproj | 3 - Source/Framework/Cryptography/PacketCrypt.cs | 4 +- Source/Framework/Framework.csproj | 4 +- Source/Game/Game.csproj | 6 +- default.props | 22 +---- 6 files changed, 32 insertions(+), 95 deletions(-) diff --git a/CypherCore.sln b/CypherCore.sln index bbaa315b1..86b5932c7 100644 --- a/CypherCore.sln +++ b/CypherCore.sln @@ -19,74 +19,30 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{0C88588D-4 EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|linux-x64 = Debug|linux-x64 - Debug|mac-x64 = Debug|mac-x64 - Debug|win-x64 = Debug|win-x64 - Release|linux-x64 = Release|linux-x64 - Release|mac-x64 = Release|mac-x64 - Release|win-x64 = Release|win-x64 + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|linux-x64.ActiveCfg = Debug|linux-x64 - {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|linux-x64.Build.0 = Debug|linux-x64 - {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|mac-x64.ActiveCfg = Debug|mac-x64 - {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|mac-x64.Build.0 = Debug|mac-x64 - {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|win-x64.ActiveCfg = Debug|win-x64 - {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|win-x64.Build.0 = Debug|win-x64 - {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|linux-x64.ActiveCfg = Release|linux-x64 - {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|linux-x64.Build.0 = Release|linux-x64 - {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|mac-x64.ActiveCfg = Release|mac-x64 - {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|mac-x64.Build.0 = Release|mac-x64 - {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|win-x64.ActiveCfg = Release|win-x64 - {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|win-x64.Build.0 = Release|win-x64 - {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|linux-x64.ActiveCfg = Debug|linux-x64 - {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|linux-x64.Build.0 = Debug|linux-x64 - {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|mac-x64.ActiveCfg = Debug|mac-x64 - {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|mac-x64.Build.0 = Debug|mac-x64 - {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|win-x64.ActiveCfg = Debug|win-x64 - {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|win-x64.Build.0 = Debug|win-x64 - {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Release|linux-x64.ActiveCfg = Release|linux-x64 - {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Release|linux-x64.Build.0 = Release|linux-x64 - {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Release|mac-x64.ActiveCfg = Release|mac-x64 - {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Release|mac-x64.Build.0 = Release|mac-x64 - {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Release|win-x64.ActiveCfg = Release|win-x64 - {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Release|win-x64.Build.0 = Release|win-x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|linux-x64.ActiveCfg = Debug|linux-x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|linux-x64.Build.0 = Debug|linux-x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|mac-x64.ActiveCfg = Debug|mac-x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|mac-x64.Build.0 = Debug|mac-x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|win-x64.ActiveCfg = Debug|win-x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|win-x64.Build.0 = Debug|win-x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|linux-x64.ActiveCfg = Release|linux-x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|linux-x64.Build.0 = Release|linux-x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|mac-x64.ActiveCfg = Release|mac-x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|mac-x64.Build.0 = Release|mac-x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|win-x64.ActiveCfg = Release|win-x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|win-x64.Build.0 = Release|win-x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|linux-x64.ActiveCfg = Debug|linux-x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|linux-x64.Build.0 = Debug|linux-x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|mac-x64.ActiveCfg = Debug|mac-x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|mac-x64.Build.0 = Debug|mac-x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|win-x64.ActiveCfg = Debug|win-x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|win-x64.Build.0 = Debug|win-x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|linux-x64.ActiveCfg = Release|linux-x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|linux-x64.Build.0 = Release|linux-x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|mac-x64.ActiveCfg = Release|mac-x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|mac-x64.Build.0 = Release|mac-x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|win-x64.ActiveCfg = Release|win-x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|win-x64.Build.0 = Release|win-x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|linux-x64.ActiveCfg = Debug|linux-x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|linux-x64.Build.0 = Debug|linux-x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|mac-x64.ActiveCfg = Debug|mac-x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|mac-x64.Build.0 = Debug|mac-x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|win-x64.ActiveCfg = Debug|win-x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|win-x64.Build.0 = Debug|win-x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|linux-x64.ActiveCfg = Release|linux-x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|linux-x64.Build.0 = Release|linux-x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|mac-x64.ActiveCfg = Release|mac-x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|mac-x64.Build.0 = Release|mac-x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|win-x64.ActiveCfg = Release|win-x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|win-x64.Build.0 = Release|win-x64 + {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|Any CPU.Build.0 = Release|Any CPU + {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Release|Any CPU.Build.0 = Release|Any CPU + {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|Any CPU.Build.0 = Release|Any CPU + {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|Any CPU.Build.0 = Release|Any CPU + {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/BNetServer/BNetServer.csproj b/Source/BNetServer/BNetServer.csproj index 016ab28ef..7251aff57 100644 --- a/Source/BNetServer/BNetServer.csproj +++ b/Source/BNetServer/BNetServer.csproj @@ -5,9 +5,6 @@ BNetServer.Server Red.ico - - - diff --git a/Source/Framework/Cryptography/PacketCrypt.cs b/Source/Framework/Cryptography/PacketCrypt.cs index 342350d8e..8556ffc44 100644 --- a/Source/Framework/Cryptography/PacketCrypt.cs +++ b/Source/Framework/Cryptography/PacketCrypt.cs @@ -13,8 +13,8 @@ namespace Framework.Cryptography if (IsInitialized) throw new InvalidOperationException("PacketCrypt already initialized!"); - _serverEncrypt = new AesGcm(key); - _clientDecrypt = new AesGcm(key); + _serverEncrypt = new AesGcm(key, 12); + _clientDecrypt = new AesGcm(key, 12); IsInitialized = true; } diff --git a/Source/Framework/Framework.csproj b/Source/Framework/Framework.csproj index 0d74947e5..5ab19a5e7 100644 --- a/Source/Framework/Framework.csproj +++ b/Source/Framework/Framework.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/Source/Game/Game.csproj b/Source/Game/Game.csproj index 8c59b3dbc..13ee1f3a1 100644 --- a/Source/Game/Game.csproj +++ b/Source/Game/Game.csproj @@ -1,8 +1,8 @@ - - True - + + True + diff --git a/default.props b/default.props index a8e106b48..6406ab111 100644 --- a/default.props +++ b/default.props @@ -2,28 +2,12 @@ ../../Build/$(Configuration)/$(Platform) - net7.0 + net8.0 False False False - win-x64;linux-x64;mac-x64 - win10-x64;linux-x64;osx-x64 - latest - - - - x64 - win10-x64 - - - - x64 - linux-x64 - - - - x64 - osx-x64 + win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64 + preview