Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.NET 8 update.

Browse Source
This commit is contained in:
Fabian König
2024-02-01 05:23:51 +01:00
committed by GitHub
parent 958ab1dfbb
commit ccaca1ccd5
6 changed files with 32 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CypherCore.sln
+22 -66
View File
@@ -19,74 +19,30 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{0C88588D-4
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|linux-x64 = Debug|linux-x64 Debug|Any CPU = Debug|Any CPU
Debug|mac-x64 = Debug|mac-x64 Release|Any CPU = Release|Any CPU
Debug|win-x64 = Debug|win-x64
Release|linux-x64 = Release|linux-x64
Release|mac-x64 = Release|mac-x64
Release|win-x64 = Release|win-x64
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|linux-x64.ActiveCfg = Debug|linux-x64 {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|linux-x64.Build.0 = Debug|linux-x64 {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|mac-x64.ActiveCfg = Debug|mac-x64 {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|mac-x64.Build.0 = Debug|mac-x64 {EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|Any CPU.Build.0 = Release|Any CPU
{EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|win-x64.ActiveCfg = Debug|win-x64 {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Debug|win-x64.Build.0 = Debug|win-x64 {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|linux-x64.ActiveCfg = Release|linux-x64 {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|linux-x64.Build.0 = Release|linux-x64 {E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Release|Any CPU.Build.0 = Release|Any CPU
{EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|mac-x64.ActiveCfg = Release|mac-x64 {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|mac-x64.Build.0 = Release|mac-x64 {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|win-x64.ActiveCfg = Release|win-x64 {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}.Release|win-x64.Build.0 = Release|win-x64 {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|Any CPU.Build.0 = Release|Any CPU
{E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|linux-x64.ActiveCfg = Debug|linux-x64 {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|linux-x64.Build.0 = Debug|linux-x64 {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|mac-x64.ActiveCfg = Debug|mac-x64 {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|mac-x64.Build.0 = Debug|mac-x64 {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|Any CPU.Build.0 = Release|Any CPU
{E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|win-x64.ActiveCfg = Debug|win-x64 {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Debug|win-x64.Build.0 = Debug|win-x64 {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Release|linux-x64.ActiveCfg = Release|linux-x64 {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5DF8709-16D8-4357-976A-DF54AD3DDD66}.Release|linux-x64.Build.0 = Release|linux-x64 {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|Any CPU.Build.0 = Release|Any CPU
{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
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
Source/BNetServer/BNetServer.csproj
-3
View File
@@ -5,9 +5,6 @@
<StartupObject>BNetServer.Server</StartupObject> <StartupObject>BNetServer.Server</StartupObject>
<ApplicationIcon>Red.ico</ApplicationIcon> <ApplicationIcon>Red.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Packaging.Tools.Trimming" Version="1.1.0-preview1-26619-01" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Framework\Framework.csproj" /> <ProjectReference Include="..\Framework\Framework.csproj" />
</ItemGroup> </ItemGroup>
Source/Framework/Cryptography/PacketCrypt.cs
+2 -2
View File
@@ -13,8 +13,8 @@ namespace Framework.Cryptography
if (IsInitialized) if (IsInitialized)
throw new InvalidOperationException("PacketCrypt already initialized!"); throw new InvalidOperationException("PacketCrypt already initialized!");
_serverEncrypt = new AesGcm(key); _serverEncrypt = new AesGcm(key, 12);
_clientDecrypt = new AesGcm(key); _clientDecrypt = new AesGcm(key, 12);
IsInitialized = true; IsInitialized = true;
} }
Source/Framework/Framework.csproj
+2 -2
View File
@@ -5,8 +5,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.21.12" /> <PackageReference Include="Google.Protobuf" Version="3.25.2" />
<PackageReference Include="MySqlConnector" Version="2.2.5" /> <PackageReference Include="MySqlConnector" Version="2.3.5" />
</ItemGroup> </ItemGroup>
</Project> </Project>
Source/Game/Game.csproj
+3 -3
View File
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\default.props" /> <Import Project="..\..\default.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Framework\Framework.csproj" /> <ProjectReference Include="..\Framework\Framework.csproj" />
default.props
+3 -19
View File
@@ -2,28 +2,12 @@
<PropertyGroup> <PropertyGroup>
<OutputPath>../../Build/$(Configuration)/$(Platform)</OutputPath> <OutputPath>../../Build/$(Configuration)/$(Platform)</OutputPath>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors> <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>False</AppendRuntimeIdentifierToOutputPath> <AppendRuntimeIdentifierToOutputPath>False</AppendRuntimeIdentifierToOutputPath>
<Platforms>win-x64;linux-x64;mac-x64</Platforms> <RuntimeIdentifiers>win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
<RuntimeIdentifiers>win10-x64;linux-x64;osx-x64</RuntimeIdentifiers> <LangVersion>preview</LangVersion>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)' == 'win-x64'">
<Platform>x64</Platform>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)' == 'linux-x64'">
<Platform>x64</Platform>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)' == 'mac-x64'">
<Platform>x64</Platform>
<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>