diff --git a/CypherCore.sln b/CypherCore.sln index 10f1dc179..a1defa9bd 100644 --- a/CypherCore.sln +++ b/CypherCore.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29926.136 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BNetServer", "Source\BNetServer\BNetServer.csproj", "{EEBFCEE3-CFAC-4D2E-927F-8E24E07A4218}" EndProject @@ -51,42 +51,42 @@ Global {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|x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|linux-x64.Build.0 = Debug|x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|mac-x64.ActiveCfg = Debug|x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|mac-x64.Build.0 = Debug|x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|win-x64.ActiveCfg = Debug|x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Debug|win-x64.Build.0 = Debug|x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|linux-x64.ActiveCfg = Release|x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|linux-x64.Build.0 = Release|x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|mac-x64.ActiveCfg = Release|x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|mac-x64.Build.0 = Release|x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|win-x64.ActiveCfg = Release|x64 - {3B8C9AB8-2DC3-4655-BF67-AE2001D3B4F6}.Release|win-x64.Build.0 = Release|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|x64 {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|linux-x64.Build.0 = Debug|x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|mac-x64.ActiveCfg = Debug|x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|mac-x64.Build.0 = Debug|x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|win-x64.ActiveCfg = Debug|x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Debug|win-x64.Build.0 = Debug|x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|linux-x64.ActiveCfg = Release|x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|linux-x64.Build.0 = Release|x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|mac-x64.ActiveCfg = Release|x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|mac-x64.Build.0 = Release|x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|win-x64.ActiveCfg = Release|x64 - {1899C17C-1FA4-4807-B90E-0336C5748C1A}.Release|win-x64.Build.0 = Release|x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|linux-x64.ActiveCfg = Debug|x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|linux-x64.Build.0 = Debug|x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|mac-x64.ActiveCfg = Debug|x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|mac-x64.Build.0 = Debug|x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|win-x64.ActiveCfg = Debug|x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Debug|win-x64.Build.0 = Debug|x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|linux-x64.ActiveCfg = Release|x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|linux-x64.Build.0 = Release|x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|mac-x64.ActiveCfg = Release|x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|mac-x64.Build.0 = Release|x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|win-x64.ActiveCfg = Release|x64 - {2F7515AD-18E3-4ACA-A14B-1929F76299E7}.Release|win-x64.Build.0 = Release|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 GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/README.md b/README.md index dd529070c..6450bf482 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ CypherCore is an open source server project for World of Warcraft written in C#. The current support game version is: 9.1.5.40944 ### Prerequisites -* Visual Studio 2019 with .NET 5.0 [Download](https://www.visualstudio.com/downloads/) +* Visual Studio 2022 with .NET 6.0 [Download](https://www.visualstudio.com/downloads/) * Mysql Database 5.6 or higher [Download](https://dev.mysql.com/downloads/mysql/) ### Server Setup @@ -15,7 +15,7 @@ The current support game version is: 9.1.5.40944 * Make sure Conf files are updated and point the the correct folders and sql user and databases ### Installing the database -* Download the full Trinity Core database (TDB 820.19071) [Download](https://github.com/TrinityCore/TrinityCore/releases) +* Download the full Trinity Core database (TDB 910.21101) [Download](https://github.com/TrinityCore/TrinityCore/releases) * Extract the sql files into the core sql folder (ex: C:\CypherCore\sql) ### Playing diff --git a/Source/BNetServer/BNetServer.csproj b/Source/BNetServer/BNetServer.csproj index 071a9356a..016ab28ef 100644 --- a/Source/BNetServer/BNetServer.csproj +++ b/Source/BNetServer/BNetServer.csproj @@ -2,7 +2,6 @@ Exe - net5.0 BNetServer.Server Red.ico diff --git a/Source/Framework/Framework.csproj b/Source/Framework/Framework.csproj index ef234cdb7..5d5158458 100644 --- a/Source/Framework/Framework.csproj +++ b/Source/Framework/Framework.csproj @@ -1,17 +1,13 @@ - - - net5.0 - x64 - true - 9.0 - + + + True + - - - - + + + diff --git a/Source/Game/Game.csproj b/Source/Game/Game.csproj index 963776e9b..8c59b3dbc 100644 --- a/Source/Game/Game.csproj +++ b/Source/Game/Game.csproj @@ -1,11 +1,8 @@ - - - net5.0 - x64 - true - 9.0 - + + + True + diff --git a/Source/Scripts/Scripts.csproj b/Source/Scripts/Scripts.csproj index f07772691..d126529ba 100644 --- a/Source/Scripts/Scripts.csproj +++ b/Source/Scripts/Scripts.csproj @@ -1,9 +1,5 @@ - - net5.0 - x64 - 9.0 - + diff --git a/Source/WorldServer/WorldServer.csproj b/Source/WorldServer/WorldServer.csproj index 68c591753..4a415b7c2 100644 --- a/Source/WorldServer/WorldServer.csproj +++ b/Source/WorldServer/WorldServer.csproj @@ -1,11 +1,9 @@ - Exe - net5.0 + Exe Blue.ico WorldServer.Server - 9.0 diff --git a/default.props b/default.props index 102eea6b1..b09477bd0 100644 --- a/default.props +++ b/default.props @@ -2,11 +2,13 @@ ../../Build/$(Configuration)/$(Platform) + net6.0 False False False win-x64;linux-x64;mac-x64 win10-x64;linux-x64;osx-x64 + latest