Merge branch 'main' into pr35429

This reverts commit 65a313fb4e.

.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

.github/actions/spell-check/expect.txt

@@ -1,6 +1,7 @@
 # FALSE POSITIVES
 ## "PackagemanagerWrapper.cs" should be "PackageManagerWrapper.cs"
 ## NOTICE.MD > MOZILLA PUBLIC LICENSE v1.1
+
 aaaa
 abcdefghjkmnpqrstuvxyz
 abgr
@@ -42,6 +43,7 @@ AMPROPSETID
 amr
 ANDSCANS
 animatedvisuals
+anr
 ansicolor
 ANull
 AOC
@@ -1212,7 +1214,6 @@ prgms
 pri
 PRINTCLIENT
 printmanagement
-privacystatement
 prm
 proactively
 PROCESSENTRY

.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",

.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 }}

.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

.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
@@ -390,16 +376,6 @@ jobs:
         msbuildArchitecture: x64
         maximumCpuCount: true
 
-  ### HACK: On ARM64 builds, building an app with Windows App SDK copies the x64 WebView2 dll instead of the ARM64 one. This task makes sure the right dll is used.
-  - task: CopyFiles@2
-    displayName: HACK Copy core WebView2 ARM64 dll to output directory
-    condition: eq(variables['BuildPlatform'],'arm64')
-    inputs:
-      contents: packages/Microsoft.Web.WebView2.1.0.2739.15/runtimes/win-ARM64/native_uap/Microsoft.Web.WebView2.Core.dll
-      targetFolder: $(Build.SourcesDirectory)/ARM64/Release/WinUI3Apps/
-      flattenFolders: True
-      OverWrite: True
-
   # Check if deps.json files don't reference different dll versions.
   - pwsh: |-
       & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'

.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

.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 }}

.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

.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"

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>

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

README.md

@@ -34,19 +34,19 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user.
 
 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.87%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.86%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.86.0/PowerToysUserSetup-0.86.0-x64.exe
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.86.0/PowerToysUserSetup-0.86.0-arm64.exe
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.86.0/PowerToysSetup-0.86.0-x64.exe
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.86.0/PowerToysSetup-0.86.0-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.86%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.85%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.85.1/PowerToysUserSetup-0.85.1-x64.exe
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.85.1/PowerToysUserSetup-0.85.1-arm64.exe
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.85.1/PowerToysSetup-0.85.1-x64.exe
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.85.1/PowerToysSetup-0.85.1-arm64.exe
 
 |  Description   | Filename | sha256 hash |
 |----------------|----------|-------------|
-| Per user - x64       | [PowerToysUserSetup-0.86.0-x64.exe][ptUserX64] | CFB9608B28B8FF12C9A7C9814A6EF981636EB5AB261DC278C28EC93FD959CCE2 |
-| Per user - ARM64     | [PowerToysUserSetup-0.86.0-arm64.exe][ptUserArm64] | 861CEDBFDCDA993D1D1056E3280319D5EA45D142CA3C737AB1FB4FABD651A5F5 |
-| Machine wide - x64   | [PowerToysSetup-0.86.0-x64.exe][ptMachineX64] | 857DE9DC5938D9602F82DFD6183DB5E6823B875A412AEC59B4BE93617E27E9CD |
-| Machine wide - ARM64 | [PowerToysSetup-0.86.0-arm64.exe][ptMachineArm64] | 6F37192534C195A02A80AAE1E449DF61C894C50763096A06195581801943FA31 |
+| Per user - x64       | [PowerToysUserSetup-0.85.1-x64.exe][ptUserX64] | 5F287C34BF68972C55D7C26585EA5C449B0DBA7D458BF7039CFF448E1D7B732B |
+| Per user - ARM64     | [PowerToysUserSetup-0.85.1-arm64.exe][ptUserArm64] | 6D5C3B24156E6E66FD38AD15076B8442F0A1C5CFCBBDC33AD478FB27E5E086AE |
+| Machine wide - x64   | [PowerToysSetup-0.85.1-x64.exe][ptMachineX64] | 1CDD3C9602F6E5DDC19C66A4FDFE4231389C08E6A037DD22C0A6471F10C7BE02 |
+| Machine wide - ARM64 | [PowerToysSetup-0.85.1-arm64.exe][ptMachineArm64] | 6F4DC0217495973B974B7AC1099FD01A2A0FCEE96E8719074EC97FBBC0ECAC4A |
 
 This is our preferred method.
 
@@ -92,103 +92,113 @@ For guidance on developing for PowerToys, please read the [developer docs](/doc/
 
 Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on.
 
-### 0.86 - October 2024 Update
+### 0.85 - September 2024 Update
 
 In this release, we focused on new features, stability, and improvements.
 
 **Highlights**
- 
- - 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.
+
+ - New utility: New+ - allows setting a personalized set of templates to quickly create files and folders from a File Explorer context menu. Thanks [@cgaarden](https://github.com/cgaarden)!
+ - Language selection - it's now possible to select which UI language should be used by PowerToys utilities.
+ - Lots of quality fixes for Workspaces, improving the number of supported applications.
+ - Reduced Peek memory usage by fixing image leaks. Thanks [@daverayment](https://github.com/daverayment)!
 
 ### 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.
- - Improved exception logging by adding the type of Exception and InnerException. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Added a general setting to select which UI language should be used in PowerToys utilities.
+ - Fixed internal code of some policies for Group Policy Objects, that were reading registry entries using the wrong internal functions, and structured code better to avoid future mistakes of the same kind. Thanks [@htcfreek](https://github.com/htcfreek)!
 
 ### Advanced Paste
 
- - Added new built-in actions: Image to text, and paste txt, png or html as a file.
+ - Fixed some telemetry calls to signal Advanced Paste activation on the cases where a direct shortcut is being used without showing the UI.
+ - User-defined custom actions can only be used with AI turned on, so custom actions were disabled on Settings when AI is disabled and were hidden from the Advanced Paste UI.
 
-### Mouse Jump
+### Awake
 
- - Refactored the common classes into a separate project. Thanks [@mikeclayton](https://github.com/mikeclayton)!
- - Brought back the telemetry events that were deleted across previous refactoring efforts.
+ - Fixed tray icon behaviors, not appearing and showing incorrect time. Thanks [@dend](https://github.com/dend)!
 
-### Mouse Without Borders
+### Environment Variables Editor
 
- - Refactored the Logger common classes. Thanks [@mikeclayton](https://github.com/mikeclayton)!
+ - Added the `_NT_SYMBOL_PATH`, `_NT_ALT_SYMBOL_PATH` and `_NT_SYMCACHE_PATH` as variables that are shown as lists. Thanks [@chwarr](https://github.com/chwarr)!
+
+### FancyZones
+
+ - Allow snapping applications that were launched by Workspaces.
+
+### File Locksmith
+
+ - Fixed an issue causing File Locksmith to be triggered by unrelated verbs in the context menu.
+
+### Mouse Pointer Crosshairs
+
+ - Allow crosshairs radius to be 0 pixels. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!
 
 ### New+
 
- - Fixed the telemetry event for when the modules is enabled or disabled. (This was a hotfix for 0.85)
- - Fixed bug when creating folders or files that contain Unicode characters. Thanks [@cgaarden](https://github.com/cgaarden)!
- - Fixed bug when the name of a new folder collided with an already existing folder. Thanks [@cgaarden](https://github.com/cgaarden)!
- - Updated the New+ icons to the fluent style.
+ - New utility - Allows setting a personalized set of templates to quickly create files and folders from a File Explorer context menu. Thanks [@cgaarden](https://github.com/cgaarden)!
+ - Added missing entry for New+ policy state reporting in the Bug Report tool. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added a policy for enabling/disabling whether filename extensions should be shown. Thanks [@htcfreek](https://github.com/htcfreek)!
 
 ### Peek
 
- - Folder preview enumeration of size and number of files is now more responsive and faster. Thanks [@daverayment](https://github.com/daverayment)!
+ - Properly show file's modified date instead of creation date in the file previewer. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed memory leak caused by unmanaged bitmap images not being freed. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed an issue causing Peek to not be displayed the first time when using a preview handler to display files. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Prevent tooltip in file previewer from overlapping with title bar controls. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed memory leaks in thumbnails and refactored image previewer. Thanks [@daverayment](https://github.com/daverayment)!
 
 ### PowerToys Run
 
- - Handled a culture not found error when checking for right-to-left languages.
- - Fixed the WebSearch plugin results title being trimmed in the UI. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!
- - The Unit Converter plugin will now show more significant digits. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Improved error handling when copying to the clipboard results in an error. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Improved the message boxes to be more specific when PowerToys Run failed to initialize itself or any plugin. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Use capital letters when showing degree results in the Unit Converter plugin. Thanks [@PesBandi](https://github.com/PesBandi)!
 
 ### Quick Accent
 
- - Added support for the Serbian Cyrillic character set. Thanks [@Sirozha1337](https://github.com/Sirozha1337)!
-
-### Registry Preview
-
- - Adopted the Monaco Editor as the UI text editor. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Add the Middle Eastern Romanization character set. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Add the degree sign, integral and vertical ellipsis when "All Languages" is selected. Thanks [@rddunphy](https://github.com/rddunphy)!
 
 ### Settings
 
- - Fixed a crash when trying to access a non-existing templates folder from the New+ page. (This was a hotfix for 0.85)
- - Added a navigation tree to group utilities in the left navigation menu.
- - Sorted the list of languages in the language selection combo box in the General tab. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Fixed the state of the info bar about templates not being backed up to not close and react to the module's enabled state in the New+ page. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Fixed a crash caused by a dangling thread.
- - Clicking a notification about there being an update available should now correctly open the Settings application in the General tab.
- - Fixed a UI freeze when trying to access the Diagnostic Data Viewer files. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed the link to the Workspaces documentation. (This was a hotfix for 0.84)
+ - Fixed flyout issues after the Windows App SDK upgrade. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed initialization for the New+ settings page. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed enabled state of a control on the New+ settings page if the module is enabled by policy. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed a crash when cancelling the template folder selection in the New+ settings page.
 
 ### Workspaces
 
- - Fixed launching the incorrect workspace when launching many workspaces quickly through shortcuts. (This was a hotfix for 0.85)
- - Fixed launching many instances of the same application in a workspace.
- - Fixed a crash when a previously captured monitor ID no longer existed.
- - Fixed an issue causing the wrong coordinates to be saved for minimized applications.
- - Fixed an issue causing a crash when stress testing workspace launching.
- - Fixed application launching when UAC is off and every application always runs elevated.
+ - Fixed detecting and snapping applications like Discord. (This was a hotfix for 0.84)
+ - Fixed detecting and snapping applications like Steam. (This was a hotfix for 0.84)
+ - Fixed button visibility in the UI. (This was a hotfix for 0.84)
+ - Fixed an issue launching the wrong project when the editor was closed without saving or cancelling a new project.
+ - Properly handle repositioning windows running as administrator.
+ - Properly handle cases where the monitor where a workspace was saved is no longer present.
+ - Fixed the workspace launcher restarting itself in a loop without success.
+ - Properly handle standalone applications.
+ - Fixed issues causing icons to not show.
 
 ### Documentation
 
- - Added HackMD plugin mention to thirdPartyRunPlugins.md. Thanks [@8LWXpg](https://github.com/8LWXpg)!
- - Added SSH plugin mention to thirdPartyRunPlugins.md. Thanks [@8LWXpg](https://github.com/8LWXpg)!
- - Added the [Data and Privacy documentation](https://github.com/microsoft/PowerToys/blob/main/DATA_AND_PRIVACY.md) to the repo.
+ - Fixed the thirdPartyRunPlugins.md entry for the RDP plugin. Thanks [@YisroelTech](https://github.com/YisroelTech)! 
 
 ### Development
 
- - Fixed the CI precheck action to take into account the recent changes in CI actions.
- - Added the new Microsoft org issue types to the issue templates. Thanks [@Aaron-Junker](https://github.com/Aaron-Junker)!
- - Updated System.Text.Json to 8.0.5 and System.Runtime.Caching to 8.0.1 and related dependencies to the latest to address security reports. Thanks [@snickler](https://github.com/snickler)!
- - Updated WinAppSDK to 1.6.1 and CsWinRT to 2.1.5. Thanks [@snickler](https://github.com/snickler)!
- - Upgraded the WpfUI dependency to 3.0.5.
- - Updated MessagePack to 2.5.187 and StreamJsonRpc to 2.19.27 to address security reports.
- - Removed some of the hacks that are no longer needed that tried to force same dependency versions in .csproj files.
- - Removed the Markdown file exclusions from the conditions that trigger a full CI test.
- - CI fails again when there are XAML style errors in a PR.
- - Fixed CI actions that were not failing when one of the powershell scripts they tried to run was failing.
- - Fixed analyzer violations to allow fully building PowerToys on Visual Studio 17.12. Thanks [@snickler](https://github.com/snickler)!
+ - Upgraded Windows App SDK to 1.6.
+ - Upgraded the Target Platform Version to 10.0.22621.0.
+ - Added a bot trigger to automatically add a label to Workspaces issues. Thanks [@plante-msft](https://github.com/plante-msft)!
+ - Fixed a regular expression in the bot triggers for wanting to submit community contributions. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Fixed analyzer errors after the Visual Studio 17.12 update. Thanks [@snickler](https://github.com/snickler)!
+ - Fixed the TSA configuration for release CI builds.
+ - Refactored automated file component generation during installer builds.
+ - Rewrote the Azure Devops build system to be more modular and share more definitions between PR CI and Release CI.
+ - Fixed debugging of the New+ page of the Settings application when a settings file was not present.
+ - Fixed setting the version of the App Manifest in the File Locksmith and New+ context menu app packages.
+ - Fixed abstracted UI library nuget package signing on release CI.
+ - Removed build status from GitHub README.
 
-#### What is being planned for version 0.87
+#### What is being planned for version 0.86
 
-For [v0.87][github-next-release-work], we'll work on the items below:
+For [v0.86][github-next-release-work], we'll work on the items below:
 
  - Stability / bug fixes
  - New module: File Actions Menu
@@ -204,7 +214,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

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'">

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

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

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();

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));
 

src/common/ManagedCommon/ManagedCommon.csproj

@@ -15,6 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="System.IO.Abstractions" />
     <PackageReference Include="System.Management" />
   </ItemGroup>
 

src/common/ManagedTelemetry/Telemetry/EtwTrace.cs

@@ -26,7 +26,7 @@ namespace Microsoft.PowerToys.Telemetry
 
         private readonly bool telemetryEnabled = DataDiagnosticsSettings.GetEnabledValue(); // This is the global telemetry setting on whether to log events
         private readonly bool telemetryRecordingEnabled = DataDiagnosticsSettings.GetViewEnabledValue(); // This is the setting for recording telemetry events to disk for viewing
-        private string etwFolderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\PowerToys\", "etw");
+        private readonly string etwFolderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\PowerToys\", "etw");
         private bool disposedValue;
         private string sessionName;
         private string etwFilePath;
@@ -49,18 +49,6 @@ namespace Microsoft.PowerToys.Telemetry
         /// Initializes a new instance of the <see cref="ETWTrace"/> class.
         /// </summary>
         public ETWTrace()
-        {
-            Init();
-        }
-
-        public ETWTrace(string etwPath)
-        {
-            this.etwFolderPath = etwPath;
-
-            Init();
-        }
-
-        private void Init()
         {
             if (File.Exists(etwFolderPath))
             {

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;
 

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>

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);
         }
     }

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()
+        {
+        }
     }
 }

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);
     }
 }

src/modules/Hosts/Hosts/Helpers/NativeEventWaiter.cs

@@ -14,7 +14,7 @@ namespace Hosts.Helpers
         public static void WaitForEventLoop(string eventName, Action callback)
         {
             var dispatcherQueue = DispatcherQueue.GetForCurrentThread();
-            var t = new Thread(() =>
+            new Thread(() =>
             {
                 var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, eventName);
                 while (true)
@@ -24,10 +24,7 @@ namespace Hosts.Helpers
                         dispatcherQueue.TryEnqueue(() => callback());
                     }
                 }
-            });
-
-            t.IsBackground = true;
-            t.Start();
+            }).Start();
         }
     }
 }

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; }
 

src/modules/Hosts/HostsModuleInterface/dllmain.cpp

@@ -216,12 +216,6 @@ public:
             m_hShowAdminEvent = nullptr;
         }
 
-        if (m_hTerminateEvent)
-        {
-            CloseHandle(m_hTerminateEvent);
-            m_hTerminateEvent = nullptr;
-        }
-
         delete this;
     }
 
@@ -286,7 +280,6 @@ public:
             SetEvent(m_hTerminateEvent);
             WaitForSingleObject(m_hProcess, 1500);
             TerminateProcess(m_hProcess, 1);
-            ResetEvent(m_hTerminateEvent);
         }
 
         m_enabled = false;

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;

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;

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)

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;

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;

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)
         {

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>();
         }
 

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;

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)
         {

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;

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;

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;

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;

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;

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()

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()

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;

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;

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)

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();

src/modules/Workspaces/WorkspacesLauncher/main.cpp

@@ -38,38 +38,6 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hInstPrev, LPSTR cmdline, int cm
         return 0;
     }
 
-    std::wstring cmdLineStr{ GetCommandLineW() };
-    auto cmdArgs = split(cmdLineStr, L" ");
-    if (cmdArgs.workspaceId.empty())
-    {
-        Logger::warn("Incorrect command line arguments: no workspace id");
-        MessageBox(NULL, GET_RESOURCE_STRING(IDS_INCORRECT_ARGS).c_str(), GET_RESOURCE_STRING(IDS_WORKSPACES).c_str(), MB_ICONERROR | MB_OK);
-        return 1;
-    }
-
-    if (!cmdArgs.isRestarted)
-    {
-        // check if restart is needed. Only check it if not yet restarted to avoid endless restarting. Restart is needed if the process is elevated.
-        if (is_process_elevated())
-        {
-            Logger::warn("Workspaces Launcher is elevated, restart");
-
-            constexpr DWORD exe_path_size = 0xFFFF;
-            auto exe_path = std::make_unique<wchar_t[]>(exe_path_size);
-            GetModuleFileNameW(nullptr, exe_path.get(), exe_path_size);
-
-            const auto modulePath = get_module_folderpath();
-
-            std::string cmdLineStr(cmdline);
-            std::wstring cmdLineWStr(cmdLineStr.begin(), cmdLineStr.end());
-
-            std::wstring cmd = cmdArgs.workspaceId + L" " + std::to_wstring(cmdArgs.invokePoint) + L" " + NonLocalizable::restartedString;
-
-            RunNonElevatedEx(exe_path.get(), cmd, modulePath);
-            return 1;
-        }
-    }
-
     auto mutex = CreateMutex(nullptr, true, instanceMutexName.c_str());
     if (mutex == nullptr)
     {
@@ -82,6 +50,34 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hInstPrev, LPSTR cmdline, int cm
         return 0;
     }
 
+    std::wstring cmdLineStr{ GetCommandLineW() };
+    auto cmdArgs = split(cmdLineStr, L" ");
+    if (cmdArgs.workspaceId.empty())
+    {
+        Logger::warn("Incorrect command line arguments: no workspace id");
+        MessageBox(NULL, GET_RESOURCE_STRING(IDS_INCORRECT_ARGS).c_str(), GET_RESOURCE_STRING(IDS_WORKSPACES).c_str(), MB_ICONERROR | MB_OK);
+        return 1;
+    }
+
+    if (is_process_elevated())
+    {
+        Logger::warn("Workspaces Launcher is elevated, restart");
+
+        constexpr DWORD exe_path_size = 0xFFFF;
+        auto exe_path = std::make_unique<wchar_t[]>(exe_path_size);
+        GetModuleFileNameW(nullptr, exe_path.get(), exe_path_size);
+
+        const auto modulePath = get_module_folderpath();
+
+        std::string cmdLineStr(cmdline);
+        std::wstring cmdLineWStr(cmdLineStr.begin(), cmdLineStr.end());
+
+        std::wstring cmd = cmdArgs.workspaceId + L" " + std::to_wstring(cmdArgs.invokePoint);
+
+        RunNonElevatedEx(exe_path.get(), cmd, modulePath);
+        return 1;
+    }
+
     // COM should be initialized before ShellExecuteEx is called.
     if (FAILED(CoInitializeEx(NULL, COINIT_MULTITHREADED)))
     {

src/modules/Workspaces/WorkspacesLib/utils.h

@@ -6,22 +6,15 @@
 #include <workspaces-common/GuidUtils.h>
 #include <workspaces-common/InvokePoint.h>
 
-namespace NonLocalizable
-{
-    const wchar_t restartedString[] = L"restarted";
-}
-
 struct CommandLineArgs
 {
     std::wstring workspaceId;
     InvokePoint invokePoint;
-    bool isRestarted;
 };
 
 CommandLineArgs split(std::wstring s, const std::wstring& delimiter)
 {
     CommandLineArgs cmdArgs{};
-    cmdArgs.isRestarted = false;
 
     size_t pos = 0;
     std::wstring token;
@@ -36,11 +29,7 @@ CommandLineArgs split(std::wstring s, const std::wstring& delimiter)
 
     for (const auto& token : tokens)
     {
-        if (token == NonLocalizable::restartedString)
-        {
-            cmdArgs.isRestarted = true;
-        }
-        else if (!cmdArgs.workspaceId.empty())
+        if (!cmdArgs.workspaceId.empty())
         {
             try
             {
@@ -58,7 +47,7 @@ CommandLineArgs split(std::wstring s, const std::wstring& delimiter)
             {
                 cmdArgs.workspaceId = token;
             }
-        }
+        }   
     }
 
     return cmdArgs;

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)

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

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;

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;

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;
 

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();

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));
             }
         }
 

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

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)
         {

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,

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>

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;
 

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

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>

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()

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>

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()

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);
 

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>

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)

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;

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);

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

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

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(

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>

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; }
 

src/modules/peek/Peek.UI/NativeEventWaiter.cs

@@ -14,7 +14,7 @@ namespace Peek.UI.Native
         public static void WaitForEventLoop(string eventName, Action callback)
         {
             var dispatcherQueue = DispatcherQueue.GetForCurrentThread();
-            var t = new Thread(() =>
+            new Thread(() =>
             {
                 var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, eventName);
                 while (true)
@@ -24,10 +24,7 @@ namespace Peek.UI.Native
                         dispatcherQueue.TryEnqueue(() => callback());
                     }
                 }
-            });
-
-            t.IsBackground = true;
-            t.Start();
+            }).Start();
         }
     }
 }

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; }
 

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)

src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandlerControl.cs

@@ -4,8 +4,6 @@
 
 using Common;
 using Microsoft.PowerToys.FilePreviewCommon;
-using Microsoft.PowerToys.PreviewHandler.Gcode.Telemetry.Events;
-using Microsoft.PowerToys.Telemetry;
 
 namespace Microsoft.PowerToys.PreviewHandler.Gcode
 {
@@ -86,13 +84,6 @@ namespace Microsoft.PowerToys.PreviewHandler.Gcode
 
                 Resize += FormResized;
                 base.DoPreview(fs);
-                try
-                {
-                    PowerToysTelemetry.Log.WriteEvent(new GcodeFilePreviewed());
-                }
-                catch
-                { // Should not crash if sending telemetry is failing. Ignore the exception.
-                }
             }
             catch (Exception ex)
             {
@@ -162,14 +153,6 @@ namespace Microsoft.PowerToys.PreviewHandler.Gcode
         /// <param name="dataSource">Stream reference to access source file.</param>
         private void PreviewError<T>(Exception exception, T dataSource)
         {
-            try
-            {
-                PowerToysTelemetry.Log.WriteEvent(new GcodeFilePreviewError { Message = exception.Message });
-            }
-            catch
-            { // Should not crash if sending telemetry is failing. Ignore the exception.
-            }
-
             Controls.Clear();
             _infoBarAdded = true;
             AddTextBoxControl(Properties.Resource.GcodeNotPreviewedError);

src/modules/previewpane/GcodePreviewHandler/Program.cs

@@ -6,7 +6,6 @@ using System.Globalization;
 using System.Windows.Threading;
 
 using Common.UI;
-using Microsoft.PowerToys.Telemetry;
 using PowerToys.Interop;
 
 namespace Microsoft.PowerToys.PreviewHandler.Gcode
@@ -28,8 +27,6 @@ namespace Microsoft.PowerToys.PreviewHandler.Gcode
             {
                 if (args.Length == 6)
                 {
-                    ETWTrace etwTrace = new ETWTrace(Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), "AppData", "LocalLow", "Microsoft", "PowerToys", "etw"));
-
                     string filePath = args[0];
                     IntPtr hwnd = IntPtr.Parse(args[1], NumberStyles.HexNumber, CultureInfo.InvariantCulture);
 
@@ -55,16 +52,12 @@ namespace Microsoft.PowerToys.PreviewHandler.Gcode
                             Rectangle s = default;
                             if (!_previewHandlerControl.SetRect(s))
                             {
-                                etwTrace?.Dispose();
-
                                 // When the parent HWND became invalid, the application won't respond to Application.Exit().
                                 Environment.Exit(0);
                             }
                         },
                         Dispatcher.CurrentDispatcher,
                         _tokenSource.Token);
-
-                    etwTrace?.Dispose();
                 }
                 else
                 {

src/modules/previewpane/GcodePreviewHandler/Telemetry/Events/GcodeFileHandlerLoaded.cs

@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// 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.Diagnostics.Tracing;
-
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace Microsoft.PowerToys.PreviewHandler.Gcode.Telemetry.Events
-{
-    /// <summary>
-    /// A telemetry event to be raised when a svg file has been viewed in the preview pane.
-    /// </summary>
-    [EventData]
-    public class GcodeFileHandlerLoaded : EventBase, IEvent
-    {
-        /// <inheritdoc/>
-        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
-    }
-}

src/modules/previewpane/GcodePreviewHandler/Telemetry/Events/GcodeFilePreviewError.cs

@@ -1,26 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// 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.Diagnostics.Tracing;
-
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace Microsoft.PowerToys.PreviewHandler.Gcode.Telemetry.Events
-{
-    /// <summary>
-    /// A telemetry event to be raised when an error has occurred in the preview pane.
-    /// </summary>
-    [EventData]
-    public class GcodeFilePreviewError : EventBase, IEvent
-    {
-        /// <summary>
-        /// Gets or sets the error message to log as part of the telemetry event.
-        /// </summary>
-        public string Message { get; set; }
-
-        /// <inheritdoc/>
-        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServicePerformance;
-    }
-}

src/modules/previewpane/GcodePreviewHandler/Telemetry/Events/GcodeFilePreviewed.cs

@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// 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.Diagnostics.Tracing;
-
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace Microsoft.PowerToys.PreviewHandler.Gcode.Telemetry.Events
-{
-    /// <summary>
-    /// A telemetry event to be raised when a svg file has been viewed in the preview pane.
-    /// </summary>
-    [EventData]
-    public class GcodeFilePreviewed : EventBase, IEvent
-    {
-        /// <inheritdoc/>
-        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
-    }
-}

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>

src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs

@@ -9,8 +9,6 @@ using System.Text.RegularExpressions;
 
 using Common;
 using Microsoft.PowerToys.PreviewHandler.Markdown.Properties;
-using Microsoft.PowerToys.PreviewHandler.Markdown.Telemetry.Events;
-using Microsoft.PowerToys.Telemetry;
 using Microsoft.Web.WebView2.Core;
 using Microsoft.Web.WebView2.WinForms;
 using Windows.System;
@@ -217,25 +215,9 @@ namespace Microsoft.PowerToys.PreviewHandler.Markdown
                     {
                     }
                 });
-
-                try
-                {
-                    PowerToysTelemetry.Log.WriteEvent(new MarkdownFilePreviewed());
-                }
-                catch
-                { // Should not crash if sending telemetry is failing. Ignore the exception.
-                }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
-                try
-                {
-                    PowerToysTelemetry.Log.WriteEvent(new MarkdownFilePreviewError { Message = ex.Message });
-                }
-                catch
-                { // Should not crash if sending telemetry is failing. Ignore the exception.
-                }
-
                 Controls.Clear();
                 _infoBarDisplayed = true;
                 _infoBar = GetTextBoxControl(Resources.MarkdownNotPreviewedError);

src/modules/previewpane/MarkdownPreviewHandler/Program.cs

@@ -6,7 +6,6 @@ using System.Globalization;
 using System.Windows.Threading;
 
 using Common.UI;
-using Microsoft.PowerToys.Telemetry;
 using PowerToys.Interop;
 
 namespace Microsoft.PowerToys.PreviewHandler.Markdown
@@ -28,8 +27,6 @@ namespace Microsoft.PowerToys.PreviewHandler.Markdown
             {
                 if (args.Length == 6)
                 {
-                    ETWTrace etwTrace = new ETWTrace(Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), "AppData", "LocalLow", "Microsoft", "PowerToys", "etw"));
-
                     string filePath = args[0];
                     IntPtr hwnd = IntPtr.Parse(args[1], NumberStyles.HexNumber, CultureInfo.InvariantCulture);
 
@@ -55,16 +52,12 @@ namespace Microsoft.PowerToys.PreviewHandler.Markdown
                             Rectangle s = default;
                             if (!_previewHandlerControl.SetRect(s))
                             {
-                                etwTrace?.Dispose();
-
                                 // When the parent HWND became invalid, the application won't respond to Application.Exit().
                                 Environment.Exit(0);
                             }
                         },
                         Dispatcher.CurrentDispatcher,
                         _tokenSource.Token);
-
-                    etwTrace?.Dispose();
                 }
                 else
                 {

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>

src/modules/previewpane/MarkdownPreviewHandler/Telemetry/Events/MarkdownFileHandlerLoaded.cs

@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// 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.Diagnostics.Tracing;
-
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace Microsoft.PowerToys.PreviewHandler.Markdown.Telemetry.Events
-{
-    /// <summary>
-    /// A telemetry event that is triggered when a markdown file is viewed in the preview pane.
-    /// </summary>
-    [EventData]
-    public class MarkdownFileHandlerLoaded : EventBase, IEvent
-    {
-        /// <inheritdoc/>
-        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
-    }
-}

src/modules/previewpane/MarkdownPreviewHandler/Telemetry/Events/MarkdownFilePreviewError.cs

@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace Microsoft.PowerToys.PreviewHandler.Markdown.Telemetry.Events
-{
-    /// <summary>
-    /// A telemetry event that is triggered when an error occurs while attempting to view a markdown file in the preview pane.
-    /// </summary>
-    public class MarkdownFilePreviewError : EventBase, IEvent
-    {
-        /// <summary>
-        /// Gets or sets the error message.
-        /// </summary>
-        public string Message { get; set; }
-
-        /// <inheritdoc/>
-        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServicePerformance;
-    }
-}

src/modules/previewpane/MarkdownPreviewHandler/Telemetry/Events/MarkdownFilePreviewed.cs

@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// 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.Diagnostics.Tracing;
-
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace Microsoft.PowerToys.PreviewHandler.Markdown.Telemetry.Events
-{
-    /// <summary>
-    /// A telemetry event that is triggered when a markdown file is viewed in the preview pane.
-    /// </summary>
-    [EventData]
-    public class MarkdownFilePreviewed : EventBase, IEvent
-    {
-        /// <inheritdoc/>
-        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
-    }
-}

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>

src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandlerControl.cs

@@ -1,17 +1,8 @@
 // Copyright (c) Microsoft Corporation
 // 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.Drawing;
-using System.IO;
-using System.Runtime.InteropServices.ComTypes;
-using System.Windows.Forms;
-
 using Common;
-using Common.Utilities;
 using Microsoft.PowerToys.PreviewHandler.Pdf.Properties;
-using Microsoft.PowerToys.PreviewHandler.Pdf.Telemetry.Events;
-using Microsoft.PowerToys.Telemetry;
 using Windows.Data.Pdf;
 using Windows.Storage.Streams;
 using Windows.UI.ViewManagement;
@@ -158,25 +149,9 @@ namespace Microsoft.PowerToys.PreviewHandler.Pdf
                         memStream.Dispose();
                     }
                 }
-
-                try
-                {
-                    PowerToysTelemetry.Log.WriteEvent(new PdfFilePreviewed());
-                }
-                catch
-                { // Should not crash if sending telemetry is failing. Ignore the exception.
-                }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
-                try
-                {
-                    PowerToysTelemetry.Log.WriteEvent(new PdfFilePreviewError { Message = ex.Message });
-                }
-                catch
-                { // Should not crash if sending telemetry is failing. Ignore the exception.
-                }
-
                 Controls.Clear();
                 _infoBar = GetTextBoxControl(Resources.PdfNotPreviewedError);
                 Controls.Add(_infoBar);

src/modules/previewpane/PdfPreviewHandler/Program.cs

@@ -5,7 +5,6 @@ using System.Globalization;
 using System.Windows.Threading;
 
 using Common.UI;
-using Microsoft.PowerToys.Telemetry;
 using PowerToys.Interop;
 
 namespace Microsoft.PowerToys.PreviewHandler.Pdf
@@ -27,8 +26,6 @@ namespace Microsoft.PowerToys.PreviewHandler.Pdf
             {
                 if (args.Length == 6)
                 {
-                    ETWTrace etwTrace = new ETWTrace(Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), "AppData", "LocalLow", "Microsoft", "PowerToys", "etw"));
-
                     string filePath = args[0];
                     IntPtr hwnd = IntPtr.Parse(args[1], NumberStyles.HexNumber, CultureInfo.InvariantCulture);
 
@@ -54,16 +51,12 @@ namespace Microsoft.PowerToys.PreviewHandler.Pdf
                             Rectangle s = default;
                             if (!_previewHandlerControl.SetRect(s))
                             {
-                                etwTrace?.Dispose();
-
                                 // When the parent HWND became invalid, the application won't respond to Application.Exit().
                                 Environment.Exit(0);
                             }
                         },
                         Dispatcher.CurrentDispatcher,
                         _tokenSource.Token);
-
-                    etwTrace?.Dispose();
                 }
                 else
                 {

src/modules/previewpane/PdfPreviewHandler/Telemetry/Events/PdfFileHandlerLoaded.cs

@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// 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.Diagnostics.Tracing;
-
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace Microsoft.PowerToys.PreviewHandler.Pdf.Telemetry.Events
-{
-    /// <summary>
-    /// A telemetry event that is triggered when a pdf file is viewed in the preview pane.
-    /// </summary>
-    [EventData]
-    public class PdfFileHandlerLoaded : EventBase, IEvent
-    {
-        /// <inheritdoc/>
-        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
-    }
-}

src/modules/previewpane/PdfPreviewHandler/Telemetry/Events/PdfFilePreviewError.cs

@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace Microsoft.PowerToys.PreviewHandler.Pdf.Telemetry.Events
-{
-    /// <summary>
-    /// A telemetry event that is triggered when an error occurs while attempting to view a markdown file in the preview pane.
-    /// </summary>
-    public class PdfFilePreviewError : EventBase, IEvent
-    {
-        /// <summary>
-        /// Gets or sets the error message.
-        /// </summary>
-        public string Message { get; set; }
-
-        /// <inheritdoc/>
-        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServicePerformance;
-    }
-}

src/modules/previewpane/PdfPreviewHandler/Telemetry/Events/PdfFilePreviewed.cs

@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// 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.Diagnostics.Tracing;
-
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace Microsoft.PowerToys.PreviewHandler.Pdf.Telemetry.Events
-{
-    /// <summary>
-    /// A telemetry event that is triggered when a markdown file is viewed in the preview pane.
-    /// </summary>
-    [EventData]
-    public class PdfFilePreviewed : EventBase, IEvent
-    {
-        /// <inheritdoc/>
-        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
-    }
-}