Update csharpier to 0.29.1

Format files

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "0.28.0",
+      "version": "0.29.1",
       "commands": [
         "dotnet-csharpier"
       ]

YMouseButtonControl.Core.Tests/KeyboardAndMouse/KeyboardSimulatorWorkerTests.cs

@@ -26,7 +26,7 @@ public void DefaultProfileSendsKeys()
         {
             SimulatedKeystrokesType = new MouseButtonPressedActionType(),
             BlockOriginalMouseInput = true,
-            Keys = "wee"
+            Keys = "wee",
         };
         var testProvider = new TestProvider();
         using var hook = new SimpleReactiveGlobalHook(globalHookProvider: testProvider);
@@ -51,7 +51,7 @@ public void DefaultProfileSendsKeys()
         var evtDn = new UioHookEvent
         {
             Type = EventType.MousePressed,
-            Mouse = new MouseEventData { Button = MouseButton.Button3, }
+            Mouse = new MouseEventData { Button = MouseButton.Button3 },
         };
         // var evtUp = new UioHookEvent
         // {
@@ -78,7 +78,7 @@ public void NonDefaultProfileSendsKeys()
         {
             SimulatedKeystrokesType = new MouseButtonPressedActionType(),
             BlockOriginalMouseInput = true,
-            Keys = "wee"
+            Keys = "wee",
         };
         var testProvider = new TestProvider();
         using var hook = new SimpleReactiveGlobalHook(globalHookProvider: testProvider);
@@ -103,7 +103,7 @@ public void NonDefaultProfileSendsKeys()
         var evtDn = new UioHookEvent
         {
             Type = EventType.MousePressed,
-            Mouse = new MouseEventData { Button = MouseButton.Button3, }
+            Mouse = new MouseEventData { Button = MouseButton.Button3 },
         };
         // var evtUp = new UioHookEvent
         // {
@@ -130,7 +130,7 @@ public void NonDefaultProfileNotSendKeys()
         {
             SimulatedKeystrokesType = new MouseButtonPressedActionType(),
             BlockOriginalMouseInput = true,
-            Keys = "wee"
+            Keys = "wee",
         };
         var testProvider = new TestProvider();
         using var hook = new SimpleReactiveGlobalHook(globalHookProvider: testProvider);
@@ -156,7 +156,7 @@ public void NonDefaultProfileNotSendKeys()
         var evtDn = new UioHookEvent
         {
             Type = EventType.MousePressed,
-            Mouse = new MouseEventData { Button = MouseButton.Button3, }
+            Mouse = new MouseEventData { Button = MouseButton.Button3 },
         };
         // var evtUp = new UioHookEvent
         // {
@@ -181,7 +181,7 @@ public void DefaultProfileSendsKeysReleased()
         {
             SimulatedKeystrokesType = new MouseButtonReleasedActionType(),
             BlockOriginalMouseInput = true,
-            Keys = "wee"
+            Keys = "wee",
         };
         var testProvider = new TestProvider();
         using var hook = new SimpleReactiveGlobalHook(globalHookProvider: testProvider);
@@ -206,7 +206,7 @@ public void DefaultProfileSendsKeysReleased()
         var evtUp = new UioHookEvent
         {
             Type = EventType.MouseReleased,
-            Mouse = new MouseEventData { Button = MouseButton.Button3, }
+            Mouse = new MouseEventData { Button = MouseButton.Button3 },
         };
         RunHookAndWaitForStart(hook, testProvider);
 

YMouseButtonControl.Core/DataAccess/Models/Enums/ButtonMappings.cs

@@ -5,5 +5,5 @@ public enum ButtonMappings
     Nothing,
     Disabled,
     SimulatedKeystrokes,
-    RightClick
+    RightClick,
 }

YMouseButtonControl.Core/DataAccess/Models/Enums/YMouseButton.cs

@@ -10,5 +10,5 @@ public enum YMouseButton : ushort
     MouseWheelUp,
     MouseWheelDown,
     MouseWheelLeft,
-    MouseWheelRight
+    MouseWheelRight,
 }

YMouseButtonControl.Core/KeyboardAndMouse/Enums/MouseButtonState.cs

@@ -3,5 +3,5 @@
 public enum MouseButtonState
 {
     Pressed,
-    Released
+    Released,
 }

YMouseButtonControl.Core/Profiles/Implementations/ProfilesService.cs

@@ -43,13 +43,12 @@ public ProfilesService(IUnitOfWorkFactory unitOfWorkFactory)
                 CurrentProfile = change.Reason switch
                 {
                     ChangeReason.Add => change.Current,
-                    ChangeReason.Remove
-                        => _profiles
-                            .Items.Where(x => x.DisplayPriority < change.Current.DisplayPriority)
-                            .MaxBy(x => x.DisplayPriority)
-                            ?? throw new Exception("Unable to get next lower priority on remove"),
+                    ChangeReason.Remove => _profiles
+                        .Items.Where(x => x.DisplayPriority < change.Current.DisplayPriority)
+                        .MaxBy(x => x.DisplayPriority)
+                        ?? throw new Exception("Unable to get next lower priority on remove"),
                     ChangeReason.Update => change.Current,
-                    _ => throw new Exception("Unhandled change reason")
+                    _ => throw new Exception("Unhandled change reason"),
                 };
             });
 
@@ -111,7 +110,7 @@ private void CheckDefaultProfile()
             MouseWheelUp = new NothingMapping(),
             MouseWheelDown = new NothingMapping(),
             MouseWheelLeft = new NothingMapping(),
-            MouseWheelRight = new NothingMapping()
+            MouseWheelRight = new NothingMapping(),
         };
         repository.Add(defaultProfile);
     }

YMouseButtonControl.Core/Services/Abstractions/Enums/WheelScrollDirection.cs

@@ -5,5 +5,5 @@ public enum WheelScrollDirection
     VerticalUp = 1,
     VerticalDown = 2,
     HorizontalRight = 3,
-    HorizontalLeft = 4
+    HorizontalLeft = 4,
 }

YMouseButtonControl.Core/ViewModels/Implementations/AppViewModel.cs

@@ -44,23 +44,29 @@ is IClassicDesktopStyleApplicationLifetime lifetime
             }
         });
         var runAtStartupCanExecute = this.WhenAnyValue(x => x.RunAtStartupIsEnabled);
-        RunAtStartupCommand = ReactiveCommand.Create(() =>
-        {
-            if (startupInstallerService.InstallStatus())
-            {
-                // uninstall
-                startupInstallerService.Uninstall();
-                RunAtStartupIsChecked = false;
-                RunAtStartupHeader = string.Format(RunAtStartupHeaderFmt, RunAtStartupNotChecked);
-            }
-            else
+        RunAtStartupCommand = ReactiveCommand.Create(
+            () =>
             {
-                // install
-                startupInstallerService.Install();
-                RunAtStartupIsChecked = true;
-                RunAtStartupHeader = string.Format(RunAtStartupHeaderFmt, RunAtStartupChecked);
-            }
-        }, runAtStartupCanExecute);
+                if (startupInstallerService.InstallStatus())
+                {
+                    // uninstall
+                    startupInstallerService.Uninstall();
+                    RunAtStartupIsChecked = false;
+                    RunAtStartupHeader = string.Format(
+                        RunAtStartupHeaderFmt,
+                        RunAtStartupNotChecked
+                    );
+                }
+                else
+                {
+                    // install
+                    startupInstallerService.Install();
+                    RunAtStartupIsChecked = true;
+                    RunAtStartupHeader = string.Format(RunAtStartupHeaderFmt, RunAtStartupChecked);
+                }
+            },
+            runAtStartupCanExecute
+        );
     }
 
     public string ToolTipText => $"YMouseButtonControl v{GetType().Assembly.GetName().Version}";
@@ -70,7 +76,7 @@ public bool RunAtStartupIsEnabled
         get => _runAtStartupIsEnabled;
         set => this.RaiseAndSetIfChanged(ref _runAtStartupIsEnabled, value);
     }
-    
+
     public bool RunAtStartupIsChecked
     {
         get => _runAtStartupIsChecked;

YMouseButtonControl.Core/ViewModels/Implementations/Dialogs/ProcessSelectorDialogViewModel.cs

@@ -44,7 +44,7 @@ public ProcessSelectorDialogViewModel(IProcessMonitorService processMonitorServi
                 {
                     Name = SelectedProcessModel!.Process.MainModule!.ModuleName,
                     Description = SelectedProcessModel.Process.MainWindowTitle,
-                    Process = SelectedProcessModel.Process.MainModule.ModuleName
+                    Process = SelectedProcessModel.Process.MainModule.ModuleName,
                 },
             canExecuteOkCommand
         );

YMouseButtonControl.Core/ViewModels/Implementations/Dialogs/SimulatedKeystrokesDialogViewModel.cs

@@ -68,7 +68,7 @@ public SimulatedKeystrokesDialogViewModel(
                     CustomKeys = CustomKeys,
                     SimulatedKeystrokesType = SimulatedKeystrokesType,
                     Description = Description,
-                    BlockOriginalMouseInput = BlockOriginalMouseInput
+                    BlockOriginalMouseInput = BlockOriginalMouseInput,
                 },
             canExecuteOkCmd
         );
@@ -215,7 +215,7 @@ public bool BlockOriginalMouseInput
             { "F21", "{F21}" },
             { "F22", "{F22}" },
             { "F23", "{F23}" },
-            { "F24", "{F24}" }
+            { "F24", "{F24}" },
         };
 
     public static Dictionary<string, string> NumericKeypadKeys =>
@@ -263,7 +263,7 @@ public bool BlockOriginalMouseInput
             { "Next Track", "{MEDIANEXT}" },
             { "Previous Track", "{MEDIAPREV}" },
             { "Select Track", "{MEDIASELECT}" },
-            { "Eject Media", "{MEDIAEJECT}" }
+            { "Eject Media", "{MEDIAEJECT}" },
         };
 
     public static Dictionary<string, string> BrowserKeys =>
@@ -314,7 +314,7 @@ public int CaretIndex
         () => new RepeatedlyWhileButtonDownActionType(),
         () => new StickyRepeatActionType(),
         () => new StickyHoldActionType(),
-        () => new AsMousePressedAndReleasedActionType()
+        () => new AsMousePressedAndReleasedActionType(),
     ];
 
     private string? _computedXy;

YMouseButtonControl.Core/ViewModels/Services/ShowSimulatedKeystrokesDialogService.cs

@@ -41,7 +41,7 @@ public Interaction<
             Keys = result.CustomKeys,
             PriorityDescription = result.Description,
             SimulatedKeystrokesType = result.SimulatedKeystrokesType,
-            BlockOriginalMouseInput = result.BlockOriginalMouseInput
+            BlockOriginalMouseInput = result.BlockOriginalMouseInput,
         };
     }
 }

YMouseButtonControl.KeyboardAndMouse.SharpHook/Implementations/EventSimulatorService.cs

@@ -32,7 +32,7 @@ public SimulateKeyboardResult SimulateKeyPress(string? key)
         {
             Result = eventSimulator
                 .SimulateKeyPress(KeyCodes[key ?? throw new NullReferenceException(key)])
-                .ToString()
+                .ToString(),
         };
     }
 
@@ -43,7 +43,7 @@ public SimulateKeyboardResult SimulateKeyRelease(string? key)
         {
             Result = eventSimulator
                 .SimulateKeyRelease(KeyCodes[key ?? throw new NullReferenceException(key)])
-                .ToString()
+                .ToString(),
         };
     }
 
@@ -300,7 +300,7 @@ private static List<ParsedKey> ParseKeys(string? keys)
                     {
                         Key = substr,
                         IsModifier = false,
-                        Value = (ushort)KeyCodes[substr]
+                        Value = (ushort)KeyCodes[substr],
                     }
                 );
                 i++;
@@ -504,6 +504,6 @@ private static List<ParsedKey> ParseKeys(string? keys)
             { "rmb", MouseButton.Button2 },
             { "mmb", MouseButton.Button3 },
             { "mb4", MouseButton.Button4 },
-            { "mb5", MouseButton.Button5 }
+            { "mb5", MouseButton.Button5 },
         };
 }

YMouseButtonControl.KeyboardAndMouse.SharpHook/Implementations/MouseListenerService.cs

@@ -87,52 +87,43 @@ private void OnMouseWheel(NewMouseWheelEventArgs args)
     private bool ShouldSuppressEvent(NewMouseHookEventArgs args) =>
         args.Button switch
         {
-            YMouseButton.MouseButton1
-                => _profilesService.Profiles.Any(p =>
-                    p is { Checked: true, MouseButton1.BlockOriginalMouseInput: true }
-                    && (args.ActiveWindow?.Contains(p.Process) ?? false)
-                ),
-            YMouseButton.MouseButton2
-                => _profilesService.Profiles.Any(p =>
-                    p is { Checked: true, MouseButton2.BlockOriginalMouseInput: true }
-                    && (args.ActiveWindow?.Contains(p.Process) ?? false)
-                ),
-            YMouseButton.MouseButton3
-                => _profilesService.Profiles.Any(p =>
-                    p is { Checked: true, MouseButton3.BlockOriginalMouseInput: true }
-                    && (args.ActiveWindow?.Contains(p.Process) ?? false)
-                ),
-            YMouseButton.MouseButton4
-                => _profilesService.Profiles.Any(p =>
-                    p is { Checked: true, MouseButton4.BlockOriginalMouseInput: true }
-                    && (args.ActiveWindow?.Contains(p.Process) ?? false)
-                ),
-            YMouseButton.MouseButton5
-                => _profilesService.Profiles.Any(p =>
-                    p is { Checked: true, MouseButton5.BlockOriginalMouseInput: true }
-                    && (args.ActiveWindow?.Contains(p.Process) ?? false)
-                ),
-            YMouseButton.MouseWheelUp
-                => _profilesService.Profiles.Any(p =>
-                    p is { Checked: true, MouseWheelUp.BlockOriginalMouseInput: true }
-                    && (args.ActiveWindow?.Contains(p.Process) ?? false)
-                ),
-            YMouseButton.MouseWheelDown
-                => _profilesService.Profiles.Any(p =>
-                    p is { Checked: true, MouseWheelDown.BlockOriginalMouseInput: true }
-                    && (args.ActiveWindow?.Contains(p.Process) ?? false)
-                ),
-            YMouseButton.MouseWheelLeft
-                => _profilesService.Profiles.Any(p =>
-                    p is { Checked: true, MouseWheelLeft.BlockOriginalMouseInput: true }
-                    && (args.ActiveWindow?.Contains(p.Process) ?? false)
-                ),
-            YMouseButton.MouseWheelRight
-                => _profilesService.Profiles.Any(p =>
-                    p is { Checked: true, MouseWheelRight.BlockOriginalMouseInput: true }
-                    && (args.ActiveWindow?.Contains(p.Process) ?? false)
-                ),
-            _ => throw new ArgumentOutOfRangeException()
+            YMouseButton.MouseButton1 => _profilesService.Profiles.Any(p =>
+                p is { Checked: true, MouseButton1.BlockOriginalMouseInput: true }
+                && (args.ActiveWindow?.Contains(p.Process) ?? false)
+            ),
+            YMouseButton.MouseButton2 => _profilesService.Profiles.Any(p =>
+                p is { Checked: true, MouseButton2.BlockOriginalMouseInput: true }
+                && (args.ActiveWindow?.Contains(p.Process) ?? false)
+            ),
+            YMouseButton.MouseButton3 => _profilesService.Profiles.Any(p =>
+                p is { Checked: true, MouseButton3.BlockOriginalMouseInput: true }
+                && (args.ActiveWindow?.Contains(p.Process) ?? false)
+            ),
+            YMouseButton.MouseButton4 => _profilesService.Profiles.Any(p =>
+                p is { Checked: true, MouseButton4.BlockOriginalMouseInput: true }
+                && (args.ActiveWindow?.Contains(p.Process) ?? false)
+            ),
+            YMouseButton.MouseButton5 => _profilesService.Profiles.Any(p =>
+                p is { Checked: true, MouseButton5.BlockOriginalMouseInput: true }
+                && (args.ActiveWindow?.Contains(p.Process) ?? false)
+            ),
+            YMouseButton.MouseWheelUp => _profilesService.Profiles.Any(p =>
+                p is { Checked: true, MouseWheelUp.BlockOriginalMouseInput: true }
+                && (args.ActiveWindow?.Contains(p.Process) ?? false)
+            ),
+            YMouseButton.MouseWheelDown => _profilesService.Profiles.Any(p =>
+                p is { Checked: true, MouseWheelDown.BlockOriginalMouseInput: true }
+                && (args.ActiveWindow?.Contains(p.Process) ?? false)
+            ),
+            YMouseButton.MouseWheelLeft => _profilesService.Profiles.Any(p =>
+                p is { Checked: true, MouseWheelLeft.BlockOriginalMouseInput: true }
+                && (args.ActiveWindow?.Contains(p.Process) ?? false)
+            ),
+            YMouseButton.MouseWheelRight => _profilesService.Profiles.Any(p =>
+                p is { Checked: true, MouseWheelRight.BlockOriginalMouseInput: true }
+                && (args.ActiveWindow?.Contains(p.Process) ?? false)
+            ),
+            _ => throw new ArgumentOutOfRangeException(),
         };
 
     private void SubscribeToEvents()

YMouseButtonControl.Linux.Tests/GlobalUsings.cs

@@ -1 +1 @@
-global using NUnit.Framework;
+global using NUnit.Framework;

YMouseButtonControl.Linux.Tests/StartupInstallerTests.cs

@@ -40,4 +40,4 @@ public void I_can_uninstall()
             Assert.That(sut.InstallStatus(), Is.False);
         });
     }
-}
+}