this is still broken

* Fix borders for windows in the Settings UI

* Fix HOSTS window

* Fix Advanced Paste

* Fix Environment Variables

* Fix File Locksmith

* Fix Peek, with a caveat

* Fix Registry Preview

* Remove unused imports

* Clean up imports in OobeShellPage

* Move OSVersionHelper from Common.UI up into ManagedCommon

.configurations/configuration.dsc.yaml

@@ -12,7 +12,6 @@ properties:
       id: vsPackage
       directives:
         description: Install Visual Studio 2022 Community (Any edition will work)
-        allowPrerelease: true
       settings:
         id: Microsoft.VisualStudio.2022.Community
         source: winget

.configurations/configuration.vsEnterprise.dsc.yaml

@@ -12,7 +12,6 @@ properties:
       id: vsPackage
       directives:
         description: Install Visual Studio 2022 Enterprise (Any edition will work)
-        allowPrerelease: true
       settings:
         id: Microsoft.VisualStudio.2022.Enterprise
         source: winget

.configurations/configuration.vsProfessional.dsc.yaml

@@ -12,7 +12,6 @@ properties:
       id: vsPackage
       directives:
         description: Install Visual Studio 2022 Professional (Any edition will work)
-        allowPrerelease: true
       settings:
         id: Microsoft.VisualStudio.2022.Professional
         source: winget

.github/actions/spell-check/allow/code.txt

@@ -78,7 +78,14 @@ sinclairinat
 stylecop
 uipi
 yinwang
-
+myaccess
+onmicrosoft
+aep
+epsf
+howto
+onefuzzconfig
+oip
+onefuzzingestionpreparationtool
 
 # KEYS
 
@@ -246,3 +253,12 @@ pwa
 
 AOT
 Aot
+
+# YML
+onefuzz
+
+# NameInCode
+leilzh
+
+#Tools
+OIP

.github/actions/spell-check/allow/names.txt

@@ -46,6 +46,8 @@ betsegaw
 bricelam
 bsky
 CCcat
+chenmy
+chemwolf
 Chinh
 chrdavis
 Chrzan
@@ -63,6 +65,7 @@ Deondre
 DHowett
 ductdo
 Essey
+Feng
 ethanfangg
 ferraridavide
 frankychen
@@ -78,6 +81,7 @@ gordon
 grzhan
 Guo
 hanselman
+haoliuu
 Harmath
 Heiko
 Hemmerlein
@@ -92,6 +96,7 @@ Jaswal
 jefflord
 Jordi
 jyuwono
+kai
 Kairu
 Kamra
 Kantarci
@@ -109,6 +114,7 @@ Markovic
 martinchrzan
 martinmoene
 Melman
+Mengyuan
 Mikhayelyan
 msft
 Mykhailo
@@ -121,11 +127,13 @@ oldnewthing
 onegreatworld
 palenshus
 pedrolamas
+Peiyao
 peteblois
 phoboslab
 Ponten
 Pooja
 Pylyp
+Qingpeng
 quachpas
 Quriz
 randyrants
@@ -154,14 +162,23 @@ Taras
 TBM
 tilovell
 Triet
+urnotdfs
 waaverecords
+wang
 Whuihuan
+Xiaofeng
 Xpg
+Yaqing
+yaqingmi
 ycv
 yeelam
 Yuniardi
 yuyoyuppe
 Zeol
+Zhao
+Zhaopeng
+zhaopy
+zhaoqpcn
 Zoltan
 Zykova
 

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

@@ -24,6 +24,7 @@ AFeature
 AFFINETRANSFORM
 AFX
 AGGREGATABLE
+ahk
 AHybrid
 akv
 ALarger
@@ -644,6 +645,7 @@ imageresizerinput
 imageresizersettings
 imagingdevices
 ime
+Indo
 inetcpl
 Infobar
 INFOEXAMPLE
@@ -739,6 +741,7 @@ LExit
 lhwnd
 LIBID
 lindex
+linkid
 LINKOVERLAY
 LINQTo
 listview
@@ -752,7 +755,7 @@ lnks
 LOADFROMFILE
 LOBYTE
 LOCALDISPLAY
-LOCALPACKAGE
+localpackage
 LOCALSYSTEM
 LOCATIONCHANGE
 LOGFONT
@@ -1211,6 +1214,7 @@ QUEUESYNC
 QUNS
 RAII
 RAlt
+randi
 Rasterize
 RAWINPUTDEVICE
 RAWINPUTHEADER
@@ -1720,6 +1724,7 @@ WIC
 wifi
 wil
 winapi
+winappsdk
 wincodec
 Wincodecsdk
 wincolor
@@ -1844,5 +1849,3 @@ zonable
 zoneset
 Zoneszonabletester
 zzz
-
-

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

@@ -131,7 +131,7 @@ _mm_(?!dd)\w+
 
 # hit-count: 4 file-count: 4
 # microsoft
-\b(?:https?://|)(?:(?:(?:blogs|download\.visualstudio|developer|docs|msdn2?|research)\.|)microsoft|blogs\.msdn)\.co(?:m|\.\w\w)/[-_a-zA-Z0-9()=./%]*
+\b(?:https?://|)(?:(?:(?:blogs|download\.visualstudio|developer|docs|learn|msdn2?|research)\.|)microsoft|blogs\.msdn)\.co(?:m|\.\w\w)/[-_a-zA-Z0-9()=./%#]*
 
 aka\.ms/[a-zA-Z0-9]+
 

.pipelines/UpdateVersions.ps1

@@ -0,0 +1,130 @@
+Param(
+  # Using the default value of 1.6 for winAppSdkVersionNumber and useExperimentalVersion as false
+  [Parameter(Mandatory=$False,Position=1)]
+  [string]$winAppSdkVersionNumber = "1.6",
+
+  # When the pipeline calls the PS1 file, the passed parameters are converted to string type
+  [Parameter(Mandatory=$False,Position=2)]
+  [boolean]$useExperimentalVersion = $False
+)
+
+function Update-NugetConfig {
+    param (
+        [string]$filePath = "nuget.config"
+    )
+
+    Write-Host "Updating nuget.config file"
+    [xml]$xml = Get-Content -Path $filePath
+
+    # Add localpackages source into nuget.config
+    $packageSourcesNode = $xml.configuration.packageSources
+    $addNode = $xml.CreateElement("add")
+    $addNode.SetAttribute("key", "localpackages")
+    $addNode.SetAttribute("value", "localpackages")
+    $packageSourcesNode.AppendChild($addNode) | Out-Null
+
+    # Remove <packageSourceMapping> tag and its content
+    $packageSourceMappingNode = $xml.configuration.packageSourceMapping
+    if ($packageSourceMappingNode) {
+        $xml.configuration.RemoveChild($packageSourceMappingNode) | Out-Null
+    }
+
+    # print nuget.config after modification
+    $xml.OuterXml
+    # Save the modified nuget.config file
+    $xml.Save($filePath)
+}
+
+$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
+
+# Execute nuget list and capture the output
+if ($useExperimentalVersion) {
+    # The nuget list for experimental versions will cost more time
+    # So, we will not use -AllVersions to wast time
+    # But it can only get the latest experimental version
+    Write-Host "Fetching WindowsAppSDK with experimental versions"
+    $nugetOutput = nuget list Microsoft.WindowsAppSDK `
+        -Source  $sourceLink `
+        -Prerelease
+    # Filter versions based on the specified version prefix
+    $escapedVersionNumber = [regex]::Escape($winAppSdkVersionNumber)
+    $filteredVersions = $nugetOutput | Where-Object { $_ -match "Microsoft.WindowsAppSDK $escapedVersionNumber\." }
+    $latestVersions = $filteredVersions
+} else {
+    Write-Host "Fetching stable WindowsAppSDK versions for $winAppSdkVersionNumber"
+    $nugetOutput = nuget list Microsoft.WindowsAppSDK `
+        -Source $sourceLink `
+        -AllVersions
+    # Filter versions based on the specified version prefix
+    $escapedVersionNumber = [regex]::Escape($winAppSdkVersionNumber)
+    $filteredVersions = $nugetOutput | Where-Object { $_ -match "Microsoft.WindowsAppSDK $escapedVersionNumber\." }
+    $latestVersions = $filteredVersions | Sort-Object { [version]($_ -split ' ')[1] } -Descending | Select-Object -First 1
+}
+
+Write-Host "Latest versions found: $latestVersions"
+# Extract the latest version number from the output
+$latestVersion = $latestVersions -split "`n" | `
+    Select-String -Pattern 'Microsoft.WindowsAppSDK\s*([0-9]+\.[0-9]+\.[0-9]+-*[a-zA-Z0-9]*)' | `
+    ForEach-Object { $_.Matches[0].Groups[1].Value } | `
+    Sort-Object -Descending | `
+    Select-Object -First 1
+
+if ($latestVersion) {
+    $WinAppSDKVersion = $latestVersion
+    Write-Host "Extracted version: $WinAppSDKVersion"
+    Write-Host "##vso[task.setvariable variable=WinAppSDKVersion]$WinAppSDKVersion"
+} else {
+    Write-Host "Failed to extract version number from nuget list output"
+    exit 1
+}
+
+# Update packages.config files
+Get-ChildItem -Recurse packages.config | ForEach-Object {
+    $content = Get-Content $_.FullName -Raw
+    if ($content -match 'package id="Microsoft.WindowsAppSDK"') {
+        $newVersionString = 'package id="Microsoft.WindowsAppSDK" version="' + $WinAppSDKVersion + '"'
+        $oldVersionString = 'package id="Microsoft.WindowsAppSDK" version="[-.0-9a-zA-Z]*"'
+        $content = $content -replace $oldVersionString, $newVersionString
+        Set-Content -Path $_.FullName -Value $content
+        Write-Host "Modified " $_.FullName 
+    }
+}
+
+# Update Directory.Packages.props file
+$propsFile = "Directory.Packages.props"
+if (Test-Path $propsFile) {
+    $content = Get-Content $propsFile -Raw
+    if ($content -match '<PackageVersion Include="Microsoft.WindowsAppSDK"') {
+        $newVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="' + $WinAppSDKVersion + '" />'
+        $oldVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*" />'
+        $content = $content -replace $oldVersionString, $newVersionString
+        Set-Content -Path $propsFile -Value $content
+        Write-Host "Modified " $propsFile
+    }
+}
+
+# Update .vcxproj files
+Get-ChildItem -Recurse *.vcxproj | ForEach-Object {
+    $content = Get-Content $_.FullName -Raw
+    if ($content -match '\\Microsoft.WindowsAppSDK.') {
+        $newVersionString = '\Microsoft.WindowsAppSDK.' + $WinAppSDKVersion + '\'
+        $oldVersionString = '\\Microsoft.WindowsAppSDK.[-.0-9a-zA-Z]*\\'
+        $content = $content -replace $oldVersionString, $newVersionString
+        Set-Content -Path $_.FullName -Value $content
+        Write-Host "Modified " $_.FullName
+    }
+}
+
+# Update .csproj files
+Get-ChildItem -Recurse *.csproj | ForEach-Object {
+    $content = Get-Content $_.FullName -Raw
+    if ($content -match 'PackageReference Include="Microsoft.WindowsAppSDK"') {
+        $newVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="'+ $WinAppSDKVersion + '"'
+        $oldVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*"'
+        $content = $content -replace $oldVersionString, $newVersionString
+        Set-Content -Path $_.FullName -Value $content
+        Write-Host "Modified " $_.FullName 
+    }
+}
+
+Update-NugetConfig

.pipelines/loc/loc.yml

@@ -32,9 +32,9 @@ steps:
     TDBuildServiceConnection: $(TouchdownServiceConnection)
     authType: SubjectNameIssuer
     resourceFilePath: |
-     **\Resources.resx
-     **\Resource.resx
-     **\Resources.resw
+     src\**\Resources.resx
+     src\**\Resource.resx
+     src\**\Resources.resw
     outputDirectoryRoot: LocOutput
     appendRelativeDir: true
     pseudoSetting: Included

.pipelines/v2/ci-test-with-canary-webview2.yml

@@ -0,0 +1,42 @@
+trigger: none
+pr: none
+schedules:
+  - cron: "0 0 * * *" # every day at midnight
+    displayName: "Daily midnight Build"
+    branches:
+      include:
+        - main
+    always: false # only run if there's code changes!
+
+name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
+
+parameters:
+  - name: buildPlatforms
+    type: object
+    default:
+      - x64
+      - arm64
+  - name: enableMsBuildCaching
+    type: boolean
+    displayName: "Enable MSBuild Caching"
+    default: false
+  - name: runTests
+    type: boolean
+    displayName: "Run Tests"
+    default: true
+  - name: useVSPreview
+    type: boolean
+    displayName: "Build Using Visual Studio Preview"
+    default: false
+  - name: useLatestWebView2
+    type: boolean
+    default: false
+
+extends:
+  template: templates/pipeline-ci-build.yml
+  parameters:
+    buildPlatforms: ${{ parameters.buildPlatforms }}
+    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    runTests: ${{ parameters.runTests }}
+    useVSPreview: ${{ parameters.useVSPreview }}
+    useLatestWebView2: ${{ parameters.useLatestWebView2 }}

.pipelines/v2/ci-using-the-latest-winappsdk.yml

@@ -0,0 +1,50 @@
+trigger: none
+pr: none
+schedules:
+  - cron: "0 0 * * *" # every day at midnight
+    displayName: "Daily midnight Build"
+    branches:
+      include:
+        - main
+    always: false # only run if there's code changes!
+
+name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
+
+parameters:
+  - name: buildPlatforms
+    type: object
+    default:
+      - x64
+      - arm64
+  - name: enableMsBuildCaching
+    type: boolean
+    displayName: "Enable MSBuild Caching"
+    default: false
+  - name: runTests
+    type: boolean
+    displayName: "Run Tests"
+    default: true
+  - name: useVSPreview
+    type: boolean
+    displayName: "Build Using Visual Studio Preview"
+    default: false
+  - name: useLatestWinAppSDK
+    type: boolean
+    default: true
+  - name: winAppSDKVersionNumber
+    type: string
+    default: 1.6
+  - name: useExperimentalVersion
+    type: boolean
+    default: false
+
+extends:
+  template: templates/pipeline-ci-build.yml
+  parameters:
+    buildPlatforms: ${{ parameters.buildPlatforms }}
+    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    runTests: ${{ parameters.runTests }}
+    useVSPreview: ${{ parameters.useVSPreview }}
+    useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}
+    winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
+    useExperimentalVersion: ${{ parameters.useExperimentalVersion }}

.pipelines/v2/oneFuzz.yml

@@ -0,0 +1,55 @@
+pr: none
+trigger: none
+
+schedules:
+  - cron: "0 0 * * 1"
+    displayName: Weekly fuzzing submission
+    branches:
+      include:
+        - main
+    always: true
+name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
+
+parameters:
+  - name: platform
+    type: string
+    default: x64 # for fuzzing, we only use x64 for now
+  - name: enableMsBuildCaching
+    type: boolean
+    displayName: "Enable MSBuild Caching"
+    default: false
+  - name: useVSPreview
+    type: boolean
+    displayName: "Build Using Visual Studio Preview"
+    default: false
+
+stages:
+  - stage: Build_${{ parameters.platform }}
+    displayName: Build ${{ parameters.platform }}
+    jobs:
+      - template: templates/job-build-project.yml
+        parameters:
+          pool:
+            ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
+              name: SHINE-INT-L
+            ${{ else }}:
+              name: SHINE-OSS-L
+            ${{ if eq(parameters.useVSPreview, true) }}:
+              demands: ImageOverride -equals SHINE-VS17-Preview
+          buildPlatforms:
+            - ${{ parameters.platform }}
+          buildConfigurations: [Release]
+          enablePackageCaching: true
+          enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+          runTests: true
+          useVSPreview: ${{ parameters.useVSPreview }}
+
+  - stage: OneFuzz
+    displayName: Fuzz ${{ parameters.platform }}
+    dependsOn:
+      - Build_${{parameters.platform}}
+    jobs:
+      - template: templates/job-fuzz.yml
+        parameters:
+          platform: ${{ parameters.platform }}
+          configuration: Release

.pipelines/v2/templates/job-build-project.yml

@@ -56,6 +56,15 @@ parameters:
   - name: versionNumber
     type: string
     default: '0.0.1'
+  - name: useLatestWinAppSDK
+    type: boolean
+    default: false
+  - name: winAppSDKVersionNumber
+    type: string
+    default: 1.6
+  - name: useExperimentalVersion
+    type: boolean
+    default: false
   - name: csProjectsToPublish
     type: object
     default:
@@ -102,6 +111,10 @@ jobs:
     ${{ else }}:
       MSBuildMainBuildTargets: Build
     ${{ insert }}: ${{ parameters.variables }}
+    ${{ if eq(parameters.useLatestWinAppSDK, true) }}:
+      RestoreAdditionalProjectSourcesArg: '/p:RestoreAdditionalProjectSources="$(Build.SourcesDirectory)\localpackages\NugetPackages"'
+    ${{ else }}:
+      RestoreAdditionalProjectSourcesArg: ''
   displayName: Build
   timeoutInMinutes: 240
   cancelTimeoutInMinutes: 1
@@ -134,6 +147,11 @@ jobs:
       sdk: true
       version: '6.0'
 
+  - template: steps-ensure-dotnet-version.yml
+    parameters:
+      sdk: true
+      version: '8.0'
+
   - template: steps-ensure-dotnet-version.yml
     parameters:
       sdk: true
@@ -177,8 +195,15 @@ jobs:
            "packages.config" | "$(Agent.OS)"
            "packages.config"
         path: packages
-
-  - template: .\steps-restore-nuget.yml
+  
+  - ${{ if eq(parameters.useLatestWinAppSDK, true)}}:
+    - template: .\steps-update-winappsdk-and-restore-nuget.yml
+      parameters:
+        versionNumber: ${{ parameters.winAppSDKVersionNumber }}
+        useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
+  
+  - ${{ if eq(parameters.useLatestWinAppSDK, false)}}:
+    - template: .\steps-restore-nuget.yml
 
   - pwsh: |-
       & "$(build.sourcesdirectory)\.pipelines\verifyAndSetLatestVCToolsVersion.ps1"
@@ -209,6 +234,7 @@ jobs:
         ${{ parameters.additionalBuildOptions }}
         $(MSBuildCacheParameters)
         /t:$(MSBuildMainBuildTargets)
+        $(RestoreAdditionalProjectSourcesArg)
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
       msbuildArchitecture: x64
@@ -233,10 +259,11 @@ 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
+        /p:NoWarn=NU5104
+        $(RestoreAdditionalProjectSourcesArg)
       configuration: $(BuildConfiguration)
       msbuildArchitecture: x64
       maximumCpuCount: true
@@ -249,10 +276,11 @@ 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
+        /p:NoWarn=NU5104
+        $(RestoreAdditionalProjectSourcesArg)
       configuration: $(BuildConfiguration)
       msbuildArchitecture: x64
       maximumCpuCount: true
@@ -265,10 +293,11 @@ 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
+        /p:NoWarn=NU5104
+        $(RestoreAdditionalProjectSourcesArg)
       configuration: $(BuildConfiguration)
       msbuildArchitecture: x64
       maximumCpuCount: true
@@ -323,6 +352,7 @@ jobs:
         /bl:$(LogOutputDirectory)\build-bug-report.binlog
         ${{ parameters.additionalBuildOptions }}
         $(MSBuildCacheParameters)
+        $(RestoreAdditionalProjectSourcesArg)
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
       msbuildArchitecture: x64
@@ -343,6 +373,7 @@ jobs:
         /bl:$(LogOutputDirectory)\build-webcam-report.binlog
         ${{ parameters.additionalBuildOptions }}
         $(MSBuildCacheParameters)
+        $(RestoreAdditionalProjectSourcesArg)
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
       msbuildArchitecture: x64
@@ -363,6 +394,7 @@ jobs:
         /bl:$(LogOutputDirectory)\build-styles-report.binlog
         ${{ parameters.additionalBuildOptions }}
         $(MSBuildCacheParameters)
+        $(RestoreAdditionalProjectSourcesArg)
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
       msbuildArchitecture: x64
@@ -385,6 +417,7 @@ jobs:
           /p:PowerToysRoot=$(Build.SourcesDirectory)
           /p:PublishProfile=InstallationPublishProfile.pubxml
           /bl:$(LogOutputDirectory)\publish-${{ join('_',split(project, '/')) }}.binlog
+          $(RestoreAdditionalProjectSourcesArg)
         platform: $(BuildPlatform)
         configuration: $(BuildConfiguration)
         msbuildArchitecture: x64
@@ -414,9 +447,11 @@ jobs:
       & '.pipelines/verifyPossibleAssetConflicts.ps1' -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)\WinUI3Apps'
     displayName: Audit WinAppSDK applications path asset conflicts
 
-  - pwsh: |-
-      & '.pipelines/verifyNoticeMdAgainstNugetPackages.ps1' -path '$(build.sourcesdirectory)\'
-    displayName: Verify NOTICE.md and NuGet packages match
+  # To streamline the pipeline and prevent errors, skip this step during compatibility tests with the latest WinAppSDK.
+  - ${{ if eq(parameters.useLatestWinAppSDK, false) }}:
+    - pwsh: |-
+        & '.pipelines/verifyNoticeMdAgainstNugetPackages.ps1' -path '$(build.sourcesdirectory)\'
+      displayName: Verify NOTICE.md and NuGet packages match
 
   - ${{ if eq(parameters.runTests, true) }}:
     # Publish test results which ran in MSBuild

.pipelines/v2/templates/job-fuzz.yml

@@ -0,0 +1,36 @@
+parameters:
+  - name: configuration
+    type: string
+    default: "Release"
+  - name: platform
+    type: string
+    default: ""
+  - name: inputArtifactStem
+    type: string
+    default: ""
+
+jobs:
+  - job: OneFuzz
+    pool:
+      vmImage: windows-2022
+    variables:
+      ArtifactName: build-${{ parameters.platform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}
+    steps:
+      - checkout: self
+        submodules: false
+        clean: true
+        fetchDepth: 1
+        fetchTags: false
+
+      - download: current
+        displayName: Download artifacts
+        artifact: $(ArtifactName)
+        patterns: |-
+          **/tests/*.FuzzTests/**
+
+      - task: onefuzz-task@0
+        inputs:
+          onefuzzOSes: Windows
+        env:
+          onefuzzDropDirectory: $(Pipeline.Workspace)\$(ArtifactName)\x64\Release\x64\Release\tests
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)

.pipelines/v2/templates/job-test-project.yml

@@ -8,6 +8,9 @@ parameters:
   - name: inputArtifactStem
     type: string
     default: ""
+  - name: useLatestWebView2
+    type: boolean
+    default: false
 
 jobs:
 - job: Test${{ parameters.platform }}${{ parameters.configuration }}
@@ -34,6 +37,29 @@ jobs:
     fetchDepth: 1
     fetchTags: false
 
+  - ${{ if eq(parameters.useLatestWebView2, true) }}:
+    - powershell: |
+        $edge_url = 'https://go.microsoft.com/fwlink/?linkid=2084649&Channel=Canary&language=en'
+        $timeout = New-TimeSpan -Minutes 6
+        $timeoutSeconds = [int]$timeout.TotalSeconds
+        $command = {
+            Invoke-WebRequest -Uri $using:edge_url -OutFile $(Pipeline.Workspace)\MicrosoftEdgeSetup.exe
+            Write-Host "##[command]Installing Canary channel of Microsoft Edge"
+            Start-Process $(Pipeline.Workspace)\MicrosoftEdgeSetup.exe -ArgumentList '/silent /install' -Wait
+        }
+
+        $job = Start-Job -ScriptBlock $command
+        Wait-Job $job -Timeout $timeoutSeconds
+        if ($job.State -eq "Running") {
+            Stop-Job $job
+            Write-Host "##[warning]The job was stopped because it exceeded the time limit."
+        }
+      displayName: "Install the latest MSEdge Canary"
+
+    - script: 
+        reg add "HKLM\Software\Policies\Microsoft\Edge\WebView2\ReleaseChannels" /v PowerToys.exe /t REG_SZ /d "3"
+      displayName: "Enable WebView2 Canary Channel"
+      
   - download: current
     displayName: Download artifacts
     artifact: build-${{ parameters.platform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}

.pipelines/v2/templates/pipeline-ci-build.yml

@@ -22,6 +22,18 @@ parameters:
   - name: useVSPreview
     type: boolean
     default: false
+  - name: useLatestWebView2
+    type: boolean
+    default: false
+  - name: useLatestWinAppSDK
+    type: boolean
+    default: false
+  - name: winAppSDKVersionNumber
+    type: string
+    default: 1.6
+  - name: useExperimentalVersion
+    type: boolean
+    default: false
 
 stages:
   # Allow manual builds to skip pre-check
@@ -55,6 +67,10 @@ stages:
             enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
             runTests: ${{ parameters.runTests }}
             useVSPreview: ${{ parameters.useVSPreview }}
+            useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}
+            ${{ if eq(parameters.useLatestWinAppSDK, true) }}:
+              winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
+              useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
 
     - ${{ if eq(parameters.runTests, true) }}:
       - stage: Test_${{ platform }}
@@ -66,3 +82,4 @@ stages:
             parameters:
               platform: ${{ platform }}
               configuration: Release
+              useLatestWebView2: ${{ parameters.useLatestWebView2 }}

.pipelines/v2/templates/steps-ensure-dotnet-version.yml

@@ -16,6 +16,10 @@ parameters:
 steps:
 - pwsh: |-
     curl.exe -J -L -O "https://dot.net/v1/dotnet-install.ps1"
+    if (-not (Test-Path dotnet-install.ps1)) {
+      Write-Error "Failed to download dotnet-install.ps1"
+      exit 1
+    }
     $NEW_DOTNET_ROOT = "$(Agent.ToolsDirectory)\dotnet"
     & ./dotnet-install.ps1 -Channel "${{parameters.version}}" -InstallDir $NEW_DOTNET_ROOT
     Write-Host "##vso[task.setvariable variable=DOTNET_ROOT]${NEW_DOTNET_ROOT}"
@@ -25,3 +29,4 @@ steps:
     displayName: "Install .NET ${{parameters.version}} SDK"
   ${{ else }}:
     displayName: "Install .NET ${{parameters.version}}"
+  retryCountOnTaskFailure: 3

.pipelines/v2/templates/steps-update-winappsdk-and-restore-nuget.yml

@@ -0,0 +1,56 @@
+parameters:
+  - name: versionNumber
+    type: string
+    default: 1.6
+  - name: useExperimentalVersion
+    type: boolean
+    default: false
+
+steps:
+- task: NuGetAuthenticate@1
+  displayName: 'NuGet Authenticate'
+
+- task: PowerShell@2
+  displayName: Update WinAppSDK Versions
+  inputs:
+    filePath: '$(build.sourcesdirectory)\.pipelines\UpdateVersions.ps1'
+    arguments: >
+      -winAppSdkVersionNumber ${{ parameters.versionNumber }}
+      -useExperimentalVersion $${{ parameters.useExperimentalVersion }}
+
+- script: echo $(WinAppSDKVersion)
+  displayName: 'Display WinAppSDK Version Found'
+
+- task: DownloadPipelineArtifact@2
+  displayName: 'Download WindowsAppSDK'
+  inputs:
+    buildType: 'specific'
+    project: '55e8140e-57ac-4e5f-8f9c-c7c15b51929d'
+    definition: '104083'
+    buildVersionToDownload: 'latestFromBranch'
+    branchName: 'refs/heads/release/${{ parameters.versionNumber }}-stable'
+    artifactName: 'WindowsAppSDK_Nuget_And_MSIX'
+    targetPath: '$(Build.SourcesDirectory)\localpackages'
+
+- script: dir $(Build.SourcesDirectory)\localpackages\NugetPackages
+  displayName: 'List downloaded packages'
+
+- task: NuGetCommand@2
+  displayName: 'Install WindowsAppSDK'
+  inputs:
+    command: 'custom'
+    arguments: >
+      install "Microsoft.WindowsAppSDK"
+      -Source "$(Build.SourcesDirectory)\localpackages\NugetPackages"
+      -Version "$(WinAppSDKVersion)"
+      -OutputDirectory "$(Build.SourcesDirectory)\localpackages\output"
+      -FallbackSource "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
+
+- task: NuGetCommand@2
+  displayName: 'Restore NuGet packages'
+  inputs:
+    command: 'restore'
+    feedsToUse: 'config'
+    nugetConfigPath: '$(build.sourcesdirectory)\nuget.config'
+    restoreSolution: '$(build.sourcesdirectory)\**\*.sln'
+    includeNuGetOrg: false

.pipelines/verifyDepsJsonLibraryVersions.ps1

@@ -15,7 +15,7 @@ Param(
 $referencedFileVersionsPerDll = @{}
 $totalFailures = 0
 
-Get-ChildItem $targetDir -Recurse -Filter *.deps.json -Exclude UITests-FancyZones*,MouseJump.Common.UnitTests* | ForEach-Object {
+Get-ChildItem $targetDir -Recurse -Filter *.deps.json -Exclude UITests-FancyZones*,MouseJump.Common.UnitTests*,AdvancedPaste.FuzzTests* | ForEach-Object {
     # Temporarily exclude FancyZones UI tests because of Appium.WebDriver dependencies
     $depsJsonFullFileName = $_.FullName
     $depsJsonFileName = $_.Name

COMMUNITY.md

@@ -181,6 +181,14 @@ Other contributors:
 - [@shuaiyuanxx](https://github.com/shuaiyuanxx) - Shawn Yuan - Dev
 - [@moooyo](https://github.com/moooyo) - Yu Leng - Dev
 - [@haoliuu](https://github.com/haoliuu) - Hao Liu - Dev
+- [@chenmy77](https://github.com/chenmy77) - Mengyuan Chen - Dev
+- [@chemwolf6922](https://github.com/chemwolf6922) - Feng Wang - Dev
+- [@yaqingmi](https://github.com/yaqingmi) - Yaqing Mi - Dev
+- [@zhaoqpcn](https://github.com/zhaoqpcn) - Qingpeng Zhao - Dev
+- [@urnotdfs](https://github.com/urnotdfs) - Xiaofeng Wang - Dev
+- [@zhaopy536](https://github.com/zhaopy536) - Peiyao Zhao - Dev
+- [@wang563681252](https://github.com/wang563681252) - Zhaopeng Wang - Dev
+- [@vanzue](https://github.com/vanzue) - Kai Tao - Dev
 
 # Former PowerToys core team members
 

Directory.Packages.props

@@ -22,7 +22,7 @@
     <PackageVersion Include="hyjiacan.pinyin4net" Version="4.1.1" />
     <PackageVersion Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0.2" />
     <PackageVersion Include="LazyCache" Version="2.4.0" />
-    <PackageVersion Include="Mages" Version="2.0.2" />
+    <PackageVersion Include="Mages" Version="3.0.0" />
     <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" />

NOTICE.md

@@ -1315,7 +1315,7 @@ EXHIBIT A -Mozilla Public License.
 - hyjiacan.pinyin4net 4.1.1
 - Interop.Microsoft.Office.Interop.OneNote 1.1.0.2
 - LazyCache 2.4.0
-- Mages 2.0.2
+- Mages 3.0.0
 - Markdig.Signed 0.34.0
 - MessagePack 2.5.187
 - Microsoft.Bcl.AsyncInterfaces 9.0.0

PowerToys.sln

@@ -179,7 +179,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
 		src\Monaco.props = src\Monaco.props
-		Solution.props = Solution.props
+		src\Solution.props = src\Solution.props
 		src\Version.props = src\Version.props
 	EndProjectSection
 EndProject
@@ -637,6 +637,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewPlus.ShellExtension.win1
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.FuzzTests", "src\modules\AdvancedPaste\AdvancedPaste.FuzzTests\AdvancedPaste.FuzzTests.csproj", "{7F5B9557-5878-4438-A721-3E28296BA193}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2821,6 +2823,18 @@ Global
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Release|x64.Build.0 = Release|x64
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Release|x86.ActiveCfg = Release|x64
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Release|x86.Build.0 = Release|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Debug|ARM64.Build.0 = Debug|ARM64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Debug|x64.ActiveCfg = Debug|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Debug|x64.Build.0 = Debug|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Debug|x86.ActiveCfg = Debug|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Debug|x86.Build.0 = Debug|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Release|ARM64.ActiveCfg = Release|ARM64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Release|ARM64.Build.0 = Release|ARM64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Release|x64.ActiveCfg = Release|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Release|x64.Build.0 = Release|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Release|x86.ActiveCfg = Release|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Release|x86.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3055,6 +3069,7 @@ Global
 		{89D0E199-B17A-418C-B2F8-7375B6708357} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E} = {CA716AE6-FE5C-40AC-BB8F-2C87912687AC}
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE} = {9873BA05-4C41-4819-9283-CF45D795431B}
+		{7F5B9557-5878-4438-A721-3E28296BA193} = {9873BA05-4C41-4819-9283-CF45D795431B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

README.md

@@ -1,6 +1,6 @@
 # Microsoft PowerToys
 
-![Hero image for Microsoft PowerToys](doc/images/overview/PT_holiday_hero_image.png)
+![Hero image for Microsoft PowerToys](doc/images/overview/PT_hero_image.png)
 
 [How to use PowerToys][usingPowerToys-docs-link] | [Downloads & Release notes][github-release-link] | [Contributing to PowerToys](#contributing) | [What's Happening](#whats-happening) | [Roadmap](#powertoys-roadmap)
 
@@ -20,12 +20,6 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 | [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) | [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) |
 | [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [Video Conference Mute](https://aka.ms/PowerToysOverview_VideoConference) | [Workspaces](https://aka.ms/PowerToysOverview_Workspaces) |
 
-## 🎁⭐ PowerToys Advent calendar ⭐🎁
-
-We will be highlighting a cool utility each day for 24 days in December! To follow along, check out these threads:
-- https://bsky.app/profile/kaylacinnamon.bsky.social/post/3lcb7iljxck2o
-- https://x.com/cinnamon_msft/status/1863284610773246257
-
 ## Installing and running Microsoft PowerToys
 
 ### Requirements
@@ -40,19 +34,19 @@ We will be highlighting a cool utility each day for 24 days in December! To foll
 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.88%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.87%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.87.1/PowerToysUserSetup-0.87.1-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.87.1/PowerToysUserSetup-0.87.1-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.87.1/PowerToysSetup-0.87.1-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.87.1/PowerToysSetup-0.87.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.87.1-x64.exe][ptUserX64] | 8EFAF47ED00BF230D2C2CC3CB6765C903A6A47E0AAED0BBB329CEF918207B486 |
+| Per user - ARM64     | [PowerToysUserSetup-0.87.1-arm64.exe][ptUserArm64] | 212FC8055789BD2DC4DE554B9AEE291A9C077907E263A302939266263A9D512B |
+| Machine wide - x64   | [PowerToysSetup-0.87.1-x64.exe][ptMachineX64] | 69AD65DDAC6436AEF292D2CC6AB1530021CE98083CB3F5FD3380A52A3B0DBB9A |
+| Machine wide - ARM64 | [PowerToysSetup-0.87.1-arm64.exe][ptMachineArm64] | AEC9F1D02F1E23F0C1FCFDF95C337C962902394F44C0568012DF78BEDB45CF19 |
 
 This is our preferred method.
 
@@ -98,103 +92,115 @@ 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.87 - December 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.
 
-### 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)!
+ - Advanced Paste has a new feature called "Advanced AI" that uses Semantic Kernel to allow setting up the orchestration of sequential clipboard transformations.
+ - Workspaces supports Progressive Web Applications.
+ - Workspaces has a new feature to move existing windows instead of creating new ones.
+ - Mouse Jump added new settings to allow customization of screens pop-up. Thanks [@mikeclayton](https://github.com/mikeclayton)!
+ - New+ now works on Windows 10. Thanks [@cgaarden](https://github.com/cgaarden)!
+ - Quick Accent allows selecting the character sets that should appear on the UI. Thanks [@Sirozha1337](https://github.com/Sirozha1337)!
 
 ### Advanced Paste
 
- - Added new built-in actions: Image to text, and paste txt, png or html as a file.
+ - Added a new optional feature allowing using AI to set up the orchestration of sequential clipboard transformations.
+
+### Awake
+
+ - Initialization, logging and tray icon setup improvements. Thanks [@dend](https://github.com/dend)!
+
+### File Explorer add-ons
+
+ - Preview Pane extensions now use the PerMonitorV2 DPI mode to fix errors on different scales. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+
+### Keyboard Manager.
+
+ - Added labels to the IME On, IME Off keys. Thanks [@kit494way](https://github.com/kit494way)!
+ - Fixed an issue that caused the Shift key to remain stuck if a numpad key was mapped to the Shift key.
+
+### Monaco Preview
+
+ - Added support for .ahk files to be shown as a plaintext file in Peek and File Explorer add-ons. Thanks [@daverayment](https://github.com/daverayment)!
+ - Added support for .ion files to be shown as a plaintext file in Peek and File Explorer add-ons. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!
+ - Added support for syntax highlighting for .srt files in Peek and File Explorer add-ons. Thanks [@PesBandi](https://github.com/PesBandi)!
 
 ### Mouse Jump
 
- - 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.
-
-### Mouse Without Borders
-
- - Refactored the Logger common classes. Thanks [@mikeclayton](https://github.com/mikeclayton)!
+ - Allow customizing the appearance of the UI of the Mouse Jump pop-up. Thanks [@mikeclayton](https://github.com/mikeclayton)!
 
 ### 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.
+ - Added support for Windows 10. Thanks [@cgaarden](https://github.com/cgaarden)!
+ - Fixed an issue causing the renaming of new files to not trigger some times. Thanks [@cgaarden](https://github.com/cgaarden)!
+ - Updated the New+ icons. Thanks [@niels9001](https://github.com/niels9001)!
 
 ### Peek
 
- - Folder preview enumeration of size and number of files is now more responsive and faster. Thanks [@daverayment](https://github.com/daverayment)!
+ - Peek now checks local capabilities to decide what image formats Image Previewer is able to support. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed an issue causing the Code Files Previewer to not load correctly under certain conditions. Thanks [@daverayment](https://github.com/daverayment)!
+ - Refactored, improved and fixed logging when loading the user settings file. 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)!
+ - Added a scoring function for proper ordering of the WindowWalker plugin results. Thanks [@andbartol](https://github.com/andbartol)!
+ - Added UUIDv7 support to the ValueGenerator plugin. Thanks [@frederik-hoeft](https://github.com/frederik-hoeft)!
+ - The calculator plugin now allows scientific notation numbers with a lowercase 'e'. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Ported the UI from WPF-UI to .NET 9 WPF, to fix "Desktop composition is disabled" crashes.
 
 ### Quick Accent
 
- - Added support for the Serbian Cyrillic character set. Thanks [@Sirozha1337](https://github.com/Sirozha1337)!
+ - Added a setting to allow selecting which character sets to show. Thanks [@Sirozha1337](https://github.com/Sirozha1337)!
 
-### Registry Preview
+### Screen Ruler
 
- - Adopted the Monaco Editor as the UI text editor. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Added a Setting to also allow showing measurements in inches, centimeters or millimeters. Thanks [@Sophanatprime](https://github.com/Sophanatprime)!
 
 ### 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 an issue causing all the links to milestones in the "What's new?" OOBE page to point to the same milestone.
+ - Removed extra space from the Welcome page. Thanks [@agarwalishita](https://github.com/agarwalishita)!
+ - Updated left navigation bar icons. Thanks [@niels9001](https://github.com/niels9001)!
+ - Fixed accessibility issues in the dashboard page. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
 
 ### 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.
+ - Added support for Progressive Web Applications to Workspaces.
+ - Implemented a feature to move existing windows instead of creating new ones.
+ - Fixed a crash when opening the workspaces editor that was caused by passing incorrect encoder parameters when saving Bitmap files.
+ - Workspaces editor position is now saved so that we can start it at the same position when we open it again.
+ - Fixed an issue causing many instances of the same application to be put in the same position instead of the intended position due to timer issues.
+ - Fixed detection of exact application version when many versions of the same application are installed.
 
 ### 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.
+ - Improved language in CONTRIBUTE.md. Thanks [@sanskaarz](https://github.com/sanskaarz)!
+ - Added Bilibili plugin mention to thirdPartyRunPlugins.md. Thanks [@Whuihuan](https://github.com/Whuihuan)!
+ - Added CanIUse and TailwindCSS plugins mention to thirdPartyRunPlugins.md. Thanks [@skttl](https://github.com/skttl)!
+ - Added HttpStatusCodes plugin mention to thirdPartyRunPlugins.md. Thanks [@grzhan](https://github.com/grzhan)!
+ - Updated COMMUNITY.md with more contributors.
 
 ### 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 to .NET 9. Thanks [@snickler](https://github.com/snickler)!
+ - Fixed building on Visual Studio 17.12.
+ - Upgraded the System.IO.Abstractions dependency to 21.0.29. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Upgraded the WindowsAppSDK dependency to 1.6.241114003. Thanks [@shuaiyuanxx](https://github.com/shuaiyuanxx)!
+ - Upgraded the MSTest dependency to 3.6.3. Thanks [@Youssef1313](https://github.com/Youssef1313)!
+ - Upgraded the check-spelling CI dependency to 0.0.24 and fixed related spell checking issues. Thanks [@jsoref](https://github.com/jsoref)!
+ - Removed duplicate names from the spellcheck allowed names file. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Improved logging of asynchronous methods call stacks when logging an error.
+ - Created a MSBuild props file to be imported by other projects to enable AOT support.
+ - Made the Peek utility source code AOT compatible.
+ - Updated .editorconfig rules to relax squiggly IDE errors in Visual Studio 17.12. Thanks [@snickler](https://github.com/snickler)!
+ - Moved Xaml.Styler from the root to the src folder.
 
-#### What is being planned for version 0.87
+#### What is being planned for version 0.88
 
-For [v0.87][github-next-release-work], we'll work on the items below:
+For [v0.88][github-next-release-work], we'll work on the items below:
 
  - Stability / bug fixes
  - New module: File Actions Menu

doc/devdocs/modules/launcher/new-plugin-checklist.md

@@ -16,7 +16,7 @@
   "Author": string,
   "Version": "1.0.0", // For future compatibility
   "Language": "csharp", // So far we support only csharp 
-  "Website": "https://aka.ms/powertoys",
+  "Website": "https://aka.ms/powertoys", // Has to be an absolute uri starting with "http://" or "https://".
   "ExecuteFileName": string, // Should be {Type}.PowerToys.Run.Plugin.{PluginName}.dll
   "IcoPathDark": string, // Path to dark theme icon. The path is relative to the root plugin folder 
   "IcoPathLight": string // Path to light theme icon. The path is relative to the root plugin folder
@@ -42,3 +42,4 @@ In the PR that adds a new plugin, reference a new issue to track the work for fu
 
 - [ ] Add the resource folder to https://github.com/microsoft/PowerToys/blob/21247c0bb09a1bee3d14d6efa53d0c247f7236af/installer/PowerToysSetup/Product.wxs#L825
 - [ ] Add the resource files under the section https://github.com/microsoft/PowerToys/blob/21247c0bb09a1bee3d14d6efa53d0c247f7236af/installer/PowerToysSetup/Product.wxs#L882
+- [ ] Your plugin's executable file (DLL) has to have correct version informations after building it. (This version information will be shown on the settings page.)

src/Monaco/monacoSpecialLanguages.js

@@ -7,7 +7,7 @@ import { srtDefinition } from './customLanguages/srt.js';
 export async function registerAdditionalLanguages(monaco){
     await languageDefinitions();
     registerAdditionalLanguage("cppExt", [".ino", ".pde"], "cpp", monaco);
-    registerAdditionalLanguage("xmlExt", [".wsdl", ".csproj", ".vcxproj", ".vbproj", ".fsproj"], "xml", monaco);
+    registerAdditionalLanguage("xmlExt", [".wsdl", ".csproj", ".vcxproj", ".vbproj", ".fsproj", ".resx", ".resw"], "xml", monaco);
     registerAdditionalLanguage("txtExt", [".sln", ".log", ".vsconfig", ".env", ".ahk", ".ion"], "txt", monaco);
     registerAdditionalLanguage("razorExt", [".razor"], "razor", monaco);
     registerAdditionalLanguage("vbExt", [".vbs"], "vb", monaco);

src/common/FilePreviewCommon/FilePreviewCommon.csproj

@@ -2,6 +2,7 @@
   <!-- Look at Directory.Build.props in root for common stuff as well -->
   <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
   <Import Project="..\..\Monaco.props" />
+  <Import Project="..\..\Common.Dotnet.AotCompatibility.props" />
 
   <PropertyGroup>
     <Description>PowerToys FilePreviewCommon</Description>

src/common/FilePreviewCommon/Formatters/FilePreviewJsonSerializerContext.cs

@@ -0,0 +1,14 @@
+// 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.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.PowerToys.FilePreviewCommon.Monaco.Formatters;
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(JsonDocument))]
+internal sealed partial class FilePreviewJsonSerializerContext : JsonSerializerContext
+{
+}

src/common/FilePreviewCommon/Formatters/JsonFormatter.cs

@@ -14,7 +14,6 @@ namespace Microsoft.PowerToys.FilePreviewCommon.Monaco.Formatters
 
         private static readonly JsonSerializerOptions _serializerOptions = new JsonSerializerOptions
         {
-            WriteIndented = true,
             Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
         };
 
@@ -28,7 +27,8 @@ namespace Microsoft.PowerToys.FilePreviewCommon.Monaco.Formatters
 
             using (var jDocument = JsonDocument.Parse(value, new JsonDocumentOptions { CommentHandling = JsonCommentHandling.Skip }))
             {
-                return JsonSerializer.Serialize(jDocument, _serializerOptions);
+                FilePreviewJsonSerializerContext context = new(_serializerOptions);
+                return JsonSerializer.Serialize(jDocument, context.JsonDocument);
             }
         }
     }

src/common/FilePreviewCommon/MonacoHelper.cs

@@ -6,9 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Reflection;
 using System.Text.Json;
-
 using Microsoft.PowerToys.FilePreviewCommon.Monaco.Formatters;
 
 namespace Microsoft.PowerToys.FilePreviewCommon
@@ -38,15 +36,15 @@ namespace Microsoft.PowerToys.FilePreviewCommon
 
         private static string GetRuntimeMonacoDirectory()
         {
-            string exePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty;
+            string baseDirectory = AppContext.BaseDirectory ?? string.Empty;
 
             // If the executable is within "WinUI3Apps", correct the path first.
-            if (Path.GetFileName(exePath) == "WinUI3Apps")
+            if (Path.GetFileName(baseDirectory) == "WinUI3Apps")
             {
-                exePath = Path.Combine(exePath, "..");
+                baseDirectory = Path.Combine(baseDirectory, "..");
             }
 
-            string monacoPath = Path.Combine(exePath, "Assets", "Monaco");
+            string monacoPath = Path.Combine(baseDirectory, "Assets", "Monaco");
 
             return Directory.Exists(monacoPath) ?
                 monacoPath :

src/common/ManagedCommon/NativeMethods.cs

@@ -42,6 +42,9 @@ namespace ManagedCommon
         [DllImport("user32.dll")]
         internal static extern uint SendInput(uint nInputs, INPUT[] pInputs, int cbSize);
 
+        [DllImport("dwmapi")]
+        internal static extern IntPtr DwmExtendFrameIntoClientArea(IntPtr hWnd, ref MARGINS pMarInset);
+
         [StructLayout(LayoutKind.Sequential)]
         public struct INPUT
         {
@@ -100,5 +103,14 @@ namespace ManagedCommon
             INPUT_KEYBOARD = 1,
             INPUT_HARDWARE = 2,
         }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct MARGINS
+        {
+            public int cxLeftWidth;
+            public int cxRightWidth;
+            public int cyTopHeight;
+            public int cyBottomHeight;
+        }
     }
 }

src/common/ManagedCommon/OSVersionHelper.cs

@@ -4,10 +4,15 @@
 
 using System;
 
-namespace Common.UI
+namespace ManagedCommon
 {
     public static class OSVersionHelper
     {
+        public static bool IsWindows10()
+        {
+            return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Minor < 22000;
+        }
+
         public static bool IsWindows11()
         {
             return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= 22000;

src/common/ManagedCommon/WindowHelpers.cs

@@ -35,5 +35,20 @@ namespace ManagedCommon
                 }
             }
         }
+
+        /// <summary>
+        /// Workaround for a WinUI bug on Windows 10 in which a window's top border is always
+        /// black. Calls <c>DwmExtendFrameIntoClientArea()</c> with a <c>cyTopHeight</c> of 2 to force
+        /// the window's top border to be visible.<br/><br/>
+        /// Is a no-op on versions other than Windows 10.
+        /// </summary>
+        public static void ForceTopBorder1PixelInsetOnWindows10(IntPtr handle)
+        {
+            if (OSVersionHelper.IsWindows10())
+            {
+                var margins = new NativeMethods.MARGINS { cxLeftWidth = 0, cxRightWidth = 0, cyBottomHeight = 0, cyTopHeight = 2 };
+                NativeMethods.DwmExtendFrameIntoClientArea(handle, ref margins);
+            }
+        }
     }
 }

src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/AdvancedPaste.FuzzTests.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+		<LangVersion>latest</LangVersion>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+	<PropertyGroup>
+		<OutputPath>..\..\..\..\$(Platform)\$(Configuration)\tests\AdvancedPaste.FuzzTests\</OutputPath>
+	</PropertyGroup>
+	<ItemGroup>
+		<Compile Include="..\AdvancedPaste\Helpers\JsonHelper.cs" Link="JsonHelper.cs" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="MSTest" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
+	</ItemGroup>
+	<ItemGroup>
+		<Content Include="OneFuzzConfig.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+</Project>

src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/Fuzz.md

@@ -0,0 +1,45 @@
+# Fuzzing .NET Code with OneFuzz
+
+This document explains the purpose of the project, the rationale for using specific technologies, and key instructions for fuzz testing .NET code using OneFuzz.
+
+## Overview
+
+This project demonstrates fuzz testing for .NET applications. It uses a `.NET 8 (Windows)` project where a code file is linked to the project. The linked file contains the functions required for fuzz testing.
+
+## Why Use .NET 8 (Windows)?
+
+1. **Current Support**: At the time of writing, OneFuzz supports only .NET 8 projects. The Fuzz team is actively working on .NET 9 support.
+2. **Interim Solution**: Until .NET 9 support is available, .NET 8 serves as a robust and temporary solution for fuzz testing, enabling direct code linking for efficient development.
+
+## Requesting Access
+
+To log into the production instance of OneFuzz with the CLI, you **must request access**. Visit the internal [OneFuzz Access Request Page](https://myaccess.microsoft.com/@microsoft.onmicrosoft.com#/access-packages/6df691eb-e3d1-444b-b4b2-9e944dc794be) for details.
+
+## How to Fuzz .NET Code
+
+To set up and run fuzz testing on .NET code, follow the detailed guide available [Fuzz .NET Code](https://eng.ms/docs/cloud-ai-platform/azure-edge-platform-aep/aep-security/epsf-edge-and-platform-security-fundamentals/the-onefuzz-service/onefuzz/howto/fuzzing-dotnet-code).
+
+## Running a .NET Fuzz Target Locally
+
+Testing a .NET fuzz target locally requires specific configurations. For a step-by-step guide, see the section on [Running a .NET Fuzz Target Locally](https://eng.ms/docs/cloud-ai-platform/azure-edge-platform-aep/aep-security/epsf-edge-and-platform-security-fundamentals/the-onefuzz-service/onefuzz/howto/fuzzing-dotnet-code#extra-running-a-net-fuzz-target-locally).
+
+## Writing a Good OneFuzzConfig.json
+
+The `OneFuzzConfig.json` file provides critical information for deploying fuzzing jobs using the OneFuzz Ingestion Preparation Tool and Ingestion Service.
+
+### Structure
+
+The primary structure is an array of configuration entries. Outside the array, the `configVersion` field is used to track changes to the configuration schema.
+
+For more details on how to write and structure this file, see the [OneFuzzConfig V3 Documentation](https://eng.ms/docs/cloud-ai-platform/azure-edge-platform-aep/aep-security/epsf-edge-and-platform-security-fundamentals/the-onefuzz-service/onefuzz/onefuzzconfig/onefuzzconfigv3).
+
+## Tools
+
+### OneFuzz Ingestion Preparation (OIP) Tool
+
+The OIP tool helps prepare data for ingestion and fuzz testing. Learn more about [OneFuzz Ingestion Preparation (OIP) Tool](https://eng.ms/docs/cloud-ai-platform/azure-edge-platform-aep/aep-security/epsf-edge-and-platform-security-fundamentals/the-onefuzz-service/onefuzz/oip/onefuzzingestionpreparationtool).
+
+### OneFuzz CLI
+
+The CLI provides commands to manage and execute fuzzing jobs. Download and set up the CLI by following this [guide](https://eng.ms/docs/cloud-ai-platform/azure-edge-platform-aep/aep-security/epsf-edge-and-platform-security-fundamentals/the-onefuzz-service/onefuzz/howto/downloading-cli).
+

src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/FuzzTests.cs

@@ -0,0 +1,32 @@
+// 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 AdvancedPaste.Helpers;
+using Windows.ApplicationModel.DataTransfer;
+
+// OneFuzz currently does not support .NET 9 code testing, so this is a temporary solution.
+// Create a .NET 8 project and use a file link to include the code for testing first.
+namespace AdvancedPaste.FuzzTests
+{
+    public class FuzzTests
+    {
+        public static void FuzzToJsonFromXmlOrCsv(ReadOnlySpan<byte> input)
+        {
+            try
+            {
+                var dataPackage = new DataPackage();
+                dataPackage.SetText(input.ToString());
+                _ = Task.Run(async () => await JsonHelper.ToJsonFromXmlOrCsvAsync(dataPackage.GetView())).Result;
+            }
+            catch (Exception ex) when (ex is ArgumentException)
+            {
+                // This is an example. It's important to filter out any *expected* exceptions from our code here.
+                // However, catching all exceptions is considered an anti-pattern because it may suppress legitimate
+                // issues, such as a NullReferenceException thrown by our code. In this case, we still re-throw
+                // the exception, as the ToJsonFromXmlOrCsvAsync method is not expected to throw any exceptions.
+                throw;
+            }
+        }
+    }
+}

src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/Logger.cs

@@ -0,0 +1,46 @@
+// 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.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+// This is used for fuzz testing and ensures that the project links only to JsonHelper,
+// avoiding unnecessary connections to additional files
+namespace ManagedCommon
+{
+    public static class Logger
+    {
+        // An empty method to simulate logging information
+        public static void LogTrace()
+        {
+            // Do nothing
+        }
+
+        // An empty method to simulate logging information
+        public static void LogInfo(string message)
+        {
+            // Do nothing
+        }
+
+        // An empty method to simulate logging warnings
+        public static void LogWarning(string message)
+        {
+            // Do nothing
+        }
+
+        // An empty method to simulate logging errors
+        public static void LogError(string message, Exception? ex = null)
+        {
+            // Do nothing
+        }
+
+        public static void LogDebug(string message, Exception? ex = null)
+        {
+            // Do nothing
+        }
+    }
+}

src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/MSTestSettings.cs

@@ -0,0 +1,5 @@
+// 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.
+
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]

src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/OneFuzzConfig.json

@@ -0,0 +1,47 @@
+{
+  "configVersion": 3,
+  "entries": [
+    {
+      "fuzzer": {
+        "$type": "libfuzzerDotNet",
+        "dll": "AdvancedPaste.FuzzTests.dll",
+        "class": "AdvancedPaste.FuzzTests.FuzzTests",
+        "method": "FuzzToJsonFromXmlOrCsv",
+        "FuzzingTargetBinaries": [
+          "PowerToys.AdvancedPaste.dll"
+        ]
+      },
+      "adoTemplate": {
+        // supply the values appropriate to your
+        // project, where bugs will be filed 
+        "org": "microsoft",
+        "project": "OS",
+        "AssignedTo": "leilzh@microsoft.com",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
+        "IterationPath": "OS\\Future"
+      },
+      "jobNotificationEmail": "leilzh@microsoft.com",
+      "skip": false,
+      "rebootAfterSetup": false,
+      "oneFuzzJobs": [
+        // at least one job is required
+        {
+          "projectName": "AdvancedPaste",
+          "targetName": "AdvancedPaste-dotnet-fuzzer"
+        }
+      ],
+      "jobDependencies": [
+        // this should contain, at minimum,
+        // the DLL and PDB files
+        // you will need to add any other files required
+        // (globs are supported)
+        "AdvancedPaste.FuzzTests.dll",
+        "AdvancedPaste.FuzzTests.pdb",
+        "Microsoft.Windows.SDK.NET.dll",
+        "Newtonsoft.Json.dll",
+        "WinRT.Runtime.dll"
+      ],
+      "SdlWorkItemId": 49911822
+    }
+  ]
+}

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs

@@ -263,7 +263,7 @@ namespace AdvancedPaste
                 if (disposing)
                 {
                     EtwTrace?.Dispose();
-                    window.Dispose();
+                    window?.Dispose();
                 }
 
                 disposedValue = true;

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PasteFormatTemplateSelector.cs

@@ -0,0 +1,29 @@
+// 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 AdvancedPaste.Models;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+
+namespace AdvancedPaste.Controls;
+
+public sealed partial class PasteFormatTemplateSelector : DataTemplateSelector
+{
+    public DataTemplate ItemTemplate { get; set; }
+
+    public DataTemplate ItemTemplateDisabled { get; set; }
+
+    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+    {
+        bool isEnabled = item is PasteFormat pasteFormat && pasteFormat.IsEnabled;
+
+        if (container is SelectorItem selector)
+        {
+            selector.IsEnabled = isEnabled;
+        }
+
+        return isEnabled ? ItemTemplate : ItemTemplateDisabled;
+    }
+}

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml

@@ -410,6 +410,7 @@
                                         Spacing="2">
                                         <Button
                                             Padding="4"
+                                            AutomationProperties.LabeledBy="{x:Bind ThumbsUpFeedback}"
                                             Click="ThumbUpDown_Click"
                                             CommandParameter="True"
                                             Content="{ui:FontIcon Glyph=&#xE8E1;,
@@ -417,11 +418,12 @@
                                             Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                             Style="{StaticResource SubtleButtonStyle}">
                                             <ToolTipService.ToolTip>
-                                                <TextBlock x:Uid="ThumbsUpFeedback" />
+                                                <TextBlock x:Name="ThumbsUpFeedback" x:Uid="ThumbsUpFeedback" />
                                             </ToolTipService.ToolTip>
                                         </Button>
                                         <Button
                                             Padding="4"
+                                            AutomationProperties.LabeledBy="{x:Bind ThumbsDownFeedback}"
                                             Click="ThumbUpDown_Click"
                                             CommandParameter="False"
                                             Content="{ui:FontIcon Glyph=&#xE8E0;,
@@ -429,7 +431,7 @@
                                             Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                             Style="{StaticResource SubtleButtonStyle}">
                                             <ToolTipService.ToolTip>
-                                                <TextBlock x:Uid="ThumbsDownFeedback" />
+                                                <TextBlock x:Name="ThumbsDownFeedback" x:Uid="ThumbsDownFeedback" />
                                             </ToolTipService.ToolTip>
                                         </Button>
                                     </StackPanel>
@@ -537,6 +539,7 @@
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         ui:VisualExtensions.NormalizedCenterPoint="0.5,0.5"
+                        AutomationProperties.HelpText="{x:Bind ViewModel.CustomAIUnavailableErrorText, Mode=OneWay}"
                         Command="{x:Bind GenerateCustomAICommand}"
                         Content="{ui:FontIcon Glyph=&#xE724;,
                                               FontSize=16}"

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml.cs

@@ -82,6 +82,7 @@ namespace AdvancedPaste
             };
 
             WindowHelpers.BringToForeground(this.GetWindowHandle());
+            WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(this.GetWindowHandle());
         }
 
         private void OnActivated(object sender, WindowActivatedEventArgs args)

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml

@@ -21,6 +21,77 @@
             x:Name="customActionsToMinHeightConverter"
             ValueIfNonZero="40"
             ValueIfZero="0" />
+        <controls:PasteFormatTemplateSelector x:Key="PasteFormatTemplateSelector">
+            <controls:PasteFormatTemplateSelector.ItemTemplate>
+                <DataTemplate x:DataType="local:PasteFormat">
+                    <Grid
+                        Margin="0"
+                        Padding="-9,0,0,0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        AutomationProperties.AcceleratorKey="{x:Bind ShortcutText, Mode=OneWay}"
+                        AutomationProperties.AutomationControlType="ListItem"
+                        AutomationProperties.FullDescription="{x:Bind ToolTip, Mode=OneWay}"
+                        AutomationProperties.HelpText="{x:Bind Name, Mode=OneWay}"
+                        AutomationProperties.Name="{x:Bind AccessibleName, Mode=OneWay}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="26" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ToolTipService.ToolTip>
+                            <TextBlock Text="{x:Bind ToolTip, Mode=OneWay}" />
+                        </ToolTipService.ToolTip>
+                        <FontIcon
+                            Margin="0,0,0,0"
+                            VerticalAlignment="Center"
+                            AutomationProperties.AccessibilityView="Raw"
+                            FontSize="16"
+                            Glyph="{x:Bind IconGlyph, Mode=OneWay}" />
+                        <TextBlock
+                            Grid.Column="1"
+                            VerticalAlignment="Center"
+                            x:Phase="1"
+                            Text="{x:Bind Name, Mode=OneWay}" />
+                        <TextBlock
+                            Grid.Column="2"
+                            Margin="0,0,8,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind ShortcutText, Mode=OneWay}" />
+                    </Grid>
+                </DataTemplate>
+            </controls:PasteFormatTemplateSelector.ItemTemplate>
+            <controls:PasteFormatTemplateSelector.ItemTemplateDisabled>
+                <DataTemplate x:DataType="local:PasteFormat" AutomationProperties.AccessibilityView="Raw">
+                    <Grid
+                        Margin="0"
+                        Padding="-9,0,0,0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        AutomationProperties.AccessibilityView="Raw"
+                        Opacity="0.5">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="26" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <FontIcon
+                            Margin="0,0,0,0"
+                            VerticalAlignment="Center"
+                            FontSize="16"
+                            Glyph="{x:Bind IconGlyph, Mode=OneWay}" />
+                        <TextBlock
+                            Grid.Column="1"
+                            VerticalAlignment="Center"
+                            x:Phase="1"
+                            Text="{x:Bind Name, Mode=OneWay}" />
+                    </Grid>
+                </DataTemplate>
+            </controls:PasteFormatTemplateSelector.ItemTemplateDisabled>
+        </controls:PasteFormatTemplateSelector>
         <Style
             x:Key="PaddingLessFlyoutPresenterStyle"
             BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
@@ -29,57 +100,6 @@
                 <Setter Property="Padding" Value="0" />
             </Style.Setters>
         </Style>
-        <Style x:Key="PasteFormatListViewItemStyle" TargetType="ListViewItem">
-            <Setter Property="Padding" Value="0" />
-            <Setter Property="Margin" Value="0" />
-            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-            <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        </Style>
-        <DataTemplate x:Key="PasteFormatTemplate" x:DataType="local:PasteFormat">
-            <Button
-                Margin="0"
-                Padding="5,0,5,0"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Stretch"
-                HorizontalContentAlignment="Stretch"
-                VerticalContentAlignment="Stretch"
-                AllowFocusOnInteraction="False"
-                BorderThickness="0"
-                Click="ListView_Button_Click"
-                IsEnabled="{x:Bind IsEnabled, Mode=OneWay}">
-                <Grid Opacity="{x:Bind Opacity, Mode=OneWay}">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="26" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-
-                    <ToolTipService.ToolTip>
-                        <TextBlock Text="{x:Bind ToolTip, Mode=OneWay}" />
-                    </ToolTipService.ToolTip>
-                    <FontIcon
-                        Margin="0,0,0,0"
-                        VerticalAlignment="Center"
-                        AutomationProperties.AccessibilityView="Raw"
-                        FontSize="16"
-                        Glyph="{x:Bind IconGlyph, Mode=OneWay}" />
-                    <TextBlock
-                        Grid.Column="1"
-                        VerticalAlignment="Center"
-                        x:Phase="1"
-                        Text="{x:Bind Name, Mode=OneWay}" />
-                    <TextBlock
-                        Grid.Column="2"
-                        Margin="0,0,8,0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="{x:Bind ShortcutText, Mode=OneWay}"
-                        Visibility="{x:Bind ShortcutText.Length, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />
-                </Grid>
-            </Button>
-        </DataTemplate>
     </Page.Resources>
     <Page.KeyboardAccelerators>
         <KeyboardAccelerator Key="Escape" Invoked="KeyboardAccelerator_Invoked" />
@@ -196,10 +216,10 @@
                 x:Name="PasteOptionsListView"
                 Grid.Row="0"
                 VerticalAlignment="Bottom"
-                IsItemClickEnabled="False"
-                ItemContainerStyle="{StaticResource PasteFormatListViewItemStyle}"
+                IsItemClickEnabled="True"
+                ItemClick="PasteFormat_ItemClick"
                 ItemContainerTransitions="{x:Null}"
-                ItemTemplate="{StaticResource PasteFormatTemplate}"
+                ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
                 ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
                 ScrollViewer.VerticalScrollBarVisibility="Visible"
                 ScrollViewer.VerticalScrollMode="Auto"
@@ -217,10 +237,10 @@
                 x:Name="CustomActionsListView"
                 Grid.Row="2"
                 VerticalAlignment="Top"
-                IsItemClickEnabled="False"
-                ItemContainerStyle="{StaticResource PasteFormatListViewItemStyle}"
+                IsItemClickEnabled="True"
+                ItemClick="PasteFormat_ItemClick"
                 ItemContainerTransitions="{x:Null}"
-                ItemTemplate="{StaticResource PasteFormatTemplate}"
+                ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
                 ItemsSource="{x:Bind ViewModel.CustomActionPasteFormats, Mode=OneWay}"
                 ScrollViewer.VerticalScrollBarVisibility="Visible"
                 ScrollViewer.VerticalScrollMode="Auto"
@@ -232,7 +252,6 @@
                 Height="1"
                 HorizontalAlignment="Stretch"
                 Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
-            <!--  x:Uid="ClipboardHistoryButton"  -->
             <Button
                 Grid.Row="4"
                 Height="32"
@@ -241,6 +260,7 @@
                 HorizontalAlignment="Stretch"
                 HorizontalContentAlignment="Stretch"
                 VerticalContentAlignment="Stretch"
+                AutomationProperties.LabeledBy="{x:Bind ClipboardHistoryButton}"
                 IsEnabled="{x:Bind ViewModel.ClipboardHistoryEnabled, Mode=TwoWay}"
                 Style="{StaticResource SubtleButtonStyle}">
                 <Grid
@@ -259,6 +279,7 @@
                         FontSize="16"
                         Glyph="&#xE81C;" />
                     <TextBlock
+                        x:Name="ClipboardHistoryButton"
                         x:Uid="ClipboardHistoryButton"
                         Grid.Column="1"
                         VerticalAlignment="Center" />
@@ -287,6 +308,7 @@
                                     <Grid
                                         Height="40"
                                         HorizontalAlignment="Stretch"
+                                        AutomationProperties.Name="{x:Bind Description, Mode=OneWay}"
                                         ColumnSpacing="8"
                                         ToolTipService.ToolTip="{x:Bind Content}">
                                         <Grid.ColumnDefinitions>
@@ -308,7 +330,8 @@
                                             TextTrimming="CharacterEllipsis"
                                             Visibility="Visible" />
                                         <Button
-                                            x:Name="moreInfo"
+                                            x:Name="ClipboardHistoryItemMoreOptionsButton"
+                                            x:Uid="ClipboardHistoryItemMoreOptionsButton"
                                             Grid.Column="1"
                                             VerticalAlignment="Center"
                                             Foreground="{ThemeResource TextFillColorSecondaryBrush}"

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs

@@ -130,9 +130,9 @@ namespace AdvancedPaste.Pages
             }
         }
 
-        private async void ListView_Button_Click(object sender, RoutedEventArgs e)
+        private async void PasteFormat_ItemClick(object sender, ItemClickEventArgs e)
         {
-            if (sender is Button { DataContext: PasteFormat format })
+            if (e.ClickedItem is PasteFormat format)
             {
                 await ViewModel.ExecutePasteFormatAsync(format, PasteActionSource.ContextMenu);
             }

src/modules/AdvancedPaste/AdvancedPaste/Helpers/DataPackageHelpers.cs

@@ -18,7 +18,7 @@ namespace AdvancedPaste.Helpers;
 
 internal static class DataPackageHelpers
 {
-    private static readonly HashSet<string> ImageFileTypes = new(StringComparer.InvariantCultureIgnoreCase) { ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff", ".ico", ".svg" };
+    private static readonly Lazy<HashSet<string>> ImageFileTypes = new(GetImageFileTypes());
 
     private static readonly (string DataFormat, ClipboardFormat ClipboardFormat)[] DataFormats =
     [
@@ -57,7 +57,7 @@ internal static class DataPackageHelpers
             {
                 availableFormats |= ClipboardFormat.File;
 
-                if (ImageFileTypes.Contains(file.FileType))
+                if (ImageFileTypes.Value.Contains(file.FileType))
                 {
                     availableFormats |= ClipboardFormat.Image;
                 }
@@ -148,4 +148,9 @@ internal static class DataPackageHelpers
 
         return null;
     }
+
+    private static HashSet<string> GetImageFileTypes() =>
+               BitmapDecoder.GetDecoderInformationEnumerator()
+                            .SelectMany(di => di.FileExtensions)
+                            .ToHashSet(StringComparer.InvariantCultureIgnoreCase);
 }

src/modules/AdvancedPaste/AdvancedPaste/Helpers/JsonHelper.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Xml;
@@ -33,6 +34,19 @@ namespace AdvancedPaste.Helpers
         private static readonly Regex CsvRemoveStartAndEndQuotationMarksRegex = new Regex(@"^""(?=(""{2})+)|(?<=(""{2})+)""$");
         private static readonly Regex CsvReplaceDoubleQuotationMarksRegex = new Regex(@"""{2}");
 
+        private static bool IsJson(string text)
+        {
+            try
+            {
+                _ = JsonDocument.Parse(text);
+                return true;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
+
         internal static async Task<string> ToJsonFromXmlOrCsvAsync(DataPackageView clipboardData)
         {
             Logger.LogTrace();
@@ -46,6 +60,12 @@ namespace AdvancedPaste.Helpers
             var text = await clipboardData.GetTextAsync();
             string jsonText = string.Empty;
 
+            // If the text is already JSON, return it
+            if (IsJson(text))
+            {
+                return text;
+            }
+
             // Try convert XML
             try
             {

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

@@ -154,8 +154,8 @@ namespace AdvancedPaste.Settings
             {
                 if (disposing)
                 {
-                    _cancellationTokenSource.Dispose();
-                    _watcher.Dispose();
+                    _cancellationTokenSource?.Dispose();
+                    _watcher?.Dispose();
                 }
 
                 _disposedValue = true;

src/modules/AdvancedPaste/AdvancedPaste/Models/ClipboardItem.cs

@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using AdvancedPaste.Helpers;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.ApplicationModel.DataTransfer;
 
@@ -14,4 +15,8 @@ public class ClipboardItem
     public ClipboardHistoryItem Item { get; set; }
 
     public BitmapImage Image { get; set; }
+
+    public string Description => !string.IsNullOrEmpty(Content) ? Content :
+                                 Image is not null ? ResourceLoaderInstance.ResourceLoader.GetString("ClipboardHistoryImage") :
+                                 string.Empty;
 }

src/modules/AdvancedPaste/AdvancedPaste/Models/PasteFormat.cs

@@ -54,7 +54,7 @@ public sealed class PasteFormat
 
     public bool IsEnabled { get; private init; }
 
-    public double Opacity => IsEnabled ? 1 : 0.5;
+    public string AccessibleName => $"{Name} ({ShortcutText})";
 
     public string ToolTip => string.IsNullOrEmpty(Prompt) ? $"{Name} ({ShortcutText})" : Prompt;
 

src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw

@@ -144,6 +144,15 @@
   <data name="ClipboardHistoryButton.Text" xml:space="preserve">
     <value>Clipboard history</value>
   </data>
+  <data name="ClipboardHistoryButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Clipboard history</value>
+  </data>
+  <data name="ClipboardHistoryImage" xml:space="preserve">
+    <value>Image data</value>
+  </data>
+  <data name="ClipboardHistoryItemMoreOptionsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>More options</value>
+  </data>
   <data name="ClipboardHistoryItemDeleteButton.Text" xml:space="preserve">
     <value>Delete</value>
   </data>

src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml.cs

@@ -40,6 +40,7 @@ namespace EnvironmentVariables
             var handle = this.GetWindowHandle();
             RegisterWindow(handle);
 
+            WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(handle);
             WindowHelpers.BringToForeground(handle);
 
             MainPage = App.GetService<EnvironmentVariablesMainPage>();

src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-
+using ManagedCommon;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -22,6 +22,7 @@ namespace FileLocksmithUI
             SetTitleBar(AppTitleBar);
             Activated += MainWindow_Activated;
             AppWindow.SetIcon("Assets/FileLocksmith/Icon.ico");
+            WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(this.GetWindowHandle());
 
             var loader = ResourceLoaderInstance.ResourceLoader;
             var title = isElevated ? loader.GetString("AppAdminTitle") : loader.GetString("AppTitle");

src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml.cs

@@ -39,6 +39,7 @@ namespace Hosts
 
             var handle = this.GetWindowHandle();
 
+            WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(handle);
             WindowHelpers.BringToForeground(handle);
             Activated += MainWindow_Activated;
 

src/modules/Hosts/HostsUILib/Helpers/DuplicateService.cs

@@ -14,7 +14,7 @@ using Microsoft.UI.Dispatching;
 
 namespace HostsUILib.Helpers
 {
-    public class DuplicateService : IDuplicateService, IDisposable
+    public partial class DuplicateService : IDuplicateService, IDisposable
     {
         private record struct Check(string Address, string[] Hosts);
 

src/modules/Hosts/HostsUILib/Helpers/HostsService.cs

@@ -21,7 +21,7 @@ using Microsoft.Win32;
 
 namespace HostsUILib.Helpers
 {
-    public class HostsService : IHostsService, IDisposable
+    public partial class HostsService : IHostsService, IDisposable
     {
         private const string _backupSuffix = $"_PowerToysBackup_";
         private const int _defaultBufferSize = 4096; // From System.IO.File source code

src/modules/Hosts/HostsUILib/HostsUILib.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
   <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\..\..\Common.Dotnet.AotCompatibility.props" />
 
   <PropertyGroup>
     <OutputType>Library</OutputType>

src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp

@@ -714,16 +714,33 @@ private:
         m_backdrop.RelativeSizeAdjustment({ 1.0f, 1.0f }); // fill the parent
         m_backdrop.Brush(m_compositor.CreateColorBrush(m_backgroundColor));
         layer.Children().InsertAtTop(m_backdrop);
-
+        
         m_circleGeometry = m_compositor.CreateEllipseGeometry(); // radius set via expression animation
+        m_circleGeometry.Radius({ m_sonarRadiusFloat * m_sonarZoomFactor, m_sonarRadiusFloat * m_sonarZoomFactor });
+        
         m_circleShape = m_compositor.CreateSpriteShape(m_circleGeometry);
         m_circleShape.FillBrush(m_compositor.CreateColorBrush(m_spotlightColor));
         m_circleShape.Offset({ m_sonarRadiusFloat * m_sonarZoomFactor, m_sonarRadiusFloat * m_sonarZoomFactor });
+        
         m_spotlight = m_compositor.CreateShapeVisual();
         m_spotlight.Size({ m_sonarRadiusFloat * 2 * m_sonarZoomFactor, m_sonarRadiusFloat * 2 * m_sonarZoomFactor });
         m_spotlight.AnchorPoint({ 0.5f, 0.5f });
+        m_spotlight.Opacity(m_spotlightColor.A);
         m_spotlight.Shapes().Append(m_circleShape);
 
+        // auto maskBrush = m_compositor.CreateMaskBrush();
+        // maskBrush.Source(m_compositor.CreateColorBrush(winrt::Windows::UI::Colors::Black()));
+        // maskBrush.Mask(m_circleShape.FillBrush());
+        
+        // auto clipGeometry = m_compositor.CreateEllipseGeometry();
+        // clipGeometry.Center(m_circleShape.Offset());
+        // clipGeometry.Radius(m_spotlight.Size());
+        auto clip = m_compositor.CreateGeometricClip(m_circleGeometry);
+        // layer.Clip(clip);
+        m_backdrop.Clip(clip);
+
+        // m_backdrop.Brush(maskBrush);
+
         layer.Children().InsertAtTop(m_spotlight);
 
         // Implicitly animate the alpha.
@@ -816,6 +833,7 @@ public:
                     m_circleShape.FillBrush().as<winrt::CompositionColorBrush>().Color(m_spotlightColor);
                     m_circleShape.Offset({ m_sonarRadiusFloat * m_sonarZoomFactor, m_sonarRadiusFloat * m_sonarZoomFactor });
                     m_spotlight.Size({ m_sonarRadiusFloat * 2 * m_sonarZoomFactor, m_sonarRadiusFloat * 2 * m_sonarZoomFactor });
+                    m_spotlight.Opacity(m_spotlightColor.A);
                     m_animation.Duration(std::chrono::milliseconds{ m_fadeDuration });
                     m_circleGeometry.StopAnimation(L"Radius");
 

src/modules/MouseUtils/FindMyMouse/dllmain.cpp

@@ -279,14 +279,15 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings)
             // Parse spotlight color
             auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_SPOTLIGHT_COLOR);
             auto spotlightColor = (std::wstring)jsonPropertiesObject.GetNamedString(JSON_KEY_VALUE);
-            uint8_t r, g, b;
-            if (!checkValidRGB(spotlightColor, &r, &g, &b))
+
+            uint8_t a, r, g, b;
+            if (!checkValidARGB(spotlightColor, &a, &r, &g, &b))
             {
                 Logger::error("Spotlight color RGB value is invalid. Will use default value");
             }
             else
             {
-                findMyMouseSettings.spotlightColor = winrt::Windows::UI::ColorHelper::FromArgb(255, r, g, b);
+                findMyMouseSettings.spotlightColor = winrt::Windows::UI::ColorHelper::FromArgb(a, r, g, b);
             }
         }
         catch (...)

src/modules/NewPlus/NewShellExtensionContextMenu.win10/shell_context_menu_win10.cpp

@@ -38,9 +38,9 @@ IFACEMETHODIMP shell_context_menu_win10::QueryContextMenu(HMENU menu_handle, UIN
         return E_FAIL;
     }
 
-    if (menu_flags & CMF_DEFAULTONLY)
+    if (menu_flags & (CMF_DEFAULTONLY | CMF_VERBSONLY | CMF_OPTIMIZEFORINVOKE))
     {
-        return MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_NULL, 0);
+        return E_UNEXPECTED;
     }
 
     try
@@ -217,6 +217,13 @@ IFACEMETHODIMP shell_context_menu_win10::InvokeCommand(CMINVOKECOMMANDINFO* para
         return E_FAIL;
     }
 
+    if (HIWORD(params->lpVerb)!=0)
+    {
+        // Not a menu command. It's likely a string verb command from another menu.
+        // The logic to interpret lpVerb is explained here: https://learn.microsoft.com/en-us/previous-versions//bb776881(v=vs.85)#invokecommand-method
+        return E_FAIL;
+    }
+
     // Get selected menu item (a template or the "Open templates" item)
     const auto selected_menu_item_index = LOWORD(params->lpVerb) - 1;
     if (selected_menu_item_index < 0)

src/modules/PowerOCR/PowerOCR/OCROverlay.xaml

@@ -95,7 +95,7 @@
         <Border
             x:Name="TopButtonsStackPanel"
             Margin="12"
-            Padding="4,8,12,8"
+            Padding="4,8,4,8"
             HorizontalAlignment="Center"
             VerticalAlignment="Top"
             d:Visibility="Visible"
@@ -116,7 +116,6 @@
                 Orientation="Horizontal">
                 <ComboBox
                     x:Name="LanguagesComboBox"
-                    Height="32"
                     Margin="4,0"
                     AutomationProperties.Name="{x:Static p:Resources.SelectedLang}"
                     SelectionChanged="LanguagesComboBox_SelectionChanged">
@@ -156,6 +155,7 @@
                 </Button>
                 <Button
                     x:Name="CancelButton"
+                    AutomationProperties.Name="{x:Static p:Resources.Cancel}"
                     Click="CancelMenuItem_Click"
                     ToolTip="{x:Static p:Resources.CancelShortcut}">
                     <ui:SymbolIcon FontSize="18" Symbol="Dismiss24" />

src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows;
@@ -76,7 +77,7 @@ public partial class OCROverlay : Window
         if (string.IsNullOrEmpty(selectedLanguageName))
         {
             selectedLanguage = ImageMethods.GetOCRLanguage();
-            selectedLanguageName = selectedLanguage?.DisplayName;
+            selectedLanguageName = selectedLanguage?.NativeName;
         }
 
         List<Language> possibleOcrLanguages = OcrEngine.AvailableRecognizerLanguages.ToList();
@@ -85,10 +86,10 @@ public partial class OCROverlay : Window
 
         foreach (Language language in possibleOcrLanguages)
         {
-            MenuItem menuItem = new() { Header = language.NativeName, Tag = language, IsCheckable = true };
-            menuItem.IsChecked = language.DisplayName.Equals(selectedLanguageName, StringComparison.Ordinal);
-            LanguagesComboBox.Items.Add(language);
-            if (language.DisplayName.Equals(selectedLanguageName, StringComparison.Ordinal))
+            MenuItem menuItem = new() { Header = EnsureStartUpper(language.NativeName), Tag = language, IsCheckable = true };
+            menuItem.IsChecked = language.NativeName.Equals(selectedLanguageName, StringComparison.OrdinalIgnoreCase);
+            LanguagesComboBox.Items.Add(new ComboBoxItem { Content = EnsureStartUpper(language.NativeName), Tag = language });
+            if (language.NativeName.Equals(selectedLanguageName, StringComparison.OrdinalIgnoreCase))
             {
                 selectedLanguage = language;
                 LanguagesComboBox.SelectedIndex = count;
@@ -358,7 +359,12 @@ public partial class OCROverlay : Window
 
         // TODO: Set the preferred language based upon what was chosen here
         int selection = languageComboBox.SelectedIndex;
-        selectedLanguage = languageComboBox.SelectedItem as Language;
+        selectedLanguage = (languageComboBox.SelectedItem as ComboBoxItem)?.Tag as Language;
+
+        if (selectedLanguage == null)
+        {
+            return;
+        }
 
         Logger.LogError($"Changed language to {selectedLanguage?.LanguageTag}");
 
@@ -499,4 +505,16 @@ public partial class OCROverlay : Window
     {
         return screenRectangle;
     }
+
+    private string EnsureStartUpper(string input)
+    {
+        if (string.IsNullOrEmpty(input))
+        {
+            return input;
+        }
+
+        var inputArray = input.ToCharArray();
+        inputArray[0] = char.ToUpper(inputArray[0], CultureInfo.CurrentCulture);
+        return new string(inputArray);
+    }
 }

src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml.cs

@@ -5,7 +5,7 @@
 using System;
 
 using ColorPicker.Helpers;
-using Common.UI;
+using ManagedCommon;
 using Wpf.Ui.Controls;
 
 namespace ColorPicker

src/modules/fancyzones/FancyZonesLib/WindowUtils.cpp

@@ -15,7 +15,6 @@
 namespace NonLocalizable
 {
     const wchar_t PowerToysAppFZEditor[] = L"POWERTOYS.FANCYZONESEDITOR.EXE";
-    const wchar_t PowerToysWorkspacesEditor[] = L"POWERTOYS.WORKSPACESEDITOR.EXE";
     const char SplashClassName[] = "MsoSplash";
     const wchar_t CoreWindow[] = L"Windows.UI.Core.CoreWindow";
     const wchar_t SearchUI[] = L"SearchUI.exe";
@@ -185,7 +184,7 @@ bool FancyZonesWindowUtils::IsExcludedByDefault(const HWND& hwnd, const std::wst
         return true;
     }
 
-    static std::vector<std::wstring> defaultExcludedApps = { NonLocalizable::PowerToysAppFZEditor, NonLocalizable::PowerToysWorkspacesEditor, NonLocalizable::CoreWindow, NonLocalizable::SearchUI };
+    static std::vector<std::wstring> defaultExcludedApps = { NonLocalizable::PowerToysAppFZEditor, NonLocalizable::CoreWindow, NonLocalizable::SearchUI };
     return (check_excluded_app(hwnd, processPath, defaultExcludedApps));
 }
 

src/modules/imageresizer/ui/Views/MainWindow.xaml.cs

@@ -7,9 +7,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
-using Common.UI;
 using ImageResizer.ViewModels;
+using ManagedCommon;
 using Microsoft.Win32;
 using Wpf.Ui.Controls;
 

src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/plugin.json

@@ -6,7 +6,7 @@
     "Author": "ThiefZero",
     "Version": "0.0.1",
     "Language": "csharp",
-    "Website": "https://github.com/ThiefZero",
+    "Website": "https://aka.ms/PowerToys",
     "IcoPathDark": "Images\\unitconverter.dark.png",
     "IcoPathLight": "Images\\unitconverter.light.png",
     "ExecuteFileName": "Community.PowerToys.Run.Plugin.UnitConverter.dll"

src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Main.cs

@@ -7,16 +7,21 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
+using System.Windows;
+using System.Windows.Input;
 
 using Community.PowerToys.Run.Plugin.VSCodeWorkspaces.Properties;
 using Community.PowerToys.Run.Plugin.VSCodeWorkspaces.RemoteMachinesHelper;
 using Community.PowerToys.Run.Plugin.VSCodeWorkspaces.VSCodeHelper;
 using Community.PowerToys.Run.Plugin.VSCodeWorkspaces.WorkspacesHelper;
+
+using Wox.Infrastructure;
 using Wox.Plugin;
+using Wox.Plugin.Logger;
 
 namespace Community.PowerToys.Run.Plugin.VSCodeWorkspaces
 {
-    public class Main : IPlugin, IPluginI18n
+    public class Main : IPlugin, IPluginI18n, IContextMenu
     {
         private PluginInitContext _context;
 
@@ -76,11 +81,9 @@ namespace Community.PowerToys.Run.Plugin.VSCodeWorkspaces
 
                                 hide = true;
                             }
-                            catch (Win32Exception)
+                            catch (Win32Exception ex)
                             {
-                                var name = $"Plugin: {_context.CurrentPluginMetadata.Name}";
-                                var msg = "Can't Open this file";
-                                _context.API.ShowMsg(name, msg, string.Empty);
+                                HandleError("Can't Open this file", ex, showMsg: true);
                                 hide = false;
                             }
 
@@ -124,11 +127,9 @@ namespace Community.PowerToys.Run.Plugin.VSCodeWorkspaces
 
                                 hide = true;
                             }
-                            catch (Win32Exception)
+                            catch (Win32Exception ex)
                             {
-                                var name = $"Plugin: {_context.CurrentPluginMetadata.Name}";
-                                var msg = "Can't Open this file";
-                                _context.API.ShowMsg(name, msg, string.Empty);
+                                HandleError("Can't Open this file", ex, showMsg: true);
                                 hide = false;
                             }
 
@@ -142,23 +143,23 @@ namespace Community.PowerToys.Run.Plugin.VSCodeWorkspaces
             results = results.Where(a => a.Title.Contains(query.Search, StringComparison.InvariantCultureIgnoreCase)).ToList();
 
             results.ForEach(x =>
-                    {
-                        if (x.Score == 0)
-                        {
-                            x.Score = 100;
-                        }
+            {
+                if (x.Score == 0)
+                {
+                    x.Score = 100;
+                }
 
-                        // intersect the title with the query
-                        var intersection = Convert.ToInt32(x.Title.ToLowerInvariant().Intersect(query.Search.ToLowerInvariant()).Count() * query.Search.Length);
-                        var differenceWithQuery = Convert.ToInt32((x.Title.Length - intersection) * query.Search.Length * 0.7);
-                        x.Score = x.Score - differenceWithQuery + intersection;
+                // intersect the title with the query
+                var intersection = Convert.ToInt32(x.Title.ToLowerInvariant().Intersect(query.Search.ToLowerInvariant()).Count() * query.Search.Length);
+                var differenceWithQuery = Convert.ToInt32((x.Title.Length - intersection) * query.Search.Length * 0.7);
+                x.Score = x.Score - differenceWithQuery + intersection;
 
-                        // if is a remote machine give it 12 extra points
-                        if (x.ContextData is VSCodeRemoteMachine)
-                        {
-                            x.Score = Convert.ToInt32(x.Score + (intersection * 2));
-                        }
-                    });
+                // if is a remote machine give it 12 extra points
+                if (x.ContextData is VSCodeRemoteMachine)
+                {
+                    x.Score = Convert.ToInt32(x.Score + (intersection * 2));
+                }
+            });
 
             results = results.OrderByDescending(x => x.Score).ToList();
             if (query.Search == string.Empty || query.Search.Replace(" ", string.Empty) == string.Empty)
@@ -174,6 +175,108 @@ namespace Community.PowerToys.Run.Plugin.VSCodeWorkspaces
             _context = context;
         }
 
+        public List<ContextMenuResult> LoadContextMenus(Result selectedResult)
+        {
+            if (selectedResult?.ContextData is not VSCodeWorkspace workspace)
+            {
+                return new List<ContextMenuResult>();
+            }
+
+            string realPath = SystemPath.RealPath(workspace.RelativePath);
+
+            return new List<ContextMenuResult>
+            {
+                new ContextMenuResult
+                {
+                    PluginName = Name,
+                    Title = $"{Resources.CopyPath} (Ctrl+C)",
+                    Glyph = "\xE8C8", // Copy
+                    FontFamily = "Segoe Fluent Icons,Segoe MDL2 Assets",
+                    AcceleratorKey = Key.C,
+                    AcceleratorModifiers = ModifierKeys.Control,
+                    Action = context => CopyToClipboard(realPath),
+                },
+                new ContextMenuResult
+                {
+                    PluginName = Name,
+                    Title = $"{Resources.OpenInExplorer} (Ctrl+Shift+F)",
+                    Glyph = "\xEC50", // File Explorer
+                    FontFamily = "Segoe Fluent Icons,Segoe MDL2 Assets",
+                    AcceleratorKey = Key.F,
+                    AcceleratorModifiers = ModifierKeys.Control | ModifierKeys.Shift,
+                    Action = context => OpenInExplorer(realPath),
+                },
+                new ContextMenuResult
+                {
+                    PluginName = Name,
+                    Title = $"{Resources.OpenInConsole} (Ctrl+Shift+C)",
+                    Glyph = "\xE756", // Command Prompt
+                    FontFamily = "Segoe Fluent Icons,Segoe MDL2 Assets",
+                    AcceleratorKey = Key.C,
+                    AcceleratorModifiers = ModifierKeys.Control | ModifierKeys.Shift,
+                    Action = context => OpenInConsole(realPath),
+                },
+            };
+        }
+
+        private bool CopyToClipboard(string path)
+        {
+            try
+            {
+                Clipboard.SetText(path);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                HandleError("Can't copy to clipboard", ex, showMsg: true);
+                return false;
+            }
+        }
+
+        private bool OpenInConsole(string path)
+        {
+            try
+            {
+                Helper.OpenInConsole(path);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                HandleError($"Unable to open the specified path in the console: {path}", ex, showMsg: true);
+                return false;
+            }
+        }
+
+        private bool OpenInExplorer(string path)
+        {
+            if (!Helper.OpenInShell("explorer.exe", $"\"{path}\""))
+            {
+                HandleError($"Failed to open folder in Explorer at path: {path}", showMsg: true);
+                return false;
+            }
+
+            return true;
+        }
+
+        private void HandleError(string msg, Exception exception = null, bool showMsg = false)
+        {
+            if (exception != null)
+            {
+                Log.Exception(msg, exception, exception.GetType());
+            }
+            else
+            {
+                Log.Error(msg, typeof(VSCodeWorkspaces.Main));
+            }
+
+            if (showMsg)
+            {
+                _context.API.ShowMsg(
+                    $"Plugin: {_context.CurrentPluginMetadata.Name}",
+                    msg);
+            }
+        }
+
         public string GetTranslatedPluginTitle()
         {
             return Resources.PluginTitle;

src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.Designer.cs

@@ -140,5 +140,32 @@ namespace Community.PowerToys.Run.Plugin.VSCodeWorkspaces.Properties {
                 return ResourceManager.GetString("Workspace", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Copy Path.
+        /// </summary>
+        internal static string CopyPath {
+            get {
+                return ResourceManager.GetString("CopyPath", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Open in console.
+        /// </summary>
+        internal static string OpenInConsole {
+            get {
+                return ResourceManager.GetString("OpenInConsole", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Open in Explorer.
+        /// </summary>
+        internal static string OpenInExplorer {
+            get {
+                return ResourceManager.GetString("OpenInExplorer", resourceCulture);
+            }
+        }
     }
 }

src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Properties/Resources.resx

@@ -151,4 +151,13 @@
     <value>Project Folder</value>
     <comment>It refers to the Visual Studio Code Project Folders</comment>
   </data>
+  <data name="CopyPath" xml:space="preserve">
+    <value>Copy path</value>
+  </data>
+  <data name="OpenInConsole" xml:space="preserve">
+    <value>Open in console</value>
+  </data>
+  <data name="OpenInExplorer" xml:space="preserve">
+    <value>Open in Explorer</value>
+  </data>
 </root>

src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/plugin.json

@@ -4,9 +4,9 @@
   "ActionKeyword": "{",
   "Name": "VS Code Workspaces",
   "Author": "ricardosantos9521",
-  "Version": "1.1.0",
+  "Version": "1.2.0",
   "Language": "csharp",
-  "Website": "https://github.com/ricardosantos9521/PowerToys/",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Community.PowerToys.Run.Plugin.VSCodeWorkspaces.dll",
   "IsGlobal": false,
   "IcoPathDark": "Images\\code.dark.png",

src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/plugin.json

@@ -7,7 +7,7 @@
   "Author": "IHorvalds",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://github/com/IHorvalds",
+  "Website": "https://aka.ms/PowerToys",
   "IcoPathDark": "Images\\ValueGenerator.dark.png",
   "IcoPathLight": "Images\\ValueGenerator.light.png",
   "ExecuteFileName": "Community.PowerToys.Run.Plugin.ValueGenerator.dll"

src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/plugin.json

@@ -6,7 +6,7 @@
   "Author": "cyberrex5",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://aka.ms/powertoys",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Community.PowerToys.Run.Plugin.WebSearch.dll",
   "IcoPathDark": "Images\\WebSearch.dark.png",
   "IcoPathLight": "Images\\WebSearch.light.png"

src/modules/launcher/Plugins/Microsoft.Plugin.Folder/plugin.json

@@ -6,7 +6,7 @@
   "Author": "qianlifeng",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://aka.ms/powertoys",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.Plugin.Folder.dll",
   "IcoPathDark": "Images\\folder.dark.png",
   "IcoPathLight": "Images\\folder.light.png"

src/modules/launcher/Plugins/Microsoft.Plugin.Shell/plugin.json

@@ -6,7 +6,7 @@
   "Author": "qianlifeng",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://aka.ms/powertoys",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.Plugin.Shell.dll",
   "IcoPathDark": "Images\\shell.dark.png",
   "IcoPathLight": "Images\\shell.light.png"

src/modules/launcher/Plugins/Microsoft.Plugin.Uri/plugin.json

@@ -6,7 +6,7 @@
   "Author": "Microsoft",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "http://aka.ms/PowerToys",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.Plugin.Uri.dll",
   "IcoPathDark": "Images\\uri.dark.png",
   "IcoPathLight": "Images\\uri.light.png"

src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/plugin.json

@@ -6,7 +6,7 @@
   "Author": "betadele",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://www.windowwalker.com/",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.Plugin.WindowWalker.dll",
   "IcoPathDark": "Images\\windowwalker.dark.png",
   "IcoPathLight": "Images\\windowwalker.light.png"

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/ExtendedCalculatorParserTests.cs

@@ -192,6 +192,13 @@ namespace Microsoft.PowerToys.Run.Plugin.Calculator.UnitTests
         [DataRow("cos", false)]
         [DataRow("abs", false)]
         [DataRow("1+1.1e3", true)]
+        [DataRow("randi(8)", true)]
+        [DataRow("randi()", false)]
+        [DataRow("randi(0.5)", true)]
+        [DataRow("rand()", true)]
+        [DataRow("rand(0.5)", false)]
+        [DataRow("0X78AD+0o123", true)]
+        [DataRow("0o9", false)]
         public void InputValid_TestValid_WhenCalled(string input, bool valid)
         {
             // Act
@@ -228,7 +235,8 @@ namespace Microsoft.PowerToys.Run.Plugin.Calculator.UnitTests
                new object[] { "abs(-2)", 2M },
                new object[] { "abs(2)", 2M },
                new object[] { "0+(1*2)/(0+1)", 2M }, // Validate that division by "(0+1)" is not interpret as division by zero.
-               new object[] { "0+(1*2)/0.5", 4M }, // Validate that division by  number with decimal digits is not interpret as division by zero.
+               new object[] { "0+(1*2)/0.5", 4M }, // Validate that division by number with decimal digits is not interpret as division by zero.
+               new object[] { "0+(1*2)/0o004", 0.5M }, // Validate that division by an octal number with zeroes is not treated as division by zero.
            };
 
         [DataTestMethod]

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/QueryTests.cs

@@ -41,6 +41,8 @@ namespace Microsoft.PowerToys.Run.Plugin.Calculator.UnitTests
         [DataRow("=5 / 0", "Expression contains division by zero")]
         [DataRow("10+(8*9)/0+7", "Expression contains division by zero")]
         [DataRow("10+(8*9)/0*7", "Expression contains division by zero")]
+        [DataRow("10+(8*9)/0x00", "Expression contains division by zero")]
+        [DataRow("10+(8*9)/0b0", "Expression contains division by zero")]
         public void ErrorResultOnInvalidKeywordQuery(string typedString, string expectedResult)
         {
             Query expectedQuery = new(typedString, "=");
@@ -230,6 +232,7 @@ namespace Microsoft.PowerToys.Run.Plugin.Calculator.UnitTests
         public void RightAnswerForHumanMultiplicationExpressions(string typedString, double answer)
         {
             // Setup
+            typedString = typedString.Replace(".", CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator); // Workaround to get correct results when the tests are running on a non-english systems.
             Query expectedQuery = new(typedString);
             Query expectedQueryWithKeyword = new("=" + typedString, "=");
 

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs

@@ -37,8 +37,8 @@ namespace Microsoft.PowerToys.Run.Plugin.Calculator
             }
 
             // check for division by zero
-            // We check if the string contains a slash followed by space (optional) and zero. Whereas the zero must not followed by dot or comma as this indicates a number with decimal digits. The zero must also not be followed by other digits.
-            if (new Regex("\\/\\s*0(?![,\\.0-9])").Match(input).Success)
+            // We check if the string contains a slash followed by space (optional) and zero. Whereas the zero must not be followed by a dot, comma, 'b', 'o' or 'x' as these indicate a number with decimal digits or a binary/octal/hexadecimal value respectively. The zero must also not be followed by other digits.
+            if (new Regex("\\/\\s*0(?!(?:[,\\.0-9]|[box]0*[1-9a-f]))", RegexOptions.IgnoreCase).Match(input).Success)
             {
                 error = Properties.Resources.wox_plugin_calculator_division_by_zero;
                 return default;

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateHelper.cs

@@ -15,13 +15,13 @@ namespace Microsoft.PowerToys.Run.Plugin.Calculator
             @"^(" +
             @"%|" +
             @"ceil\s*\(|floor\s*\(|exp\s*\(|max\s*\(|min\s*\(|abs\s*\(|log(?:2|10)?\s*\(|ln\s*\(|sqrt\s*\(|pow\s*\(|" +
-            @"factorial\s*\(|sign\s*\(|round\s*\(|rand\s*\(|" +
+            @"factorial\s*\(|sign\s*\(|round\s*\(|rand\s*\(\)|randi\s*\([^\)]|" +
             @"sin\s*\(|cos\s*\(|tan\s*\(|arcsin\s*\(|arccos\s*\(|arctan\s*\(|" +
             @"sinh\s*\(|cosh\s*\(|tanh\s*\(|arsinh\s*\(|arcosh\s*\(|artanh\s*\(|" +
             @"pi|" +
             @"==|~=|&&|\|\||" +
             @"((-?(\d+(\.\d*)?)|-?(\.\d+))[Ee](-?\d+))|" + /* expression from CheckScientificNotation between parenthesis */
-            @"e|[0-9]|0x[0-9a-fA-F]+|0b[01]+|[\+\-\*\/\^\., ""]|[\(\)\|\!\[\]]" +
+            @"e|[0-9]|0[xX][0-9a-fA-F]+|0[bB][01]+|0[oO][0-7]+|[\+\-\*\/\^\., ""]|[\(\)\|\!\[\]]" +
             @")+$",
             RegexOptions.Compiled);
 

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/plugin.json

@@ -6,7 +6,7 @@
   "Author": "cxfksword",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://aka.ms/powertoys",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.PowerToys.Run.Plugin.Calculator.dll",
   "IcoPathDark": "Images\\calculator.dark.png",
   "IcoPathLight": "Images\\calculator.light.png"

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/plugin.json

@@ -6,7 +6,7 @@
   "Author": "jefflord",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://aka.ms/powertoys",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.PowerToys.Run.Plugin.History.dll",
   "IcoPathDark": "Images\\history.dark.png",
   "IcoPathLight": "Images\\history.light.png"

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/plugin.json

@@ -7,7 +7,7 @@
   "Author": "palenshus",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://aka.ms/powertoys",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.PowerToys.Run.Plugin.OneNote.dll",
   "IcoPathDark": "Images\\oneNote.dark.png",
   "IcoPathLight": "Images\\oneNote.light.png"

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/plugin.json

@@ -6,7 +6,7 @@
   "Author": "davidegiacometti",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://aka.ms/powertoys",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.PowerToys.Run.Plugin.PowerToys.dll",
   "IcoPathDark": "Images\\PowerToys.dark.png",
   "IcoPathLight": "Images\\PowerToys.light.png"

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/plugin.json

@@ -6,7 +6,7 @@
   "Author": "TobiasSekan",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://aka.ms/powertoys",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.PowerToys.Run.Plugin.Registry.dll",
   "IcoPathDark": "Images\\reg.dark.png",
   "IcoPathLight": "Images\\reg.light.png"

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/plugin.json

@@ -6,7 +6,7 @@
   "Author": "davidegiacometti",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://aka.ms/powertoys",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.PowerToys.Run.Plugin.Service.dll",
   "IcoPathDark": "Images\\service.dark.png",
   "IcoPathLight": "Images\\service.light.png"

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/plugin.json

@@ -6,7 +6,7 @@
   "Author": "Wox",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://aka.ms/powertoys",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.PowerToys.Run.Plugin.System.dll",
   "IcoPathDark": "Images\\lock.dark.png",
   "IcoPathLight": "Images\\lock.light.png"

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/plugin.json

@@ -6,7 +6,7 @@
   "Author": "htcfreek",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://aka.ms/powertoys",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.PowerToys.Run.Plugin.TimeDate.dll",
   "IcoPathDark": "Images\\timeDate.dark.png",
   "IcoPathLight": "Images\\timeDate.light.png"

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/plugin.json

@@ -6,7 +6,7 @@
   "Author": "TobiasSekan",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://aka.ms/powertoys",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.PowerToys.Run.Plugin.WindowsSettings.dll",
   "IcoPathDark": "Images\\WindowsSettings.dark.png",
   "IcoPathLight": "Images\\WindowsSettings.light.png"

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/plugin.json

@@ -7,7 +7,7 @@
   "Author": "davidegiacometti",
   "Version": "1.0.0",
   "Language": "csharp",
-  "Website": "https://aka.ms/powertoys",
+  "Website": "https://aka.ms/PowerToys",
   "ExecuteFileName": "Microsoft.PowerToys.Run.Plugin.WindowsTerminal.dll",
   "IcoPathDark": "Images\\WindowsTerminal.dark.png",
   "IcoPathLight": "Images\\WindowsTerminal.light.png"

src/modules/launcher/PowerLauncher/Helper/ThemeManager.cs

@@ -6,6 +6,7 @@ using System;
 using System.IO;
 using System.Windows;
 using System.Windows.Media;
+using ManagedCommon;
 using Microsoft.Win32;
 using Wox.Infrastructure.Image;
 using Wox.Infrastructure.UserSettings;
@@ -50,7 +51,7 @@ namespace PowerLauncher.Helper
 
         private void SetSystemTheme(ManagedCommon.Theme theme)
         {
-            _mainWindow.Background = Common.UI.OSVersionHelper.IsWindows11() is false ? SystemColors.WindowBrush : null;
+            _mainWindow.Background = OSVersionHelper.IsWindows11() is false ? SystemColors.WindowBrush : null;
 
             _mainWindow.Resources.MergedDictionaries.Clear();
             _mainWindow.Resources.MergedDictionaries.Add(new ResourceDictionary
@@ -66,7 +67,7 @@ namespace PowerLauncher.Helper
                     Source = new Uri(themeString, UriKind.Absolute),
                 };
                 _mainWindow.Resources.MergedDictionaries.Add(fluentThemeDictionary);
-                if (!Common.UI.OSVersionHelper.IsWindows11())
+                if (!OSVersionHelper.IsWindows11())
                 {
                     // Apply background only on Windows 10
                     // Windows theme does not work properly for dark and light mode so right now set the background color manual.
@@ -95,7 +96,7 @@ namespace PowerLauncher.Helper
                 {
                     Source = new Uri(styleThemeString, UriKind.Relative),
                 });
-                if (Common.UI.OSVersionHelper.IsWindows11())
+                if (OSVersionHelper.IsWindows11())
                 {
                     // Apply background only on Windows 11 to keep the same style as WPFUI
                     _mainWindow.Background = new SolidColorBrush

src/modules/launcher/PowerLauncher/MainWindow.xaml

@@ -27,109 +27,112 @@
     WindowStartupLocation="Manual"
     WindowStyle="None"
     mc:Ignorable="d">
-    <Grid x:Name="RootGrid" MouseDown="OnMouseDown">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" MaxHeight="{Binding Results.MaxHeight}" />
-        </Grid.RowDefinitions>
-        <Border
-            x:Name="SearchBoxBorder"
-            Grid.Row="0"
-            Padding="12,4,12,3">
-            <local:LauncherControl x:Name="SearchBox" />
-        </Border>
-
-        <!--  Have to use a Grid instead of a StackPanel for scrolling to work?  -->
-        <Grid
-            x:Name="KeywordsOverviewGrid"
-            Grid.Row="1"
-            MaxHeight="{Binding Results.MaxHeight}"
-            Visibility="{Binding PluginsOverviewVisibility}">
+    <Border x:Name="MainBorder" BorderBrush="{DynamicResource {x:Static SystemColors.ActiveBorderBrushKey}}">
+        <Grid x:Name="RootGrid" MouseDown="OnMouseDown">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" MaxHeight="{Binding Results.MaxHeight}" />
             </Grid.RowDefinitions>
-            <Rectangle
-                Height="1"
-                VerticalAlignment="Top"
-                Fill="{DynamicResource DividerStrokeColorDefaultBrush}" />
-            <TextBlock
-                Margin="22,12,0,4"
-                FontWeight="SemiBold"
-                Foreground="{DynamicResource TextFillColorSecondaryBrush}"
-                Style="{StaticResource CaptionTextBlockStyle}"
-                Text="{x:Static p:Resources.PluginKeywords}" />
+            <Border
+                x:Name="SearchBoxBorder"
+                Grid.Row="0"
+                Padding="12,4,12,3"
+                Background="Transparent">
+                <local:LauncherControl x:Name="SearchBox" />
+            </Border>
 
-            <ListView
-                x:Name="pluginsHintsList"
+            <!--  Have to use a Grid instead of a StackPanel for scrolling to work?  -->
+            <Grid
+                x:Name="KeywordsOverviewGrid"
                 Grid.Row="1"
-                Background="Transparent"
-                BorderBrush="Transparent"
-                ItemContainerStyle="{StaticResource PluginsListViewItemStyle}"
-                ItemsSource="{Binding Plugins}"
-                PreviewMouseLeftButtonUp="PluginsHintsList_PreviewMouseLeftButtonUp"
-                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                ScrollViewer.VerticalScrollBarVisibility="Auto"
-                SelectedItem="{Binding SelectedPlugin, Mode=TwoWay}"
-                SelectionMode="Single">
-                <ListView.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <VirtualizingStackPanel
-                            Margin="16,0"
-                            IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}"
-                            VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}" />
-                    </ItemsPanelTemplate>
-                </ListView.ItemsPanel>
-                <ListView.ItemTemplate>
-                    <DataTemplate>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Border
-                                Width="32"
-                                Height="32"
-                                Padding="2,0,2,0"
-                                Background="{DynamicResource ControlFillColorDefaultBrush}"
-                                BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
-                                BorderThickness="1"
-                                CornerRadius="4"
-                                ToolTipService.ToolTip="{Binding Metadata.ActionKeyword}">
+                MaxHeight="{Binding Results.MaxHeight}"
+                Visibility="{Binding PluginsOverviewVisibility}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Rectangle
+                    Height="1"
+                    VerticalAlignment="Top"
+                    Fill="{DynamicResource DividerStrokeColorDefaultBrush}" />
+                <TextBlock
+                    Margin="22,12,0,4"
+                    FontWeight="SemiBold"
+                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                    Style="{StaticResource CaptionTextBlockStyle}"
+                    Text="{x:Static p:Resources.PluginKeywords}" />
+
+                <ListView
+                    x:Name="pluginsHintsList"
+                    Grid.Row="1"
+                    Background="Transparent"
+                    BorderBrush="Transparent"
+                    ItemContainerStyle="{StaticResource PluginsListViewItemStyle}"
+                    ItemsSource="{Binding Plugins}"
+                    PreviewMouseLeftButtonUp="PluginsHintsList_PreviewMouseLeftButtonUp"
+                    ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                    ScrollViewer.VerticalScrollBarVisibility="Auto"
+                    SelectedItem="{Binding SelectedPlugin, Mode=TwoWay}"
+                    SelectionMode="Single">
+                    <ListView.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <VirtualizingStackPanel
+                                Margin="16,0"
+                                IsVirtualizing="{TemplateBinding VirtualizingPanel.IsVirtualizing}"
+                                VirtualizationMode="{TemplateBinding VirtualizingPanel.VirtualizationMode}" />
+                        </ItemsPanelTemplate>
+                    </ListView.ItemsPanel>
+                    <ListView.ItemTemplate>
+                        <DataTemplate>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Border
+                                    Width="32"
+                                    Height="32"
+                                    Padding="2,0,2,0"
+                                    Background="{DynamicResource ControlFillColorDefaultBrush}"
+                                    BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
+                                    BorderThickness="1"
+                                    CornerRadius="4"
+                                    ToolTipService.ToolTip="{Binding Metadata.ActionKeyword}">
+                                    <TextBlock
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        FontWeight="SemiBold"
+                                        Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                                        Text="{Binding Metadata.ActionKeyword}"
+                                        TextAlignment="Left"
+                                        TextTrimming="WordEllipsis" />
+                                </Border>
                                 <TextBlock
-                                    HorizontalAlignment="Center"
+                                    Grid.Column="1"
+                                    Margin="12,0,0,0"
                                     VerticalAlignment="Center"
-                                    FontWeight="SemiBold"
                                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                                    Text="{Binding Metadata.ActionKeyword}"
-                                    TextAlignment="Left"
-                                    TextTrimming="WordEllipsis" />
-                            </Border>
-                            <TextBlock
-                                Grid.Column="1"
-                                Margin="12,0,0,0"
-                                VerticalAlignment="Center"
-                                Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                                Text="{Binding Plugin.Description}"
-                                TextTrimming="CharacterEllipsis"
-                                TextWrapping="Wrap" />
-                        </Grid>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
+                                    Text="{Binding Plugin.Description}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="Wrap" />
+                            </Grid>
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                </ListView>
+            </Grid>
+
+            <local:ResultList
+                x:Name="ListBox"
+                Grid.Row="2"
+                VerticalAlignment="Stretch"
+                BorderBrush="{DynamicResource DividerStrokeColorDefaultBrush}"
+                BorderThickness="0,1,0,0"
+                PreviewMouseDown="ListBox_PreviewMouseDown"
+                Visibility="{Binding Results.Visibility}" />
+
         </Grid>
-
-        <local:ResultList
-            x:Name="ListBox"
-            Grid.Row="2"
-            VerticalAlignment="Stretch"
-            BorderBrush="{DynamicResource DividerStrokeColorDefaultBrush}"
-            BorderThickness="0,1,0,0"
-            PreviewMouseDown="ListBox_PreviewMouseDown"
-            Visibility="{Binding Results.Visibility}" />
-
-    </Grid>
+    </Border>
     <Window.InputBindings>
         <KeyBinding Key="Escape" Command="{Binding EscCommand}" />
         <KeyBinding Key="Enter" Command="{Binding OpenResultWithKeyboardCommand}" />

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

@@ -15,6 +15,7 @@ using System.Windows.Interop;
 using System.Windows.Media.Imaging;
 
 using Common.UI;
+using ManagedCommon;
 using Microsoft.PowerLauncher.Telemetry;
 using Microsoft.PowerToys.Telemetry;
 using PowerLauncher.Helper;
@@ -200,6 +201,11 @@ namespace PowerLauncher
                 DWM_WINDOW_CORNER_PREFERENCE preference = DWM_WINDOW_CORNER_PREFERENCE.DWMWCP_ROUND;
                 DwmSetWindowAttribute(hWnd, attribute, ref preference, sizeof(uint));
             }
+            else
+            {
+                // On Windows10 ResizeMode="NoResize" removes the border so we add a new one.
+                MainBorder.BorderThickness = new System.Windows.Thickness(0.5);
+            }
         }
 
         private void OnLoaded(object sender, RoutedEventArgs e)

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

@@ -238,7 +238,10 @@ namespace PowerLauncher.Plugin
             }
             catch (Exception e)
             {
-                Log.Exception($"Exception for plugin <{pair.Metadata.Name}> when query <{query}>", e, MethodBase.GetCurrentMethod().DeclaringType);
+                // After updating to .NET 9, calling MethodBase.GetCurrentMethod() started crashing when trying
+                // to log methods called from within the OneNote plugin, so we've replaced this instance with typeof(PluginManager).
+                // This should be revised in the future.
+                Log.Exception($"Exception for plugin <{pair.Metadata.Name}> when query <{query}>", e, typeof(PluginManager));
 
                 return new List<Result>();
             }

src/modules/launcher/PowerLauncher/SettingsReader.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
@@ -251,7 +252,9 @@ namespace PowerLauncher
                 Id = x.Metadata.ID,
                 Name = x.Plugin == null ? x.Metadata.Name : x.Plugin.Name,
                 Description = x.Plugin?.Description,
+                Version = FileVersionInfo.GetVersionInfo(x.Metadata.ExecuteFilePath).FileVersion,
                 Author = x.Metadata.Author,
+                Website = x.Metadata.Website,
                 Disabled = x.Metadata.Disabled,
                 IsGlobal = x.Metadata.IsGlobal,
                 ActionKeyword = x.Metadata.ActionKeyword,
@@ -281,7 +284,9 @@ namespace PowerLauncher
                     var enabledPolicyState = GPOWrapper.GetRunPluginEnabledValue(id);
                     plugin.Name = name;
                     plugin.Description = value.Description;
+                    plugin.Version = value.Version;
                     plugin.Author = value.Author;
+                    plugin.Website = value.Website;
                     plugin.IconPathDark = value.IconPathDark;
                     plugin.IconPathLight = value.IconPathLight;
                     plugin.EnabledPolicyUiState = (int)enabledPolicyState;

src/modules/launcher/Wox.Plugin/Common/VirtualDesktop/VirtualDesktopHelper.cs

@@ -7,8 +7,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text;
-
-using Common.UI;
+using ManagedCommon;
 using Microsoft.Win32;
 using Wox.Plugin.Common.VirtualDesktop.Interop;
 using Wox.Plugin.Common.Win32;

src/modules/peek/Peek.UI/PeekXAML/MainWindow.xaml.cs

@@ -48,7 +48,8 @@ namespace Peek.UI
             ViewModel = Application.Current.GetService<MainWindowViewModel>();
 
             TitleBarControl.SetTitleBarToWindow(this);
-            AppWindow.TitleBar.ExtendsContentIntoTitleBar = true;
+            ExtendsContentIntoTitleBar = true;
+            WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(this.GetWindowHandle());
             AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
             AppWindow.SetIcon("Assets/Peek/Icon.ico");