Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Converted Common to .net 5.0

Browse Source
This commit is contained in:
Timothy Baldridge 2020-12-31 16:39:18 -07:00
parent 1ba7c2ed4e
commit 0638612e0d
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Wabbajack.Common.Test/Wabbajack.Common.Test.csproj
View File

@ -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>

2
Wabbajack.Common/Exceptions/HttpException.cs
View File

@ -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";
}
}
}

6
Wabbajack.Common/GameMetaData.cs
View File

@ -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));

2
Wabbajack.Common/Hash.cs
View File

@ -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)

2
Wabbajack.Common/Json.cs
View File

@ -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)

4
Wabbajack.Common/StoreHandlers/BethNetHandler.cs
View File

@ -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)
{

2
Wabbajack.Common/StoreHandlers/EpicGameStoreHandler.cs
View File

@ -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;

2
Wabbajack.Common/Util/TempFile.cs
View File

@ -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();
}

2
Wabbajack.Common/Wabbajack.Common.csproj
View File

@ -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>