From 0638612e0d83637392d1db74dbc2348a7b489dec Mon Sep 17 00:00:00 2001
From: Timothy Baldridge <tbaldridge@gmail.com>
Date: Thu, 31 Dec 2020 16:39:18 -0700
Subject: [PATCH] Converted Common to .net 5.0

---
 Wabbajack.Common.Test/Wabbajack.Common.Test.csproj     | 2 +-
 Wabbajack.Common/Exceptions/HttpException.cs           | 2 +-
 Wabbajack.Common/GameMetaData.cs                       | 6 +++---
 Wabbajack.Common/Hash.cs                               | 2 +-
 Wabbajack.Common/Json.cs                               | 2 +-
 Wabbajack.Common/StoreHandlers/BethNetHandler.cs       | 4 ++--
 Wabbajack.Common/StoreHandlers/EpicGameStoreHandler.cs | 2 +-
 Wabbajack.Common/Util/TempFile.cs                      | 2 +-
 Wabbajack.Common/Wabbajack.Common.csproj               | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Wabbajack.Common.Test/Wabbajack.Common.Test.csproj b/Wabbajack.Common.Test/Wabbajack.Common.Test.csproj
index a227c3cf..572d964d 100644
--- a/Wabbajack.Common.Test/Wabbajack.Common.Test.csproj
+++ b/Wabbajack.Common.Test/Wabbajack.Common.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0-windows</TargetFramework>
         <Platforms>x64</Platforms>
         <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
         <IsPackable>false</IsPackable>
diff --git a/Wabbajack.Common/Exceptions/HttpException.cs b/Wabbajack.Common/Exceptions/HttpException.cs
index aba72e11..ee37a96a 100644
--- a/Wabbajack.Common/Exceptions/HttpException.cs
+++ b/Wabbajack.Common/Exceptions/HttpException.cs
@@ -20,7 +20,7 @@ namespace Wabbajack.Common.Exceptions
             $"Http Error {response.StatusCode} - {response.ReasonPhrase}")
         {
             Code = (int)response.StatusCode;
-            Reason = response.ReasonPhrase;
+            Reason = response.ReasonPhrase ?? "Unknown";
         }
     }
 }
diff --git a/Wabbajack.Common/GameMetaData.cs b/Wabbajack.Common/GameMetaData.cs
index 4476068f..20dcf5e8 100644
--- a/Wabbajack.Common/GameMetaData.cs
+++ b/Wabbajack.Common/GameMetaData.cs
@@ -186,18 +186,18 @@ namespace Wabbajack.Common
 
     public class GameRegistry
     {
-        public static GameMetaData GetByMO2ArchiveName(string gameName)
+        public static GameMetaData? GetByMO2ArchiveName(string gameName)
         {
             gameName = gameName.ToLower();
             return Games.Values.FirstOrDefault(g => g.MO2ArchiveName?.ToLower() == gameName);
         }
 
-        public static GameMetaData GetByNexusName(string gameName)
+        public static GameMetaData? GetByNexusName(string gameName)
         {
             return Games.Values.FirstOrDefault(g => g.NexusName == gameName.ToLower());
         }
 
-        public static GameMetaData GetBySteamID(int id)
+        public static GameMetaData? GetBySteamID(int id)
         {
             return Games.Values
                 .FirstOrDefault(g => g.SteamIDs != null && g.SteamIDs.Count > 0 && g.SteamIDs.Any(i => i == id));
diff --git a/Wabbajack.Common/Hash.cs b/Wabbajack.Common/Hash.cs
index 131f88a3..6286eca9 100644
--- a/Wabbajack.Common/Hash.cs
+++ b/Wabbajack.Common/Hash.cs
@@ -146,7 +146,7 @@ namespace Wabbajack.Common
                 using var i = new MemoryStream(Encoding.UTF8.GetBytes(s));
                 i.CopyTo(o);
             }
-            return sha.Hash.ToHex();
+            return sha.Hash!.ToHex();
         }
 
         public static Hash xxHash(this byte[] data)
diff --git a/Wabbajack.Common/Json.cs b/Wabbajack.Common/Json.cs
index 0de935bb..1b9f9f5d 100644
--- a/Wabbajack.Common/Json.cs
+++ b/Wabbajack.Common/Json.cs
@@ -265,7 +265,7 @@ namespace Wabbajack.Common
         {
             public override void WriteJson(JsonWriter writer, [AllowNull] IPath value, JsonSerializer serializer)
             {
-                writer.WriteValue(Enum.GetName(typeof(Game), value));
+                writer.WriteValue(value == null ? "" : value.ToString());
             }
 
             public override IPath ReadJson(JsonReader reader, Type objectType, [AllowNull] IPath existingValue, bool hasExistingValue, JsonSerializer serializer)
diff --git a/Wabbajack.Common/StoreHandlers/BethNetHandler.cs b/Wabbajack.Common/StoreHandlers/BethNetHandler.cs
index 9a02134d..0221b899 100644
--- a/Wabbajack.Common/StoreHandlers/BethNetHandler.cs
+++ b/Wabbajack.Common/StoreHandlers/BethNetHandler.cs
@@ -87,11 +87,11 @@ namespace Wabbajack.Common.StoreHandlers
                 {
                     var files = d.EnumerateFiles();
                     var game = GameRegistry.Games.Values
-                        .FirstOrDefault(g => g.RequiredFiles.All(f =>
+                        .FirstOrDefault(g => g.RequiredFiles?.All(f =>
                         {
                             var absPath = new RelativePath(f).RelativeTo(d);
                             return files.Contains(absPath);
-                        }));
+                        }) ?? true);
 
                     if (game != null)
                     {
diff --git a/Wabbajack.Common/StoreHandlers/EpicGameStoreHandler.cs b/Wabbajack.Common/StoreHandlers/EpicGameStoreHandler.cs
index 1e8b83cf..0d7c6cda 100644
--- a/Wabbajack.Common/StoreHandlers/EpicGameStoreHandler.cs
+++ b/Wabbajack.Common/StoreHandlers/EpicGameStoreHandler.cs
@@ -49,7 +49,7 @@ namespace Wabbajack.Common.StoreHandlers
 
                 }
             }
-            catch (NullReferenceException ex)
+            catch (NullReferenceException)
             {
                 Utils.Log("Epic Game Store is does not appear to be installed");
                 return false;
diff --git a/Wabbajack.Common/Util/TempFile.cs b/Wabbajack.Common/Util/TempFile.cs
index 11f74bcb..5e5dd0a8 100644
--- a/Wabbajack.Common/Util/TempFile.cs
+++ b/Wabbajack.Common/Util/TempFile.cs
@@ -34,7 +34,7 @@ namespace Wabbajack.Common
         public TempFile(FileInfo file, bool deleteAfter = true, bool createFolder = true)
         {
             this.File = file;
-            if (createFolder && !file.Directory.Exists)
+            if (createFolder && file.Directory != null && !file.Directory!.Exists)
             {
                 file.Directory.Create();
             }
diff --git a/Wabbajack.Common/Wabbajack.Common.csproj b/Wabbajack.Common/Wabbajack.Common.csproj
index 23e4873f..af0d5ce5 100644
--- a/Wabbajack.Common/Wabbajack.Common.csproj
+++ b/Wabbajack.Common/Wabbajack.Common.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net5.0-windows</TargetFramework>
         <Platforms>x64</Platforms>
         <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
         <Nullable>enable</Nullable>