Use some new C#10 features

mscrivo · Nov 5, 2023 · dcdf43c · dcdf43c
1 parent f76b000
commit dcdf43c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 26 deletions.
diff --git a/NetSparkle b/NetSparkle
diff --git a/OotD.Core/Events/InstanceRemovedEventArgs.cs b/OotD.Core/Events/InstanceRemovedEventArgs.cs
@@ -6,12 +6,7 @@
 
 namespace OotD.Events;
 
-public class InstanceRemovedEventArgs : EventArgs
+public class InstanceRemovedEventArgs(string instanceName) : EventArgs
 {
-    public InstanceRemovedEventArgs(string instanceName)
-    {
-        InstanceName = instanceName;
-    }
-
-    public string InstanceName { get; }
-}
+    public string InstanceName { get; } = instanceName;
+}
diff --git a/OotD.Core/Events/InstanceRenamedEventArgs.cs b/OotD.Core/Events/InstanceRenamedEventArgs.cs
@@ -6,15 +6,9 @@
 
 namespace OotD.Events;
 
-public class InstanceRenamedEventArgs : EventArgs
+public class InstanceRenamedEventArgs(string oldInstanceName, string newInstanceName) : EventArgs
 {
-    public InstanceRenamedEventArgs(string oldInstanceName, string newInstanceName)
-    {
-        OldInstanceName = oldInstanceName;
-        NewInstanceName = newInstanceName;
-    }
+    public string OldInstanceName { get; } = oldInstanceName;
 
-    public string OldInstanceName { get; }
-
-    public string NewInstanceName { get; }
-}
+    public string NewInstanceName { get; } = newInstanceName;
+}
diff --git a/OotD.Core/Preferences/InstancePreferences.cs b/OotD.Core/Preferences/InstancePreferences.cs
@@ -9,20 +9,15 @@
 
 namespace OotD.Preferences;
 
-public class InstancePreferences
+public class InstancePreferences(string instanceName)
 {
     public const int DefaultHeight = 500;
     public const int DefaultLeftPosition = 100;
     public const double DefaultOpacity = 0.5;
     public const int DefaultTopPosition = 100;
     public const int DefaultWidth = 700;
 
-    private readonly RegistryKey _appReg;
-
-    public InstancePreferences(string instanceName)
-    {
-        _appReg = Registry.CurrentUser.CreateSubKey("Software\\" + Application.CompanyName + "\\" + Application.ProductName + "\\" + instanceName) ?? throw new InvalidOperationException();
-    }
+    private readonly RegistryKey _appReg = Registry.CurrentUser.CreateSubKey("Software\\" + Application.CompanyName + "\\" + Application.ProductName + "\\" + instanceName) ?? throw new InvalidOperationException();
 
     /// <summary>
     /// Main Window Opacity.
+5 −15		NetSparkle/HttpClientWithProgress.cs
+3 −10		NetSparkle/NetSparkleDeviceInventory.cs