Merge #4171 Nullable references, net8.0, blend registry alert dot, ne…

…tkan fixes
KSP-CKAN · Sep 3, 2024 · 49fe676 · 49fe676
2 parents 9ce588f + 28284da
commit 49fe676
Show file tree

Hide file tree

Showing 408 changed files with 10,219 additions and 9,248 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -42,9 +42,18 @@ dotnet_diagnostic.IDE0055.severity = none
 # OK to call functions that return values and not use them
 dotnet_diagnostic.IDE0058.severity = none
 
+# I like seeing when a using block ends
+dotnet_diagnostic.IDE0063.severity = none
+
 # A `using` inside a namespace is useful as a typedef
 dotnet_diagnostic.IDE0065.severity = none
 
+# 'switch' expressions are nice, but I don't need to be alerted about them
+dotnet_diagnostic.IDE0066.severity = none
+
+# Why do 'new' expressions need to be simple?
+dotnet_diagnostic.IDE0090.severity = none
+
 # Allow namespaces to be independent of folder names
 dotnet_diagnostic.IDE0130.severity = none
 

diff --git a/AutoUpdate/CKAN-autoupdate.csproj b/AutoUpdate/CKAN-autoupdate.csproj
@@ -16,10 +16,12 @@
     <Deterministic>true</Deterministic>
     <Configurations>Debug;Release</Configurations>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>7</LangVersion>
+    <LangVersion>9</LangVersion>
+    <Nullable>enable</Nullable>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <ApplicationIcon>..\assets\ckan.ico</ApplicationIcon>
-    <TargetFrameworks>net48;net7.0-windows</TargetFrameworks>
-    <UseWindowsForms Condition=" '$(TargetFramework)' == 'net7.0-windows' ">true</UseWindowsForms>
+    <TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
+    <UseWindowsForms Condition=" '$(TargetFramework)' == 'net8.0-windows' ">true</UseWindowsForms>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <FileAlignment>512</FileAlignment>
     <ErrorReport>prompt</ErrorReport>

diff --git a/AutoUpdate/Main.cs b/AutoUpdate/Main.cs
@@ -4,6 +4,9 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows.Forms;
+#if NET5_0_OR_GREATER
+using System.Runtime.Versioning;
+#endif
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * CKAN AUTO-UPDATE TOOL
@@ -145,7 +148,7 @@ private static void MakeExecutable(string path)
                 {
                     UseShellExecute = false
                 });
-                permsprocess.WaitForExit();
+                permsprocess?.WaitForExit();
             }
         }
 
@@ -158,8 +161,17 @@ private static bool IsOnMono
         /// <summary>
         /// Are we on Windows?
         /// </summary>
-        private static bool IsOnWindows
-            => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+        #if NET6_0_OR_GREATER
+        [SupportedOSPlatformGuard("windows")]
+        #endif
+        private static readonly bool IsOnWindows
+            = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+
+        #if NET8_0_OR_GREATER
+        [SupportedOSPlatformGuard("windows6.1")]
+        private static readonly bool IsOnWindows61
+            = IsOnWindows && OperatingSystem.IsWindowsVersionAtLeast(6, 1);
+        #endif
 
         /// <summary>
         /// Display unexpected exceptions to user
@@ -179,11 +191,20 @@ private static void ReportError(string message, params object[] args)
         {
             string err = string.Format(message, args);
             Console.Error.WriteLine(err);
-            if (fromGui)
+            #if NETFRAMEWORK || WINDOWS
+            if (
+                #if NET8_0_OR_GREATER
+                IsOnWindows61 &&
+                #endif
+                fromGui)
             {
                 // Show a popup in case the console isn't open
-                MessageBox.Show(err, Properties.Resources.FatalErrorTitle, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show(err,
+                                Properties.Resources.FatalErrorTitle,
+                                MessageBoxButtons.OK,
+                                MessageBoxIcon.Error);
             }
+            #endif
         }
 
         private const  int  maxRetries = 8;

diff --git a/AutoUpdate/SingleAssemblyResourceManager.cs b/AutoUpdate/SingleAssemblyResourceManager.cs
@@ -1,4 +1,3 @@
-using System.IO;
 using System.Globalization;
 using System.Resources;
 using System.Reflection;
@@ -14,16 +13,13 @@ public SingleAssemblyResourceManager(string basename, Assembly assembly) : base(
         {
         }
 
-        protected override ResourceSet InternalGetResourceSet(CultureInfo culture,
+        protected override ResourceSet? InternalGetResourceSet(CultureInfo culture,
             bool createIfNotExists, bool tryParents)
         {
-            if (!myResourceSets.TryGetValue(culture, out ResourceSet rs) && createIfNotExists)
+            if (!myResourceSets.TryGetValue(culture, out ResourceSet? rs) && createIfNotExists && MainAssembly != null)
             {
                 // Lazy-load default language (without caring about duplicate assignment in race conditions, no harm done)
-                if (neutralResourcesCulture == null)
-                {
-                    neutralResourcesCulture = GetNeutralResourcesLanguage(MainAssembly);
-                }
+                neutralResourcesCulture ??= GetNeutralResourcesLanguage(MainAssembly);
 
                 // If we're asking for the default language, then ask for the
                 // invariant (non-specific) resources.
@@ -33,7 +29,7 @@ protected override ResourceSet InternalGetResourceSet(CultureInfo culture,
                 }
                 string resourceFileName = GetResourceFileName(culture);
 
-                Stream store = MainAssembly.GetManifestResourceStream(resourceFileName);
+                var store = MainAssembly.GetManifestResourceStream(resourceFileName);
 
                 // If we found the appropriate resources in the local assembly
                 if (store != null)
@@ -50,7 +46,7 @@ protected override ResourceSet InternalGetResourceSet(CultureInfo culture,
             return rs;
         }
 
-        private CultureInfo neutralResourcesCulture;
+        private CultureInfo? neutralResourcesCulture;
         private readonly Dictionary<CultureInfo, ResourceSet> myResourceSets = new Dictionary<CultureInfo, ResourceSet>();
     }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -78,6 +78,7 @@ All notable changes to this project will be documented in this file.
 - [Netkan] Autogenerate `spec_version` and make it optional in netkans (#4155 by: HebaruSan)
 - [Infra] Trigger mod installer deploy after APT repo update (#4158 by: HebaruSan)
 - [CLI] Ability to update repos without a game instance (#4161 by: HebaruSan)
+- [Multiple] Nullable references, net8.0, blend registry alert dot, netkan fixes (#4171 by: HebaruSan)
 
 ## v1.34.4 (Niven)
 

diff --git a/Cmdline/Action/AuthToken.cs b/Cmdline/Action/AuthToken.cs
@@ -26,7 +26,9 @@ public AuthToken() { }
         /// <returns>
         /// Exit code
         /// </returns>
-        public int RunSubCommand(GameInstanceManager manager, CommonOptions opts, SubCommandOptions unparsed)
+        public int RunSubCommand(GameInstanceManager? manager,
+                                 CommonOptions?       opts,
+                                 SubCommandOptions    unparsed)
         {
             string[] args     = unparsed.options.ToArray();
             int      exitCode = Exit.OK;
@@ -37,12 +39,9 @@ public int RunSubCommand(GameInstanceManager manager, CommonOptions opts, SubCom
                 {
                     CommonOptions options = (CommonOptions)suboptions;
                     options.Merge(opts);
-                    user                  = new ConsoleUser(options.Headless);
-                    if (manager == null)
-                    {
-                        manager           = new GameInstanceManager(user);
-                    }
-                    exitCode              = options.Handle(manager, user);
+                    user      = new ConsoleUser(options.Headless);
+                    manager ??= new GameInstanceManager(user);
+                    exitCode  = options.Handle(manager, user);
                     if (exitCode == Exit.OK)
                     {
                         switch (option)
@@ -75,24 +74,23 @@ private int listAuthTokens()
                 foreach (string host in hosts)
                 {
                     longestHostLen = Math.Max(longestHostLen, host.Length);
-                    if (ServiceLocator.Container.Resolve<IConfiguration>().TryGetAuthToken(host, out string token))
+                    if (ServiceLocator.Container.Resolve<IConfiguration>().TryGetAuthToken(host, out string? token))
                     {
                         longestTokenLen = Math.Max(longestTokenLen, token.Length);
                     }
                 }
                 // Create format string: {0,-longestHostLen}  {1,-longestTokenLen}
                 string fmt = string.Format("{0}0,-{2}{1}  {0}1,-{3}{1}",
                     "{", "}", longestHostLen, longestTokenLen);
-                user.RaiseMessage(fmt, hostHeader, tokenHeader);
-                user.RaiseMessage(fmt,
-                    new string('-', longestHostLen),
-                    new string('-', longestTokenLen)
-                );
+                user?.RaiseMessage(fmt, hostHeader, tokenHeader);
+                user?.RaiseMessage(fmt,
+                                   new string('-', longestHostLen),
+                                   new string('-', longestTokenLen));
                 foreach (string host in hosts)
                 {
-                    if (ServiceLocator.Container.Resolve<IConfiguration>().TryGetAuthToken(host, out string token))
+                    if (ServiceLocator.Container.Resolve<IConfiguration>().TryGetAuthToken(host, out string? token))
                     {
-                        user.RaiseMessage(fmt, host, token);
+                        user?.RaiseMessage(fmt, host, token);
                     }
                 }
             }
@@ -101,36 +99,42 @@ private int listAuthTokens()
 
         private int addAuthToken(AddAuthTokenOptions opts)
         {
-            if (Uri.CheckHostName(opts.host) != UriHostNameType.Unknown)
-            {
-                ServiceLocator.Container.Resolve<IConfiguration>().SetAuthToken(opts.host, opts.token);
-            }
-            else
+            if (opts.host is string h)
             {
-                user.RaiseError(Properties.Resources.AuthTokenInvalidHostName, opts.host);
+                if (Uri.CheckHostName(h) != UriHostNameType.Unknown)
+                {
+                    ServiceLocator.Container.Resolve<IConfiguration>().SetAuthToken(h, opts.token);
+                }
+                else
+                {
+                    user?.RaiseError(Properties.Resources.AuthTokenInvalidHostName, h);
+                }
             }
             return Exit.OK;
         }
 
         private int removeAuthToken(RemoveAuthTokenOptions opts)
         {
-            ServiceLocator.Container.Resolve<IConfiguration>().SetAuthToken(opts.host, null);
+            if (opts.host is string h)
+            {
+                ServiceLocator.Container.Resolve<IConfiguration>().SetAuthToken(h, null);
+            }
             return Exit.OK;
         }
 
-        private IUser user;
+        private IUser? user;
     }
 
     internal class AuthTokenSubOptions : VerbCommandOptions
     {
         [VerbOption("list",   HelpText = "List auth tokens")]
-        public CommonOptions          ListOptions   { get; set; }
+        public CommonOptions?          ListOptions   { get; set; }
 
         [VerbOption("add",    HelpText = "Add an auth token")]
-        public AddAuthTokenOptions    AddOptions    { get; set; }
+        public AddAuthTokenOptions?    AddOptions    { get; set; }
 
         [VerbOption("remove", HelpText = "Delete an auth token")]
-        public RemoveAuthTokenOptions RemoveOptions { get; set; }
+        public RemoveAuthTokenOptions? RemoveOptions { get; set; }
 
         [HelpVerbOption]
         public string GetUsage(string verb)
@@ -173,13 +177,13 @@ public static IEnumerable<string> GetHelp(string verb)
 
     internal class AddAuthTokenOptions : CommonOptions
     {
-        [ValueOption(0)] public string host  { get; set; }
-        [ValueOption(1)] public string token { get; set; }
+        [ValueOption(0)] public string? host  { get; set; }
+        [ValueOption(1)] public string? token { get; set; }
     }
 
     internal class RemoveAuthTokenOptions : CommonOptions
     {
-        [ValueOption(0)] public string host { get; set; }
+        [ValueOption(0)] public string? host { get; set; }
     }
 
 }