From 43b298b830d7cd8d8570fffe2120790fa40863b5 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Thu, 21 Jan 2021 13:44:11 -0500
Subject: [PATCH] Updated to .net5.0

---
 Source/BNetServer/BNetServer.csproj         | 2 +-
 Source/Framework/Framework.csproj           | 2 +-
 Source/Framework/GameMath/AxisAlignedBox.cs | 2 +-
 Source/Framework/GameMath/Plane.cs          | 2 +-
 Source/Game/Entities/Player/Player.Items.cs | 7 +++----
 Source/Game/Game.csproj                     | 2 +-
 Source/Scripts/Scripts.csproj               | 2 +-
 Source/WorldServer/WorldServer.csproj       | 2 +-
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Source/BNetServer/BNetServer.csproj b/Source/BNetServer/BNetServer.csproj
index fe7748683..071a9356a 100644
--- a/Source/BNetServer/BNetServer.csproj
+++ b/Source/BNetServer/BNetServer.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\default.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <StartupObject>BNetServer.Server</StartupObject>
     <ApplicationIcon>Red.ico</ApplicationIcon>
   </PropertyGroup>
diff --git a/Source/Framework/Framework.csproj b/Source/Framework/Framework.csproj
index 56a773d25..5276b5440 100644
--- a/Source/Framework/Framework.csproj
+++ b/Source/Framework/Framework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 	<Platforms>x64</Platforms>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>8.0</LangVersion>
diff --git a/Source/Framework/GameMath/AxisAlignedBox.cs b/Source/Framework/GameMath/AxisAlignedBox.cs
index 9ba24fba4..6d92f49bc 100644
--- a/Source/Framework/GameMath/AxisAlignedBox.cs
+++ b/Source/Framework/GameMath/AxisAlignedBox.cs
@@ -92,7 +92,7 @@ namespace Framework.GameMath
         /// </summary> 
         /// <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> 
-        [SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
+        //[SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
         public void GetObjectData(SerializationInfo info, StreamingContext context)
         {
             info.AddValue("Max", _hi, typeof(Vector3));
diff --git a/Source/Framework/GameMath/Plane.cs b/Source/Framework/GameMath/Plane.cs
index 1411afd74..0cdbdc3f7 100644
--- a/Source/Framework/GameMath/Plane.cs
+++ b/Source/Framework/GameMath/Plane.cs
@@ -174,7 +174,7 @@ namespace Framework.GameMath
         /// </summary>
         /// <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>
-        [SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
+        //[SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
         public void GetObjectData(SerializationInfo info, StreamingContext context)
         {
             info.AddValue("Normal", _normal, typeof(Vector3));
diff --git a/Source/Game/Entities/Player/Player.Items.cs b/Source/Game/Entities/Player/Player.Items.cs
index aafd6ff95..e839faf39 100644
--- a/Source/Game/Entities/Player/Player.Items.cs
+++ b/Source/Game/Entities/Player/Player.Items.cs
@@ -4482,11 +4482,10 @@ namespace Game.Entities
 
         public ObjectGuid GetLootWorldObjectGUID(ObjectGuid lootObjectGuid)
         {
-            var guid = m_AELootView.LookupByKey(lootObjectGuid);
-            if (guid != null)
-                return guid;
+            if (!m_AELootView.ContainsKey(lootObjectGuid))
+                return ObjectGuid.Empty;
 
-            return ObjectGuid.Empty;
+            return m_AELootView[lootObjectGuid];
         }
 
         public void RemoveAELootedObject(ObjectGuid lootObjectGuid)
diff --git a/Source/Game/Game.csproj b/Source/Game/Game.csproj
index e51725593..b88d82e04 100644
--- a/Source/Game/Game.csproj
+++ b/Source/Game/Game.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 	<Platforms>x64</Platforms>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>8.0</LangVersion>
diff --git a/Source/Scripts/Scripts.csproj b/Source/Scripts/Scripts.csproj
index 7cf909d6b..c5dddaee4 100644
--- a/Source/Scripts/Scripts.csproj
+++ b/Source/Scripts/Scripts.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 	<Platforms>x64</Platforms>
 	<LangVersion>8.0</LangVersion>
   </PropertyGroup>
diff --git a/Source/WorldServer/WorldServer.csproj b/Source/WorldServer/WorldServer.csproj
index 88c15ae51..5c286628a 100644
--- a/Source/WorldServer/WorldServer.csproj
+++ b/Source/WorldServer/WorldServer.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\default.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <ApplicationIcon>Blue.ico</ApplicationIcon>
     <StartupObject>WorldServer.Server</StartupObject>
     <LangVersion>8.0</LangVersion>