Merge #3920 VSCode clean-up and other minor fixes

.gitignore

@@ -1,5 +1,6 @@
 /_build/
 /.vs/
+/.vscode/
 /tools
 test-results
 *.userprefs

AutoUpdate/Main.cs

@@ -140,9 +140,10 @@ private static void MakeExecutable(string path)
 
                 string command = string.Format("+x \"{0}\"", path);
 
-                ProcessStartInfo permsinfo = new ProcessStartInfo("chmod", command);
-                permsinfo.UseShellExecute = false;
-                Process permsprocess = Process.Start(permsinfo);
+                var permsprocess = Process.Start(new ProcessStartInfo("chmod", command)
+                {
+                    UseShellExecute = false
+                });
                 permsprocess.WaitForExit();
             }
         }

AutoUpdate/SingleAssemblyResourceManager.cs

@@ -18,8 +18,7 @@ public SingleAssemblyResourceManager(string basename, Assembly assembly) : base(
         protected override ResourceSet InternalGetResourceSet(CultureInfo culture,
             bool createIfNotExists, bool tryParents)
         {
-            ResourceSet rs;
-            if (!myResourceSets.TryGetValue(culture, out rs) && createIfNotExists)
+            if (!myResourceSets.TryGetValue(culture, out ResourceSet rs) && createIfNotExists)
             {
                 // Lazy-load default language (without caring about duplicate assignment in race conditions, no harm done)
                 if (neutralResourcesCulture == null)
@@ -53,6 +52,6 @@ protected override ResourceSet InternalGetResourceSet(CultureInfo culture,
         }
 
         private CultureInfo neutralResourcesCulture;
-        private Dictionary<CultureInfo, ResourceSet> myResourceSets = new Dictionary<CultureInfo, ResourceSet>();
+        private readonly Dictionary<CultureInfo, ResourceSet> myResourceSets = new Dictionary<CultureInfo, ResourceSet>();
     }
 }

CHANGELOG.md

@@ -39,6 +39,7 @@ All notable changes to this project will be documented in this file.
 - [CLI] Parse quoted strings for `ckan prompt` (#3889 by: HebaruSan; reviewed: techman83)
 - [Build] Remove log4net, newtonsoft deps from deb package (#3900 by: HebaruSan; reviewed: techman83)
 - [GUI] Add test to check GUI thread safety (#3914 by: HebaruSan; reviewed: techman83)
+- [Multiple] VSCode clean-up and other minor fixes (#3920 by: HebaruSan)
 
 ## v1.33.2 (Laplace)
 

Cmdline/Action/AuthToken.cs

@@ -4,7 +4,6 @@
 using CKAN.Configuration;
 using CommandLine;
 using CommandLine.Text;
-using log4net;
 
 namespace CKAN.CmdLine
 {
@@ -49,7 +48,7 @@ public int RunSubCommand(GameInstanceManager manager, CommonOptions opts, SubCom
                         switch (option)
                         {
                             case "list":
-                                exitCode = listAuthTokens(options);
+                                exitCode = listAuthTokens();
                                 break;
                             case "add":
                                 exitCode = addAuthToken((AddAuthTokenOptions)options);
@@ -64,7 +63,7 @@ public int RunSubCommand(GameInstanceManager manager, CommonOptions opts, SubCom
             return exitCode;
         }
 
-        private int listAuthTokens(CommonOptions opts)
+        private int listAuthTokens()
         {
             string hostHeader  = Properties.Resources.AuthTokenHostHeader;
             string tokenHeader = Properties.Resources.AuthTokenTokenHeader;
@@ -76,8 +75,7 @@ private int listAuthTokens(CommonOptions opts)
                 foreach (string host in hosts)
                 {
                     longestHostLen = Math.Max(longestHostLen, host.Length);
-                    string token;
-                    if (ServiceLocator.Container.Resolve<IConfiguration>().TryGetAuthToken(host, out token))
+                    if (ServiceLocator.Container.Resolve<IConfiguration>().TryGetAuthToken(host, out string token))
                     {
                         longestTokenLen = Math.Max(longestTokenLen, token.Length);
                     }
@@ -92,8 +90,7 @@ private int listAuthTokens(CommonOptions opts)
                 );
                 foreach (string host in hosts)
                 {
-                    string token;
-                    if (ServiceLocator.Container.Resolve<IConfiguration>().TryGetAuthToken(host, out token))
+                    if (ServiceLocator.Container.Resolve<IConfiguration>().TryGetAuthToken(host, out string token))
                     {
                         user.RaiseMessage(fmt, host, token);
                     }
@@ -121,8 +118,7 @@ private int removeAuthToken(RemoveAuthTokenOptions opts)
             return Exit.OK;
         }
 
-        private                 IUser user;
-        private static readonly ILog  log = LogManager.GetLogger(typeof(AuthToken));
+        private IUser user;
     }
 
     internal class AuthTokenSubOptions : VerbCommandOptions

Cmdline/Action/Available.cs

@@ -42,7 +42,7 @@ public int RunCommand(CKAN.GameInstance instance, object raw_options)
             return Exit.OK;
         }
 
-        private IUser                 user;
-        private RepositoryDataManager repoData;
+        private readonly IUser                 user;
+        private readonly RepositoryDataManager repoData;
     }
 }

Cmdline/Action/Cache.cs

@@ -1,6 +1,5 @@
 using CommandLine;
 using CommandLine.Text;
-using log4net;
 using Autofac;
 
 using CKAN.Configuration;
@@ -112,23 +111,23 @@ public int RunSubCommand(GameInstanceManager mgr, CommonOptions opts, SubCommand
                     switch (option)
                     {
                         case "list":
-                            exitCode = ListCacheDirectory((CommonOptions)suboptions);
+                            exitCode = ListCacheDirectory();
                             break;
 
                         case "set":
                             exitCode = SetCacheDirectory((SetOptions)suboptions);
                             break;
 
                         case "clear":
-                            exitCode = ClearCacheDirectory((CommonOptions)suboptions);
+                            exitCode = ClearCacheDirectory();
                             break;
 
                         case "reset":
-                            exitCode = ResetCacheDirectory((CommonOptions)suboptions);
+                            exitCode = ResetCacheDirectory();
                             break;
 
                         case "showlimit":
-                            exitCode = ShowCacheSizeLimit((CommonOptions)suboptions);
+                            exitCode = ShowCacheSizeLimit();
                             break;
 
                         case "setlimit":
@@ -145,7 +144,7 @@ public int RunSubCommand(GameInstanceManager mgr, CommonOptions opts, SubCommand
             return exitCode;
         }
 
-        private int ListCacheDirectory(CommonOptions options)
+        private int ListCacheDirectory()
         {
             IConfiguration cfg = ServiceLocator.Container.Resolve<IConfiguration>();
             user.RaiseMessage(cfg.DownloadCacheDir);
@@ -161,8 +160,7 @@ private int SetCacheDirectory(SetOptions options)
                 return Exit.BADOPT;
             }
 
-            string failReason;
-            if (manager.TrySetupCache(options.Path, out failReason))
+            if (manager.TrySetupCache(options.Path, out string failReason))
             {
                 IConfiguration cfg = ServiceLocator.Container.Resolve<IConfiguration>();
                 user.RaiseMessage(Properties.Resources.CacheSet, cfg.DownloadCacheDir);
@@ -176,18 +174,17 @@ private int SetCacheDirectory(SetOptions options)
             }
         }
 
-        private int ClearCacheDirectory(CommonOptions options)
+        private int ClearCacheDirectory()
         {
             manager.Cache.RemoveAll();
             user.RaiseMessage(Properties.Resources.CacheCleared);
             printCacheInfo();
             return Exit.OK;
         }
 
-        private int ResetCacheDirectory(CommonOptions options)
+        private int ResetCacheDirectory()
         {
-            string failReason;
-            if (manager.TrySetupCache("", out failReason))
+            if (manager.TrySetupCache("", out string failReason))
             {
                 IConfiguration cfg = ServiceLocator.Container.Resolve<IConfiguration>();
                 user.RaiseMessage(Properties.Resources.CacheReset, cfg.DownloadCacheDir);
@@ -200,7 +197,7 @@ private int ResetCacheDirectory(CommonOptions options)
             return Exit.OK;
         }
 
-        private int ShowCacheSizeLimit(CommonOptions options)
+        private int ShowCacheSizeLimit()
         {
             IConfiguration cfg = ServiceLocator.Container.Resolve<IConfiguration>();
             if (cfg.CacheSizeLimit.HasValue)
@@ -225,7 +222,7 @@ private int SetCacheSizeLimit(SetLimitOptions options)
             {
                 cfg.CacheSizeLimit = options.Megabytes * (long)1024 * (long)1024;
             }
-            return ShowCacheSizeLimit(null);
+            return ShowCacheSizeLimit();
         }
 
         private void printCacheInfo()
@@ -239,8 +236,6 @@ private void printCacheInfo()
 
         private IUser               user;
         private GameInstanceManager manager;
-
-        private static readonly ILog log = LogManager.GetLogger(typeof(Cache));
     }
 
 }

Cmdline/Action/Compare.cs

@@ -5,7 +5,7 @@ namespace CKAN.CmdLine
     // Does not need an instance, so this is not an ICommand
     public class Compare
     {
-        private IUser user;
+        private readonly IUser user;
 
         public Compare(IUser user)
         {

Cmdline/Action/Compat.cs

@@ -150,11 +150,10 @@ public int RunSubCommand(GameInstanceManager manager, CommonOptions opts, SubCom
                                 var instance = MainClass.GetGameInstance(_kspManager);
                                 var addOptions = (CompatAddOptions)suboptions;
 
-                                GameVersion GameVersion;
-                                if (GameVersion.TryParse(addOptions.Version, out GameVersion))
+                                if (GameVersion.TryParse(addOptions.Version, out GameVersion gv))
                                 {
                                     var newCompatibleVersion = instance.GetCompatibleVersions();
-                                    newCompatibleVersion.Add(GameVersion);
+                                    newCompatibleVersion.Add(gv);
                                     instance.SetCompatibleVersions(newCompatibleVersion);
                                 }
                                 else
@@ -170,13 +169,12 @@ public int RunSubCommand(GameInstanceManager manager, CommonOptions opts, SubCom
                                 var instance = MainClass.GetGameInstance(_kspManager);
                                 var addOptions = (CompatForgetOptions)suboptions;
 
-                                GameVersion GameVersion;
-                                if (GameVersion.TryParse(addOptions.Version, out GameVersion))
+                                if (GameVersion.TryParse(addOptions.Version, out GameVersion gv))
                                 {
-                                    if (GameVersion != instance.Version())
+                                    if (gv != instance.Version())
                                     {
                                         var newCompatibleVersion = instance.GetCompatibleVersions();
-                                        newCompatibleVersion.RemoveAll(i => i == GameVersion);
+                                        newCompatibleVersion.RemoveAll(i => i == gv);
                                         instance.SetCompatibleVersions(newCompatibleVersion);
                                     }
                                     else

Cmdline/Action/Filter.cs

@@ -4,7 +4,6 @@
 using Autofac;
 using CommandLine;
 using CommandLine.Text;
-using log4net;
 
 namespace CKAN.CmdLine
 {
@@ -48,7 +47,7 @@ public int RunSubCommand(GameInstanceManager mgr, CommonOptions opts, SubCommand
                     switch (option)
                     {
                         case "list":
-                            exitCode = ListFilters((FilterListOptions)suboptions, option);
+                            exitCode = ListFilters((FilterListOptions)suboptions);
                             break;
 
                         case "add":
@@ -69,7 +68,7 @@ public int RunSubCommand(GameInstanceManager mgr, CommonOptions opts, SubCommand
             return exitCode;
         }
 
-        private int ListFilters(FilterListOptions opts, string verb)
+        private int ListFilters(FilterListOptions opts)
         {
             int exitCode = opts.Handle(manager, user);
             if (exitCode != Exit.OK)
@@ -216,8 +215,6 @@ private int RemoveFilters(FilterRemoveOptions opts, string verb)
 
         private GameInstanceManager manager;
         private IUser               user;
-
-        private static readonly ILog log = LogManager.GetLogger(typeof(Filter));
     }
 
     internal class FilterSubOptions : VerbCommandOptions

Cmdline/Action/GameInstance.cs

@@ -346,7 +346,7 @@ private int CloneInstall(CloneOptions options)
                 }
                 // Try to use instanceNameOrPath as a path and create a new game instance.
                 // If it's valid, go on.
-                else if (Manager.InstanceAt(instanceNameOrPath, newName) is CKAN.GameInstance instance && instance.Valid)
+                else if (Manager.InstanceAt(instanceNameOrPath) is CKAN.GameInstance instance && instance.Valid)
                 {
                     Manager.CloneInstance(instance, newName, newPath);
                 }

Cmdline/Action/Install.cs

@@ -80,7 +80,7 @@ public int RunCommand(CKAN.GameInstance instance, object raw_options)
                     // Parse the JSON file.
                     try
                     {
-                        CkanModule m = MainClass.LoadCkanFromFile(instance, filename);
+                        CkanModule m = MainClass.LoadCkanFromFile(filename);
                         options.modules.Add($"{m.identifier}={m.version}");
                     }
                     catch (Kraken kraken)
@@ -275,9 +275,9 @@ public int RunCommand(CKAN.GameInstance instance, object raw_options)
             return Exit.OK;
         }
 
-        private GameInstanceManager   manager;
-        private RepositoryDataManager repoData;
-        private IUser                 user;
+        private readonly GameInstanceManager   manager;
+        private readonly RepositoryDataManager repoData;
+        private readonly IUser                 user;
 
         private static readonly ILog log = LogManager.GetLogger(typeof(Install));
     }

Cmdline/Action/List.cs

@@ -167,8 +167,8 @@ public int RunCommand(CKAN.GameInstance instance, object raw_options)
             }
         }
 
-        private RepositoryDataManager repoData;
-        private IUser                 user;
+        private readonly RepositoryDataManager repoData;
+        private readonly IUser                 user;
 
         private static readonly ILog log = LogManager.GetLogger(typeof(List));
     }

Cmdline/Action/Mark.cs

@@ -2,7 +2,6 @@
 
 using CommandLine;
 using CommandLine.Text;
-using log4net;
 
 namespace CKAN.CmdLine
 {
@@ -120,10 +119,8 @@ private int MarkAuto(MarkAutoOptions opts, bool value, string verb, string descr
         }
 
         private GameInstanceManager   manager;
-        private RepositoryDataManager repoData;
+        private readonly RepositoryDataManager repoData;
         private IUser                 user;
-
-        private static readonly ILog log = LogManager.GetLogger(typeof(Mark));
     }
 
     internal class MarkSubOptions : VerbCommandOptions

Cmdline/Action/Prompt.cs

@@ -5,8 +5,6 @@
 using System.Text.RegularExpressions;
 
 using CommandLine;
-using CommandLine.Text;
-using log4net;
 
 namespace CKAN.CmdLine
 {

Cmdline/Action/Remove.cs

@@ -112,9 +112,9 @@ public int RunCommand(CKAN.GameInstance instance, object raw_options)
             return Exit.OK;
         }
 
-        private GameInstanceManager   manager;
-        private RepositoryDataManager repoData;
-        private IUser                 user;
+        private readonly GameInstanceManager   manager;
+        private readonly RepositoryDataManager repoData;
+        private readonly IUser                 user;
 
         private static readonly ILog log = LogManager.GetLogger(typeof(Remove));
     }

Cmdline/Action/Repair.cs

@@ -80,7 +80,7 @@ public int RunSubCommand(GameInstanceManager manager, CommonOptions opts, SubCom
         }
 
         private IUser User { get; set; }
-        private RepositoryDataManager repoData;
+        private readonly RepositoryDataManager repoData;
 
         /// <summary>
         /// Try to repair our registry.