[Docs]Fix 0.86.0 release hashes in README

2026-01-25 13:37:22 +01:00 · 2024-11-05 11:33:24 +00:00
91 changed files with 163 additions and 294 deletions
--- a/.github/actions/spell-check/allow/names.txt
+++ b/.github/actions/spell-check/allow/names.txt
@@ -56,6 +56,7 @@ damienleroy
 davidegiacometti
 debian
 Deibisu
+Deibisu
 Delimarsky
 Deondre
 DHowett
@@ -86,6 +87,7 @@ jefflord
 Jordi
 jyuwono
 Kairu
+Kairu
 Kamra
 Kantarci
 Karthick
@@ -121,6 +123,7 @@ Quriz
 randyrants
 ricardosantos
 riri
+riri
 ritchielawrence
 robmikh
 Rutkas
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -321,10 +321,6 @@
                "WinUI3Apps\\ReverseMarkdown.dll",
                "WinUI3Apps\\SharpCompress.dll",
                "WinUI3Apps\\ZstdSharp.dll",
-                "TestableIO.System.IO.Abstractions.dll",
-                "WinUI3Apps\\TestableIO.System.IO.Abstractions.dll",
-                "TestableIO.System.IO.Abstractions.Wrappers.dll",
-                "WinUI3Apps\\TestableIO.System.IO.Abstractions.Wrappers.dll",
                "ColorCode.Core.dll", 
                "ColorCode.UWP.dll",
                "UnitsNet.dll",
--- a/.pipelines/v2/ci.yml
+++ b/.pipelines/v2/ci.yml
@@ -37,10 +37,6 @@ parameters:
    type: boolean
    displayName: "Run Tests"
    default: true
-  - name: useVSPreview
-    type: boolean
-    displayName: "Build Using Visual Studio Preview"
-    default: false

 extends:
  template: templates/pipeline-ci-build.yml
@@ -48,4 +44,3 @@ extends:
    buildPlatforms: ${{ parameters.buildPlatforms }}
    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
    runTests: ${{ parameters.runTests }}
-    useVSPreview: ${{ parameters.useVSPreview }}
--- a/.pipelines/v2/release.yml
+++ b/.pipelines/v2/release.yml
@@ -33,11 +33,6 @@ parameters:
      - x64
      - arm64

-  - name: useVSPreview
-    type: boolean
-    displayName: "Build Using Visual Studio Preview"
-    default: false
-
 name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)

 extends:
@@ -47,10 +42,7 @@ extends:
    - 1ES.PT.ViaStartRight
    pool:
      name: SHINE-INT-S
-      ${{ if eq(parameters.useVSPreview, true) }}:
-        demands: ImageOverride -equals SHINE-VS17-Preview
-      ${{ else }}:
-        image: SHINE-VS17-Latest
+      image: SHINE-VS17-Latest
      os: windows
    sdl:
      tsa:
@@ -66,10 +58,7 @@ extends:
            parameters:
              pool:
                name: SHINE-INT-L
-                ${{ if eq(parameters.useVSPreview, true) }}:
-                  demands: ImageOverride -equals SHINE-VS17-Preview
-                ${{ else }}:
-                  image: SHINE-VS17-Latest
+                image: SHINE-VS17-Latest
                os: windows
              variables:
                IsPipeline: 1 # The installer uses this to detect whether it should pick up localizations
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -50,9 +50,7 @@ parameters:
  - name: runTests
    type: boolean
    default: true
-  - name: useVSPreview
-    type: boolean
-    default: false
+
  - name: versionNumber
    type: string
    default: '0.0.1'
@@ -137,7 +135,7 @@ jobs:
  - template: steps-ensure-dotnet-version.yml
    parameters:
      sdk: true
-      version: '9.0'
+      version: '8.0'

  - ${{ if eq(parameters.runTests, true) }}:
    - task: VisualStudioTestPlatformInstaller@1
@@ -183,9 +181,6 @@ jobs:
  - pwsh: |-
      & "$(build.sourcesdirectory)\.pipelines\verifyAndSetLatestVCToolsVersion.ps1"
    displayName: Work around DD-1541167 (VCToolsVersion)
-    ${{ if eq(parameters.useVSPreview, true) }}:
-      env:
-        VCWhereExtraVersionTarget: '-prerelease'

  - pwsh: |-
      & "$(build.sourcesdirectory)\.pipelines\installWiX.ps1"
@@ -233,10 +228,7 @@ jobs:
    inputs:
      solution: '**\HostsUILib.csproj'
      vsVersion: 17.0
-      ${{ if eq(parameters.useVSPreview, true) }}:
-        msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-hosts.binlog /p:NoWarn=NU5104
-      ${{ else }}:
-        msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-hosts.binlog
+      msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-hosts.binlog
      configuration: $(BuildConfiguration)
      msbuildArchitecture: x64
      maximumCpuCount: true
@@ -249,10 +241,7 @@ jobs:
    inputs:
      solution: '**\EnvironmentVariablesUILib.csproj'
      vsVersion: 17.0
-      ${{ if eq(parameters.useVSPreview, true) }}:
-        msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-env-var-editor.binlog /p:NoWarn=NU5104
-      ${{ else }}:
-        msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-env-var-editor.binlog
+      msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-env-var-editor.binlog
      configuration: $(BuildConfiguration)
      msbuildArchitecture: x64
      maximumCpuCount: true
@@ -265,10 +254,7 @@ jobs:
    inputs:
      solution: '**\RegistryPreviewUILib.csproj'
      vsVersion: 17.0
-      ${{ if eq(parameters.useVSPreview, true) }}:
-        msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-registry-preview.binlog /p:NoWarn=NU5104
-      ${{ else }}:
-        msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-registry-preview.binlog
+      msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-registry-preview.binlog
      configuration: $(BuildConfiguration)
      msbuildArchitecture: x64
      maximumCpuCount: true
--- a/.pipelines/v2/templates/job-test-project.yml
+++ b/.pipelines/v2/templates/job-test-project.yml
@@ -45,7 +45,7 @@ jobs:
  - template: steps-ensure-dotnet-version.yml
    parameters:
      sdk: true
-      version: '9.0'
+      version: '8.0'

  - task: VisualStudioTestPlatformInstaller@1
    displayName: Ensure VSTest Platform
--- a/.pipelines/v2/templates/pipeline-ci-build.yml
+++ b/.pipelines/v2/templates/pipeline-ci-build.yml
@@ -19,9 +19,6 @@ parameters:
  - name: runTests
    type: boolean
    default: true
-  - name: useVSPreview
-    type: boolean
-    default: false

 stages:
  # Allow manual builds to skip pre-check
@@ -46,15 +43,12 @@ stages:
                name: SHINE-INT-L
              ${{ else }}:
                name: SHINE-OSS-L
-              ${{ if eq(parameters.useVSPreview, true) }}:
-                demands: ImageOverride -equals SHINE-VS17-Preview
            buildPlatforms:
              - ${{ platform }}
            buildConfigurations: [Release]
            enablePackageCaching: true
            enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
            runTests: ${{ parameters.runTests }}
-            useVSPreview: ${{ parameters.useVSPreview }}

    - ${{ if eq(parameters.runTests, true) }}:
      - stage: Test_${{ platform }}
--- a/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
+++ b/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
@@ -1,7 +1,7 @@
 parameters:
 - name: version
  type: string
-  default: "9.0"
+  default: "8.0"
 - name: sdk
  type: boolean
  default: false
--- a/.pipelines/verifyAndSetLatestVCToolsVersion.ps1
+++ b/.pipelines/verifyAndSetLatestVCToolsVersion.ps1
@@ -1,4 +1,4 @@
-$LatestVCToolsVersion = (([xml](& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest $env:VCWhereExtraVersionTarget -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -include packages -format xml)).instances.instance.packages.package | ? { $_.id -eq "Microsoft.VisualCpp.CRT.Source" }).version;
+$LatestVCToolsVersion = (([xml](& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -include packages -format xml)).instances.instance.packages.package | ? { $_.id -eq "Microsoft.VisualCpp.CRT.Source" }).version;

 Write-Output "Latest VCToolsVersion: $LatestVCToolsVersion"
 Write-Output "Updating VCToolsVersion environment variable for job"
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -26,19 +26,19 @@
    <PackageVersion Include="Markdig.Signed" Version="0.34.0" />
    <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
    <PackageVersion Include="MessagePack" Version="2.5.187" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24508.2" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.7" />
    <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
    <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
    <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.10" />
    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
    <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
    <!-- 
@@ -63,26 +63,24 @@
    <PackageVersion Include="StreamJsonRpc" Version="2.19.27" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
    <!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.CodeDom" Version="9.0.0" />
+    <PackageVersion Include="System.CodeDom" Version="8.0.0" />
    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.0" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.0" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="8.0.0" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
+    <PackageVersion Include="System.Data.OleDb" Version="8.0.1" />
    <!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
    <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
    <!-- Package System.Diagnostics.EventLog added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.0" />
-    <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.0" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.0" />
-    <PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
-    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
-    <PackageVersion Include="System.Management" Version="9.0.0" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="8.0.1" />
+    <PackageVersion Include="System.Drawing.Common" Version="8.0.7" />
+    <PackageVersion Include="System.IO.Abstractions" Version="17.2.3" />
+    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="17.2.3" />
+    <PackageVersion Include="System.Management" Version="8.0.0" />
    <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.Runtime.Caching" Version="9.0.0" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.0" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.0" />
+    <PackageVersion Include="System.Runtime.Caching" Version="8.0.1" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
    <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
    <PackageVersion Include="UnitsNet" Version="5.56.0" />
    <PackageVersion Include="UTF.Unknown" Version="2.5.1" />
@@ -94,4 +92,4 @@
    <PackageVersion Include="Microsoft.VariantAssignment.Client" Version="2.4.17140001" />
    <PackageVersion Include="Microsoft.VariantAssignment.Contract" Version="3.0.16990001" />
  </ItemGroup>
-</Project>
+</Project>
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1318,18 +1318,18 @@ EXHIBIT A -Mozilla Public License.
 - Mages 2.0.2
 - Markdig.Signed 0.34.0
 - MessagePack 2.5.187
- Microsoft.CodeAnalysis.NetAnalyzers 9.0.0-preview.24508.2
- Microsoft.Data.Sqlite 9.0.0
+- Microsoft.CodeAnalysis.NetAnalyzers 8.0.0
+- Microsoft.Data.Sqlite 8.0.7
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
- Microsoft.Extensions.DependencyInjection 9.0.0
- Microsoft.Extensions.Hosting 9.0.0
- Microsoft.Extensions.Hosting.WindowsServices 9.0.0
- Microsoft.Extensions.Logging 9.0.0
- Microsoft.Extensions.Logging.Abstractions 9.0.0
+- Microsoft.Extensions.DependencyInjection 8.0.0
+- Microsoft.Extensions.Hosting 8.0.0
+- Microsoft.Extensions.Hosting.WindowsServices 8.0.0
+- Microsoft.Extensions.Logging 8.0.0
+- Microsoft.Extensions.Logging.Abstractions 8.0.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
 - Microsoft.Web.WebView2 1.0.2739.15
- Microsoft.Win32.SystemEvents 9.0.0
- Microsoft.Windows.Compatibility 9.0.0
+- Microsoft.Win32.SystemEvents 8.0.0
+- Microsoft.Windows.Compatibility 8.0.10
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.1.5
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
@@ -1346,23 +1346,22 @@ EXHIBIT A -Mozilla Public License.
 - SharpCompress 0.37.2
 - StreamJsonRpc 2.19.27
 - StyleCop.Analyzers 1.2.0-beta.556
- System.CodeDom 9.0.0
+- System.CodeDom 8.0.0
 - System.CommandLine 2.0.0-beta4.22272.1
- System.ComponentModel.Composition 9.0.0
- System.Configuration.ConfigurationManager 9.0.0
- System.Data.OleDb 9.0.0
+- System.ComponentModel.Composition 8.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Data.OleDb 8.0.1
 - System.Data.SqlClient 4.8.6
- System.Diagnostics.EventLog 9.0.0
- System.Diagnostics.PerformanceCounter 9.0.0
- System.Drawing.Common 9.0.0
- System.IO.Abstractions 21.0.29
- System.IO.Abstractions.TestingHelpers 21.0.29
- System.Management 9.0.0
+- System.Diagnostics.EventLog 8.0.1
+- System.Drawing.Common 8.0.7
+- System.IO.Abstractions 17.2.3
+- System.IO.Abstractions.TestingHelpers 17.2.3
+- System.Management 8.0.0
 - System.Reactive 6.0.1
- System.Runtime.Caching 9.0.0
- System.ServiceProcess.ServiceController 9.0.0
- System.Text.Encoding.CodePages 9.0.0
- System.Text.Json 9.0.0
+- System.Runtime.Caching 8.0.1
+- System.ServiceProcess.ServiceController 8.0.1
+- System.Text.Encoding.CodePages 8.0.0
+- System.Text.Json 8.0.5
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0
 - UTF.Unknown 2.5.1
--- a/README.md
+++ b/README.md
@@ -101,11 +101,11 @@ In this release, we focused on new features, stability, and improvements.
 - Advanced Paste has new abilities: Image to text, and paste to file (text / png / html).
 - In settings, we've adjusted the left navigation to group the utilities. As the number of utilities shipped with PowerToys keeps growing, we felt this was a needed adjustment. Thanks everyone for your feedback!
 - Workspaces received many bug fixes, including the proper launching of many instances of the same application in the same workspace. Note, we are still actively looking at how to properly handle PWA detection.
- - We've added a diagnostic data (telemetry) opt-in option in the Settings General tab. As it is off-by-default, we encourage users to turn it on as that helps direct our development efforts and their journeys. More information about the data we collect can be found in the [PowerToys Data and Privacy documentation](https://aka.ms/powertoys-data-and-privacy-documentation) and what each event does.
+ - We've added a telemetry opt-in option in the Settings General tab. As it is off-by-default, we encourage users to turn it on as that helps direct our development efforts and their journeys. More information about the data we collect can be found in the [PowerToys Data and Privacy documentation](https://aka.ms/powertoys-data-and-privacy-documentation) and what each event does.

 ### General

- - Added a setting for diagnostic data (telemetry) opt-in (off by default, however, see above for why we encourage you to opt-in!) and user controls to view data.
+ - Added a setting for telemetry opt-in (off by default, however, see above for why we encourage you to opt-in!) and user controls to view data.
 - Improved exception logging by adding the type of Exception and InnerException. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!

 ### Advanced Paste
@@ -204,7 +204,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct][oss-conduct

 ## Privacy Statement

-The application logs basic diagnostic data (telemetry). For more information on privacy and what we collect, see our [PowerToys Data and Privacy documentation](https://aka.ms/powertoys-data-and-privacy-documentation).
+The application logs basic telemetry. Our Telemetry Data page (Coming Soon) has the trends from the telemetry. Please read the [Microsoft privacy statement][privacy-link] for more information.

 [oss-CLA]: https://cla.opensource.microsoft.com
 [oss-conduct-code]: CODE_OF_CONDUCT.md
--- a/src/Common.Dotnet.CsWinRT.props
+++ b/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>net9.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net8.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;CA1859;CA2263;CA2022</WarningsNotAsErrors>
+    <WarningsNotAsErrors>CA1720</WarningsNotAsErrors>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
--- a/src/common/Common.UI/Common.UI.csproj
+++ b/src/common/Common.UI/Common.UI.csproj
@@ -4,7 +4,6 @@

  <PropertyGroup>
    <UseWPF>true</UseWPF>
-    <UseWindowsForms>true</UseWindowsForms>
    <AssemblyName>PowerToys.Common.UI</AssemblyName>
  </PropertyGroup>

--- a/src/common/ManagedCommon/LanguageHelper.cs
+++ b/src/common/ManagedCommon/LanguageHelper.cs
@@ -4,6 +4,7 @@

 using System;
 using System.IO;
+using System.IO.Abstractions;
 using System.Text.Json;
 using System.Text.Json.Serialization;

@@ -22,14 +23,15 @@ namespace ManagedCommon

        public static string LoadLanguage()
        {
+            FileSystem fileSystem = new FileSystem();
            var localAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
            var file = localAppDataDir + SettingsFilePath + SettingsFile;

-            if (File.Exists(file))
+            if (fileSystem.File.Exists(file))
            {
                try
                {
-                    var inputStream = File.Open(file, FileMode.Open);
+                    Stream inputStream = fileSystem.File.Open(file, FileMode.Open);
                    StreamReader reader = new StreamReader(inputStream);
                    string data = reader.ReadToEnd();
                    inputStream.Close();
--- a/src/common/ManagedCommon/Logger.cs
+++ b/src/common/ManagedCommon/Logger.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Diagnostics;
 using System.Globalization;
-using System.IO;
+using System.IO.Abstractions;
 using System.Reflection;

 using PowerToys.Interop;
@@ -14,6 +14,7 @@ namespace ManagedCommon
 {
    public static class Logger
    {
+        private static readonly IFileSystem _fileSystem = new FileSystem();
        private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
        private static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location).ProductVersion;

@@ -40,12 +41,12 @@ namespace ManagedCommon
                applicationLogPath = Constants.AppDataPath() + applicationLogPath + "\\" + Version;
            }

-            if (!Directory.Exists(applicationLogPath))
+            if (!_fileSystem.Directory.Exists(applicationLogPath))
            {
-                Directory.CreateDirectory(applicationLogPath);
+                _fileSystem.Directory.CreateDirectory(applicationLogPath);
            }

-            var logFilePath = Path.Combine(applicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".txt");
+            var logFilePath = _fileSystem.Path.Combine(applicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".txt");

            Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));

--- a/src/common/ManagedCommon/ManagedCommon.csproj
+++ b/src/common/ManagedCommon/ManagedCommon.csproj
@@ -15,6 +15,7 @@
  </PropertyGroup>

  <ItemGroup>
+    <PackageReference Include="System.IO.Abstractions" />
    <PackageReference Include="System.Management" />
  </ItemGroup>

--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
+++ b/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 Lock _loadingSettingsLock = new();
+        private readonly object _loadingSettingsLock = new();
        private readonly List<PasteFormats> _additionalActions;
        private readonly List<AdvancedPasteCustomAction> _customActions;

--- a/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/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>net9.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
    <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps</PublishDir>
--- a/src/modules/Hosts/Hosts.Tests/HostsServiceTest.cs
+++ b/src/modules/Hosts/Hosts.Tests/HostsServiceTest.cs
@@ -276,7 +276,7 @@ namespace Hosts.Tests

            service.RemoveReadOnlyAttribute();

-            var readOnly = fileSystem.FileInfo.New(service.HostsFilePath).Attributes.HasFlag(FileAttributes.ReadOnly);
+            var readOnly = fileSystem.FileInfo.FromFileName(service.HostsFilePath).Attributes.HasFlag(FileAttributes.ReadOnly);
            Assert.IsFalse(readOnly);
        }

@@ -295,7 +295,7 @@ namespace Hosts.Tests

            await service.WriteAsync("# Empty hosts file", Enumerable.Empty<Entry>());

-            var hidden = fileSystem.FileInfo.New(service.HostsFilePath).Attributes.HasFlag(FileAttributes.Hidden);
+            var hidden = fileSystem.FileInfo.FromFileName(service.HostsFilePath).Attributes.HasFlag(FileAttributes.Hidden);
            Assert.IsTrue(hidden);
        }
    }
--- a/src/modules/Hosts/Hosts.Tests/Mocks/MockFileSystemWatcher.cs
+++ b/src/modules/Hosts/Hosts.Tests/Mocks/MockFileSystemWatcher.cs
@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.IO;
@@ -10,7 +9,7 @@ using System.IO.Abstractions;

 namespace Hosts.Tests.Mocks
 {
-    public partial class MockFileSystemWatcher : FileSystemWatcherBase
+    public class MockFileSystemWatcher : FileSystemWatcherBase
    {
        public override bool IncludeSubdirectories { get; set; }

@@ -28,35 +27,26 @@ namespace Hosts.Tests.Mocks

        public override ISynchronizeInvoke SynchronizingObject { get; set; }

-        public override Collection<string> Filters => throw new NotImplementedException();
+        public override Collection<string> Filters => throw new System.NotImplementedException();

-        public override IFileSystem FileSystem => throw new NotImplementedException();
+        public override WaitForChangedResult WaitForChanged(WatcherChangeTypes changeType) => default;

-        public override IContainer Container => throw new NotImplementedException();
+        public override WaitForChangedResult WaitForChanged(WatcherChangeTypes changeType, int timeout) => default;

-        public override void BeginInit() => throw new NotImplementedException();
-
-        public override void EndInit() => throw new NotImplementedException();
-
-        public override IWaitForChangedResult WaitForChanged(WatcherChangeTypes changeType, TimeSpan timeout) => throw new NotImplementedException();
-
-        public override IWaitForChangedResult WaitForChanged(WatcherChangeTypes changeType) => throw new NotImplementedException();
-
-        public override IWaitForChangedResult WaitForChanged(WatcherChangeTypes changeType, int timeout) => throw new NotImplementedException();
-
-        public MockFileSystemWatcher()
-        {
-        }
-
-        public MockFileSystemWatcher(string path)
-        {
-            Path = path;
-        }
+        public MockFileSystemWatcher(string path) => Path = path;

        public MockFileSystemWatcher(string path, string filter)
        {
            Path = path;
            Filter = filter;
        }
+
+        public override void BeginInit()
+        {
+        }
+
+        public override void EndInit()
+        {
+        }
    }
 }
--- a/src/modules/Hosts/Hosts.Tests/Mocks/MockFileSystemWatcherFactory.cs
+++ b/src/modules/Hosts/Hosts.Tests/Mocks/MockFileSystemWatcherFactory.cs
@@ -2,22 +2,18 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
-using System.IO;
 using System.IO.Abstractions;

 namespace Hosts.Tests.Mocks
 {
    public class MockFileSystemWatcherFactory : IFileSystemWatcherFactory
    {
-        public IFileSystem FileSystem => throw new NotImplementedException();
+        public IFileSystemWatcher CreateNew() => new MockFileSystemWatcher(null);

-        public IFileSystemWatcher New() => new MockFileSystemWatcher();
+        public IFileSystemWatcher CreateNew(string path) => new MockFileSystemWatcher(path);

-        public IFileSystemWatcher New(string path) => new MockFileSystemWatcher(path);
+        public IFileSystemWatcher CreateNew(string path, string filter) => new MockFileSystemWatcher(path, filter);

-        public IFileSystemWatcher New(string path, string filter) => new MockFileSystemWatcher(path, filter);
-
-        public IFileSystemWatcher Wrap(FileSystemWatcher fileSystemWatcher) => throw new NotImplementedException();
+        public IFileSystemWatcher FromPath(string path) => new MockFileSystemWatcher(path);
    }
 }
--- a/src/modules/Hosts/Hosts/Settings/UserSettings.cs
+++ b/src/modules/Hosts/Hosts/Settings/UserSettings.cs
@@ -20,7 +20,7 @@ namespace Hosts.Settings

        private readonly SettingsUtils _settingsUtils;
        private readonly IFileSystemWatcher _watcher;
-        private readonly Lock _loadingSettingsLock = new Lock();
+        private readonly object _loadingSettingsLock = new object();

        public bool ShowStartupWarning { get; private set; }

--- a/src/modules/Hosts/HostsUILib/Helpers/HostsService.cs
+++ b/src/modules/Hosts/HostsUILib/Helpers/HostsService.cs
@@ -52,7 +52,7 @@ namespace HostsUILib.Helpers

            _hostsFilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), @"System32\drivers\etc\hosts");

-            _fileSystemWatcher = _fileSystem.FileSystemWatcher.New();
+            _fileSystemWatcher = _fileSystem.FileSystemWatcher.CreateNew();
            _fileSystemWatcher.Path = _fileSystem.Path.GetDirectoryName(HostsFilePath);
            _fileSystemWatcher.Filter = _fileSystem.Path.GetFileName(HostsFilePath);
            _fileSystemWatcher.NotifyFilter = NotifyFilters.LastWrite;
@@ -130,7 +130,7 @@ namespace HostsUILib.Helpers
                throw new NotRunningElevatedException();
            }

-            if (_fileSystem.FileInfo.New(HostsFilePath).IsReadOnly)
+            if (_fileSystem.FileInfo.FromFileName(HostsFilePath).IsReadOnly)
            {
                throw new ReadOnlyHostsException();
            }
@@ -200,7 +200,7 @@ namespace HostsUILib.Helpers
                }

                // FileMode.OpenOrCreate is necessary to prevent UnauthorizedAccessException when the hosts file is hidden
-                using var stream = _fileSystem.FileStream.New(HostsFilePath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read, _defaultBufferSize, FileOptions.Asynchronous);
+                using var stream = _fileSystem.FileStream.Create(HostsFilePath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read, _defaultBufferSize, FileOptions.Asynchronous);
                using var writer = new StreamWriter(stream, Encoding);
                foreach (var line in lines)
                {
@@ -305,7 +305,7 @@ namespace HostsUILib.Helpers

        public void RemoveReadOnlyAttribute()
        {
-            var fileInfo = _fileSystem.FileInfo.New(HostsFilePath);
+            var fileInfo = _fileSystem.FileInfo.FromFileName(HostsFilePath);
            if (fileInfo.IsReadOnly)
            {
                fileInfo.IsReadOnly = false;
--- a/src/modules/MouseUtils/MouseJumpUI/Helpers/ThrottledActionInvoker.cs
+++ b/src/modules/MouseUtils/MouseJumpUI/Helpers/ThrottledActionInvoker.cs
@@ -3,14 +3,13 @@
 // 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 Lock _invokerLock = new();
+    private readonly object _invokerLock = new();
    private readonly DispatcherTimer _timer;

    private Action? _actionToRun;
--- a/src/modules/MouseWithoutBorders/App/Class/Common.Clipboard.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.Clipboard.cs
@@ -368,7 +368,7 @@ namespace MouseWithoutBorders
            }
        }

-        private static readonly Lock ClipboardThreadOldLock = new();
+        private static readonly object ClipboardThreadOldLock = new();
        private static System.Threading.Thread clipboardThreadOld;

        internal static void GetRemoteClipboard(string postAction)
--- a/src/modules/MouseWithoutBorders/App/Class/Common.Log.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.Log.cs
@@ -32,7 +32,7 @@ namespace MouseWithoutBorders
 {
    public class Thread
    {
-        private static readonly Lock ThreadsLock = new();
+        private static readonly object ThreadsLock = new();
        private static List<System.Threading.Thread> threads;

        private readonly System.Threading.Thread thread;
--- a/src/modules/MouseWithoutBorders/App/Class/Common.MachineStuff.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.MachineStuff.cs
@@ -43,7 +43,7 @@ namespace MouseWithoutBorders

    internal partial class Common
    {
-        private static readonly Lock McMatrixLock = new();
+        private static readonly object McMatrixLock = new();

        internal const byte MAX_MACHINE = 4;
        internal const byte MAX_SOCKET = MAX_MACHINE * 2;
--- a/src/modules/MouseWithoutBorders/App/Class/Common.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.cs
@@ -474,7 +474,7 @@ namespace MouseWithoutBorders
            }
        }

-        private static readonly Lock InputSimulationLock = new();
+        private static readonly object InputSimulationLock = new();

        internal static void DoSomethingInTheInputSimulationThread(ThreadStart target)
        {
--- a/src/modules/MouseWithoutBorders/App/Class/MachinePool.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/MachinePool.cs
@@ -10,7 +10,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;

 namespace MouseWithoutBorders.Class
 {
@@ -37,12 +36,12 @@ namespace MouseWithoutBorders.Class
    /// </remarks>
    internal class MachinePool
    {
-        private readonly Lock @lock;
+        private readonly object @lock;
        private readonly List<MachineInf> list;

        public MachinePool()
        {
-            @lock = new Lock();
+            @lock = new object();
            list = new List<MachineInf>();
        }

--- a/src/modules/MouseWithoutBorders/App/Class/Setting.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Setting.cs
@@ -13,7 +13,6 @@ 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;

@@ -45,7 +44,7 @@ namespace MouseWithoutBorders.Class
        internal bool Changed;

        private readonly SettingsUtils _settingsUtils;
-        private readonly Lock _loadingSettingsLock = new Lock();
+        private readonly object _loadingSettingsLock = new object();
        private readonly IFileSystemWatcher _watcher;

        private MouseWithoutBordersProperties _properties;
--- a/src/modules/MouseWithoutBorders/App/Class/SocketStuff.cs
+++ b/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 Lock BadIPsLock = new();
+        private static readonly object BadIPsLock = new();

        private static bool IsBadIP(string machineName, IPAddress ip)
        {
--- a/src/modules/MouseWithoutBorders/App/Control/ColorBorderField.cs
+++ b/src/modules/MouseWithoutBorders/App/Control/ColorBorderField.cs
@@ -19,7 +19,6 @@ namespace MouseWithoutBorders

        [Category("Appearance")]
        [Description("The thickness of the border around the field")]
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
        public int BorderSize
        {
            get => _borderSize;
@@ -34,7 +33,6 @@ namespace MouseWithoutBorders

        [Category("Appearance")]
        [Description("The color of the border around the field")]
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
        public Color BorderColor
        {
            get => _borderColor;
@@ -49,7 +47,6 @@ 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;
@@ -62,14 +59,12 @@ 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;
--- a/src/modules/MouseWithoutBorders/App/Control/ImageButton.cs
+++ b/src/modules/MouseWithoutBorders/App/Control/ImageButton.cs
@@ -19,14 +19,12 @@ 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;
@@ -39,12 +37,10 @@ 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;
--- a/src/modules/MouseWithoutBorders/App/Control/ImageRadioButton.cs
+++ b/src/modules/MouseWithoutBorders/App/Control/ImageRadioButton.cs
@@ -16,7 +16,6 @@ namespace MouseWithoutBorders

        [Category("Appearance")]
        [Description("The bounding rectangle of the check image in local co-ordinates")]
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
        public Point ImageLocation
        {
            get => _imageLocation;
@@ -29,7 +28,6 @@ namespace MouseWithoutBorders

        private Point _textLocation;

-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
        public Point TextLocation
        {
            get => _textLocation;
@@ -49,7 +47,6 @@ namespace MouseWithoutBorders

        [Category("Appearance")]
        [Description("Image to show when Mouse is pressed on button")]
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
        public Image CheckedImage
        {
            get => _checkedImage;
@@ -64,7 +61,6 @@ namespace MouseWithoutBorders

        [Category("Appearance")]
        [Description("Image to show when button is in normal state")]
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
        public Image UncheckedImage
        {
            get => _uncheckedImage;
--- a/src/modules/MouseWithoutBorders/App/Control/Machine.cs
+++ b/src/modules/MouseWithoutBorders/App/Control/Machine.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.

 using System;
-using System.ComponentModel;
 using System.Windows.Forms;

 // <summary>
@@ -35,14 +34,12 @@ 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;
@@ -55,7 +52,6 @@ namespace MouseWithoutBorders
            }
        }

-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
        internal bool Editable
        {
            set => textBoxName.Enabled = value;
@@ -63,7 +59,6 @@ namespace MouseWithoutBorders
            // get { return textBoxName.Enabled;  }
        }

-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
        internal bool CheckAble
        {
            set
@@ -78,7 +73,6 @@ namespace MouseWithoutBorders
            }
        }

-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
        internal bool LocalHost
        {
            // get { return localhost; }
@@ -171,7 +165,6 @@ namespace MouseWithoutBorders
            return rv;
        }

-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
        internal SocketStatus StatusClient
        {
            get => statusClient;
@@ -189,7 +182,6 @@ namespace MouseWithoutBorders
            }
        }

-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
        internal SocketStatus StatusServer
        {
            get => statusServer;
--- a/src/modules/MouseWithoutBorders/App/Core/Logger.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/Logger.cs
@@ -12,7 +12,6 @@ using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
 using System.Text;
-using System.Threading;
 using System.Windows.Forms;

 // <summary>
@@ -31,7 +30,7 @@ namespace MouseWithoutBorders.Core;
 internal static class Logger
 {
    internal static readonly string[] AllLogs = new string[MAX_LOG];
-    private static readonly Lock AllLogsLock = new();
+    private static readonly object AllLogsLock = new();
    internal static readonly ConcurrentDictionary<string, int> LogCounter = new();
    private const int MAX_LOG = 10000;
    private static int allLogsIndex;
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.

 using System;
-using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;

@@ -33,7 +32,6 @@ namespace MouseWithoutBorders

        private int _animationFrame;

-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
        public bool ReturnToSettings { get; set; }

        public SetupPage3a()
--- a/src/modules/MouseWithoutBorders/App/Form/frmScreen.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/frmScreen.cs
@@ -58,16 +58,12 @@ 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()
--- a/src/modules/MouseWithoutBorders/App/Helper/FormHelper.cs
+++ b/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 Lock bmScreenLock = new();
+        private readonly object bmScreenLock = new();
        private long lastClipboardEventTime;

        private IClipboardHelper remoteClipboardHelper;
--- a/src/modules/PowerOCR/PowerOCR/Helpers/ThrottledActionInvoker.cs
+++ b/src/modules/PowerOCR/PowerOCR/Helpers/ThrottledActionInvoker.cs
@@ -4,7 +4,6 @@

 using System;
 using System.ComponentModel.Composition;
-using System.Threading;
 using System.Windows.Threading;

 namespace PowerOCR.Helpers;
@@ -12,7 +11,7 @@ namespace PowerOCR.Helpers;
 [Export(typeof(IThrottledActionInvoker))]
 public sealed class ThrottledActionInvoker : IThrottledActionInvoker
 {
-    private Lock _invokerLock = new Lock();
+    private object _invokerLock = new object();
    private Action? _actionToRun;

    private DispatcherTimer _timer;
--- a/src/modules/PowerOCR/PowerOCR/Settings/UserSettings.cs
+++ b/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 Lock _loadingSettingsLock = new();
+        private readonly object _loadingSettingsLock = new();

        [ImportingConstructor]
        public UserSettings(Helpers.IThrottledActionInvoker throttledActionInvoker)
--- a/src/modules/Workspaces/WorkspacesEditor/Utils/IOUtils.cs
+++ b/src/modules/Workspaces/WorkspacesEditor/Utils/IOUtils.cs
@@ -31,7 +31,7 @@ namespace WorkspacesEditor.Utils
                {
                    try
                    {
-                        using (FileSystemStream inputStream = _fileSystem.File.Open(fileName, FileMode.Open))
+                        using (Stream inputStream = _fileSystem.File.Open(fileName, FileMode.Open))
                        using (StreamReader reader = new StreamReader(inputStream))
                        {
                            string data = reader.ReadToEnd();
--- a/src/modules/colorPicker/ColorPickerUI/Common/RangeObservableCollection.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Common/RangeObservableCollection.cs
@@ -6,14 +6,13 @@ 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 Lock _collectionChangedLock = new Lock();
+        private object _collectionChangedLock = new object();
        private bool _suppressNotification;

        protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
--- a/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml.cs
+++ b/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 = Convert.ToHexString(new byte[] { color.R, color.G, color.B });
+            string newHexString = BitConverter.ToString(new byte[] { color.R, color.G, color.B }).Replace("-", string.Empty, StringComparison.InvariantCulture);
            newHexString = newHexString.ToLowerInvariant();

            // Return only with hashtag if user typed it before
--- a/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs
@@ -4,7 +4,6 @@

 using System;
 using System.ComponentModel.Composition;
-using System.Threading;
 using System.Windows;
 using System.Windows.Interop;

@@ -24,7 +23,7 @@ namespace ColorPicker.Helpers
        private readonly IUserSettings _userSettings;
        private ColorEditorWindow _colorEditorWindow;
        private bool _colorPickerShown;
-        private Lock _colorPickerVisibilityLock = new Lock();
+        private object _colorPickerVisibilityLock = new object();

        private HwndSource _hwndSource;
        private const int _globalHotKeyId = 0x0001;
--- a/src/modules/colorPicker/ColorPickerUI/Helpers/ThrottledActionInvoker.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Helpers/ThrottledActionInvoker.cs
@@ -4,7 +4,6 @@

 using System;
 using System.ComponentModel.Composition;
-using System.Threading;
 using System.Windows.Threading;

 namespace ColorPicker.Helpers
@@ -12,7 +11,7 @@ namespace ColorPicker.Helpers
    [Export(typeof(IThrottledActionInvoker))]
    public sealed class ThrottledActionInvoker : IThrottledActionInvoker
    {
-        private Lock _invokerLock = new Lock();
+        private object _invokerLock = new object();
        private Action _actionToRun;

        private DispatcherTimer _timer;
--- a/src/modules/colorPicker/ColorPickerUI/Settings/UserSettings.cs
+++ b/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 Lock _loadingSettingsLock = new Lock();
+        private readonly object _loadingSettingsLock = new object();

        private bool _loadingColorsHistory;

--- a/src/modules/fancyzones/FancyZonesEditorCommon/Utils/IOUtils.cs
+++ b/src/modules/fancyzones/FancyZonesEditorCommon/Utils/IOUtils.cs
@@ -31,7 +31,7 @@ namespace FancyZonesEditorCommon.Utils
                {
                    try
                    {
-                        using (FileSystemStream inputStream = _fileSystem.File.Open(fileName, FileMode.Open))
+                        using (Stream inputStream = _fileSystem.File.Open(fileName, FileMode.Open))
                        using (StreamReader reader = new StreamReader(inputStream))
                        {
                            string data = reader.ReadToEnd();
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/Utils/IOTestHelper.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/Utils/IOTestHelper.cs
@@ -27,11 +27,7 @@ namespace Microsoft.FancyZonesEditor.UITests.Utils
            }
            else
            {
-                var path = Path.GetDirectoryName(file);
-                if (path != null)
-                {
-                    _fileSystem.Directory.CreateDirectory(path);
-                }
+                _fileSystem.Directory.CreateDirectory(Path.GetDirectoryName(file));
            }
        }

--- a/src/modules/imageresizer/ui/Properties/Settings.cs
+++ b/src/modules/imageresizer/ui/Properties/Settings.cs
@@ -421,7 +421,7 @@ namespace ImageResizer.Properties
            string jsonData = JsonSerializer.Serialize(new SettingsWrapper() { Properties = this }, _jsonSerializerOptions);

            // Create directory if it doesn't exist
-            IFileInfo file = _fileSystem.FileInfo.New(SettingsPath);
+            IFileInfo file = _fileSystem.FileInfo.FromFileName(SettingsPath);
            file.Directory.Create();

            // write string to file
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/InternalQueryFolderTests.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/InternalQueryFolderTests.cs
@@ -51,7 +51,7 @@ namespace Microsoft.Plugin.Folder.UnitTests
        [DataRow(@"c:", 2, 1, false, DisplayName = "Root without \\")]
        [DataRow(@"c:\", 2, 1, false, DisplayName = "Normal root")]
        [DataRow(@"c:\Test", 2, 2, false, DisplayName = "Select yourself")]
-        [DataRow(@"c:\not-exist", 2, 0, false, DisplayName = "Folder not exist, return root")]
+        [DataRow(@"c:\not-exist", 2, 1, false, DisplayName = "Folder not exist, return root")]
        [DataRow(@"c:\not-exist\not-exist2", 0, 0, false, DisplayName = "Folder not exist, return root")]
        [DataRow(@"c:\bla.t", 2, 1, false, DisplayName = "Partial match file")]
        [DataRow(@"c:/bla.t", 2, 1, false, DisplayName = "Partial match file with /")]
@@ -88,8 +88,8 @@ namespace Microsoft.Plugin.Folder.UnitTests

        [DataTestMethod]
        [DataRow(@"c:\>", 3, 3, true, DisplayName = "Max Folder test recursive")]
-        [DataRow(@"c:\Test>", 3, 0, true, DisplayName = "2 Folders recursive")]
-        [DataRow(@"c:\not-exist>", 3, 0, true, DisplayName = "Folder not exist, return root recursive")]
+        [DataRow(@"c:\Test>", 3, 3, true, DisplayName = "2 Folders recursive")]
+        [DataRow(@"c:\not-exist>", 3, 3, true, DisplayName = "Folder not exist, return root recursive")]
        [DataRow(@"c:\not-exist\not-exist2>", 0, 0, false, DisplayName = "Folder not exist, return root recursive")]
        public void Query_Recursive_WhenCalled(string search, int folders, int files, bool truncated)
        {
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/QueryFileSystemInfo.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/QueryFileSystemInfo.cs
@@ -25,7 +25,7 @@ namespace Microsoft.Plugin.Folder.Sources
        public IEnumerable<DisplayFileInfo> MatchFileSystemInfo(string search, string incompleteName, bool isRecursive)
        {
            // search folder and add results
-            var directoryInfo = _directoryInfoFactory.New(search);
+            var directoryInfo = _directoryInfoFactory.FromDirectoryName(search);
            var fileSystemInfos = directoryInfo.EnumerateFileSystemInfos(incompleteName, new EnumerationOptions
            {
                MatchType = _matchType,
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj
@@ -17,15 +17,6 @@

  <ItemGroup>
    <PackageReference Include="System.Data.OleDb" />
-    <PackageReference Include="System.Configuration.ConfigurationManager">
-      <ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
-    </PackageReference>
-    <PackageReference Include="System.Diagnostics.EventLog">
-      <ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
-    </PackageReference>
-    <PackageReference Include="System.Diagnostics.PerformanceCounter">
-      <ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
-    </PackageReference>
  </ItemGroup>

  <ItemGroup>
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/ProgramSource.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/ProgramSource.cs
@@ -22,7 +22,7 @@ namespace Microsoft.Plugin.Program

        public string Location { get; set; }

-        public string Name { get => name ?? FileSystem.DirectoryInfo.New(Location).Name; set => name = value; }
+        public string Name { get => name ?? FileSystem.DirectoryInfo.FromDirectoryName(Location).Name; set => name = value; }

        public bool Enabled { get; set; } = true;

--- a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/OpenWindows.cs
+++ b/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 Lock _enumWindowsLock = new();
+        private static readonly object _enumWindowsLock = new();

        /// <summary>
        /// PowerLauncher main executable
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj
@@ -39,15 +39,6 @@
    <PackageReference Include="System.Drawing.Common">
      <ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
    </PackageReference>
-    <PackageReference Include="System.Configuration.ConfigurationManager">
-      <ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
-    </PackageReference>
-    <PackageReference Include="System.Diagnostics.EventLog">
-      <ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
-    </PackageReference>
-    <PackageReference Include="System.Diagnostics.PerformanceCounter">
-      <ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
-    </PackageReference>
  </ItemGroup>

  <ItemGroup>
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Components/UtilityProvider.cs
+++ b/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 Lock _loadingSettingsLock = new();
+        private readonly object _loadingSettingsLock = new();
        private bool _disposed;

        public UtilityProvider()
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj
@@ -20,9 +20,6 @@

  <ItemGroup>
    <PackageReference Include="System.ServiceProcess.ServiceController" />
-    <PackageReference Include="System.Diagnostics.EventLog">
-      <ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
-    </PackageReference>
  </ItemGroup>

  <ItemGroup>
--- a/src/modules/launcher/PowerLauncher/App.xaml.cs
+++ b/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 Lock _disposingLock = new Lock();
+        private static readonly object _disposingLock = new object();

        [STAThread]
        public static void Main()
--- a/src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs
+++ b/src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs
@@ -11,7 +11,6 @@ using System.IO.Abstractions;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;

@@ -30,7 +29,7 @@ namespace PowerLauncher.Plugin
    {
        private static readonly IFileSystem FileSystem = new FileSystem();
        private static readonly IDirectory Directory = FileSystem.Directory;
-        private static readonly Lock AllPluginsLock = new Lock();
+        private static readonly object AllPluginsLock = new object();

        private static readonly CompositeFormat FailedToInitializePluginsDescription = System.Text.CompositeFormat.Parse(Properties.Resources.FailedToInitializePluginsDescription);

--- a/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/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>net9.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
    <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>
--- a/src/modules/launcher/PowerLauncher/SettingsReader.cs
+++ b/src/modules/launcher/PowerLauncher/SettingsReader.cs
@@ -29,7 +29,7 @@ namespace PowerLauncher
        private readonly SettingsUtils _settingsUtils;

        private const int MaxRetries = 10;
-        private static readonly Lock _readSyncObject = new Lock();
+        private static readonly object _readSyncObject = new object();
        private readonly PowerToysRunSettings _settings;
        private readonly ThemeManager _themeManager;
        private Action _refreshPluginsOverviewCallback;
@@ -73,7 +73,7 @@ namespace PowerLauncher

        public void ReadSettings()
        {
-            _readSyncObject.Enter();
+            Monitor.Enter(_readSyncObject);
            var retry = true;
            var retryCount = 0;
            while (retry)
@@ -224,7 +224,7 @@ namespace PowerLauncher
                }
            }

-            _readSyncObject.Exit();
+            Monitor.Exit(_readSyncObject);
        }

        public void SetRefreshPluginsOverviewCallback(Action callback)
--- a/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs
+++ b/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 Lock _addResultsLock = new Lock();
+        private static readonly object _addResultsLock = new object();
        private readonly System.Diagnostics.Stopwatch _hotkeyTimer = new System.Diagnostics.Stopwatch();

        private string _queryTextBeforeLeaveResults;
--- a/src/modules/launcher/Wox.Infrastructure/Helper.cs
+++ b/src/modules/launcher/Wox.Infrastructure/Helper.cs
@@ -71,8 +71,8 @@ namespace Wox.Infrastructure
                }
                else
                {
-                    var time1 = FileInfo.New(bundledDataPath).LastWriteTimeUtc;
-                    var time2 = FileInfo.New(dataPath).LastWriteTimeUtc;
+                    var time1 = FileInfo.FromFileName(bundledDataPath).LastWriteTimeUtc;
+                    var time2 = FileInfo.FromFileName(dataPath).LastWriteTimeUtc;
                    if (time1 != time2)
                    {
                        File.Copy(bundledDataPath, dataPath, true);
--- a/src/modules/launcher/Wox.Infrastructure/Stopwatch.cs
+++ b/src/modules/launcher/Wox.Infrastructure/Stopwatch.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Threading;

 using Wox.Plugin.Logger;

@@ -14,7 +13,7 @@ namespace Wox.Infrastructure
    public static class Stopwatch
    {
        private static readonly Dictionary<string, long> Count = new Dictionary<string, long>();
-        private static readonly Lock Locker = new Lock();
+        private static readonly object Locker = new object();

        /// <summary>
        /// This stopwatch will appear only in Debug mode
--- a/src/modules/launcher/Wox.Infrastructure/Storage/JsonStorage`1.cs
+++ b/src/modules/launcher/Wox.Infrastructure/Storage/JsonStorage`1.cs
@@ -9,7 +9,6 @@ using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
 using System.Text.Json;
-using System.Threading;

 using Wox.Plugin.Logger;

@@ -24,7 +23,7 @@ namespace Wox.Infrastructure.Storage
        private static readonly IPath Path = FileSystem.Path;
        private static readonly IFile File = FileSystem.File;

-        private readonly Lock _saveLock = new Lock();
+        private readonly object _saveLock = new object();

        // use property initialization instead of DefaultValueAttribute
        // easier and flexible for default value of object
--- a/src/modules/launcher/Wox.Plugin/Common/DefaultBrowserInfo.cs
+++ b/src/modules/launcher/Wox.Plugin/Common/DefaultBrowserInfo.cs
@@ -4,7 +4,6 @@

 using System;
 using System.Text;
-using System.Threading;

 using Wox.Plugin.Common.Win32;
 using Wox.Plugin.Logger;
@@ -16,7 +15,7 @@ namespace Wox.Plugin.Common
    /// </summary>
    public static class DefaultBrowserInfo
    {
-        private static readonly Lock _updateLock = new Lock();
+        private static readonly object _updateLock = new object();

        /// <summary>Gets the path to the MS Edge browser executable.</summary>
        public static string MSEdgePath => System.IO.Path.Combine(
--- a/src/modules/launcher/Wox.Test/Wox.Test.csproj
+++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj
@@ -34,15 +34,6 @@
    <PackageReference Include="System.Drawing.Common">
      <ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
    </PackageReference>
-    <PackageReference Include="System.Configuration.ConfigurationManager">
-      <ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
-    </PackageReference>
-    <PackageReference Include="System.Diagnostics.EventLog">
-      <ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
-    </PackageReference>
-    <PackageReference Include="System.Diagnostics.PerformanceCounter">
-      <ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
-    </PackageReference>
  </ItemGroup>

 </Project>
--- a/src/modules/peek/Peek.FilePreviewer/Models/PreviewSettings.cs
+++ b/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 Lock _loadingSettingsLock = new();
+        private readonly object _loadingSettingsLock = new();

        public bool SourceCodeWrapText { get; private set; }

--- a/src/modules/peek/Peek.UI/Services/UserSettings.cs
+++ b/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 Lock _loadingSettingsLock = new();
+        private readonly object _loadingSettingsLock = new();

        public bool CloseAfterLosingFocus { get; private set; }

--- a/src/modules/poweraccent/PowerAccent.Core/Services/SettingsService.cs
+++ b/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 Lock _loadingSettingsLock = new Lock();
+    private readonly object _loadingSettingsLock = new object();
    private KeyboardListener _keyboardListener;

    public SettingsService(KeyboardListener keyboardListener)
--- a/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj
+++ b/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj
@@ -37,7 +37,6 @@
    <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>
--- a/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/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>net9.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
    <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>
--- a/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/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>net9.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
    <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>
--- a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj
+++ b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj
@@ -35,7 +35,6 @@
    <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>
--- a/src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj
+++ b/src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj
@@ -36,7 +36,6 @@
    <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>
--- a/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/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>net9.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
    <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>
--- a/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/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>net9.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
    <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>
--- a/src/settings-ui/Settings.UI.Library/LanguageModel.cs
+++ b/src/settings-ui/Settings.UI.Library/LanguageModel.cs
@@ -30,7 +30,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
            {
                try
                {
-                    FileSystemStream inputStream = fileSystem.File.Open(file, FileMode.Open);
+                    Stream inputStream = fileSystem.File.Open(file, FileMode.Open);
                    StreamReader reader = new StreamReader(inputStream);
                    string data = reader.ReadToEnd();
                    inputStream.Close();
--- a/src/settings-ui/Settings.UI.Library/SettingsBackupAndRestoreUtils.cs
+++ b/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 Lock backupSettingsInternalLock = new Lock();
-        private static Lock removeOldBackupsLock = new Lock();
+        private static object backupSettingsInternalLock = new object();
+        private static object removeOldBackupsLock = new object();

        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 (!removeOldBackupsLock.TryEnter(1000))
+            if (!Monitor.TryEnter(removeOldBackupsLock, 1000))
            {
                return;
            }
@@ -1002,7 +1002,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
            }
            finally
            {
-                removeOldBackupsLock.Exit();
+                Monitor.Exit(removeOldBackupsLock);
            }
        }

--- a/src/settings-ui/Settings.UI.Library/SettingsRepository`1.cs
+++ b/src/settings-ui/Settings.UI.Library/SettingsRepository`1.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.

 using System;
-using System.Threading;

 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;

@@ -14,7 +13,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
    public class SettingsRepository<T> : ISettingsRepository<T>
        where T : class, ISettingsConfig, new()
    {
-        private static readonly Lock _SettingsRepoLock = new Lock();
+        private static readonly object _SettingsRepoLock = new object();

        private static ISettingsUtils _settingsUtils;

--- a/src/settings-ui/Settings.UI.Library/UpdatingSettings.cs
+++ b/src/settings-ui/Settings.UI.Library/UpdatingSettings.cs
@@ -102,7 +102,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
            {
                try
                {
-                    FileSystemStream inputStream = fileSystem.File.Open(file, FileMode.Open);
+                    Stream inputStream = fileSystem.File.Open(file, FileMode.Open);
                    StreamReader reader = new StreamReader(inputStream);
                    string data = reader.ReadToEnd();
                    inputStream.Close();
--- a/src/settings-ui/Settings.UI.Library/Utilities/Helper.cs
+++ b/src/settings-ui/Settings.UI.Library/Utilities/Helper.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
+using System.Net.NetworkInformation;
 using System.Security.Principal;

 using Microsoft.PowerToys.Settings.UI.Library.CustomAction;
@@ -62,7 +63,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
                FileSystem.Directory.CreateDirectory(path);
            }

-            var watcher = FileSystem.FileSystemWatcher.New();
+            var watcher = FileSystem.FileSystemWatcher.CreateNew();
            watcher.Path = path;
            watcher.Filter = fileName;
            watcher.NotifyFilter = NotifyFilters.LastWrite;
--- a/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/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>net9.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
    <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps</PublishDir>
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml.cs
@@ -123,15 +123,11 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views

            // Regex to remove installer hash sections from the release notes, since there'll be no Highlights section for hotfix releases.
            Regex removeHotfixHashRegex = new Regex(RemoveHotFixInstallerHashesRegex, RemoveInstallerHashesRegexOptions);
-            int counter = 0;
+
            foreach (var release in latestReleases)
            {
                releaseNotesHtmlBuilder.AppendLine("# " + release.Name);
                var notes = removeHashRegex.Replace(release.ReleaseNotes, "\r\n## Highlights");
-
-                // Add a unique counter to [github-current-release-work] to distinguish each release,
-                // since this variable is used for all latest releases when they are merged.
-                notes = notes.Replace("[github-current-release-work]", $"[github-current-release-work{++counter}]");
                notes = removeHotfixHashRegex.Replace(notes, string.Empty);
                releaseNotesHtmlBuilder.AppendLine(notes);
                releaseNotesHtmlBuilder.AppendLine("&nbsp;");
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs
@@ -54,7 +54,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views

            var settingsPath = _settingsUtils.GetSettingsFilePath(_appName);

-            _fileSystemWatcher = _fileSystem.FileSystemWatcher.New();
+            _fileSystemWatcher = _fileSystem.FileSystemWatcher.CreateNew();
            _fileSystemWatcher.Path = _fileSystem.Path.GetDirectoryName(settingsPath);
            _fileSystemWatcher.Filter = _fileSystem.Path.GetFileName(settingsPath);
            _fileSystemWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.CreationTime;
--- a/src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs
+++ b/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 System.Threading.Lock _delayedActionLock = new System.Threading.Lock();
+        private readonly object _delayedActionLock = new object();

        private readonly AdvancedPasteSettings _advancedPasteSettings;
        private readonly AdvancedPasteAdditionalActions _additionalActions;
--- a/src/settings-ui/Settings.UI/ViewModels/ColorPickerViewModel.cs
+++ b/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 System.Threading.Lock _delayedActionLock = new System.Threading.Lock();
+        private readonly object _delayedActionLock = new object();

        private readonly ColorPickerSettings _colorPickerSettings;
        private Timer _delayedTimer;
--- a/src/settings-ui/Settings.UI/ViewModels/MouseWithoutBordersViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/MouseWithoutBordersViewModel.cs
@@ -39,7 +39,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            0,
        };

-        private readonly Lock _machineMatrixStringLock = new();
+        private readonly object _machineMatrixStringLock = new();

        private static readonly Dictionary<SocketStatus, Brush> StatusColors = new Dictionary<SocketStatus, Brush>()
 {
--- a/src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs
+++ b/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 System.Threading.Lock _delayedActionLock = new System.Threading.Lock();
+        private readonly object _delayedActionLock = new object();

        private readonly PowerOcrSettings _powerOcrSettings;
        private Timer _delayedTimer;