Update to net8.0-windows and C# 12

2026-07-27 13:12:21 -07:00 · 2024-05-20 21:53:52 -05:00
parent a2cf29e1ed
commit 49479d4cd9
11 changed files with 989 additions and 1042 deletions
@@ -1,73 +1,65 @@
 using Microsoft.Win32;

-namespace ZuneModCore.Win32
+namespace ZuneModCore.Win32;
+
+public class RegEdit
 {
+    public const string ZUNE_REG_PATH = @"SOFTWARE\Microsoft\Zune\";

-#pragma warning disable CA1416 // Validate platform compatibility
-
-    public class RegEdit
+    public static bool CurrentUserSetBoolValue(string key, string name, bool value)
    {
-        public const string ZUNE_REG_PATH = @"SOFTWARE\Microsoft\Zune\";
+        RegistryKey? regKey = Registry.CurrentUser.OpenSubKey(key, true);
+        regKey ??= Registry.CurrentUser.CreateSubKey(key, true);

-        public static bool CurrentUserSetBoolValue(string key, string name, bool value)
-        {
-            RegistryKey? regKey = Registry.CurrentUser.OpenSubKey(key, true);
-            if (regKey == null)
-                regKey = Registry.CurrentUser.CreateSubKey(key, true);
+        regKey.SetValue(name, value, RegistryValueKind.DWord);
+        regKey.Close();
+        regKey.Dispose();

-            regKey.SetValue(name, value, RegistryValueKind.DWord);
-            regKey.Close();
-            regKey.Dispose();
-
-            // Read the key to make sure it was set properly
-            if (CurrentUserGetBoolValue(key, name) == null)
-                return false;
-            return true;
-        }
-
-        public static bool? CurrentUserGetBoolValue(string key, string name)
-        {
-            using RegistryKey? regKey = Registry.CurrentUser.OpenSubKey(key, true);
-            if (regKey == null)
-                return false;
-
-            // Return null if a boolean value couldn't be read from the key
-            int? value = regKey.GetValue(name, false) as int?;
-            if (!value.HasValue)
-                return null;
-            return value != 0;
-        }
-
-        public static void CurrentUserDeleteKey(string key)
-        {
-            using RegistryKey? targetKey = Registry.CurrentUser.OpenSubKey(key, true);
-            if (targetKey == null)
-                // Key is already deleted
-                return;
-
-            // Delete target subkeys
-            if (targetKey.SubKeyCount > 0)
-                targetKey.DeleteSubKeyTree(key, false);
-
-            // Delete target values
-            string[] values = targetKey.GetValueNames();
-            foreach (string value in values)
-                targetKey.DeleteValue(value, false);
-
-            // Delete target key
-            Registry.CurrentUser.DeleteSubKey(key);
-        }
-
-        public static void CurrentUserDeleteValue(string key, string name)
-        {
-            using RegistryKey? regKey = Registry.CurrentUser.OpenSubKey(key, true);
-            if (regKey == null)
-                return;
-
-            regKey.DeleteValue(name, false);
-        }
+        // Read the key to make sure it was set properly
+        if (CurrentUserGetBoolValue(key, name) == null)
+            return false;
+        return true;
    }

-#pragma warning restore CA1416 // Validate platform compatibility
+    public static bool? CurrentUserGetBoolValue(string key, string name)
+    {
+        using RegistryKey? regKey = Registry.CurrentUser.OpenSubKey(key, true);
+        if (regKey == null)
+            return false;

+        // Return null if a boolean value couldn't be read from the key
+        int? value = regKey.GetValue(name, false) as int?;
+        if (!value.HasValue)
+            return null;
+        return value != 0;
+    }
+
+    public static void CurrentUserDeleteKey(string key)
+    {
+        using RegistryKey? targetKey = Registry.CurrentUser.OpenSubKey(key, true);
+        if (targetKey == null)
+            // Key is already deleted
+            return;
+
+        // Delete target subkeys
+        if (targetKey.SubKeyCount > 0)
+            targetKey.DeleteSubKeyTree(key, false);
+
+        // Delete target values
+        string[] values = targetKey.GetValueNames();
+        foreach (string value in values)
+            targetKey.DeleteValue(value, false);
+
+        // Delete target key
+        Registry.CurrentUser.DeleteSubKey(key);
+    }
+
+    public static void CurrentUserDeleteValue(string key, string name)
+    {
+        using RegistryKey? regKey = Registry.CurrentUser.OpenSubKey(key, true);
+        if (regKey == null)
+            return;
+
+        regKey.DeleteValue(name, false);
+    }
 }