[Dev][Build] .NET 9 Upgrade (#35716)

* [Deps] Upgrade Framework Libraries to .NET 9 RC2

* [Common][Build] Update TFM to NET9

* [FileLocksmith][Build] Update TFM to NET9 in Publish Profile

* [PreviewPane][Build] Update TFM to NET9 in Publish Profile

* [PTRun][Build] Update TFM to NET9 in Publish Profile

* [Settings][Build] Update TFM to NET9 in Publish Profile

* [MouseWithoutBorders][Analyzers] Resolve WFO1000 by configuring Designer Serialization Visibility

* [Deps] Update Microsoft.CodeAnalysis.NetAnalyzers

* [Analyzers] Set CA1859,CA2263,CA2022 to be excluded from error

* [MouseWithoutBorders] Use System.Threading.Lock to lock instead of object instance

* [ColorPicker] Use System.Threading.Lock to lock instead of object instance

* [AdvancedPaste] Use System.Threading.Lock to lock instead of object instance

* [TextExtractor] Use System.Threading.Lock to lock instead of object instance

* [Hosts] Use System.Threading.Lock to lock instead of object instance

* [MouseJump] Use System.Threading.Lock to lock instead of object instance

* [PTRun] Use System.Threading.Lock to lock instead of object instance

* [Wox] Use System.Threading.Lock to lock instead of object instance

* [Peek] Use System.Threading.Lock to lock instead of object instance

* [PowerAccent] Use System.Threading.Lock to lock instead of object instance

* [Settings] Use System.Threading.Lock to lock instead of object instance

* [Deps] Update NOTICE.md

* [CI] Update .NET version step to target 9.0

* [Build] Attempt to add manual trigger for using Visual Studio Preview for building

* [Build] Fix variable typo

* [Build][Temporary] set to use preview builds

* [Build] Add missing parameters

* [Build][Temporary] directly hardcode preview image

* [Build][Temporary] Trying ImageOverride

* [Build] Revert hardcode and use ImageOverride

* [Build] Add env var for adding prerelease argument for vswhere

* [Build] Update VCToolsVersion script to use env var to optionally add prerelease version checking

* [Build] Remove unneeded parameter

* [Build] Re-add parameter in all the right places

* [CI][Build] Add NoWarn NU5104 when building with VS Preview

* [Deps] Update to stable .NET 9 packages

* [Deps] Update NOTICE.md

* Everything is WPF and WindowsForms now to fix .NET 9 dependency conflicts

* Ensure .NET 9 SDK for tests too

---------

Co-authored-by: Jaime Bernardo <jaime@janeasystems.com>

src/Common.Dotnet.CsWinRT.props

@@ -3,7 +3,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <WindowsSdkPackageVersion>10.0.22621.48</WindowsSdkPackageVersion>
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
@@ -14,7 +14,7 @@
     <WarningLevel>4</WarningLevel>
     <NoWarn></NoWarn>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <WarningsNotAsErrors>CA1720</WarningsNotAsErrors>
+    <WarningsNotAsErrors>CA1720;CA1859;CA2263;CA2022</WarningsNotAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">

src/common/Common.UI/Common.UI.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
     <AssemblyName>PowerToys.Common.UI</AssemblyName>
   </PropertyGroup>
 

src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs

@@ -21,7 +21,7 @@ namespace AdvancedPaste.Settings
         private readonly SettingsUtils _settingsUtils;
         private readonly TaskScheduler _taskScheduler;
         private readonly IFileSystemWatcher _watcher;
-        private readonly object _loadingSettingsLock = new();
+        private readonly Lock _loadingSettingsLock = new();
         private readonly List<PasteFormats> _additionalActions;
         private readonly List<AdvancedPasteCustomAction> _customActions;
 

src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps</PublishDir>

src/modules/Hosts/Hosts/Settings/UserSettings.cs

@@ -20,7 +20,7 @@ namespace Hosts.Settings
 
         private readonly SettingsUtils _settingsUtils;
         private readonly IFileSystemWatcher _watcher;
-        private readonly object _loadingSettingsLock = new object();
+        private readonly Lock _loadingSettingsLock = new Lock();
 
         public bool ShowStartupWarning { get; private set; }
 

src/modules/MouseUtils/MouseJumpUI/Helpers/ThrottledActionInvoker.cs

@@ -3,13 +3,14 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Threading;
 using System.Windows.Threading;
 
 namespace MouseJumpUI.Helpers;
 
 internal sealed class ThrottledActionInvoker
 {
-    private readonly object _invokerLock = new();
+    private readonly Lock _invokerLock = new();
     private readonly DispatcherTimer _timer;
 
     private Action? _actionToRun;

src/modules/MouseWithoutBorders/App/Class/Common.Clipboard.cs

@@ -368,7 +368,7 @@ namespace MouseWithoutBorders
             }
         }
 
-        private static readonly object ClipboardThreadOldLock = new();
+        private static readonly Lock ClipboardThreadOldLock = new();
         private static System.Threading.Thread clipboardThreadOld;
 
         internal static void GetRemoteClipboard(string postAction)

src/modules/MouseWithoutBorders/App/Class/Common.Log.cs

@@ -32,7 +32,7 @@ namespace MouseWithoutBorders
 {
     public class Thread
     {
-        private static readonly object ThreadsLock = new();
+        private static readonly Lock ThreadsLock = new();
         private static List<System.Threading.Thread> threads;
 
         private readonly System.Threading.Thread thread;

src/modules/MouseWithoutBorders/App/Class/Common.MachineStuff.cs

@@ -43,7 +43,7 @@ namespace MouseWithoutBorders
 
     internal partial class Common
     {
-        private static readonly object McMatrixLock = new();
+        private static readonly Lock McMatrixLock = new();
 
         internal const byte MAX_MACHINE = 4;
         internal const byte MAX_SOCKET = MAX_MACHINE * 2;

src/modules/MouseWithoutBorders/App/Class/Common.cs

@@ -474,7 +474,7 @@ namespace MouseWithoutBorders
             }
         }
 
-        private static readonly object InputSimulationLock = new();
+        private static readonly Lock InputSimulationLock = new();
 
         internal static void DoSomethingInTheInputSimulationThread(ThreadStart target)
         {

src/modules/MouseWithoutBorders/App/Class/MachinePool.cs

@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 
 namespace MouseWithoutBorders.Class
 {
@@ -36,12 +37,12 @@ namespace MouseWithoutBorders.Class
     /// </remarks>
     internal class MachinePool
     {
-        private readonly object @lock;
+        private readonly Lock @lock;
         private readonly List<MachineInf> list;
 
         public MachinePool()
         {
-            @lock = new object();
+            @lock = new Lock();
             list = new List<MachineInf>();
         }
 

src/modules/MouseWithoutBorders/App/Class/Setting.cs

@@ -13,6 +13,7 @@ using System.IO.Abstractions;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text.Json.Serialization;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -44,7 +45,7 @@ namespace MouseWithoutBorders.Class
         internal bool Changed;
 
         private readonly SettingsUtils _settingsUtils;
-        private readonly object _loadingSettingsLock = new object();
+        private readonly Lock _loadingSettingsLock = new Lock();
         private readonly IFileSystemWatcher _watcher;
 
         private MouseWithoutBordersProperties _properties;

src/modules/MouseWithoutBorders/App/Class/SocketStuff.cs

@@ -826,7 +826,7 @@ namespace MouseWithoutBorders.Class
         }
 
         private static readonly Dictionary<string, List<IPAddress>> BadIPs = new();
-        private static readonly object BadIPsLock = new();
+        private static readonly Lock BadIPsLock = new();
 
         private static bool IsBadIP(string machineName, IPAddress ip)
         {

src/modules/MouseWithoutBorders/App/Control/ColorBorderField.cs

@@ -19,6 +19,7 @@ namespace MouseWithoutBorders
 
         [Category("Appearance")]
         [Description("The thickness of the border around the field")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         public int BorderSize
         {
             get => _borderSize;
@@ -33,6 +34,7 @@ namespace MouseWithoutBorders
 
         [Category("Appearance")]
         [Description("The color of the border around the field")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         public Color BorderColor
         {
             get => _borderColor;
@@ -47,6 +49,7 @@ namespace MouseWithoutBorders
 
         [Category("Appearance")]
         [Description("The color of the border around the field when it has focus")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         public Color FocusColor
         {
             get => _focusColor;
@@ -59,12 +62,14 @@ namespace MouseWithoutBorders
 
         [Category("Behavior")]
         [Description("The maximum number of characters that can be typed in the field")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         public int MaximumLength
         {
             get => InnerField.MaxLength;
             set => InnerField.MaxLength = value;
         }
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public override string Text
         {
             get => InnerField.Text;

src/modules/MouseWithoutBorders/App/Control/ImageButton.cs

@@ -19,12 +19,14 @@ namespace MouseWithoutBorders
 
         [Category("Appearance")]
         [Description("Image to show when Mouse is pressed on button")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         public Image DownImage { get; set; }
 
         private Image _normalImage;
 
         [Category("Appearance")]
         [Description("Image to show when button is in normal state")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         public Image NormalImage
         {
             get => _normalImage;
@@ -37,10 +39,12 @@ namespace MouseWithoutBorders
 
         [Category("Appearance")]
         [Description("Image to show when Mouse hovers over button")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         public Image HoverImage { get; set; }
 
         [Category("Appearance")]
         [Description("Image to show when button is disabled")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         public Image DisabledImage { get; set; }
 
         private bool _hovering;

src/modules/MouseWithoutBorders/App/Control/ImageRadioButton.cs

@@ -16,6 +16,7 @@ namespace MouseWithoutBorders
 
         [Category("Appearance")]
         [Description("The bounding rectangle of the check image in local co-ordinates")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         public Point ImageLocation
         {
             get => _imageLocation;
@@ -28,6 +29,7 @@ namespace MouseWithoutBorders
 
         private Point _textLocation;
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         public Point TextLocation
         {
             get => _textLocation;
@@ -47,6 +49,7 @@ namespace MouseWithoutBorders
 
         [Category("Appearance")]
         [Description("Image to show when Mouse is pressed on button")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         public Image CheckedImage
         {
             get => _checkedImage;
@@ -61,6 +64,7 @@ namespace MouseWithoutBorders
 
         [Category("Appearance")]
         [Description("Image to show when button is in normal state")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         public Image UncheckedImage
         {
             get => _uncheckedImage;

src/modules/MouseWithoutBorders/App/Control/Machine.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.ComponentModel;
 using System.Windows.Forms;
 
 // <summary>
@@ -34,12 +35,14 @@ namespace MouseWithoutBorders
             MachineEnabled = false;
         }
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         internal string MachineName
         {
             get => textBoxName.Text;
             set => textBoxName.Text = value;
         }
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         internal bool MachineEnabled
         {
             get => checkBoxEnabled.Checked;
@@ -52,6 +55,7 @@ namespace MouseWithoutBorders
             }
         }
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         internal bool Editable
         {
             set => textBoxName.Enabled = value;
@@ -59,6 +63,7 @@ namespace MouseWithoutBorders
             // get { return textBoxName.Enabled;  }
         }
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         internal bool CheckAble
         {
             set
@@ -73,6 +78,7 @@ namespace MouseWithoutBorders
             }
         }
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         internal bool LocalHost
         {
             // get { return localhost; }
@@ -165,6 +171,7 @@ namespace MouseWithoutBorders
             return rv;
         }
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         internal SocketStatus StatusClient
         {
             get => statusClient;
@@ -182,6 +189,7 @@ namespace MouseWithoutBorders
             }
         }
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         internal SocketStatus StatusServer
         {
             get => statusServer;

src/modules/MouseWithoutBorders/App/Core/Logger.cs

@@ -12,6 +12,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
 using System.Text;
+using System.Threading;
 using System.Windows.Forms;
 
 // <summary>
@@ -30,7 +31,7 @@ namespace MouseWithoutBorders.Core;
 internal static class Logger
 {
     internal static readonly string[] AllLogs = new string[MAX_LOG];
-    private static readonly object AllLogsLock = new();
+    private static readonly Lock AllLogsLock = new();
     internal static readonly ConcurrentDictionary<string, int> LogCounter = new();
     private const int MAX_LOG = 10000;
     private static int allLogsIndex;

src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -32,6 +33,7 @@ namespace MouseWithoutBorders
 
         private int _animationFrame;
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
         public bool ReturnToSettings { get; set; }
 
         public SetupPage3a()

src/modules/MouseWithoutBorders/App/Form/frmScreen.cs

@@ -58,12 +58,16 @@ namespace MouseWithoutBorders
         private Timer helperTimer;
 #pragma warning restore CA2213
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         internal int CurIcon { get; set; }
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         internal NotifyIcon NotifyIcon { get; set; }
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         internal System.Windows.Forms.ToolStripMenuItem MenuAllPC { get; set; }
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         internal System.Windows.Forms.ContextMenuStrip MainMenu { get; set; }
 
         internal FrmScreen()

src/modules/MouseWithoutBorders/App/Helper/FormHelper.cs

@@ -19,7 +19,7 @@ namespace MouseWithoutBorders
     public partial class FormHelper : System.Windows.Forms.Form
     {
         private readonly List<FocusArea> focusZone = new();
-        private readonly object bmScreenLock = new();
+        private readonly Lock bmScreenLock = new();
         private long lastClipboardEventTime;
 
         private IClipboardHelper remoteClipboardHelper;

src/modules/PowerOCR/PowerOCR/Helpers/ThrottledActionInvoker.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.ComponentModel.Composition;
+using System.Threading;
 using System.Windows.Threading;
 
 namespace PowerOCR.Helpers;
@@ -11,7 +12,7 @@ namespace PowerOCR.Helpers;
 [Export(typeof(IThrottledActionInvoker))]
 public sealed class ThrottledActionInvoker : IThrottledActionInvoker
 {
-    private object _invokerLock = new object();
+    private Lock _invokerLock = new Lock();
     private Action? _actionToRun;
 
     private DispatcherTimer _timer;

src/modules/PowerOCR/PowerOCR/Settings/UserSettings.cs

@@ -24,7 +24,7 @@ namespace PowerOCR.Settings
         private const int SettingsReadOnChangeDelayInMs = 300;
 
         private readonly IFileSystemWatcher _watcher;
-        private readonly object _loadingSettingsLock = new();
+        private readonly Lock _loadingSettingsLock = new();
 
         [ImportingConstructor]
         public UserSettings(Helpers.IThrottledActionInvoker throttledActionInvoker)

src/modules/colorPicker/ColorPickerUI/Common/RangeObservableCollection.cs

@@ -6,13 +6,14 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.Threading;
 
 namespace ColorPicker.Common
 {
     [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649:File name should match first type name", Justification = "File name is correct, ignore generics")]
     public sealed class RangeObservableCollection<T> : ObservableCollection<T>
     {
-        private object _collectionChangedLock = new object();
+        private Lock _collectionChangedLock = new Lock();
         private bool _suppressNotification;
 
         protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)

src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml.cs

@@ -325,7 +325,7 @@ namespace ColorPicker.Controls
 
         private static string ColorToHex(Color color, string oldValue = "")
         {
-            string newHexString = BitConverter.ToString(new byte[] { color.R, color.G, color.B }).Replace("-", string.Empty, StringComparison.InvariantCulture);
+            string newHexString = Convert.ToHexString(new byte[] { color.R, color.G, color.B });
             newHexString = newHexString.ToLowerInvariant();
 
             // Return only with hashtag if user typed it before

src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.ComponentModel.Composition;
+using System.Threading;
 using System.Windows;
 using System.Windows.Interop;
 
@@ -23,7 +24,7 @@ namespace ColorPicker.Helpers
         private readonly IUserSettings _userSettings;
         private ColorEditorWindow _colorEditorWindow;
         private bool _colorPickerShown;
-        private object _colorPickerVisibilityLock = new object();
+        private Lock _colorPickerVisibilityLock = new Lock();
 
         private HwndSource _hwndSource;
         private const int _globalHotKeyId = 0x0001;

src/modules/colorPicker/ColorPickerUI/Helpers/ThrottledActionInvoker.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.ComponentModel.Composition;
+using System.Threading;
 using System.Windows.Threading;
 
 namespace ColorPicker.Helpers
@@ -11,7 +12,7 @@ namespace ColorPicker.Helpers
     [Export(typeof(IThrottledActionInvoker))]
     public sealed class ThrottledActionInvoker : IThrottledActionInvoker
     {
-        private object _invokerLock = new object();
+        private Lock _invokerLock = new Lock();
         private Action _actionToRun;
 
         private DispatcherTimer _timer;

src/modules/colorPicker/ColorPickerUI/Settings/UserSettings.cs

@@ -33,7 +33,7 @@ namespace ColorPicker.Settings
         [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Actually, call back is LoadSettingsFromJson")]
         private readonly IFileSystemWatcher _watcher;
 
-        private readonly object _loadingSettingsLock = new object();
+        private readonly Lock _loadingSettingsLock = new Lock();
 
         private bool _loadingColorsHistory;
 

src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/OpenWindows.cs

@@ -21,7 +21,7 @@ namespace Microsoft.Plugin.WindowWalker.Components
         /// <summary>
         /// Used to enforce single execution of EnumWindows
         /// </summary>
-        private static readonly object _enumWindowsLock = new();
+        private static readonly Lock _enumWindowsLock = new();
 
         /// <summary>
         /// PowerLauncher main executable

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Components/UtilityProvider.cs

@@ -22,7 +22,7 @@ namespace Microsoft.PowerToys.Run.Plugin.PowerToys
         private const int MaxNumberOfRetry = 5;
         private readonly List<Utility> _utilities;
         private readonly FileSystemWatcher _watcher;
-        private readonly object _loadingSettingsLock = new();
+        private readonly Lock _loadingSettingsLock = new();
         private bool _disposed;
 
         public UtilityProvider()

src/modules/launcher/PowerLauncher/App.xaml.cs

@@ -49,7 +49,7 @@ namespace PowerLauncher
         private ETWTrace etwTrace = new ETWTrace();
 
         // To prevent two disposals running at the same time.
-        private static readonly object _disposingLock = new object();
+        private static readonly Lock _disposingLock = new Lock();
 
         [STAThread]
         public static void Main()

src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs

@@ -11,6 +11,7 @@ using System.IO.Abstractions;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 
@@ -29,7 +30,7 @@ namespace PowerLauncher.Plugin
     {
         private static readonly IFileSystem FileSystem = new FileSystem();
         private static readonly IDirectory Directory = FileSystem.Directory;
-        private static readonly object AllPluginsLock = new object();
+        private static readonly Lock AllPluginsLock = new Lock();
 
         private static readonly CompositeFormat FailedToInitializePluginsDescription = System.Text.CompositeFormat.Parse(Properties.Resources.FailedToInitializePluginsDescription);
 

src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>

src/modules/launcher/PowerLauncher/SettingsReader.cs

@@ -29,7 +29,7 @@ namespace PowerLauncher
         private readonly SettingsUtils _settingsUtils;
 
         private const int MaxRetries = 10;
-        private static readonly object _readSyncObject = new object();
+        private static readonly Lock _readSyncObject = new Lock();
         private readonly PowerToysRunSettings _settings;
         private readonly ThemeManager _themeManager;
         private Action _refreshPluginsOverviewCallback;
@@ -73,7 +73,7 @@ namespace PowerLauncher
 
         public void ReadSettings()
         {
-            Monitor.Enter(_readSyncObject);
+            _readSyncObject.Enter();
             var retry = true;
             var retryCount = 0;
             while (retry)
@@ -224,7 +224,7 @@ namespace PowerLauncher
                 }
             }
 
-            Monitor.Exit(_readSyncObject);
+            _readSyncObject.Exit();
         }
 
         public void SetRefreshPluginsOverviewCallback(Action callback)

src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs

@@ -47,7 +47,7 @@ namespace PowerLauncher.ViewModel
         private readonly PowerToysRunSettings _settings;
         private readonly QueryHistory _history;
         private readonly UserSelectedRecord _userSelectedRecord;
-        private static readonly object _addResultsLock = new object();
+        private static readonly Lock _addResultsLock = new Lock();
         private readonly System.Diagnostics.Stopwatch _hotkeyTimer = new System.Diagnostics.Stopwatch();
 
         private string _queryTextBeforeLeaveResults;

src/modules/launcher/Wox.Infrastructure/Stopwatch.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Threading;
 
 using Wox.Plugin.Logger;
 
@@ -13,7 +14,7 @@ namespace Wox.Infrastructure
     public static class Stopwatch
     {
         private static readonly Dictionary<string, long> Count = new Dictionary<string, long>();
-        private static readonly object Locker = new object();
+        private static readonly Lock Locker = new Lock();
 
         /// <summary>
         /// This stopwatch will appear only in Debug mode

src/modules/launcher/Wox.Infrastructure/Storage/JsonStorage`1.cs

@@ -9,6 +9,7 @@ using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
 using System.Text.Json;
+using System.Threading;
 
 using Wox.Plugin.Logger;
 
@@ -23,7 +24,7 @@ namespace Wox.Infrastructure.Storage
         private static readonly IPath Path = FileSystem.Path;
         private static readonly IFile File = FileSystem.File;
 
-        private readonly object _saveLock = new object();
+        private readonly Lock _saveLock = new Lock();
 
         // use property initialization instead of DefaultValueAttribute
         // easier and flexible for default value of object

src/modules/launcher/Wox.Plugin/Common/DefaultBrowserInfo.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Text;
+using System.Threading;
 
 using Wox.Plugin.Common.Win32;
 using Wox.Plugin.Logger;
@@ -15,7 +16,7 @@ namespace Wox.Plugin.Common
     /// </summary>
     public static class DefaultBrowserInfo
     {
-        private static readonly object _updateLock = new object();
+        private static readonly Lock _updateLock = new Lock();
 
         /// <summary>Gets the path to the MS Edge browser executable.</summary>
         public static string MSEdgePath => System.IO.Path.Combine(

src/modules/peek/Peek.FilePreviewer/Models/PreviewSettings.cs

@@ -20,7 +20,7 @@ namespace Peek.FilePreviewer.Models
 
         private readonly SettingsUtils _settingsUtils;
         private readonly IFileSystemWatcher _watcher;
-        private readonly object _loadingSettingsLock = new();
+        private readonly Lock _loadingSettingsLock = new();
 
         public bool SourceCodeWrapText { get; private set; }
 

src/modules/peek/Peek.UI/Services/UserSettings.cs

@@ -20,7 +20,7 @@ namespace Peek.UI
 
         private readonly SettingsUtils _settingsUtils;
         private readonly IFileSystemWatcher _watcher;
-        private readonly object _loadingSettingsLock = new();
+        private readonly Lock _loadingSettingsLock = new();
 
         public bool CloseAfterLosingFocus { get; private set; }
 

src/modules/poweraccent/PowerAccent.Core/Services/SettingsService.cs

@@ -18,7 +18,7 @@ public class SettingsService
     private const string PowerAccentModuleName = "QuickAccent";
     private readonly SettingsUtils _settingsUtils;
     private readonly IFileSystemWatcher _watcher;
-    private readonly object _loadingSettingsLock = new object();
+    private readonly Lock _loadingSettingsLock = new Lock();
     private KeyboardListener _keyboardListener;
 
     public SettingsService(KeyboardListener keyboardListener)

src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj

@@ -37,6 +37,7 @@
     <ProjectReference Include="..\..\..\common\GPOWrapper\GPOWrapper.vcxproj" />
     <ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
     <ProjectReference Include="..\Common\PreviewHandlerCommon.csproj" />
+    <ProjectReference Include="..\..\..\common\Common.UI\Common.UI.csproj" />
   </ItemGroup>
 
 </Project>

src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>

src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>

src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj

@@ -35,6 +35,7 @@
     <ProjectReference Include="..\..\..\common\GPOWrapper\GPOWrapper.vcxproj" />
     <ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
     <ProjectReference Include="..\Common\PreviewHandlerCommon.csproj" />
+    <ProjectReference Include="..\..\..\common\Common.UI\Common.UI.csproj" />
   </ItemGroup>
 
 </Project>

src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj

@@ -36,6 +36,7 @@
     <ProjectReference Include="..\..\..\common\GPOWrapper\GPOWrapper.vcxproj" />
     <ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
     <ProjectReference Include="..\Common\PreviewHandlerCommon.csproj" />
+    <ProjectReference Include="..\..\..\common\Common.UI\Common.UI.csproj" />
   </ItemGroup>
 
 </Project>

src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>

src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>

src/settings-ui/Settings.UI.Library/SettingsBackupAndRestoreUtils.cs

@@ -25,8 +25,8 @@ namespace Microsoft.PowerToys.Settings.UI.Library
     {
         private static SettingsBackupAndRestoreUtils instance;
         private (bool Success, string Severity, bool LastBackupExists, DateTime? LastRan) lastBackupSettingsResults;
-        private static object backupSettingsInternalLock = new object();
-        private static object removeOldBackupsLock = new object();
+        private static Lock backupSettingsInternalLock = new Lock();
+        private static Lock removeOldBackupsLock = new Lock();
 
         public DateTime LastBackupStartTime { get; set; }
 
@@ -933,7 +933,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         /// </summary>
         private static void RemoveOldBackups(string location, int minNumberToKeep, TimeSpan deleteIfOlderThanTs)
         {
-            if (!Monitor.TryEnter(removeOldBackupsLock, 1000))
+            if (!removeOldBackupsLock.TryEnter(1000))
             {
                 return;
             }
@@ -1002,7 +1002,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             }
             finally
             {
-                Monitor.Exit(removeOldBackupsLock);
+                removeOldBackupsLock.Exit();
             }
         }
 

src/settings-ui/Settings.UI.Library/SettingsRepository`1.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Threading;
 
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
@@ -13,7 +14,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
     public class SettingsRepository<T> : ISettingsRepository<T>
         where T : class, ISettingsConfig, new()
     {
-        private static readonly object _SettingsRepoLock = new object();
+        private static readonly Lock _SettingsRepoLock = new Lock();
 
         private static ISettingsUtils _settingsUtils;
 

src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps</PublishDir>

src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs

@@ -35,7 +35,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         private GeneralSettings GeneralSettingsConfig { get; set; }
 
         private readonly ISettingsUtils _settingsUtils;
-        private readonly object _delayedActionLock = new object();
+        private readonly System.Threading.Lock _delayedActionLock = new System.Threading.Lock();
 
         private readonly AdvancedPasteSettings _advancedPasteSettings;
         private readonly AdvancedPasteAdditionalActions _additionalActions;

src/settings-ui/Settings.UI/ViewModels/ColorPickerViewModel.cs

@@ -29,7 +29,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         private GeneralSettings GeneralSettingsConfig { get; set; }
 
         private readonly ISettingsUtils _settingsUtils;
-        private readonly object _delayedActionLock = new object();
+        private readonly System.Threading.Lock _delayedActionLock = new System.Threading.Lock();
 
         private readonly ColorPickerSettings _colorPickerSettings;
         private Timer _delayedTimer;

src/settings-ui/Settings.UI/ViewModels/MouseWithoutBordersViewModel.cs

@@ -39,7 +39,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             0,
         };
 
-        private readonly object _machineMatrixStringLock = new();
+        private readonly Lock _machineMatrixStringLock = new();
 
         private static readonly Dictionary<SocketStatus, Brush> StatusColors = new Dictionary<SocketStatus, Brush>()
 {

src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs

@@ -30,7 +30,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         private GeneralSettings GeneralSettingsConfig { get; set; }
 
         private readonly ISettingsUtils _settingsUtils;
-        private readonly object _delayedActionLock = new object();
+        private readonly System.Threading.Lock _delayedActionLock = new System.Threading.Lock();
 
         private readonly PowerOcrSettings _powerOcrSettings;
         private Timer _delayedTimer;