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

Updated to .net5.0

Browse Source
This commit is contained in:
hondacrx
2021-01-21 13:44:11 -05:00
parent 099a2fa98f
commit 43b298b830
8 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/BNetServer/BNetServer.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<Import Project="..\..\default.props" /> <Import Project="..\..\default.props" />
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<StartupObject>BNetServer.Server</StartupObject> <StartupObject>BNetServer.Server</StartupObject>
<ApplicationIcon>Red.ico</ApplicationIcon> <ApplicationIcon>Red.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
Source/Framework/Framework.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>8.0</LangVersion> <LangVersion>8.0</LangVersion>
Source/Framework/GameMath/AxisAlignedBox.cs
+1 -1
View File
@@ -92,7 +92,7 @@ namespace Framework.GameMath
/// </summary> /// </summary>
/// <param name="info">The <see cref="SerializationInfo"/> to populate with data. </param> /// <param name="info">The <see cref="SerializationInfo"/> to populate with data. </param>
/// <param name="context">The destination (see <see cref="StreamingContext"/>) for this serialization.</param> /// <param name="context">The destination (see <see cref="StreamingContext"/>) for this serialization.</param>
[SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)] //[SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
public void GetObjectData(SerializationInfo info, StreamingContext context) public void GetObjectData(SerializationInfo info, StreamingContext context)
{ {
info.AddValue("Max", _hi, typeof(Vector3)); info.AddValue("Max", _hi, typeof(Vector3));
Source/Framework/GameMath/Plane.cs
+1 -1
View File
@@ -174,7 +174,7 @@ namespace Framework.GameMath
/// </summary> /// </summary>
/// <param name="info">The <see cref="SerializationInfo"/> to populate with data. </param> /// <param name="info">The <see cref="SerializationInfo"/> to populate with data. </param>
/// <param name="context">The destination (see <see cref="StreamingContext"/>) for this serialization.</param> /// <param name="context">The destination (see <see cref="StreamingContext"/>) for this serialization.</param>
[SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)] //[SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
public void GetObjectData(SerializationInfo info, StreamingContext context) public void GetObjectData(SerializationInfo info, StreamingContext context)
{ {
info.AddValue("Normal", _normal, typeof(Vector3)); info.AddValue("Normal", _normal, typeof(Vector3));
Source/Game/Entities/Player/Player.Items.cs
+3 -4
View File
@@ -4482,11 +4482,10 @@ namespace Game.Entities
public ObjectGuid GetLootWorldObjectGUID(ObjectGuid lootObjectGuid) public ObjectGuid GetLootWorldObjectGUID(ObjectGuid lootObjectGuid)
{ {
var guid = m_AELootView.LookupByKey(lootObjectGuid); if (!m_AELootView.ContainsKey(lootObjectGuid))
if (guid != null) return ObjectGuid.Empty;
return guid;
return ObjectGuid.Empty; return m_AELootView[lootObjectGuid];
} }
public void RemoveAELootedObject(ObjectGuid lootObjectGuid) public void RemoveAELootedObject(ObjectGuid lootObjectGuid)
Source/Game/Game.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>8.0</LangVersion> <LangVersion>8.0</LangVersion>
Source/Scripts/Scripts.csproj
+1 -1
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<LangVersion>8.0</LangVersion> <LangVersion>8.0</LangVersion>
</PropertyGroup> </PropertyGroup>
Source/WorldServer/WorldServer.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<Import Project="..\..\default.props" /> <Import Project="..\..\default.props" />
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<ApplicationIcon>Blue.ico</ApplicationIcon> <ApplicationIcon>Blue.ico</ApplicationIcon>
<StartupObject>WorldServer.Server</StartupObject> <StartupObject>WorldServer.Server</StartupObject>
<LangVersion>8.0</LangVersion> <LangVersion>8.0</LangVersion>