Enforce net472 code contracts

ArchiSteamFarm/ASF.cs

@@ -25,7 +25,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using ArchiSteamFarm.JSON;
@@ -60,10 +59,8 @@ namespace ArchiSteamFarm {
 
 			ArchiLogger.LogGenericInfo(Strings.UpdateCheckingNewVersion);
 
-			string targetDirectory = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-
 			// Cleanup from previous update - update directory for old in-use runtime files
-			string backupDirectory = Path.Combine(targetDirectory, SharedInfo.UpdateDirectory);
+			string backupDirectory = Path.Combine(SharedInfo.HomeDirectory, SharedInfo.UpdateDirectory);
 			if (Directory.Exists(backupDirectory)) {
 				// It's entirely possible that old process is still running, wait a short moment for eventual cleanup
 				await Task.Delay(5000).ConfigureAwait(false);
@@ -78,7 +75,7 @@ namespace ArchiSteamFarm {
 
 			// Cleanup from previous update - old non-runtime in-use files
 			try {
-				foreach (string file in Directory.EnumerateFiles(targetDirectory, "*.old", SearchOption.AllDirectories)) {
+				foreach (string file in Directory.EnumerateFiles(SharedInfo.HomeDirectory, "*.old", SearchOption.AllDirectories)) {
 					File.Delete(file);
 				}
 			} catch (Exception e) {
@@ -161,7 +158,9 @@ namespace ArchiSteamFarm {
 
 			try {
 				using (ZipArchive zipArchive = new ZipArchive(new MemoryStream(response.Content))) {
-					UpdateFromArchive(zipArchive, targetDirectory);
+					if (!UpdateFromArchive(zipArchive, SharedInfo.HomeDirectory)) {
+						ArchiLogger.LogGenericError(Strings.WarningFailed);
+					}
 				}
 			} catch (Exception e) {
 				ArchiLogger.LogGenericException(e);
@@ -169,7 +168,7 @@ namespace ArchiSteamFarm {
 			}
 
 			if (OS.IsUnix) {
-				string executable = Path.Combine(targetDirectory, SharedInfo.AssemblyName);
+				string executable = Path.Combine(SharedInfo.HomeDirectory, SharedInfo.AssemblyName);
 				if (File.Exists(executable)) {
 					OS.UnixSetFileAccessExecutable(executable);
 				}
@@ -521,10 +520,10 @@ namespace ArchiSteamFarm {
 			}
 		}
 
-		private static void UpdateFromArchive(ZipArchive archive, string targetDirectory) {
+		private static bool UpdateFromArchive(ZipArchive archive, string targetDirectory) {
 			if ((archive == null) || string.IsNullOrEmpty(targetDirectory)) {
 				ArchiLogger.LogNullError(nameof(archive) + " || " + nameof(targetDirectory));
-				return;
+				return false;
 			}
 
 			string backupDirectory = Path.Combine(targetDirectory, SharedInfo.UpdateDirectory);
@@ -538,6 +537,9 @@ namespace ArchiSteamFarm {
 					// Files that we want to keep in original directory
 					case "NLog.config":
 						continue;
+					case null:
+						ArchiLogger.LogNullError(nameof(fileName));
+						return false;
 				}
 
 				string target = Path.Combine(backupDirectory, fileName);
@@ -548,10 +550,22 @@ namespace ArchiSteamFarm {
 			string runtimesDirectory = Path.Combine(targetDirectory, "runtimes");
 			if (Directory.Exists(runtimesDirectory)) {
 				foreach (string file in Directory.EnumerateFiles(runtimesDirectory, "*", SearchOption.AllDirectories)) {
-					string directory = Path.Combine(backupDirectory, Path.GetDirectoryName(RuntimeCompatibility.Path.GetRelativePath(targetDirectory, file)));
+					string directoryName = Path.GetDirectoryName(RuntimeCompatibility.Path.GetRelativePath(targetDirectory, file));
+					if (string.IsNullOrEmpty(directoryName)) {
+						ArchiLogger.LogNullError(nameof(directoryName));
+						return false;
+					}
+
+					string directory = Path.Combine(backupDirectory, directoryName);
 					Directory.CreateDirectory(directory);
 
-					string target = Path.Combine(directory, Path.GetFileName(file));
+					string fileName = Path.GetFileName(file);
+					if (string.IsNullOrEmpty(fileName)) {
+						ArchiLogger.LogNullError(nameof(fileName));
+						return false;
+					}
+
+					string target = Path.Combine(directory, fileName);
 					File.Move(file, target);
 				}
 			}
@@ -560,6 +574,11 @@ namespace ArchiSteamFarm {
 				string file = Path.Combine(targetDirectory, zipFile.FullName);
 				string directory = Path.GetDirectoryName(file);
 
+				if (string.IsNullOrEmpty(directory)) {
+					ArchiLogger.LogNullError(nameof(directory));
+					return false;
+				}
+
 				if (!Directory.Exists(directory)) {
 					Directory.CreateDirectory(directory);
 				}
@@ -583,6 +602,8 @@ namespace ArchiSteamFarm {
 					// Ignored - that file is indeed in use, it will be deleted after restart
 				}
 			}
+
+			return true;
 		}
 
 		internal enum EUserInputType : byte {

ArchiSteamFarm/ConcurrentHashSet.cs

@@ -22,6 +22,7 @@
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
 namespace ArchiSteamFarm {
@@ -33,7 +34,10 @@ namespace ArchiSteamFarm {
 
 		public bool Add(T item) => BackingCollection.TryAdd(item, true);
 		public void Clear() => BackingCollection.Clear();
+
+		[SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")]
 		public bool Contains(T item) => BackingCollection.ContainsKey(item);
+
 		public void CopyTo(T[] array, int arrayIndex) => BackingCollection.Keys.CopyTo(array, arrayIndex);
 
 		public void ExceptWith(IEnumerable<T> other) {
@@ -68,6 +72,8 @@ namespace ArchiSteamFarm {
 
 		public bool IsSupersetOf(IEnumerable<T> other) => other.AsParallel().All(Contains);
 		public bool Overlaps(IEnumerable<T> other) => other.AsParallel().Any(Contains);
+
+		[SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")]
 		public bool Remove(T item) => BackingCollection.TryRemove(item, out _);
 
 		public bool SetEquals(IEnumerable<T> other) {
@@ -95,7 +101,9 @@ namespace ArchiSteamFarm {
 			}
 		}
 
+		[SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")]
 		void ICollection<T>.Add(T item) => Add(item);
+
 		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
 		// We use Count() and not Any() because we must ensure full loop pass

ArchiSteamFarm/ConcurrentSortedHashSet.cs

@@ -22,6 +22,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 
 namespace ArchiSteamFarm {
@@ -197,7 +198,9 @@ namespace ArchiSteamFarm {
 			}
 		}
 
+		[SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")]
 		void ICollection<T>.Add(T item) => Add(item);
+
 		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
 		internal void ReplaceWith(IEnumerable<T> other) {

ArchiSteamFarm/IPC.cs

@@ -679,11 +679,6 @@ namespace ArchiSteamFarm {
 				return true;
 			}
 
-			if (obj == null) {
-				await ResponseJsonObject(request, response, new GenericResponse<object>(false, string.Format(Strings.ErrorParsingObject, targetType)), HttpStatusCode.BadRequest).ConfigureAwait(false);
-				return true;
-			}
-
 			await ResponseJsonObject(request, response, new GenericResponse<object>(true, "OK", obj)).ConfigureAwait(false);
 			return true;
 		}

ArchiSteamFarm/Program.cs

@@ -137,6 +137,11 @@ namespace ArchiSteamFarm {
 			}
 
 			string executableName = Path.GetFileNameWithoutExtension(ProcessFileName);
+			if (string.IsNullOrEmpty(executableName)) {
+				ASF.ArchiLogger.LogNullError(nameof(executableName));
+				return;
+			}
+
 			IEnumerable<string> arguments = Environment.GetCommandLineArgs().Skip(executableName.Equals(SharedInfo.AssemblyName) ? 1 : 0);
 
 			try {