Merge branch 'dev/migrie/f/powerdock' into dev/migrie/powerdock-pin-everything

we're enterprise grade software baybe

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

@@ -315,7 +315,6 @@ xef
 xes
 PACKAGEVERSIONNUMBER
 APPXMANIFESTVERSION
-PROGMAN
 
 # MRU lists
 CACHEWRITE
@@ -326,14 +325,6 @@ REGSTR
 # Misc Win32 APIs and PInvokes
 INVOKEIDLIST
 MEMORYSTATUSEX
-ABE
-HTCAPTION
-POSCHANGED
-QUERYPOS
-SETAUTOHIDEBAR
-WINDOWPOS
-WINEVENTPROC
-WORKERW
 
 # PowerRename metadata pattern abbreviations (used in tests and regex patterns)
 DDDD
@@ -358,6 +349,3 @@ nostdin
 # Performance counter keys
 engtype
 Nonpaged
-
-# XAML
-Untargeted

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

@@ -207,7 +207,6 @@ Bilibili
 BVID
 capturevideosample
 cmdow
-Contoso
 Controlz
 cortana
 devhints

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

@@ -110,8 +110,8 @@
 ^src/modules/cmdpal/doc/initial-sdk-spec/list-elements-mock-002\.pdn$
 ^src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage\.cs$
 ^src/modules/cmdpal/Microsoft\.CmdPal\.UI/Settings/InternalPage\.SampleData\.cs$
-^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Common\.UnitTests/.*\.TestData\.cs$
-^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Common\.UnitTests/Text/.*\.cs$
+^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Core\.Common\.UnitTests/.*\.TestData\.cs$
+^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Core\.Common\.UnitTests/Text/.*\.cs$
 ^src/modules/colorPicker/ColorPickerUI/Shaders/GridShader\.cso$
 ^src/modules/launcher/Plugins/Microsoft\.PowerToys\.Run\.Plugin\.TimeDate/Properties/
 ^src/modules/MouseUtils/MouseJumpUI/MainForm\.resx$
@@ -143,5 +143,3 @@ ignore$
 ^src/modules/registrypreview/RegistryPreviewUILib/Controls/HexBox/.*$
 ^src/common/CalculatorEngineCommon/exprtk\.hpp$
 src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage.cs
-^src/modules/powerrename/unittests/testdata/avif_test\.avif$
-^src/modules/powerrename/unittests/testdata/heif_test\.heic$

.pipelines/ESRPSigning_core.json

@@ -18,7 +18,6 @@
             "StylesReportTool\\PowerToys.StylesReportTool.exe",
 
             "CalculatorEngineCommon.dll",
-            "PowerToys.Common.UI.Controls.dll",
             "PowerToys.ManagedTelemetry.dll",
             "PowerToys.ManagedCommon.dll",
             "PowerToys.ManagedCsWin32.dll",
@@ -211,6 +210,9 @@
             "PowerToys.PowerAccentModuleInterface.dll",
             "PowerToys.PowerAccentKeyboardService.dll",
 
+            "PowerToys.PowerDisplayModuleInterface.dll",
+            "WinUI3Apps\\PowerToys.PowerDisplay.dll",
+            "WinUI3Apps\\PowerToys.PowerDisplay.exe",
             "PowerDisplay.Lib.dll",
 
             "WinUI3Apps\\PowerToys.PowerRenameExt.dll",

.pipelines/UpdateVersions.ps1

@@ -13,36 +13,9 @@ Param(
 
   # Root folder Path for processing
   [Parameter(Mandatory=$False,Position=4)]
-  [string]$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json",
-
-  # Use Azure Pipeline artifact as source for metapackage
-  [Parameter(Mandatory=$False,Position=5)]
-  [boolean]$useArtifactSource = $False,
-
-  # Azure DevOps organization URL
-  [Parameter(Mandatory=$False,Position=6)]
-  [string]$azureDevOpsOrg = "https://dev.azure.com/microsoft",
-
-  # Azure DevOps project name
-  [Parameter(Mandatory=$False,Position=7)]
-  [string]$azureDevOpsProject = "ProjectReunion",
-
-  # Pipeline build ID (or "latest" for latest build)
-  [Parameter(Mandatory=$False,Position=8)]
-  [string]$buildId = "",
-
-  # Artifact name containing the NuGet packages
-  [Parameter(Mandatory=$False,Position=9)]
-  [string]$artifactName = "WindowsAppSDK_Nuget_And_MSIX",
-
-  # Metapackage name to look for in artifact
-  [Parameter(Mandatory=$False,Position=10)]
-  [string]$metaPackageName = "Microsoft.WindowsAppSDK"
+  [string]$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
 )
 
-# Script-level constants
-$script:PackageVersionRegex = '^(.+?)\.(\d+\..*)$'
-
 
 
 function Read-FileWithEncoding {
@@ -84,7 +57,7 @@ function Add-NuGetSourceAndMapping {
 
     # Ensure packageSources exists
     if (-not $Xml.configuration.packageSources) {
-        $null = $Xml.configuration.AppendChild($Xml.CreateElement("packageSources"))
+        $Xml.configuration.AppendChild($Xml.CreateElement("packageSources")) | Out-Null
     }
     $sources = $Xml.configuration.packageSources
 
@@ -93,13 +66,13 @@ function Add-NuGetSourceAndMapping {
     if (-not $sourceNode) {
         $sourceNode = $Xml.CreateElement("add")
         $sourceNode.SetAttribute("key", $Key)
-        $null = $sources.AppendChild($sourceNode)
+        $sources.AppendChild($sourceNode) | Out-Null
     }
     $sourceNode.SetAttribute("value", $Value)
 
     # Ensure packageSourceMapping exists
     if (-not $Xml.configuration.packageSourceMapping) {
-        $null = $Xml.configuration.AppendChild($Xml.CreateElement("packageSourceMapping"))
+        $Xml.configuration.AppendChild($Xml.CreateElement("packageSourceMapping")) | Out-Null
     }
     $mapping = $Xml.configuration.packageSourceMapping
 
@@ -107,7 +80,7 @@ function Add-NuGetSourceAndMapping {
     $invalidNodes = $mapping.SelectNodes("packageSource[not(@key) or @key='']")
     if ($invalidNodes) {
         foreach ($node in $invalidNodes) {
-            $null = $mapping.RemoveChild($node)
+            $mapping.RemoveChild($node) | Out-Null
         }
     }
 
@@ -118,9 +91,9 @@ function Add-NuGetSourceAndMapping {
         $mappingSource.SetAttribute("key", $Key)
         # Insert at top for priority
         if ($mapping.HasChildNodes) {
-            $null = $mapping.InsertBefore($mappingSource, $mapping.FirstChild)
+            $mapping.InsertBefore($mappingSource, $mapping.FirstChild) | Out-Null
         } else {
-            $null = $mapping.AppendChild($mappingSource)
+            $mapping.AppendChild($mappingSource) | Out-Null
         }
     }
     
@@ -137,273 +110,14 @@ function Add-NuGetSourceAndMapping {
     foreach ($pattern in $Patterns) {
         $pkg = $Xml.CreateElement("package")
         $pkg.SetAttribute("pattern", $pattern)
-        $null = $mappingSource.AppendChild($pkg)
+        $mappingSource.AppendChild($pkg) | Out-Null
     }
 }
 
-function Download-ArtifactFromPipeline {
-    param (
-        [string]$Organization,
-        [string]$Project,
-        [string]$BuildId,
-        [string]$ArtifactName,
-        [string]$OutputDir
-    )
-
-    Write-Host "Downloading artifact '$ArtifactName' from build $BuildId..."
-    $null = New-Item -ItemType Directory -Path $OutputDir -Force
-
-    try {
-        # Authenticate with Azure DevOps using System Access Token (if available)
-        if ($env:SYSTEM_ACCESSTOKEN) {
-            Write-Host "Authenticating with Azure DevOps using System Access Token..."
-            $env:AZURE_DEVOPS_EXT_PAT = $env:SYSTEM_ACCESSTOKEN
-        } else {
-            Write-Host "No SYSTEM_ACCESSTOKEN found, assuming az CLI is already authenticated..."
-        }
-
-        # Use az CLI to download artifact
-        & az pipelines runs artifact download `
-            --organization $Organization `
-            --project $Project `
-            --run-id $BuildId `
-            --artifact-name $ArtifactName `
-            --path $OutputDir
-
-        if ($LASTEXITCODE -eq 0) {
-            Write-Host "Successfully downloaded artifact to $OutputDir"
-            return $true
-        } else {
-            Write-Warning "Failed to download artifact. Exit code: $LASTEXITCODE"
-            return $false
-        }
-    } catch {
-        Write-Warning "Error downloading artifact: $_"
-        return $false
-    }
-}
-
-function Get-NuspecDependencies {
-    param (
-        [string]$NupkgPath,
-        [string]$TargetFramework = ""
-    )
-
-    $tempDir = Join-Path $env:TEMP "nuspec_parse_$(Get-Random)"
-
-    try {
-        # Extract .nupkg (it's a zip file)
-        # Workaround: Expand-Archive may not recognize .nupkg extension, so copy to .zip first
-        $tempZip = Join-Path $env:TEMP "temp_$(Get-Random).zip"
-        Copy-Item $NupkgPath -Destination $tempZip -Force
-        Expand-Archive -Path $tempZip -DestinationPath $tempDir -Force
-        Remove-Item $tempZip -Force -ErrorAction SilentlyContinue
-
-        # Find .nuspec file
-        $nuspecFile = Get-ChildItem -Path $tempDir -Filter "*.nuspec" -Recurse | Select-Object -First 1
-
-        if (-not $nuspecFile) {
-            Write-Warning "No .nuspec file found in $NupkgPath"
-            return @{}
-        }
-
-        [xml]$nuspec = Get-Content $nuspecFile.FullName
-
-        # Extract package info
-        $packageId = $nuspec.package.metadata.id
-        $version = $nuspec.package.metadata.version
-        Write-Host "Parsing $packageId version $version"
-
-        # Parse dependencies
-        $dependencies = @{}
-        $depGroups = $nuspec.package.metadata.dependencies.group
-
-        if ($depGroups) {
-            # Dependencies are grouped by target framework
-            foreach ($group in $depGroups) {
-                $fx = $group.targetFramework
-                Write-Host "  Target Framework: $fx"
-
-                foreach ($dep in $group.dependency) {
-                    $depId = $dep.id
-                    $depVer = $dep.version
-                    # Remove version range brackets if present (e.g., "[2.0.0]" -> "2.0.0")
-                    $depVer = $depVer -replace '[\[\]]', ''
-                    $dependencies[$depId] = $depVer
-                    Write-Host "    - ${depId} : ${depVer}"
-                }
-            }
-        } else {
-            # No grouping, direct dependencies
-            $deps = $nuspec.package.metadata.dependencies.dependency
-            if ($deps) {
-                foreach ($dep in $deps) {
-                    $depId = $dep.id
-                    $depVer = $dep.version
-                    $depVer = $depVer -replace '[\[\]]', ''
-                    $dependencies[$depId] = $depVer
-                    Write-Host "  - ${depId} : ${depVer}"
-                }
-            }
-        }
-
-        return $dependencies
-    }
-    catch {
-        Write-Warning "Failed to parse nuspec: $_"
-        return @{}
-    }
-    finally {
-        Remove-Item $tempDir -Recurse -Force -ErrorAction SilentlyContinue
-    }
-}
-
-function Resolve-ArtifactBasedDependencies {
-    param (
-        [string]$ArtifactDir,
-        [string]$MetaPackageName,
-        [string]$SourceUrl,
-        [string]$OutputDir
-    )
-
-    Write-Host "Resolving dependencies from artifact-based metapackage..."
-    $null = New-Item -ItemType Directory -Path $OutputDir -Force
-
-    # Find the metapackage in artifact
-    $metaNupkg = Get-ChildItem -Path $ArtifactDir -Recurse -Filter "$MetaPackageName.*.nupkg" |
-                 Where-Object { $_.Name -notmatch "Runtime" } |
-                 Select-Object -First 1
-
-    if (-not $metaNupkg) {
-        Write-Warning "Metapackage $MetaPackageName not found in artifact"
-        return @{}
-    }
-
-    # Extract version from filename
-    if ($metaNupkg.Name -match "$MetaPackageName\.(.+)\.nupkg") {
-        $metaVersion = $Matches[1]
-        Write-Host "Found metapackage: $MetaPackageName version $metaVersion"
-    } else {
-        Write-Warning "Could not extract version from $($metaNupkg.Name)"
-        return @{}
-    }
-
-    # Parse dependencies from metapackage
-    $dependencies = Get-NuspecDependencies -NupkgPath $metaNupkg.FullName
-
-    # Copy metapackage to output directory
-    Copy-Item $metaNupkg.FullName -Destination $OutputDir -Force
-    Write-Host "Copied metapackage to $OutputDir"
-
-    # Prepare package versions hashtable - initialize with metapackage version
-    $packageVersions = @{ $MetaPackageName = $metaVersion }
-
-    # Copy Runtime package from artifact (it's not in feed) and extract its version
-    $runtimeNupkg = Get-ChildItem -Path $ArtifactDir -Recurse -Filter "$MetaPackageName.Runtime.*.nupkg" | Select-Object -First 1
-    if ($runtimeNupkg) {
-        Copy-Item $runtimeNupkg.FullName -Destination $OutputDir -Force
-        Write-Host "Copied Runtime package to $OutputDir"
-
-        # Extract version from Runtime package filename
-        if ($runtimeNupkg.Name -match "$MetaPackageName\.Runtime\.(.+)\.nupkg") {
-            $runtimeVersion = $Matches[1]
-            $packageVersions["$MetaPackageName.Runtime"] = $runtimeVersion
-            Write-Host "Extracted Runtime package version: $runtimeVersion"
-        } else {
-            Write-Warning "Could not extract version from Runtime package: $($runtimeNupkg.Name)"
-        }
-    }
-
-    # Download other dependencies from feed (excluding Runtime as it's already copied)
-    # Create temp nuget.config that includes both local packages and remote feed
-    # This allows NuGet to find packages already copied from artifact
-    $tempConfig = Join-Path $env:TEMP "nuget_artifact_$(Get-Random).config"
-    $tempConfigContent = @"
-<?xml version='1.0' encoding='utf-8'?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key='LocalPackages' value='$OutputDir' />
-    <add key='RemoteFeed' value='$SourceUrl' />
-  </packageSources>
-</configuration>
-"@
-    Set-Content -Path $tempConfig -Value $tempConfigContent
-
-    try {
-        foreach ($depId in $dependencies.Keys) {
-            # Skip Runtime as it's already copied from artifact
-            if ($depId -like "*Runtime*") {
-                # Don't overwrite the version we extracted from the Runtime package filename
-                if (-not $packageVersions.ContainsKey($depId)) {
-                    $packageVersions[$depId] = $dependencies[$depId]
-                }
-                Write-Host "Skipping $depId (already in artifact)"
-                continue
-            }
-
-            $depVersion = $dependencies[$depId]
-            Write-Host "Downloading dependency: $depId version $depVersion from feed..."
-
-            & nuget install $depId `
-                -Version $depVersion `
-                -ConfigFile $tempConfig `
-                -OutputDirectory $OutputDir `
-                -NonInteractive `
-                -NoCache `
-                | Out-Null
-
-            if ($LASTEXITCODE -eq 0) {
-                $packageVersions[$depId] = $depVersion
-                Write-Host "  Successfully downloaded $depId"
-            } else {
-                Write-Warning "  Failed to download $depId version $depVersion"
-            }
-        }
-    }
-    finally {
-        Remove-Item $tempConfig -Force -ErrorAction SilentlyContinue
-    }
-
-    # Parse all downloaded packages to get actual versions
-    $directories = Get-ChildItem -Path $OutputDir -Directory
-    $allLocalPackages = @()
-
-    # Add metapackage and runtime to the list (they are .nupkg files, not directories)
-    $allLocalPackages += $MetaPackageName
-    if ($packageVersions.ContainsKey("$MetaPackageName.Runtime")) {
-        $allLocalPackages += "$MetaPackageName.Runtime"
-    }
-
-    foreach ($dir in $directories) {
-        if ($dir.Name -match $script:PackageVersionRegex) {
-            $pkgId = $Matches[1]
-            $pkgVer = $Matches[2]
-            $allLocalPackages += $pkgId
-            if (-not $packageVersions.ContainsKey($pkgId)) {
-                $packageVersions[$pkgId] = $pkgVer
-            }
-        }
-    }
-
-    # Update nuget.config dynamically during pipeline execution
-    # This modification is temporary and won't be committed back to the repo
-    $nugetConfig = Join-Path $rootPath "nuget.config"
-    $configData = Read-FileWithEncoding -Path $nugetConfig
-    [xml]$xml = $configData.Content
-
-    Add-NuGetSourceAndMapping -Xml $xml -Key "localpackages" -Value $OutputDir -Patterns $allLocalPackages
-
-    $xml.Save($nugetConfig)
-    Write-Host "Updated nuget.config with localpackages mapping (temporary, for pipeline execution only)."
-
-    return ,$packageVersions
-}
-
 function Resolve-WinAppSdkSplitDependencies {
     Write-Host "Version $WinAppSDKVersion detected. Resolving split dependencies..."
     $installDir = Join-Path $rootPath "localpackages\output"
-    $null = New-Item -ItemType Directory -Path $installDir -Force
+    New-Item -ItemType Directory -Path $installDir -Force | Out-Null
 
     # Create a temporary nuget.config to avoid interference from the repo's config
     $tempConfig = Join-Path $env:TEMP "nuget_$(Get-Random).config"
@@ -417,24 +131,14 @@ function Resolve-WinAppSdkSplitDependencies {
             if ($propsContent -match '<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="([^"]+)"') {
                 $buildToolsVersion = $Matches[1]
                 Write-Host "Downloading Microsoft.Windows.SDK.BuildTools version $buildToolsVersion..."
-                & nuget install Microsoft.Windows.SDK.BuildTools `
-                    -Version $buildToolsVersion `
-                    -ConfigFile $tempConfig `
-                    -OutputDirectory $installDir `
-                    -NonInteractive `
-                    -NoCache `
-                    | Out-Null
+                $nugetArgsBuildTools = "install Microsoft.Windows.SDK.BuildTools -Version $buildToolsVersion -ConfigFile $tempConfig -OutputDirectory $installDir -NonInteractive -NoCache"
+                Invoke-Expression "nuget $nugetArgsBuildTools" | Out-Null
             }
         }
 
         # Download package to inspect nuspec and keep it for the build
-        & nuget install Microsoft.WindowsAppSDK `
-            -Version $WinAppSDKVersion `
-            -ConfigFile $tempConfig `
-            -OutputDirectory $installDir `
-            -NonInteractive `
-            -NoCache `
-            | Out-Null
+        $nugetArgs = "install Microsoft.WindowsAppSDK -Version $WinAppSDKVersion -ConfigFile $tempConfig -OutputDirectory $installDir -NonInteractive -NoCache"
+        Invoke-Expression "nuget $nugetArgs" | Out-Null
 
         # Parse dependencies from the installed folders
         # Folder structure is typically {PackageId}.{Version}
@@ -468,101 +172,52 @@ function Resolve-WinAppSdkSplitDependencies {
     }
 }
 
-# Main logic: choose between artifact-based or feed-based approach
-if ($useArtifactSource) {
-    Write-Host "=== Using Artifact-Based Source ===" -ForegroundColor Cyan
-    Write-Host "Organization: $azureDevOpsOrg"
-    Write-Host "Project: $azureDevOpsProject"
-    Write-Host "Build ID: $buildId"
-    Write-Host "Artifact: $artifactName"
-
-    if ([string]::IsNullOrEmpty($buildId) -or $buildId -eq 'N/A') {
-        Write-Error "buildId parameter is required when using artifact source. Please provide a valid Windows App SDK Build ID."
-        Write-Host "Tip: You can find the build ID from the Windows App SDK pipeline run in Azure DevOps."
-        exit 1
-    }
-
-    # Download artifact
-    $artifactDir = Join-Path $rootPath "localpackages\artifact"
-    $downloadSuccess = Download-ArtifactFromPipeline `
-        -Organization $azureDevOpsOrg `
-        -Project $azureDevOpsProject `
-        -BuildId $buildId `
-        -ArtifactName $artifactName `
-        -OutputDir $artifactDir
-
-    if (-not $downloadSuccess) {
-        Write-Host "Failed to download artifact"
-        exit 1
-    }
-
-    # Resolve dependencies from artifact
-    $installDir = Join-Path $rootPath "localpackages\output"
-    $packageVersions = Resolve-ArtifactBasedDependencies `
-        -ArtifactDir $artifactDir `
-        -MetaPackageName $metaPackageName `
-        -SourceUrl $sourceLink `
-        -OutputDir $installDir
-
-    if ($packageVersions.Count -eq 0) {
-        Write-Error "Failed to resolve dependencies from artifact"
-        exit 1
-    }
-
-    $WinAppSDKVersion = $packageVersions[$metaPackageName]
-    Write-Host "WinAppSDK Version: $WinAppSDKVersion"
-    Write-Host "##vso[task.setvariable variable=WinAppSDKVersion]$WinAppSDKVersion"
-
+# 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 "=== Using Feed-Based Source ===" -ForegroundColor Cyan
-
-    # 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
-    }
-
-    # Resolve dependencies for 1.8+
-    $packageVersions = @{ "Microsoft.WindowsAppSDK" = $WinAppSDKVersion }
-
-    Resolve-WinAppSdkSplitDependencies
+    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
+}
+
+# Resolve dependencies for 1.8+
+$packageVersions = @{ "Microsoft.WindowsAppSDK" = $WinAppSDKVersion }
+
+Resolve-WinAppSdkSplitDependencies
+
 # Update Directory.Packages.props file
 Get-ChildItem -Path $rootPath -Recurse "Directory.Packages.props" | ForEach-Object {
     $file = Read-FileWithEncoding -Path $_.FullName
@@ -571,16 +226,9 @@ Get-ChildItem -Path $rootPath -Recurse "Directory.Packages.props" | ForEach-Obje
     
     foreach ($pkgId in $packageVersions.Keys) {
         $ver = $packageVersions[$pkgId]
-
-        # Skip packages with empty versions to prevent corruption
-        if ([string]::IsNullOrWhiteSpace($ver)) {
-            Write-Warning "Skipping ${pkgId}: version is empty"
-            continue
-        }
-
         # Escape dots in package ID for regex
         $pkgIdRegex = $pkgId -replace '\.', '\.'
-
+        
         $newVersionString = "<PackageVersion Include=""$pkgId"" Version=""$ver"" />"
         $oldVersionString = "<PackageVersion Include=""$pkgIdRegex"" Version=""[-.0-9a-zA-Z]*"" />"
 

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

@@ -1,8 +1,3 @@
-# NOTE: When using artifact mode (useArtifactSource: true), the pipeline needs
-# permission to access System.AccessToken. This is automatically handled by the
-# script if SYSTEM_ACCESSTOKEN environment variable is available.
-# If you encounter authentication errors, ensure the job has oauth access enabled.
-
 trigger: none
 pr: none
 schedules:
@@ -42,23 +37,6 @@ parameters:
   - name: useExperimentalVersion
     type: boolean
     default: false
-  # Artifact mode parameters (optional)
-  - name: useArtifactSource
-    type: boolean
-    displayName: "Use Artifact Source (instead of feed)"
-    default: false
-  - name: buildId
-    type: string
-    displayName: "Windows App SDK Build ID (required only if using artifact source)"
-    default: 'N/A'
-  - name: azureDevOpsProject
-    type: string
-    displayName: "Source Project (for artifact mode, default: ProjectReunion)"
-    default: 'ProjectReunion'
-  - name: artifactName
-    type: string
-    displayName: "Artifact Name (for artifact mode, default: WindowsAppSDK_Nuget_And_MSIX)"
-    default: 'WindowsAppSDK_Nuget_And_MSIX'
 
 extends:
   template: templates/pipeline-ci-build.yml
@@ -71,7 +49,3 @@ extends:
     useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}
     winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
     useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
-    useArtifactSource: ${{ parameters.useArtifactSource }}
-    buildId: ${{ parameters.buildId }}
-    azureDevOpsProject: ${{ parameters.azureDevOpsProject }}
-    artifactName: ${{ parameters.artifactName }}

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

@@ -74,25 +74,6 @@ parameters:
   - name: useExperimentalVersion
     type: boolean
     default: false
-  # Artifact mode parameters
-  - name: useArtifactSource
-    type: boolean
-    default: false
-  - name: azureDevOpsOrg
-    type: string
-    default: 'https://dev.azure.com/microsoft'
-  - name: azureDevOpsProject
-    type: string
-    default: 'ProjectReunion'
-  - name: buildId
-    type: string
-    default: ''
-  - name: artifactName
-    type: string
-    default: 'WindowsAppSDK_Nuget_And_MSIX'
-  - name: metaPackageName
-    type: string
-    default: 'Microsoft.WindowsAppSDK'
   - name: csProjectsToPublish
     type: object
     default:
@@ -245,12 +226,6 @@ jobs:
       parameters:
         versionNumber: ${{ parameters.winAppSDKVersionNumber }}
         useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
-        useArtifactSource: ${{ parameters.useArtifactSource }}
-        azureDevOpsOrg: ${{ parameters.azureDevOpsOrg }}
-        azureDevOpsProject: ${{ parameters.azureDevOpsProject }}
-        buildId: ${{ parameters.buildId }}
-        artifactName: ${{ parameters.artifactName }}
-        metaPackageName: ${{ parameters.metaPackageName }}
   
   - ${{ if eq(parameters.useLatestWinAppSDK, false)}}:
     - template: .\steps-restore-nuget.yml

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

@@ -108,6 +108,9 @@ jobs:
       sdk: true
       version: '9.0'
 
+  - task: VisualStudioTestPlatformInstaller@1
+    displayName: Ensure VSTest Platform
+
   - pwsh: |-
       & '$(build.sourcesdirectory)\.pipelines\InstallWinAppDriver.ps1'
     displayName: Download and install WinAppDriver
@@ -149,7 +152,46 @@ jobs:
       inputs:
         displaySettings: 'optimal'
 
-  - script: |
-      dotnet test $(Build.SourcesDirectory)\src\modules\fancyzones\FancyZones.UITests\FancyZones.UITests.csproj --no-build -c $(BuildConfiguration) -p:Platform=$(BuildPlatform)
-      dotnet test $(Build.SourcesDirectory)\src\modules\fancyzones\FancyZonesEditor.UITests\FancyZonesEditor.UITests.csproj --no-build -c $(BuildConfiguration) -p:Platform=$(BuildPlatform)
-    displayName: "Run UI Tests"
+  - ${{ if eq(length(parameters.uiTestModules), 0) }}:
+    - task: VSTest@3
+      displayName: Run UI Tests
+      inputs:
+        platform: '$(BuildPlatform)'
+        configuration: '$(BuildConfiguration)'
+        testSelector: 'testAssemblies'
+        searchFolder: '$(Pipeline.Workspace)\$(TestArtifactsName)'
+        vsTestVersion: 'toolsInstaller'
+        uiTests: true
+        rerunFailedTests: true
+        testRunTitle: 'UITests_${{ parameters.platform }}_${{ parameters.installMode }}'
+        # Since UITests-FancyZonesEditor.dll is generated in both UITests-FancyZonesEditor and UITests-FancyZones, removed one to avoid duplicate test runs
+        testAssemblyVer2: |
+          **\*UITest*.dll
+          !**\obj\**
+          !**\ref\**
+          !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
+      env:
+        platform: '$(TestPlatform)'
+        useInstallerForTest: ${{ ne(parameters.buildSource, 'buildNow') }}
+
+  - ${{ if ne(length(parameters.uiTestModules), 0) }}:
+    - ${{ each module in parameters.uiTestModules }}:
+      - task: VSTest@3
+        displayName: Run UI Test - ${{ module }}
+        inputs:
+          platform: '$(BuildPlatform)'
+          configuration: '$(BuildConfiguration)'
+          testSelector: 'testAssemblies'
+          searchFolder: '$(Pipeline.Workspace)\$(TestArtifactsName)'
+          vsTestVersion: 'toolsInstaller'
+          uiTests: true
+          rerunFailedTests: true
+          testRunTitle: 'UITests_${{ parameters.platform }}_${{ parameters.installMode }}'
+          testAssemblyVer2: |
+            **\*${{ module }}*.dll
+            !**\obj\**
+            !**\ref\**
+            !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
+        env:
+          platform: '$(TestPlatform)'
+          useInstallerForTest: ${{ ne(parameters.buildSource, 'buildNow') }}

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

@@ -34,25 +34,6 @@ parameters:
   - name: useExperimentalVersion
     type: boolean
     default: false
-  # Artifact mode parameters
-  - name: useArtifactSource
-    type: boolean
-    default: false
-  - name: azureDevOpsOrg
-    type: string
-    default: 'https://dev.azure.com/microsoft'
-  - name: azureDevOpsProject
-    type: string
-    default: 'ProjectReunion'
-  - name: buildId
-    type: string
-    default: ''
-  - name: artifactName
-    type: string
-    default: 'WindowsAppSDK_Nuget_And_MSIX'
-  - name: metaPackageName
-    type: string
-    default: 'Microsoft.WindowsAppSDK'
 
 stages:
   - ${{ each platform in parameters.buildPlatforms }}:
@@ -84,12 +65,6 @@ stages:
             ${{ if eq(parameters.useLatestWinAppSDK, true) }}:
               winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
               useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
-              useArtifactSource: ${{ parameters.useArtifactSource }}
-              azureDevOpsOrg: ${{ parameters.azureDevOpsOrg }}
-              azureDevOpsProject: ${{ parameters.azureDevOpsProject }}
-              buildId: ${{ parameters.buildId }}
-              artifactName: ${{ parameters.artifactName }}
-              metaPackageName: ${{ parameters.metaPackageName }}
             timeoutInMinutes: 90
 
   - stage: Build_SDK

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

@@ -5,25 +5,6 @@ parameters:
   - name: useExperimentalVersion
     type: boolean
     default: false
-  # Artifact mode parameters
-  - name: useArtifactSource
-    type: boolean
-    default: false
-  - name: azureDevOpsOrg
-    type: string
-    default: 'https://dev.azure.com/microsoft'
-  - name: azureDevOpsProject
-    type: string
-    default: 'ProjectReunion'
-  - name: buildId
-    type: string
-    default: ''
-  - name: artifactName
-    type: string
-    default: 'WindowsAppSDK_Nuget_And_MSIX'
-  - name: metaPackageName
-    type: string
-    default: 'Microsoft.WindowsAppSDK'
 
 steps:
 - task: NuGetAuthenticate@1
@@ -31,20 +12,12 @@ steps:
 
 - task: PowerShell@2
   displayName: Update WinAppSDK Versions
-  env:
-    SYSTEM_ACCESSTOKEN: $(System.AccessToken)
   inputs:
     filePath: '$(build.sourcesdirectory)\.pipelines\UpdateVersions.ps1'
     arguments: >
       -winAppSdkVersionNumber ${{ parameters.versionNumber }}
       -useExperimentalVersion $${{ parameters.useExperimentalVersion }}
       -rootPath "$(build.sourcesdirectory)"
-      -useArtifactSource $${{ parameters.useArtifactSource }}
-      -azureDevOpsOrg "${{ parameters.azureDevOpsOrg }}"
-      -azureDevOpsProject "${{ parameters.azureDevOpsProject }}"
-      -buildId "${{ parameters.buildId }}"
-      -artifactName "${{ parameters.artifactName }}"
-      -metaPackageName "${{ parameters.metaPackageName }}"
 
 # - task: NuGetCommand@2
 #   displayName: 'Restore NuGet packages (slnx)'
@@ -63,4 +36,3 @@ steps:
     feedsToUse: 'config'
     nugetConfigPath: '$(build.sourcesdirectory)\nuget.config'
     workingDirectory: '$(build.sourcesdirectory)'
-    arguments: '/p:NoWarn=NU1602,NU1604'

.pipelines/verifyNoticeMdAgainstNugetPackages.ps1

@@ -93,8 +93,7 @@ if ($noticeMatch.Success) {
 # Test-only packages that are allowed to be in NOTICE.md but not in the build
 # (e.g., when BuildTests=false, these packages won't appear in the NuGet list)
 $allowedExtraPackages = @(
-	"- Moq",
-	"- MSTest"
+	"- Moq"
 )
 
 if (!$noticeFile.Trim().EndsWith($returnList.Trim()))

Directory.Build.props

@@ -20,23 +20,6 @@
     <NuGetAuditMode>direct</NuGetAuditMode>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>    <!-- Don't add source revision hash to the product version of binaries. -->
     <PlatformTarget>$(Platform)</PlatformTarget>
-
-    <!-- Enable Microsoft.Testing.Platform -->
-    <EnableMSTestRunner>true</EnableMSTestRunner>
-    <TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
-    <TestingPlatformDotNetTestSupport>true</TestingPlatformDotNetTestSupport>
-    <TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --report-trx</TestingPlatformCommandLineArguments>
-    <!-- No arm64 agents to run the tests. -->
-    <TestingPlatformDisableCustomTestTarget Condition="'$(Platform)' == 'ARM64'">true</TestingPlatformDisableCustomTestTarget>
-  </PropertyGroup>
-
-  <!--
-    UI tests are run in dedicated UI test jobs/pipelines.
-    In CI, the main build uses `/t:Build;Test` across the full solution, so
-    prevent UI test projects from being executed in that pass.
-  -->
-  <PropertyGroup Condition="'$(TF_BUILD)' != '' and $(MSBuildProjectName.Contains('UITest'))">
-    <TestingPlatformDisableCustomTestTarget>true</TestingPlatformDisableCustomTestTarget>
   </PropertyGroup>
 
   <!--
@@ -99,15 +82,7 @@
     </PackageReference>
   </ItemGroup>
 
-  <!-- In CI, we build and test with `/t:Build;Test` -->
-  <!-- So, for non-test projects, we want the target to be there and it's basically doing nothing -->
-  <!-- For C# test projects, Microsoft.Testing.Platform should inject Test target here: -->
-  <!-- https://github.com/microsoft/testfx/blob/5ad21909704db501f58f27d4a7ec241edd761af5/src/Platform/Microsoft.Testing.Platform.MSBuild/buildMultiTargeting/Microsoft.Testing.Platform.MSBuild.targets#L270-L273 -->
-  <!-- For C++ test projects, the RunVSTest SDK will do its job -->
-  <Target Name="Test" />
-
-  <!-- Add ability to run tests via "msbuild /t:Test" using the RunVSTest SDK -->
-  <!-- This is only needed for C++, as we use Microsoft.Testing.Platform for C# -->
+  <!-- Add ability to run tests via "msbuild /t:Test" -->
   <!--
     Work around an MSBuild bug where Microsoft.Common.Test.targets is missing from the Arm64 installation.
     See: https://github.com/dotnet/msbuild/pull/9984
@@ -117,11 +92,11 @@
           Once the change referenced above is fixed, the ImportGroup below can be replaced with:
             <Sdk Name="Microsoft.Build.RunVSTest" Version="1.0.319" />
   -->
-  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64' AND ('$(Language)' == 'C++' OR '$(MSBuildProjectExtension)' == '.vcxproj')">
+  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64'">
     <Import Project="Sdk.props" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
     <Import Project="Sdk.targets" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
   </ImportGroup>
-  <PropertyGroup Condition="'$(Language)' == 'C++' OR '$(MSBuildProjectExtension)' == '.vcxproj'">
+  <PropertyGroup>
     <VSTestLogger>trx</VSTestLogger>
     <!--
       RunVSTest by default uses %VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe,

Directory.Packages.props

@@ -2,7 +2,6 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <MSTestVersion>3.8.3</MSTestVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
@@ -78,17 +77,16 @@
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="1.0.231216.1"/>
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.260209005" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK.Foundation" Version="1.8.260203002" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.47" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.260209005" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Foundation" Version="1.8.251104000" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.39" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.251106002" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
     <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="MSTest" Version="$(MSTestVersion)" />
-    <PackageVersion Include="MSTest.TestFramework" Version="$(MSTestVersion)" />
+    <PackageVersion Include="MSTest" Version="3.8.3" />
     <PackageVersion Include="NJsonSchema" Version="11.4.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NLog" Version="5.2.8" />

NOTICE.md

@@ -1582,7 +1582,6 @@ SOFTWARE.
 - ModernWpfUI
 - Moq
 - MSTest
-- MSTest.TestFramework
 - NJsonSchema
 - NLog
 - NLog.Extensions.Logging
@@ -1603,4 +1602,4 @@ SOFTWARE.
 - WinUIEx
 - WmiLight
 - WPF-UI
-- WyHash
+- WyHash

PowerToys.slnx

@@ -13,10 +13,6 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <Project Path="src/common/Common.UI.Controls/Common.UI.Controls.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
     <Project Path="src/common/COMUtils/COMUtils.vcxproj" Id="7319089e-46d6-4400-bc65-e39bdf1416ee" />
     <Project Path="src/common/Display/Display.vcxproj" Id="caba8dfb-823b-4bf2-93ac-3f31984150d9" />
     <Project Path="src/common/FilePreviewCommon/FilePreviewCommon.csproj">
@@ -196,10 +192,6 @@
   <Folder Name="/modules/CommandPalette/">
     <Project Path="src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj" Id="5f63c743-f6ce-4dba-a200-2b3f8a14e8c2" />
     <Project Path="src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj" Id="0adeb797-c8c7-4ffa-acd5-2af6cad7ecd8" />
-    <Project Path="src/modules/cmdpal/Microsoft.CmdPal.Common/Microsoft.CmdPal.Common.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
   </Folder>
   <Folder Name="/modules/CommandPalette/Built-in Extensions/">
     <Project Path="src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj">
@@ -279,6 +271,16 @@
       <Deploy />
     </Project>
   </Folder>
+  <Folder Name="/modules/CommandPalette/Core/">
+    <Project Path="src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Microsoft.CmdPal.Core.Common.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Microsoft.CmdPal.Core.ViewModels.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+  </Folder>
   <Folder Name="/modules/CommandPalette/Extension SDK/">
     <Project Path="src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Microsoft.CommandPalette.Extensions.Toolkit.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
@@ -299,7 +301,7 @@
     </Project>
   </Folder>
   <Folder Name="/modules/CommandPalette/Tests/">
-    <Project Path="src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Microsoft.CmdPal.Common.UnitTests.csproj">
+    <Project Path="src/modules/cmdpal/Tests/Microsoft.CmdPal.Core.Common.UnitTests/Microsoft.CmdPal.Core.Common.UnitTests.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
@@ -688,13 +690,11 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <!-- TEMPORARILY_DISABLED: PowerDisplay
     <Project Path="src/modules/powerdisplay/PowerDisplay/PowerDisplay.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
     <Project Path="src/modules/powerdisplay/PowerDisplayModuleInterface/PowerDisplayModuleInterface.vcxproj" Id="d1234567-8901-2345-6789-abcdef012345" />
-    -->
   </Folder>
   <Folder Name="/modules/PowerDisplay/Tests/">
     <Project Path="src/modules/powerdisplay/PowerDisplay.Lib.UnitTests/PowerDisplay.Lib.UnitTests.csproj">

doc/devdocs/modules/advancedpaste-python-scripts.md

@@ -1,285 +0,0 @@
-# Advanced Paste – Python Scripts
-
-Advanced Paste supports user-defined Python scripts that transform clipboard content. Scripts are
-discovered automatically from a configurable folder and appear as actions in the Advanced Paste UI.
-
-## Quick start
-
-1. Open the scripts folder — by default `%LOCALAPPDATA%\Microsoft\PowerToys\AdvancedPaste\Scripts`.
-   You can change this in **Settings → Advanced Paste → Python scripts → Scripts folder**.
-2. Drop a `.py` file into the folder.
-3. Define one `advanced_paste_from_<input>_to_<output>` function (see [Writing a script](#writing-a-script)).
-4. Open the Advanced Paste UI (`Win+Shift+V`) — your script will appear in the action list.
-
-> **Important:** Each `.py` file must define exactly one `advanced_paste_from_<input>_to_<output>`
-> function. Scripts with zero or multiple such functions are ignored.
-
-## Writing a script
-
-You write a single Python function whose **name** declares both what clipboard input it accepts
-and what output type it produces.
-No imports from PowerToys are needed — zero setup, zero dependencies on our side.
-
-### Function naming convention
-
-The function name follows the pattern:
-
-```
-advanced_paste_from_<input>_to_<output>(<param>)
-```
-
-**Input types** (what the function receives):
-
-| Input | Parameter | When it runs |
-|-------|-----------|--------------|
-| `text` | `str` — clipboard text | Clipboard has text |
-| `html` | `str` — clipboard HTML | Clipboard has HTML |
-| `image` | `str` — path to temp image file | Clipboard has an image |
-| `audio` | `str` — path to audio file | Clipboard has an audio file |
-| `video` | `str` — path to video file | Clipboard has a video file |
-| `files` | `list[str]` — file paths | Clipboard has files |
-
-**Output types** (what the function produces — declared via `_to_` suffix):
-
-| Output | Effect |
-|--------|--------|
-| `text` | Sets clipboard to text |
-| `html` | Sets clipboard to HTML |
-| `image` | Sets clipboard to image |
-| `audio` | Sets clipboard to audio file |
-| `video` | Sets clipboard to video file |
-| `file` | Sets clipboard to a file |
-| `files` | Sets clipboard to multiple files |
-
-### Return value
-
-The return value is interpreted according to the declared output type:
-
-| Output type | Expected return value |
-|-------------|---------------------|
-| `text` | `str` (or any value — will be converted via `str()`) |
-| `html` | `str` containing HTML |
-| `image` | `str` or `pathlib.Path` pointing to an image file |
-| `file` | `str` or `pathlib.Path` pointing to a file |
-| `files` | `list` of `str`/`pathlib.Path` file paths |
-
-Returning `None` produces an empty result (no-op).
-
-## Examples
-
-### Minimal — uppercase text
-
-```python
-def advanced_paste_from_text_to_text(text):
-    return text.upper()
-```
-
-That's it. No headers required, no imports from PowerToys.
-
-### With optional metadata
-
-```python
-# @advancedpaste:name   Reverse Text
-# @advancedpaste:desc   Reverses clipboard text character by character
-
-def advanced_paste_from_text_to_text(text):
-    return text[::-1]
-```
-
-### Text to HTML
-
-```python
-# @advancedpaste:name   Markdown Table to HTML
-# @advancedpaste:desc   Convert a markdown table to an HTML table
-
-def advanced_paste_from_text_to_html(text):
-    headers = text.splitlines()[0].split("|")
-    return f"<table><tr>{''.join(f'<th>{h.strip()}</th>' for h in headers if h.strip())}</tr></table>"
-```
-
-### Image to text (OCR)
-
-```python
-# @advancedpaste:requires pytesseract
-
-def advanced_paste_from_image_to_text(image_path):
-    import pytesseract
-    return pytesseract.image_to_string(image_path).strip()
-```
-
-### Save text as file
-
-```python
-import os
-from pathlib import Path
-import tempfile
-
-def advanced_paste_from_text_to_file(text):
-    # Use ADVANCED_PASTE_WORK_DIR for WSL compatibility; falls back to temp dir on Windows.
-    out_dir = os.environ.get("ADVANCED_PASTE_WORK_DIR") or tempfile.gettempdir()
-    out = Path(out_dir) / "clipboard.txt"
-    out.write_text(text, encoding="utf-8")
-    return out
-```
-
-### Image processing (image → image)
-
-```python
-import os
-from PIL import Image
-from pathlib import Path
-import tempfile
-
-def advanced_paste_from_image_to_image(image_path):
-    """Convert image to grayscale."""
-    img = Image.open(image_path).convert("L")
-    out_dir = os.environ.get("ADVANCED_PASTE_WORK_DIR") or tempfile.gettempdir()
-    out = Path(out_dir) / "gray.png"
-    img.save(out)
-    return out
-```
-
-### File listing (files → text)
-
-```python
-import os
-
-def advanced_paste_from_files_to_text(file_paths):
-    lines = []
-    for p in file_paths:
-        size = os.path.getsize(p)
-        lines.append(f"{os.path.basename(p)} ({size} bytes)")
-    return "\n".join(lines)
-```
-
-## Header tags
-
-All header tags are **optional**. Tags are placed in comment lines at the top of the script.
-
-| Tag | Description |
-|-----|-------------|
-| `name` | Display name in the Advanced Paste UI. If omitted, the filename is used. |
-| `desc` | Short description / tooltip. |
-| `disabled` | Presence of this tag disables the script (it won't appear in the UI). |
-| `requires` | Declare Python package dependencies (see [Dependencies](#declaring-dependencies)). |
-
-### Example header
-
-```python
-# @advancedpaste:name   My Formatter
-# @advancedpaste:desc   Formats clipboard text as markdown table
-```
-
-To disable a script without deleting it, add:
-
-```python
-# @advancedpaste:disabled
-```
-
-Remove the line to re-enable.
-
-## Declaring dependencies
-
-Use `requires` to declare Python packages the script needs:
-
-```python
-# @advancedpaste:requires PIL=Pillow
-# @advancedpaste:requires cv2=opencv-python-headless numpy requests
-```
-
-Each token is either:
-
-- **`import_name`** — the pip package is assumed to have the same name (e.g. `requests`).
-- **`import_name=pip_package`** — when the import name differs from the pip package
-  (e.g. `cv2=opencv-python-headless`, `PIL=Pillow`).
-
-### Automatic import detection
-
-Advanced Paste also scans the script body for `import` and `from ... import` statements
-and cross-references them against the Python standard library. Any non-stdlib import
-that is not already installed triggers a prompt to install it automatically.
-
-## Security — script trust
-
-The first time a script is executed (or after it has been modified), Advanced Paste
-shows a confirmation dialog. Upon approval the SHA-256 hash of the script is stored.
-Subsequent runs of the unchanged file skip the dialog.
-
-## Error handling
-
-When a script fails, Advanced Paste extracts the Python traceback from stderr and
-displays a user-friendly summary in the UI:
-
-- **ModuleNotFoundError** — identifies the missing module and suggests installing it.
-- **SyntaxError** — shows the file and line number.
-- **Timeout** — shows the configured timeout value (default 30 s; configurable in Settings).
-- **Other errors** — shows the last line of the traceback as a summary, with the full
-  traceback available in the expandable *Details* section.
-
-## Settings
-
-The Python scripts feature uses a **mode selector** (dropdown) with three options:
-
-| Mode | Description |
-|------|-------------|
-| **Disabled** | Python scripts are not active. |
-| **Windows** | Scripts run using a native Windows Python interpreter. |
-| **WSL** | Scripts run inside Windows Subsystem for Linux. |
-
-Each mode maintains its own independent settings (scripts folder, interpreter path, etc.),
-so switching between Windows and WSL does not lose your previous configuration.
-
-### Windows mode settings
-
-| Setting | Description | Default |
-|---------|-------------|---------|
-| Scripts folder | Folder to scan for `.py` scripts. | `%LOCALAPPDATA%\Microsoft\PowerToys\AdvancedPaste\Scripts` |
-| Python interpreter | Path to the Python executable. Leave blank for auto-detection. | *(auto-detect)* |
-
-### WSL mode settings
-
-| Setting | Description | Default |
-|---------|-------------|---------|
-| Scripts folder | Folder to scan for `.py` scripts (Windows path — auto-translated to `/mnt/...`). | `%LOCALAPPDATA%\Microsoft\PowerToys\AdvancedPaste\Scripts` |
-| WSL distribution | Which WSL distro to use (e.g. `Ubuntu`). Leave blank for the default distribution. | *(default)* |
-
-### Scripts list
-
-The Settings page shows a read-only list of discovered scripts. For each script you can see:
-
-- **Name** — from `@advancedpaste:name` tag, or the filename if not set.
-- **Description** — from `@advancedpaste:desc` tag.
-- **Conversion** — the input → output types detected from the function name (e.g. "text → image").
-
-The list is **not editable** from Settings. To change a script's name, description, enabled state,
-or any other metadata, open the script file directly (click the "Open in editor" button) and edit
-the `# @advancedpaste:...` header tags. After saving, click **Refresh** in Settings to reload.
-
-### WSL mode details
-
-When **WSL** mode is selected:
-
-- Scripts are executed via `wsl.exe bash -l -c "python3 ..."` using the configured distribution.
-- The scripts folder remains on the Windows filesystem; paths are automatically translated
-  to `/mnt/c/...` format for WSL access.
-- Package installation uses `pip3 install` inside the WSL environment.
-- Output files from scripts must be written under `/mnt/` (the Windows-mounted filesystem)
-  so they can be accessed from Windows. The runner sets the `ADVANCED_PASTE_WORK_DIR` environment
-  variable to a temp directory under `/mnt/c/...` — use it instead of `tempfile.gettempdir()`
-  when producing file output for cross-platform compatibility.
-
-> **Tip:** If you have Python installed only in WSL (not on Windows), select WSL mode
-> to use your existing WSL Python environment with all its packages.
-
-## Tips
-
-- Each `.py` file must contain exactly one `advanced_paste_from_<input>_to_<output>` function.
-  If you need to handle multiple input types, create separate script files for each.
-- A `.py` file without any matching function is ignored — use this for helper modules
-  that other scripts can import.
-- Scripts can be tested from the command line:
-  ```
-  echo {"format":["text"],"text":"hello"} | python _runner.py my_script.py
-  ```
-- The script's directory is added to `sys.path` at runtime, so you can import sibling `.py`
-  files as helper modules.

doc/devdocs/readme.md

@@ -96,10 +96,6 @@ See [Debugging](development/debugging.md) for detailed debugging techniques, inc
 
 See [Creating a New PowerToy](development/new-powertoy.md) for an end-to-end guide covering module architecture, settings integration, installer packaging, and testing.
 
-### Building Command Palette Extensions
-
-If you want to build your own extensions for Command Palette, check out the [Command Palette extensibility documentation](https://aka.ms/building-cmdpal-extensions). It covers how to create, package, and distribute custom extensions that integrate with Command Palette.
-
 ## Development Guidelines
 
 - [Coding Guidelines](development/guidelines.md) - Development guidelines and best practices

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

@@ -1565,6 +1565,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
         L"PowerToys.PowerRename.exe",
         L"PowerToys.ImageResizer.exe",
         L"PowerToys.LightSwitchService.exe",
+        L"PowerToys.PowerDisplay.exe",
         L"PowerToys.GcodeThumbnailProvider.exe",
         L"PowerToys.BgcodeThumbnailProvider.exe",
         L"PowerToys.PdfThumbnailProvider.exe",

installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

@@ -47,6 +47,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
       call move /Y ..\..\..\NewPlus.wxs.bk ..\..\..\NewPlus.wxs
       call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs
       call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs
+      call move /Y ..\..\..\PowerDisplay.wxs.bk ..\..\..\PowerDisplay.wxs
       call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs
       call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs
       call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs
@@ -123,6 +124,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <Compile Include="KeyboardManager.wxs" />
     <Compile Include="Peek.wxs" />
     <Compile Include="PowerRename.wxs" />
+    <Compile Include="PowerDisplay.wxs" />
     <Compile Include="DscResources.wxs" />
     <Compile Include="RegistryPreview.wxs" />
     <Compile Include="Run.wxs" />

installer/PowerToysSetupVNext/Product.wxs

@@ -53,6 +53,7 @@
       <ComponentGroupRef Id="LightSwitchComponentGroup" />
       <ComponentGroupRef Id="PeekComponentGroup" />
       <ComponentGroupRef Id="PowerRenameComponentGroup" />
+      <ComponentGroupRef Id="PowerDisplayComponentGroup" />
       <ComponentGroupRef Id="RegistryPreviewComponentGroup" />
       <ComponentGroupRef Id="RunComponentGroup" />
       <ComponentGroupRef Id="SettingsComponentGroup" />

installer/PowerToysSetupVNext/generateAllFileComponents.ps1

@@ -176,6 +176,10 @@ Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PS
 Generate-FileList -fileDepsJson "" -fileListName LightSwitchFiles -wxsFilePath $PSScriptRoot\LightSwitch.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\LightSwitchService"
 Generate-FileComponents -fileListName "LightSwitchFiles" -wxsFilePath $PSScriptRoot\LightSwitch.wxs
 
+#PowerDisplay
+Generate-FileList -fileDepsJson "" -fileListName PowerDisplayAssetsFiles -wxsFilePath $PSScriptRoot\PowerDisplay.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerDisplay"
+Generate-FileComponents -fileListName "PowerDisplayAssetsFiles" -wxsFilePath $PSScriptRoot\PowerDisplay.wxs
+
 #New+
 Generate-FileList -fileDepsJson "" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus"
 Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs

nuget.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<packageSources>
 		<clear />

src/Common.Dotnet.CsWinRT.props

@@ -4,9 +4,8 @@
   <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />
 
   <PropertyGroup>
-    <CoreTargetFramework>net9.0</CoreTargetFramework>
     <WindowsSdkPackageVersion>10.0.26100.68-preview</WindowsSdkPackageVersion>
-    <TargetFramework>$(CoreTargetFramework)-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>

src/Common.Dotnet.FuzzTest.props

@@ -7,13 +7,4 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
   </PropertyGroup>
-
-  <!--
-    In CI, the main build runs `/t:Build;Test` across the full solution.
-    Fuzz test projects are built for OneFuzz ingestion, but should not be
-    executed as regular MSTest tests in this pass.
-  -->
-  <PropertyGroup Condition="'$(TF_BUILD)' != ''">
-    <TestingPlatformDisableCustomTestTarget>true</TestingPlatformDisableCustomTestTarget>
-  </PropertyGroup>
 </Project>

src/PackageIdentity/PackageIdentity.vcxproj

@@ -117,4 +117,4 @@
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 
-</Project>
+</Project>

src/codeAnalysis/GlobalSuppressions.cs

@@ -22,13 +22,13 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("StyleCop.CSharp.SpecialRules", "SA0001:XmlCommentAnalysisDisabled", Justification = "Not enabled as we don't want or need XML documentation.")]
 [assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1629:DocumentationTextMustEndWithAPeriod", Justification = "Not enabled as we don't want or need XML documentation.")]
 
-[assembly: SuppressMessage("Microsoft.Design", "CA1009:DeclareEventHandlersCorrectly", Scope = "member", Target = "Microsoft.Templates.Locations.TemplatesSynchronization.#SyncStatusChanged", Justification = "Using an Action<object, SyncStatusEventArgs> does not allow the required notation")]
+[assembly: SuppressMessage("Microsoft.Design", "CA1009:DeclareEventHandlersCorrectly", Scope = "member", Target = "Microsoft.Templates.Core.Locations.TemplatesSynchronization.#SyncStatusChanged", Justification = "Using an Action<object, SyncStatusEventArgs> does not allow the required notation")]
 
 // Non general suppressions
 [assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "This is part of the markdown processing", MessageId = "System.Windows.Documents.Run.#ctor(System.String)", Scope = "member", Target = "Microsoft.Templates.UI.Controls.Markdown.#ImageInlineEvaluator(System.Text.RegularExpressions.Match)")]
-[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer specification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.ITemplateInfoExtensions.#GetQueryableProperties(Microsoft.TemplateEngine.Abstractions.ITemplateInfo)")]
-[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer specification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.Composition.CompositionQuery.#Match(System.Collections.Generic.IEnumerable`1<Microsoft.Templates.Composition.QueryNode>,Microsoft.Templates.Composition.QueryablePropertyDictionary)")]
-[assembly: SuppressMessage("Usage", "VSTHRD103:Call async methods when in an async method", Justification = "Resource DictionaryWriter does not implement flush async", Scope = "member", Target = "~M:Microsoft.Templates.PostActions.Catalog.Merge.MergeResourceDictionaryPostAction.ExecuteInternalAsync~System.Threading.Tasks.Task")]
+[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer specification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.Core.ITemplateInfoExtensions.#GetQueryableProperties(Microsoft.TemplateEngine.Abstractions.ITemplateInfo)")]
+[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer specification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.Core.Composition.CompositionQuery.#Match(System.Collections.Generic.IEnumerable`1<Microsoft.Templates.Core.Composition.QueryNode>,Microsoft.Templates.Core.Composition.QueryablePropertyDictionary)")]
+[assembly: SuppressMessage("Usage", "VSTHRD103:Call async methods when in an async method", Justification = "Resource DictionaryWriter does not implement flush async", Scope = "member", Target = "~M:Microsoft.Templates.Core.PostActions.Catalog.Merge.MergeResourceDictionaryPostAction.ExecuteInternalAsync~System.Threading.Tasks.Task")]
 [assembly: SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Used in a lot of places for meaningful method names")]
 [assembly: SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Static methods may improve performance but decrease maintainability")]
 [assembly: SuppressMessage("Naming", "CA1711:Identifiers should not have incorrect suffix", Justification = "Renaming everything would be a lot of work. It does not do any harm if an EventHandler delegate ends with the suffix EventHandler. Besides this, the Rule causes some false positives.")]
@@ -43,10 +43,10 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("Microsoft.VisualStudio.Threading.Analyzers", "VSTHRD100:Avoid async void methods", Justification = "Event handlers needs async void", Scope = "member", Target = "~M:Microsoft.Templates.UI.ViewModels.Common.SavedTemplateViewModel.OnDelete(Microsoft.Templates.UI.ViewModels.Common.SavedTemplateViewModel)")]
 
 // Localization suppressions
-[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Locations.JunctionNativeMethods.#CreateJunction(System.String,System.String,System.Boolean)", Justification = "Only used for local generation")]
-[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Locations.JunctionNativeMethods.#DeleteJunction(System.String)", Justification = "Only used for local generation")]
-[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Locations.JunctionNativeMethods.#InternalGetTarget(Microsoft.Win32.SafeHandles.SafeFileHandle)", Justification = "Only used for local generation")]
-[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Locations.JunctionNativeMethods.#OpenReparsePoint(System.String,Microsoft.Templates.Locations.JunctionNativeMethods+EFileAccess)", Justification = "Only used for local generation")]
+[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.#CreateJunction(System.String,System.String,System.Boolean)", Justification = "Only used for local generation")]
+[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.#DeleteJunction(System.String)", Justification = "Only used for local generation")]
+[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.#InternalGetTarget(Microsoft.Win32.SafeHandles.SafeFileHandle)", Justification = "Only used for local generation")]
+[assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.ThrowLastWin32Error(System.String)", Scope = "member", Target = "Microsoft.Templates.Core.Locations.JunctionNativeMethods.#OpenReparsePoint(System.String,Microsoft.Templates.Core.Locations.JunctionNativeMethods+EFileAccess)", Justification = "Only used for local generation")]
 [assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "System.Windows.Documents.InlineCollection.Add(System.String)", Scope = "member", Target = "Microsoft.Templates.UI.Extensions.TextBlockExtensions.#OnSequentialFlowStepChanged(System.Windows.DependencyObject,System.Windows.DependencyPropertyChangedEventArgs)", Justification = "No text here")]
 [assembly: SuppressMessage("Globalization", "CA1309:Use ordinal string comparison", Justification = "The user's search term should be compared with culture based rules.", Scope = "type", Target = "~T:Microsoft.PowerToys.Run.Plugin.TimeDate.Components.SearchController")]
 

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

@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
-  <Import Project="$(RepoRoot)src\Common.SelfContained.props" />
-
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
-    <RootNamespace>Microsoft.PowerToys.Common.UI.Controls</RootNamespace>
-    <AssemblyName>PowerToys.Common.UI.Controls</AssemblyName>
-    <UseWinUI>true</UseWinUI>
-    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-    <GenerateLibraryLayout>true</GenerateLibraryLayout>
-    <ProjectPriFileName>PowerToys.Common.UI.Controls.pri</ProjectPriFileName>
-    <Nullable>enable</Nullable>
-    <Platforms>x64;ARM64</Platforms>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
-    <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
-    <PackageReference Include="CommunityToolkit.WinUI.Extensions" />
-    <PackageReference Include="CommunityToolkit.WinUI.Converters" />
-    <PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ManagedCommon\ManagedCommon.csproj" />
-  </ItemGroup>
-
-</Project>

src/common/Common.UI.Controls/Themes/Generic.xaml

@@ -1,8 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///PowerToys.Common.UI.Controls/Controls/KeyVisual/KeyVisual.xaml" />
-        <ResourceDictionary Source="ms-appx:///PowerToys.Common.UI.Controls/Controls/KeyVisual/KeyCharPresenter.xaml" />
-        <ResourceDictionary Source="ms-appx:///PowerToys.Common.UI.Controls/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml" />
-        <ResourceDictionary Source="ms-appx:///PowerToys.Common.UI.Controls/Controls/ShortcutWithTextLabelControl/ShortcutWithTextLabelControl.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>

src/common/ManagedCommon/ColorFormatHelper.cs

@@ -515,7 +515,8 @@ namespace ManagedCommon
                     return lightnessL.ToString(CultureInfo.InvariantCulture);
                 case "Lc":
                     var (lightnessC, _, _) = ConvertToCIELABColor(color);
-                    return ColorPercentFormatted(lightnessC, paramFormat, 2);
+                    lightnessC = Math.Round(lightnessC, 2);
+                    return lightnessC.ToString(CultureInfo.InvariantCulture);
                 case "Lo":
                     var (lightnessO, _, _) = ConvertToOklabColor(color);
                     lightnessO = Math.Round(lightnessO, 2);
@@ -530,10 +531,12 @@ namespace ManagedCommon
                     return blackness.ToString(CultureInfo.InvariantCulture);
                 case "Ca":
                     var (_, chromaticityA, _) = ConvertToCIELABColor(color);
-                    return ColorPercentFormatted(chromaticityA, paramFormat, 2);
+                    chromaticityA = Math.Round(chromaticityA, 2);
+                    return chromaticityA.ToString(CultureInfo.InvariantCulture);
                 case "Cb":
                     var (_, _, chromaticityB) = ConvertToCIELABColor(color);
-                    return ColorPercentFormatted(chromaticityB, paramFormat, 2);
+                    chromaticityB = Math.Round(chromaticityB, 2);
+                    return chromaticityB.ToString(CultureInfo.InvariantCulture);
                 case "Oa":
                     var (_, chromaticityAOklab, _) = ConvertToOklabColor(color);
                     chromaticityAOklab = Math.Round(chromaticityAOklab, 2);
@@ -592,24 +595,6 @@ namespace ManagedCommon
             }
         }
 
-        private static string ColorPercentFormatted(double colorPercentValue, char paramFormat, int defaultDecimalDigits)
-        {
-            switch (paramFormat)
-            {
-                case 'i':
-                    double roundedColorPercentValue = Math.Round(colorPercentValue);
-                    if (roundedColorPercentValue == 0)
-                    {
-                        // convert -0 to 0
-                        roundedColorPercentValue = 0.0;
-                    }
-
-                    return roundedColorPercentValue.ToString(CultureInfo.InvariantCulture);
-                default:
-                    return Math.Round(colorPercentValue, defaultDecimalDigits).ToString(CultureInfo.InvariantCulture);
-            }
-        }
-
         public static string GetDefaultFormat(string formatName)
         {
             switch (formatName)

src/common/UITestAutomation/Element/Element.cs

@@ -8,6 +8,7 @@ using System.Runtime.CompilerServices;
 using System.Xml.Linq;
 using ABI.Windows.Foundation;
 using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;

src/common/UITestAutomation/UITestAutomation.csproj

@@ -15,8 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="Appium.WebDriver" />
-    <!-- Test libraries/utilities should not use the metapackage. -->
-    <PackageReference Include="MSTest.TestFramework" />
+    <PackageReference Include="MSTest" />
     <PackageReference Include="System.IO.Abstractions" />
     <PackageReference Include="System.Text.RegularExpressions" />
     <PackageReference Include="CoenM.ImageSharp.ImageHash" />

src/common/interop/interop-tests/Common.Interop.UnitTests.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.Interop.Tests</RootNamespace>
     <AssemblyName>Microsoft.Interop.Tests</AssemblyName>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

src/dsc/v3/PowerToys.DSC.UnitTests/PowerToys.DSC.UnitTests.csproj

@@ -3,10 +3,6 @@
   <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
-    <SelfContained>true</SelfContained>
-    <RuntimeIdentifier Condition="'$(Platform)' == 'x64'">win-x64</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="'$(Platform)' == 'ARM64'">win-arm64</RuntimeIdentifier>
-    <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
     <OutputPath>$(RepoRoot)$(Configuration)\$(Platform)\tests\PowerToys.DSC.Tests\</OutputPath>
   </PropertyGroup>

src/dsc/v3/PowerToys.DSC/PowerToys.DSC.csproj

@@ -46,7 +46,6 @@
     <Message Text="Generating DSC resource JSON files to DSCModules subfolder..." Importance="high" />
     <MakeDir Directories="$(TargetDir)DSCModules" />
     
-    <Exec Command="&quot;$(TargetDir)$(AssemblyName).exe&quot; manifest --resource settings --outputDir &quot;$(TargetDir)DSCModules&quot;" Condition="'$(SelfContained)' == 'true'" />
-    <Exec Command="dotnet &quot;$(TargetPath)&quot; manifest --resource settings --outputDir &quot;$(TargetDir)DSCModules&quot;" Condition="'$(SelfContained)' != 'true'" />
+    <Exec Command="dotnet &quot;$(TargetPath)&quot; manifest --resource settings --outputDir &quot;$(TargetDir)DSCModules&quot;" />
   </Target>
 </Project>

src/gpo/assets/PowerToys.admx

@@ -149,7 +149,6 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
-    <!-- TEMPORARILY_DISABLED: PowerDisplay
     <policy name="ConfigureEnabledUtilityPowerDisplay" class="Both" displayName="$(string.ConfigureEnabledUtilityPowerDisplay)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityPowerDisplay">
       <parentCategory ref="PowerToys" />
       <supportedOn ref="SUPPORTED_POWERTOYS_0_95_0" />
@@ -160,7 +159,6 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
-    -->
     <policy name="ConfigureEnabledUtilityEnvironmentVariables" class="Both" displayName="$(string.ConfigureEnabledUtilityEnvironmentVariables)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityEnvironmentVariables">
       <parentCategory ref="PowerToys" />
       <supportedOn ref="SUPPORTED_POWERTOYS_0_75_0" />

src/gpo/assets/en-US/PowerToys.adml

@@ -248,7 +248,7 @@ If you don't configure this policy, the user will be able to control the setting
       <string id="ConfigureEnabledUtilityCmdPal">CmdPal: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityCropAndLock">Crop And Lock: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityLightSwitch">Light Switch: Configure enabled state</string>
-      <!-- <string id="ConfigureEnabledUtilityPowerDisplay">PowerDisplay: Configure enabled state</string> --><!-- TEMPORARILY_DISABLED: PowerDisplay -->
+      <string id="ConfigureEnabledUtilityPowerDisplay">PowerDisplay: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityEnvironmentVariables">Environment Variables: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityFancyZones">FancyZones: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityFileLocksmith">File Locksmith: Configure enabled state</string>

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

@@ -6,12 +6,6 @@
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<OutputType>Exe</OutputType>
-
-		<!-- exit code 8 means no tests ran. -->
-		<!-- Doc: https://learn.microsoft.com/dotnet/core/testing/unit-testing-platform-exit-codes -->
-		<!-- This test project doesn't seem to contain any tests. -->
-	    <TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --ignore-exit-code 8</TestingPlatformCommandLineArguments>
 	</PropertyGroup>
 	<PropertyGroup>
 		<OutputPath>$(RepoRoot)$(Platform)\$(Configuration)\tests\AdvancedPaste.FuzzTests\</OutputPath>

src/modules/AdvancedPaste/AdvancedPaste.UnitTests/AdvancedPaste.UnitTests.csproj

@@ -3,14 +3,11 @@
   <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
-    <SelfContained>true</SelfContained>
-    <RuntimeIdentifier Condition="'$(Platform)' == 'x64'">win-x64</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="'$(Platform)' == 'ARM64'">win-arm64</RuntimeIdentifier>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\tests\AdvancedPaste.UnitTests\</OutputPath>
-    <OutputType>Exe</OutputType>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>

src/modules/AdvancedPaste/AdvancedPaste.UnitTests/Mocks/IntegrationTestUserSettings.cs

@@ -57,22 +57,6 @@ internal sealed class IntegrationTestUserSettings : IUserSettings
 
     public PasteAIConfiguration PasteAIConfiguration => _configuration;
 
-    public IReadOnlyList<AdvancedPastePythonScriptAction> PythonScriptActions => Array.Empty<AdvancedPastePythonScriptAction>();
-
-    public string PythonScriptsFolder => string.Empty;
-
-    public string PythonExecutablePath => string.Empty;
-
-    public bool PythonUseWsl => false;
-
-    public string PythonWslDistribution => string.Empty;
-
-    public int PythonScriptTimeoutSeconds => 30;
-
-    public bool IsPythonScriptsEnabled => true;
-
-    public IReadOnlyDictionary<string, string> TrustedScriptHashes => new Dictionary<string, string>();
-
     public event EventHandler Changed;
 
     public Task SetActiveAIProviderAsync(string providerId)
@@ -81,8 +65,4 @@ internal sealed class IntegrationTestUserSettings : IUserSettings
         Changed?.Invoke(this, EventArgs.Empty);
         return Task.CompletedTask;
     }
-
-    public void StoreTrustedScriptHash(string scriptPath, string hash)
-    {
-    }
 }

src/modules/AdvancedPaste/AdvancedPaste.UnitTests/ServicesTests/PythonScriptServiceTests.cs

@@ -1,560 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-using AdvancedPaste.Helpers;
-using AdvancedPaste.Services.PythonScripts;
-using AdvancedPaste.UnitTests.Mocks;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace AdvancedPaste.UnitTests.ServicesTests;
-
-[TestClass]
-public sealed class PythonScriptServiceTests
-{
-    private PythonScriptService _service;
-
-    [TestInitialize]
-    public void Setup()
-    {
-        _service = new PythonScriptService(new IntegrationTestUserSettings());
-    }
-
-    [TestMethod]
-    public void MergeWithAutoDetectedImports_DetectsSimpleImports()
-    {
-        var lines = new[]
-        {
-            "# @advancedpaste:name test",
-            "import requests",
-            "import numpy",
-            "import os",
-            "import sys",
-        };
-
-        var result = PythonScriptService.MergeWithAutoDetectedImports(lines, []);
-
-        Assert.AreEqual(2, result.Count); // requests + numpy; os and sys are stdlib
-        Assert.IsTrue(result.Any(r => r.ImportName == "requests" && r.PipPackage == "requests"));
-        Assert.IsTrue(result.Any(r => r.ImportName == "numpy" && r.PipPackage == "numpy"));
-    }
-
-    [TestMethod]
-    public void MergeWithAutoDetectedImports_DetectsFromImports()
-    {
-        var lines = new[]
-        {
-            "from PIL import Image",
-            "from markitdown import MarkItDown",
-        };
-
-        var result = PythonScriptService.MergeWithAutoDetectedImports(lines, []);
-
-        Assert.AreEqual(2, result.Count);
-        Assert.IsTrue(result.Any(r => r.ImportName == "PIL" && r.PipPackage == "Pillow"));
-        Assert.IsTrue(result.Any(r => r.ImportName == "markitdown" && r.PipPackage == "markitdown"));
-    }
-
-    [TestMethod]
-    public void MergeWithAutoDetectedImports_WellKnownMappings()
-    {
-        var lines = new[]
-        {
-            "import cv2",
-            "import win32clipboard",
-            "import yaml",
-        };
-
-        var result = PythonScriptService.MergeWithAutoDetectedImports(lines, []);
-
-        Assert.AreEqual(3, result.Count);
-        Assert.IsTrue(result.Any(r => r.ImportName == "cv2" && r.PipPackage == "opencv-python"));
-        Assert.IsTrue(result.Any(r => r.ImportName == "win32clipboard" && r.PipPackage == "pywin32"));
-        Assert.IsTrue(result.Any(r => r.ImportName == "yaml" && r.PipPackage == "PyYAML"));
-    }
-
-    [TestMethod]
-    public void MergeWithAutoDetectedImports_ExplicitRequirementsTakePrecedence()
-    {
-        var lines = new[]
-        {
-            "import cv2",
-            "import requests",
-        };
-
-        var explicitReqs = new List<PythonRequirement>
-        {
-            new("cv2", "opencv-python-headless"),
-        };
-
-        var result = PythonScriptService.MergeWithAutoDetectedImports(lines, explicitReqs);
-
-        Assert.AreEqual(2, result.Count);
-
-        // cv2 should use the explicit pip package name, not the well-known mapping
-        var cv2Req = result.First(r => r.ImportName == "cv2");
-        Assert.AreEqual("opencv-python-headless", cv2Req.PipPackage);
-
-        // requests should be auto-detected
-        Assert.IsTrue(result.Any(r => r.ImportName == "requests"));
-    }
-
-    [TestMethod]
-    public void MergeWithAutoDetectedImports_SkipsStdlib()
-    {
-        var lines = new[]
-        {
-            "import os",
-            "import sys",
-            "import json",
-            "import io",
-            "import pathlib",
-            "import tempfile",
-            "import subprocess",
-        };
-
-        var result = PythonScriptService.MergeWithAutoDetectedImports(lines, []);
-
-        Assert.AreEqual(0, result.Count);
-    }
-
-    [TestMethod]
-    public void MergeWithAutoDetectedImports_SkipsComments()
-    {
-        var lines = new[]
-        {
-            "# import requests",
-            "# from PIL import Image",
-            "import json",
-        };
-
-        var result = PythonScriptService.MergeWithAutoDetectedImports(lines, []);
-
-        Assert.AreEqual(0, result.Count);
-    }
-
-    [TestMethod]
-    public void MergeWithAutoDetectedImports_HandlesMultipleImportsOnOneLine()
-    {
-        var lines = new[]
-        {
-            "import requests, numpy, pandas",
-        };
-
-        var result = PythonScriptService.MergeWithAutoDetectedImports(lines, []);
-
-        Assert.AreEqual(3, result.Count);
-        Assert.IsTrue(result.Any(r => r.ImportName == "requests"));
-        Assert.IsTrue(result.Any(r => r.ImportName == "numpy"));
-        Assert.IsTrue(result.Any(r => r.ImportName == "pandas"));
-    }
-
-    [TestMethod]
-    public void MergeWithAutoDetectedImports_HandlesSubmoduleImport()
-    {
-        var lines = new[]
-        {
-            "import win32com.client",
-            "from llama_cpp import Llama",
-        };
-
-        var result = PythonScriptService.MergeWithAutoDetectedImports(lines, []);
-
-        Assert.AreEqual(2, result.Count);
-        Assert.IsTrue(result.Any(r => r.ImportName == "win32com" && r.PipPackage == "pywin32"));
-        Assert.IsTrue(result.Any(r => r.ImportName == "llama_cpp" && r.PipPackage == "llama-cpp-python"));
-    }
-
-    [TestMethod]
-    public void ParsePythonError_ModuleNotFoundError()
-    {
-        var stderr = """
-            Traceback (most recent call last):
-              File "C:\scripts\reverse.py", line 4, in <module>
-                import win32clipboard
-            ModuleNotFoundError: No module named 'win32clipboard'
-            """;
-
-        var (summary, details) = PythonScriptService.ParsePythonError(stderr);
-
-        Assert.IsTrue(summary.Contains("reverse.py"), $"Summary should mention the script: {summary}");
-        Assert.IsTrue(summary.Contains("line 4"), $"Summary should mention the line: {summary}");
-        Assert.IsTrue(summary.Contains("win32clipboard"), $"Summary should mention the module: {summary}");
-        Assert.IsTrue(summary.Contains("pywin32"), $"Summary should suggest pip package: {summary}");
-        Assert.IsTrue(!string.IsNullOrEmpty(details));
-    }
-
-    [TestMethod]
-    public void ParsePythonError_SyntaxError()
-    {
-        var stderr = """
-            File "test.py", line 5
-                def foo(
-                       ^
-            SyntaxError: unexpected EOF while parsing
-            """;
-
-        var (summary, details) = PythonScriptService.ParsePythonError(stderr);
-
-        Assert.IsTrue(summary.Contains("test.py"), $"Summary should mention the script: {summary}");
-        Assert.IsTrue(summary.Contains("line 5"), $"Summary should mention the line: {summary}");
-        Assert.IsTrue(summary.Contains("Python syntax error:"), $"Summary: {summary}");
-        Assert.IsTrue(!string.IsNullOrEmpty(details));
-    }
-
-    [TestMethod]
-    public void ParsePythonError_SyntaxErrorWithColumn()
-    {
-        var stderr = "  File \"script.py\", line 3\n    x = (1 +\n        ^\nSyntaxError: '(' was never closed\n";
-
-        var (summary, details) = PythonScriptService.ParsePythonError(stderr);
-
-        Assert.IsTrue(summary.Contains("script.py"), $"Summary should mention the script: {summary}");
-        Assert.IsTrue(summary.Contains("line 3"), $"Summary should mention the line: {summary}");
-        Assert.IsTrue(summary.Contains("col"), $"Summary should mention the column: {summary}");
-        Assert.IsTrue(summary.Contains("Python syntax error:"), $"Summary: {summary}");
-        Assert.IsTrue(!string.IsNullOrEmpty(details));
-    }
-
-    [TestMethod]
-    public void ParsePythonError_GenericError()
-    {
-        var stderr = """
-            Traceback (most recent call last):
-              File "test.py", line 10, in <module>
-                result = 1 / 0
-            ZeroDivisionError: division by zero
-            """;
-
-        var (summary, details) = PythonScriptService.ParsePythonError(stderr);
-
-        Assert.IsTrue(summary.Contains("test.py"), $"Summary should mention the script: {summary}");
-        Assert.IsTrue(summary.Contains("line 10"), $"Summary should mention the line: {summary}");
-        Assert.IsTrue(summary.Contains("ZeroDivisionError"), $"Summary: {summary}");
-        Assert.IsTrue(!string.IsNullOrEmpty(details));
-    }
-
-    [TestMethod]
-    public void ParsePythonError_NestedTraceback_ShowsLastFrame()
-    {
-        var stderr = """
-            Traceback (most recent call last):
-              File "main.py", line 5, in <module>
-                helper()
-              File "helper.py", line 12, in helper
-                do_work()
-              File "worker.py", line 8, in do_work
-                raise RuntimeError("bad state")
-            RuntimeError: bad state
-            """;
-
-        var (summary, details) = PythonScriptService.ParsePythonError(stderr);
-
-        Assert.IsTrue(summary.Contains("worker.py"), $"Summary should mention the last script in the chain: {summary}");
-        Assert.IsTrue(summary.Contains("line 8"), $"Summary should mention the line of the last frame: {summary}");
-        Assert.IsTrue(summary.Contains("bad state"), $"Summary should contain the error message: {summary}");
-    }
-
-    [TestMethod]
-    public void ParsePythonError_EmptyStderr()
-    {
-        var (summary, details) = PythonScriptService.ParsePythonError(string.Empty);
-
-        Assert.IsTrue(!string.IsNullOrEmpty(summary));
-        Assert.AreEqual(string.Empty, details);
-    }
-
-    [TestMethod]
-    public void ParsePythonError_NoTraceback_PlainStderr()
-    {
-        var stderr = "Something went wrong in the script\n";
-
-        var (summary, details) = PythonScriptService.ParsePythonError(stderr);
-
-        // No File "..." reference, so no location — just the message
-        Assert.IsTrue(summary.Contains("Something went wrong"), $"Summary: {summary}");
-        Assert.IsFalse(summary.Contains("line"), $"Summary should not contain 'line' without a traceback: {summary}");
-    }
-
-    [TestMethod]
-    public void ExtractLastTracebackLocation_BasicTraceback()
-    {
-        var lines = new[]
-        {
-            "Traceback (most recent call last):",
-            "  File \"script.py\", line 10, in <module>",
-            "    result = 1 / 0",
-            "ZeroDivisionError: division by zero",
-        };
-
-        var location = PythonScriptService.ExtractLastTracebackLocation(lines);
-
-        Assert.IsNotNull(location);
-        Assert.AreEqual("script.py", location.Value.FileName);
-        Assert.AreEqual(10, location.Value.Line);
-        Assert.IsNull(location.Value.Column);
-    }
-
-    [TestMethod]
-    public void ExtractLastTracebackLocation_WithCaret()
-    {
-        var lines = new[]
-        {
-            "  File \"test.py\", line 5",
-            "    def foo(",
-            "           ^",
-            "SyntaxError: unexpected EOF while parsing",
-        };
-
-        var location = PythonScriptService.ExtractLastTracebackLocation(lines);
-
-        Assert.IsNotNull(location);
-        Assert.AreEqual("test.py", location.Value.FileName);
-        Assert.AreEqual(5, location.Value.Line);
-        Assert.IsNotNull(location.Value.Column);
-    }
-
-    [TestMethod]
-    public void ExtractLastTracebackLocation_FullPath_ReturnsBasename()
-    {
-        var lines = new[]
-        {
-            "Traceback (most recent call last):",
-            "  File \"C:\\Users\\user\\scripts\\my_script.py\", line 42, in <module>",
-            "    some_call()",
-            "ValueError: invalid value",
-        };
-
-        var location = PythonScriptService.ExtractLastTracebackLocation(lines);
-
-        Assert.IsNotNull(location);
-        Assert.AreEqual("my_script.py", location.Value.FileName);
-        Assert.AreEqual(42, location.Value.Line);
-    }
-
-    [TestMethod]
-    public void ExtractLastTracebackLocation_NoFileLine_ReturnsNull()
-    {
-        var lines = new[]
-        {
-            "Some random error output",
-            "No traceback here",
-        };
-
-        var location = PythonScriptService.ExtractLastTracebackLocation(lines);
-
-        Assert.IsNull(location);
-    }
-
-    [TestMethod]
-    public void ParsePipInstallError_ExtractsErrorLine()
-    {
-        var stderr = """
-            Collecting some-package
-              Downloading some-package-1.0.tar.gz (15 kB)
-            ERROR: Could not find a version that satisfies the requirement some-package (from versions: none)
-            ERROR: No matching distribution found for some-package
-            """;
-
-        var (summary, fullStderr) = PythonScriptService.ParsePipInstallError(stderr);
-
-        Assert.IsTrue(summary.Contains("No matching distribution"), $"Summary should contain the last ERROR line: {summary}");
-        Assert.IsTrue(!string.IsNullOrEmpty(fullStderr));
-    }
-
-    [TestMethod]
-    public void ParsePipInstallError_NoErrorPrefix_UsesLastLine()
-    {
-        var stderr = "permission denied: /usr/lib/python3/dist-packages\n";
-
-        var (summary, fullStderr) = PythonScriptService.ParsePipInstallError(stderr);
-
-        Assert.IsTrue(summary.Contains("permission denied"), $"Summary: {summary}");
-        Assert.IsTrue(!string.IsNullOrEmpty(fullStderr));
-    }
-
-    [TestMethod]
-    public void ParsePipInstallError_EmptyStderr()
-    {
-        var (summary, fullStderr) = PythonScriptService.ParsePipInstallError(string.Empty);
-
-        Assert.AreEqual("unknown error", summary);
-        Assert.AreEqual(string.Empty, fullStderr);
-    }
-
-    [TestMethod]
-    public void ReadMetadata_FunctionNameDeterminesFormat_Text()
-    {
-        // The new interface uses function names like advanced_paste_from_text_to_text(...)
-        // to determine supported formats, not parameter signatures.
-        var scriptPath = CreateTempScript("def advanced_paste_from_text_to_text(text):\n    return text.upper()\n");
-        var metadata = _service.ReadMetadata(scriptPath);
-
-        Assert.IsNotNull(metadata);
-        Assert.AreEqual(Models.ClipboardFormat.Text, metadata.SupportedFormats);
-        Assert.AreEqual("text", metadata.OutputTypeHint);
-        File.Delete(scriptPath);
-    }
-
-    [TestMethod]
-    public void ReadMetadata_FunctionNameDeterminesFormat_Html()
-    {
-        var scriptPath = CreateTempScript("def advanced_paste_from_html_to_text(html: str) -> str:\n    return html\n");
-        var metadata = _service.ReadMetadata(scriptPath);
-
-        Assert.IsNotNull(metadata);
-        Assert.AreEqual(Models.ClipboardFormat.Html, metadata.SupportedFormats);
-        Assert.AreEqual("text", metadata.OutputTypeHint);
-        File.Delete(scriptPath);
-    }
-
-    [TestMethod]
-    public void ReadMetadata_FunctionNameDeterminesFormat_Image()
-    {
-        var scriptPath = CreateTempScript("def advanced_paste_from_image_to_text(image_path):\n    return 'desc'\n");
-        var metadata = _service.ReadMetadata(scriptPath);
-
-        Assert.IsNotNull(metadata);
-        Assert.AreEqual(Models.ClipboardFormat.Image, metadata.SupportedFormats);
-        Assert.AreEqual("text", metadata.OutputTypeHint);
-        File.Delete(scriptPath);
-    }
-
-    [TestMethod]
-    public void ReadMetadata_FunctionNameDeterminesFormat_Files()
-    {
-        var scriptPath = CreateTempScript("def advanced_paste_from_files_to_text(file_paths):\n    return ''\n");
-        var metadata = _service.ReadMetadata(scriptPath);
-
-        Assert.IsNotNull(metadata);
-        Assert.AreEqual(Models.ClipboardFormat.File, metadata.SupportedFormats);
-        Assert.AreEqual("text", metadata.OutputTypeHint);
-        File.Delete(scriptPath);
-    }
-
-    [TestMethod]
-    public void ReadMetadata_OutputTypeHint_Image()
-    {
-        var scriptPath = CreateTempScript("def advanced_paste_from_text_to_image(text):\n    return '/path/img.png'\n");
-        var metadata = _service.ReadMetadata(scriptPath);
-
-        Assert.IsNotNull(metadata);
-        Assert.AreEqual("image", metadata.OutputTypeHint);
-        File.Delete(scriptPath);
-    }
-
-    [TestMethod]
-    public void ReadMetadata_OutputTypeHint_File()
-    {
-        var scriptPath = CreateTempScript("def advanced_paste_from_text_to_file(text):\n    return '/path/out.txt'\n");
-        var metadata = _service.ReadMetadata(scriptPath);
-
-        Assert.IsNotNull(metadata);
-        Assert.AreEqual("file", metadata.OutputTypeHint);
-        File.Delete(scriptPath);
-    }
-
-    [TestMethod]
-    public void ReadMetadata_OutputTypeHint_Files()
-    {
-        var scriptPath = CreateTempScript("def advanced_paste_from_files_to_files(file_paths):\n    return file_paths\n");
-        var metadata = _service.ReadMetadata(scriptPath);
-
-        Assert.IsNotNull(metadata);
-        Assert.AreEqual("files", metadata.OutputTypeHint);
-        File.Delete(scriptPath);
-    }
-
-    [TestMethod]
-    public void ReadMetadata_RejectsMultipleFunctions()
-    {
-        var scriptPath = CreateTempScript(
-            "def advanced_paste_from_text_to_text(text):\n    return text\n\n" +
-            "def advanced_paste_from_html_to_text(html):\n    return html\n");
-        var metadata = _service.ReadMetadata(scriptPath);
-
-        Assert.IsNull(metadata);
-        File.Delete(scriptPath);
-    }
-
-    [TestMethod]
-    public void ReadMetadata_RejectsNoFunction()
-    {
-        var scriptPath = CreateTempScript("def some_other_function(text):\n    return text\n");
-        var metadata = _service.ReadMetadata(scriptPath);
-
-        Assert.IsNull(metadata);
-        File.Delete(scriptPath);
-    }
-
-    [TestMethod]
-    public void ReadMetadata_RejectsOldFormatWithoutTo()
-    {
-        // Old format (advanced_paste_from_text without _to_) should be rejected.
-        var scriptPath = CreateTempScript("def advanced_paste_from_text(text):\n    return text\n");
-        var metadata = _service.ReadMetadata(scriptPath);
-
-        Assert.IsNull(metadata);
-        File.Delete(scriptPath);
-    }
-
-    [TestMethod]
-    public void ReadMetadata_FunctionNameDeterminesFormat_Audio()
-    {
-        var scriptPath = CreateTempScript("def advanced_paste_from_audio_to_text(audio_path):\n    return 'transcribed'\n");
-        var metadata = _service.ReadMetadata(scriptPath);
-
-        Assert.IsNotNull(metadata);
-        Assert.AreEqual(Models.ClipboardFormat.Audio, metadata.SupportedFormats);
-        Assert.AreEqual("text", metadata.OutputTypeHint);
-        File.Delete(scriptPath);
-    }
-
-    [TestMethod]
-    public void ReadMetadata_FunctionNameDeterminesFormat_Video()
-    {
-        var scriptPath = CreateTempScript("def advanced_paste_from_video_to_text(video_path):\n    return 'description'\n");
-        var metadata = _service.ReadMetadata(scriptPath);
-
-        Assert.IsNotNull(metadata);
-        Assert.AreEqual(Models.ClipboardFormat.Video, metadata.SupportedFormats);
-        Assert.AreEqual("text", metadata.OutputTypeHint);
-        File.Delete(scriptPath);
-    }
-
-    [TestMethod]
-    public void ReadMetadata_OutputTypeHint_Audio()
-    {
-        var scriptPath = CreateTempScript("def advanced_paste_from_text_to_audio(text):\n    return '/path/out.mp3'\n");
-        var metadata = _service.ReadMetadata(scriptPath);
-
-        Assert.IsNotNull(metadata);
-        Assert.AreEqual(Models.ClipboardFormat.Text, metadata.SupportedFormats);
-        Assert.AreEqual("audio", metadata.OutputTypeHint);
-        File.Delete(scriptPath);
-    }
-
-    [TestMethod]
-    public void ReadMetadata_OutputTypeHint_Video()
-    {
-        var scriptPath = CreateTempScript("def advanced_paste_from_text_to_video(text):\n    return '/path/out.mp4'\n");
-        var metadata = _service.ReadMetadata(scriptPath);
-
-        Assert.IsNotNull(metadata);
-        Assert.AreEqual(Models.ClipboardFormat.Text, metadata.SupportedFormats);
-        Assert.AreEqual("video", metadata.OutputTypeHint);
-        File.Delete(scriptPath);
-    }
-
-    private static string CreateTempScript(string content)
-    {
-        var path = Path.Combine(Path.GetTempPath(), $"test_script_{Guid.NewGuid():N}.py");
-        File.WriteAllText(path, content);
-        return path;
-    }
-}

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj

@@ -155,9 +155,5 @@
     <Content Include="Assets\AdvancedPaste\SemanticKernel.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-
-    <Content Include="Services\PythonScripts\_runner.py">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
 </Project>

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

@@ -14,7 +14,6 @@ using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using AdvancedPaste.Services;
 using AdvancedPaste.Services.CustomActions;
-using AdvancedPaste.Services.PythonScripts;
 using AdvancedPaste.Settings;
 using AdvancedPaste.ViewModels;
 using ManagedCommon;
@@ -84,8 +83,6 @@ namespace AdvancedPaste
                 services.AddSingleton<IPasteAIProviderFactory, PasteAIProviderFactory>();
                 services.AddSingleton<ICustomActionTransformService, CustomActionTransformService>();
                 services.AddSingleton<IKernelService, AdvancedAIKernelService>();
-                services.AddSingleton<IPythonScriptService, PythonScriptService>();
-                services.AddSingleton<IPythonScriptTrustService, PythonScriptTrustService>();
                 services.AddSingleton<IPasteFormatExecutor, PasteFormatExecutor>();
                 services.AddSingleton<OptionsViewModel>();
             }).Build();

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

@@ -755,7 +755,63 @@
                 <animations:OpacityAnimation To="0.0" Duration="0:0:0.167" />
             </animations:Implicit.HideAnimations>
         </TextBlock>
-        <!--  Error message grid moved to MainPage.xaml so it remains enabled when PromptBox is disabled  -->
+        <Grid
+            x:Name="ErrorMessageGrid"
+            x:Uid="ErrorMessageGrid"
+            Grid.Row="1"
+            Margin="8,8,0,0"
+            ColumnSpacing="8"
+            Visibility="Collapsed">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <StackPanel Grid.Column="0" Orientation="Horizontal">
+                <ToolTipService.ToolTip>
+                    <ToolTip VerticalOffset="-105" Visibility="{x:Bind ViewModel.PasteActionError.HasDetails, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                        <StackPanel
+                            MinWidth="300"
+                            HorizontalAlignment="Stretch"
+                            Orientation="Vertical">
+                            <TextBox
+                                x:Name="AIErrorMessage"
+                                x:Uid="AIErrorMessage"
+                                FontSize="12"
+                                IsReadOnly="True"
+                                Text="{x:Bind ViewModel.PasteActionError.Details, Mode=OneWay}"
+                                TextWrapping="Wrap" />
+                        </StackPanel>
+                    </ToolTip>
+                </ToolTipService.ToolTip>
+                <FontIcon
+                    Margin="0,3,3,0"
+                    VerticalAlignment="Top"
+                    FontSize="12"
+                    Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                    Glyph="&#xE946;"
+                    Visibility="{x:Bind ViewModel.PasteActionError.HasDetails, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                <TextBlock
+                    FontWeight="SemiBold"
+                    Foreground="{ThemeResource SystemFillColorCriticalBrush}"
+                    Style="{StaticResource CaptionTextBlockStyle}"
+                    Text="{x:Bind ViewModel.PasteActionError.Text, Mode=OneWay}" />
+            </StackPanel>
+            <HyperlinkButton
+                x:Uid="SettingsBtn"
+                Grid.Column="1"
+                Margin="0,-1,0,0"
+                Padding="0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Command="{x:Bind ViewModel.OpenSettingsCommand}"
+                FontSize="12" />
+            <animations:Implicit.ShowAnimations>
+                <animations:OpacityAnimation To="1.0" Duration="0:0:0.6" />
+            </animations:Implicit.ShowAnimations>
+            <animations:Implicit.HideAnimations>
+                <animations:OpacityAnimation To="0.0" Duration="0:0:0.167" />
+            </animations:Implicit.HideAnimations>
+        </Grid>
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup x:Name="CommonStates">
                 <VisualState x:Name="DefaultState" />
@@ -776,6 +832,7 @@
                     <VisualState.Setters>
                         <Setter Target="InputTxtBox.BorderBrush" Value="{ThemeResource SystemFillColorCriticalBrush}" />
                         <Setter Target="DisclaimerPresenter.Visibility" Value="Collapsed" />
+                        <Setter Target="ErrorMessageGrid.Visibility" Value="Visible" />
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>

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

@@ -43,8 +43,7 @@ namespace AdvancedPaste
                 double GetHeight(int maxCustomActionCount) =>
                     baseHeight +
                     new PasteFormatsToHeightConverter().GetHeight(coreActionCount + _userSettings.AdditionalActions.Count) +
-                    new PasteFormatsToHeightConverter() { MaxItems = maxCustomActionCount }.GetHeight(_optionsViewModel.IsCustomAIServiceEnabled ? _userSettings.CustomActions.Count : 0) +
-                    new PasteFormatsToHeightConverter() { MaxItems = maxCustomActionCount }.GetHeight(_optionsViewModel.PythonScriptPasteFormats.Count);
+                    new PasteFormatsToHeightConverter() { MaxItems = maxCustomActionCount }.GetHeight(_optionsViewModel.IsCustomAIServiceEnabled ? _userSettings.CustomActions.Count : 0);
 
                 MinHeight = GetHeight(1);
                 Height = GetHeight(5);
@@ -60,7 +59,6 @@ namespace AdvancedPaste
                     UpdateHeight();
                 }
             };
-            _optionsViewModel.PythonScriptPasteFormats.CollectionChanged += (_, _) => UpdateHeight();
 
             AppWindow.SetIcon("Assets/AdvancedPaste/AdvancedPaste.ico");
             this.ExtendsContentIntoTitleBar = true;
@@ -143,7 +141,11 @@ namespace AdvancedPaste
         internal void FinishLoading(bool success)
         {
             MainPage.CustomFormatTextBox.IsLoading(false);
-            VisualStateManager.GoToState(MainPage.CustomFormatTextBox, "DefaultState", true);
+
+            if (success)
+            {
+                VisualStateManager.GoToState(MainPage.CustomFormatTextBox, "DefaultState", true);
+            }
         }
     }
 }

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

@@ -144,7 +144,6 @@
     </Page.KeyboardAccelerators>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
@@ -251,12 +250,10 @@
             Grid.Row="1"
             Margin="20,0,20,0"
             x:FieldModifier="public"
-            IsEnabled="True"
+            IsEnabled="{x:Bind ViewModel.IsCustomAIServiceEnabled, Mode=OneWay}"
             TabIndex="0">
             <controls:PromptBox.Footer>
-                <StackPanel
-                    Orientation="Horizontal"
-                    Visibility="{x:Bind ViewModel.IsCustomAIServiceEnabled, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                <StackPanel Orientation="Horizontal">
                     <TextBlock
                         x:Uid="AIMistakeNote"
                         Margin="0,0,2,0"
@@ -302,70 +299,19 @@
                 </StackPanel>
             </controls:PromptBox.Footer>
         </controls:PromptBox>
-        <Grid
-            x:Name="ErrorMessageGrid"
-            Grid.Row="2"
-            Margin="20,4,20,0"
-            ColumnSpacing="8"
-            Visibility="{x:Bind ViewModel.PasteActionError.HasText, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <FontIcon
-                Grid.Column="0"
-                Margin="0,3,3,0"
-                VerticalAlignment="Top"
-                FontSize="12"
-                Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
-                Glyph="&#xE946;"
-                Visibility="{x:Bind ViewModel.PasteActionError.HasDetails, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-            <TextBlock
-                Grid.Column="1"
-                FontWeight="SemiBold"
-                Foreground="{ThemeResource SystemFillColorCriticalBrush}"
-                Style="{StaticResource CaptionTextBlockStyle}"
-                MaxLines="2"
-                TextTrimming="CharacterEllipsis"
-                TextWrapping="Wrap"
-                Text="{x:Bind ViewModel.PasteActionError.Text, Mode=OneWay}" />
-            <HyperlinkButton
-                x:Name="ShowErrorDetailsBtn"
-                x:Uid="ShowErrorDetailsBtn"
-                Grid.Column="2"
-                Margin="4,-1,0,0"
-                Padding="0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Click="ShowErrorDetailsBtn_Click"
-                FontSize="12"
-                Visibility="{x:Bind ViewModel.PasteActionError.HasDetails, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-            <HyperlinkButton
-                x:Uid="SettingsBtn"
-                Grid.Column="3"
-                Margin="0,-1,0,0"
-                Padding="0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Command="{x:Bind ViewModel.OpenSettingsCommand}"
-                FontSize="12" />
-        </Grid>
-        <ScrollViewer Grid.Row="3">
+        <ScrollViewer Grid.Row="2">
             <Grid RowSpacing="4">
                 <Grid.RowDefinitions>
+                    <RowDefinition Height="{x:Bind ViewModel.StandardPasteFormats.Count, Mode=OneWay, Converter={StaticResource standardPasteFormatsToHeightConverter}}" />
                     <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" MinHeight="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource customActionsToMinHeightConverter}}" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <ListView
                     x:Name="PasteOptionsListView"
                     Grid.Row="0"
+                    VerticalAlignment="Bottom"
                     IsItemClickEnabled="True"
                     ItemClick="PasteFormat_ItemClick"
                     ItemContainerTransitions="{x:Null}"
@@ -395,27 +341,6 @@
                     ScrollViewer.VerticalScrollMode="Disabled"
                     SelectionMode="None"
                     TabIndex="2" />
-
-                <Rectangle
-                    Grid.Row="3"
-                    Height="1"
-                    HorizontalAlignment="Stretch"
-                    Fill="{ThemeResource DividerStrokeColorDefaultBrush}"
-                    Visibility="{x:Bind ViewModel.PythonScriptPasteFormats.Count, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />
-
-                <ListView
-                    x:Name="PythonScriptsListView"
-                    Grid.Row="4"
-                    VerticalAlignment="Top"
-                    IsItemClickEnabled="True"
-                    ItemClick="PasteFormat_ItemClick"
-                    ItemContainerTransitions="{x:Null}"
-                    ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
-                    ItemsSource="{x:Bind ViewModel.PythonScriptPasteFormats, Mode=OneWay}"
-                    ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                    ScrollViewer.VerticalScrollMode="Disabled"
-                    SelectionMode="None"
-                    TabIndex="3" />
             </Grid>
         </ScrollViewer>
     </Grid>

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

@@ -208,43 +208,5 @@ namespace AdvancedPaste.Pages
                 Clipboard.SetHistoryItemAsContent(item.Item);
             }
         }
-
-        private async void ShowErrorDetailsBtn_Click(object sender, RoutedEventArgs e)
-        {
-            var details = ViewModel.PasteActionError?.Details;
-            if (string.IsNullOrEmpty(details))
-            {
-                return;
-            }
-
-            var scrollViewer = new ScrollViewer
-            {
-                MaxHeight = 400,
-                MinWidth = 400,
-                HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled,
-                VerticalScrollBarVisibility = ScrollBarVisibility.Auto,
-            };
-
-            var textBlock = new TextBlock
-            {
-                Text = details,
-                TextWrapping = TextWrapping.Wrap,
-                FontFamily = new Microsoft.UI.Xaml.Media.FontFamily("Consolas"),
-                FontSize = 12,
-                IsTextSelectionEnabled = true,
-            };
-
-            scrollViewer.Content = textBlock;
-
-            var dialog = new ContentDialog
-            {
-                Title = ResourceLoaderInstance.ResourceLoader.GetString("ErrorDetailsDialogTitle"),
-                CloseButtonText = ResourceLoaderInstance.ResourceLoader.GetString("ErrorDetailsDialogClose"),
-                Content = scrollViewer,
-                XamlRoot = this.XamlRoot,
-            };
-
-            await dialog.ShowAsync();
-        }
     }
 }

src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs

@@ -27,26 +27,8 @@ namespace AdvancedPaste.Settings
 
         public PasteAIConfiguration PasteAIConfiguration { get; }
 
-        public IReadOnlyList<AdvancedPastePythonScriptAction> PythonScriptActions { get; }
-
-        public bool IsPythonScriptsEnabled { get; }
-
-        public string PythonScriptsFolder { get; }
-
-        public string PythonExecutablePath { get; }
-
-        public bool PythonUseWsl { get; }
-
-        public string PythonWslDistribution { get; }
-
-        public int PythonScriptTimeoutSeconds { get; }
-
-        public IReadOnlyDictionary<string, string> TrustedScriptHashes { get; }
-
         public event EventHandler Changed;
 
         Task SetActiveAIProviderAsync(string providerId);
-
-        void StoreTrustedScriptHash(string scriptPath, string hash);
     }
 }

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

@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
 using System.Threading;
@@ -26,10 +25,6 @@ namespace AdvancedPaste.Settings
         private readonly Lock _loadingSettingsLock = new();
         private readonly List<PasteFormats> _additionalActions;
         private readonly List<AdvancedPasteCustomAction> _customActions;
-        private readonly List<AdvancedPastePythonScriptAction> _pythonScriptActions;
-        private FileSystemWatcher _scriptFolderWatcher;
-        private CancellationTokenSource _scriptFolderDebounce;
-        private string _watchedScriptsFolder = string.Empty;
 
         private const string AdvancedPasteModuleName = "AdvancedPaste";
         private const int MaxNumberOfRetry = 5;
@@ -53,22 +48,6 @@ namespace AdvancedPaste.Settings
 
         public PasteAIConfiguration PasteAIConfiguration { get; private set; }
 
-        public IReadOnlyList<AdvancedPastePythonScriptAction> PythonScriptActions => _pythonScriptActions;
-
-        public string PythonScriptsFolder { get; private set; }
-
-        public bool IsPythonScriptsEnabled { get; private set; }
-
-        public string PythonExecutablePath { get; private set; }
-
-        public bool PythonUseWsl { get; private set; }
-
-        public string PythonWslDistribution { get; private set; } = string.Empty;
-
-        public int PythonScriptTimeoutSeconds { get; private set; } = 30;
-
-        public IReadOnlyDictionary<string, string> TrustedScriptHashes { get; private set; } = new Dictionary<string, string>();
-
         public UserSettings(IFileSystem fileSystem)
         {
             _settingsUtils = new SettingsUtils(fileSystem);
@@ -78,14 +57,8 @@ namespace AdvancedPaste.Settings
             CloseAfterLosingFocus = false;
             EnableClipboardPreview = true;
             PasteAIConfiguration = new PasteAIConfiguration();
-            PythonScriptsFolder = GetDefaultScriptsFolder();
-            PythonExecutablePath = string.Empty;
-            PythonUseWsl = false;
-            PythonWslDistribution = string.Empty;
-            PythonScriptTimeoutSeconds = 30;
             _additionalActions = [];
             _customActions = [];
-            _pythonScriptActions = [];
             _taskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
 
             LoadSettingsFromJson();
@@ -93,14 +66,6 @@ namespace AdvancedPaste.Settings
             _watcher = Helper.GetFileWatcher(AdvancedPasteModuleName, "settings.json", OnSettingsFileChanged, fileSystem);
         }
 
-        private static string GetDefaultScriptsFolder() =>
-            System.IO.Path.Combine(
-                Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                "Microsoft",
-                "PowerToys",
-                "AdvancedPaste",
-                "Scripts");
-
         private void OnSettingsFileChanged()
         {
             lock (_loadingSettingsLock)
@@ -166,42 +131,6 @@ namespace AdvancedPaste.Settings
                                 _customActions.Clear();
                                 _customActions.AddRange(properties.CustomActions.Value.Where(customAction => customAction.IsShown && customAction.IsValid));
 
-                                var pythonScripts = properties.PythonScripts ?? new AdvancedPastePythonScriptSettings();
-                                pythonScripts.MigrateLegacyIfNeeded();
-
-                                var mode = pythonScripts.Mode ?? "disabled";
-                                IsPythonScriptsEnabled = !string.Equals(mode, "disabled", StringComparison.OrdinalIgnoreCase);
-                                PythonUseWsl = string.Equals(mode, "wsl", StringComparison.OrdinalIgnoreCase);
-
-                                if (PythonUseWsl)
-                                {
-                                    var wslSettings = pythonScripts.WslSettings ?? new PythonScriptWslSettings();
-                                    PythonScriptsFolder = string.IsNullOrWhiteSpace(wslSettings.ScriptsFolder)
-                                        ? GetDefaultScriptsFolder()
-                                        : wslSettings.ScriptsFolder;
-                                    PythonExecutablePath = string.Empty;
-                                    PythonWslDistribution = wslSettings.Distribution ?? string.Empty;
-                                }
-                                else
-                                {
-                                    var winSettings = pythonScripts.WindowsSettings ?? new PythonScriptWindowsSettings();
-                                    PythonScriptsFolder = string.IsNullOrWhiteSpace(winSettings.ScriptsFolder)
-                                        ? GetDefaultScriptsFolder()
-                                        : winSettings.ScriptsFolder;
-                                    PythonExecutablePath = winSettings.PythonExecutablePath ?? string.Empty;
-                                    PythonWslDistribution = string.Empty;
-                                }
-
-                                PythonScriptTimeoutSeconds = pythonScripts.TimeoutSeconds > 0 ? pythonScripts.TimeoutSeconds : 30;
-                                TrustedScriptHashes = new Dictionary<string, string>(
-                                    pythonScripts.TrustedScriptHashes ?? new Dictionary<string, string>(),
-                                    StringComparer.OrdinalIgnoreCase);
-
-                                _pythonScriptActions.Clear();
-                                _pythonScriptActions.AddRange(pythonScripts.Value.Where(a => a.IsShown));
-
-                                UpdateScriptFolderWatcher(PythonScriptsFolder);
-
                                 Changed?.Invoke(this, EventArgs.Empty);
                             }
 
@@ -366,102 +295,6 @@ namespace AdvancedPaste.Settings
             return string.IsNullOrWhiteSpace(filtered) ? "default" : filtered.ToLowerInvariant();
         }
 
-        private void UpdateScriptFolderWatcher(string folderPath)
-        {
-            if (string.Equals(_watchedScriptsFolder, folderPath, StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            _scriptFolderWatcher?.Dispose();
-            _scriptFolderWatcher = null;
-            _watchedScriptsFolder = folderPath;
-
-            if (string.IsNullOrWhiteSpace(folderPath))
-            {
-                return;
-            }
-
-            try
-            {
-                if (!System.IO.Directory.Exists(folderPath))
-                {
-                    System.IO.Directory.CreateDirectory(folderPath);
-                }
-
-                _scriptFolderWatcher = new FileSystemWatcher(folderPath, "*.py")
-                {
-                    NotifyFilter = NotifyFilters.FileName | NotifyFilters.LastWrite | NotifyFilters.CreationTime,
-                    EnableRaisingEvents = true,
-                    IncludeSubdirectories = false,
-                };
-
-                _scriptFolderWatcher.Changed += OnScriptFolderChanged;
-                _scriptFolderWatcher.Created += OnScriptFolderChanged;
-                _scriptFolderWatcher.Deleted += OnScriptFolderChanged;
-                _scriptFolderWatcher.Renamed += OnScriptFolderChanged;
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Failed to set up script folder watcher for {folderPath}", ex);
-            }
-        }
-
-        private void OnScriptFolderChanged(object sender, FileSystemEventArgs e)
-        {
-            lock (_loadingSettingsLock)
-            {
-                _scriptFolderDebounce?.Cancel();
-                _scriptFolderDebounce = new CancellationTokenSource();
-
-                Task.Delay(TimeSpan.FromMilliseconds(500))
-                    .ContinueWith(
-                        _ =>
-                        {
-                            Task.Factory
-                                .StartNew(
-                                    () => Changed?.Invoke(this, EventArgs.Empty),
-                                    CancellationToken.None,
-                                    TaskCreationOptions.None,
-                                    _taskScheduler)
-                                .Wait();
-                        },
-                        _scriptFolderDebounce.Token,
-                        TaskContinuationOptions.NotOnCanceled,
-                        TaskScheduler.Default);
-            }
-        }
-
-        public void StoreTrustedScriptHash(string scriptPath, string hash)
-        {
-            lock (_loadingSettingsLock)
-            {
-                try
-                {
-                    var settings = _settingsUtils.GetSettingsOrDefault<AdvancedPasteSettings>(AdvancedPasteModuleName);
-                    if (settings?.Properties?.PythonScripts is null)
-                    {
-                        return;
-                    }
-
-                    settings.Properties.PythonScripts.TrustedScriptHashes ??= new Dictionary<string, string>();
-                    settings.Properties.PythonScripts.TrustedScriptHashes[scriptPath] = hash;
-                    settings.Save(_settingsUtils);
-
-                    // Update in-memory cache.
-                    var updated = new Dictionary<string, string>(TrustedScriptHashes, StringComparer.OrdinalIgnoreCase)
-                    {
-                        [scriptPath] = hash,
-                    };
-                    TrustedScriptHashes = updated;
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogError("Failed to store trusted script hash", ex);
-                }
-            }
-        }
-
         public async Task SetActiveAIProviderAsync(string providerId)
         {
             if (string.IsNullOrWhiteSpace(providerId))
@@ -554,8 +387,6 @@ namespace AdvancedPaste.Settings
                 if (disposing)
                 {
                     _cancellationTokenSource?.Dispose();
-                    _scriptFolderDebounce?.Dispose();
-                    _scriptFolderWatcher?.Dispose();
                     _watcher?.Dispose();
                 }
 

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

@@ -40,14 +40,6 @@ public sealed class PasteFormat
             IsSavedQuery = isSavedQuery,
         };
 
-    public static PasteFormat CreatePythonScriptFormat(string name, string scriptPath, ClipboardFormat availableFormats) =>
-        new(PasteFormats.PythonScript, availableFormats, isAIServiceEnabled: false)
-        {
-            Name = name,
-            Prompt = scriptPath,
-            IsSavedQuery = true,
-        };
-
     public PasteFormatMetadataAttribute Metadata => MetadataDict[Format];
 
     public string IconGlyph => Metadata.IconGlyph;

src/modules/AdvancedPaste/AdvancedPaste/Models/PasteFormats.cs

@@ -122,13 +122,4 @@ public enum PasteFormats
         KernelFunctionDescription = "Takes user instructions and applies them to the current clipboard content (text or image). Use this function for image analysis, description, or transformation tasks beyond simple OCR.",
         RequiresPrompt = true)]
     CustomTextTransformation,
-
-    [PasteFormatMetadata(
-        IsCoreAction = false,
-        IconGlyph = "\uE943",
-        RequiresAIService = false,
-        CanPreview = true,
-        SupportedClipboardFormats = ClipboardFormat.Text | ClipboardFormat.Html | ClipboardFormat.Image | ClipboardFormat.Audio | ClipboardFormat.Video | ClipboardFormat.File,
-        KernelFunctionDescription = "Runs a user-provided Python script on clipboard content.")]
-    PythonScript,
 }

src/modules/AdvancedPaste/AdvancedPaste/Services/PasteFormatExecutor.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// 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.
 
@@ -9,23 +9,15 @@ using System.Threading.Tasks;
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using AdvancedPaste.Services.CustomActions;
-using AdvancedPaste.Services.PythonScripts;
-using ManagedCommon;
 using Microsoft.PowerToys.Telemetry;
 using Windows.ApplicationModel.DataTransfer;
 
 namespace AdvancedPaste.Services;
 
-public sealed class PasteFormatExecutor(
-    IKernelService kernelService,
-    ICustomActionTransformService customActionTransformService,
-    IPythonScriptService pythonScriptService,
-    IPythonScriptTrustService pythonScriptTrustService) : IPasteFormatExecutor
+public sealed class PasteFormatExecutor(IKernelService kernelService, ICustomActionTransformService customActionTransformService) : IPasteFormatExecutor
 {
     private readonly IKernelService _kernelService = kernelService;
     private readonly ICustomActionTransformService _customActionTransformService = customActionTransformService;
-    private readonly IPythonScriptService _pythonScriptService = pythonScriptService;
-    private readonly IPythonScriptTrustService _pythonScriptTrustService = pythonScriptTrustService;
 
     public async Task<DataPackage> ExecutePasteFormatAsync(PasteFormat pasteFormat, PasteActionSource source, CancellationToken cancellationToken, IProgress<double> progress)
     {
@@ -40,15 +32,6 @@ public sealed class PasteFormatExecutor(
 
         var clipboardData = Clipboard.GetContent();
 
-        // PythonScript must NOT run inside Task.Run: the trust confirmation (ContentDialog)
-        // requires the UI (XAML) thread and will throw if called from a thread-pool thread.
-        // Python script execution is fully async (process.WaitForExitAsync), so it is safe
-        // to await it directly without wrapping in Task.Run.
-        if (format == PasteFormats.PythonScript)
-        {
-            return await ExecutePythonScriptAsync(pasteFormat.Prompt, clipboardData, cancellationToken, progress);
-        }
-
         // Run on thread-pool; although we use Async routines consistently, some actions still occasionally take a long time without yielding.
         return await Task.Run(async () =>
             pasteFormat.Format switch
@@ -59,92 +42,6 @@ public sealed class PasteFormatExecutor(
             });
     }
 
-    private async Task<DataPackage> ExecutePythonScriptAsync(
-        string scriptPath,
-        DataPackageView clipboardData,
-        CancellationToken cancellationToken,
-        IProgress<double> progress)
-    {
-        // Security: ensure the script is trusted before executing.
-        if (!_pythonScriptTrustService.IsTrusted(scriptPath))
-        {
-            var hash = _pythonScriptTrustService.ComputeHash(scriptPath);
-            var approved = await _pythonScriptTrustService.RequestTrustAsync(scriptPath, hash);
-
-            if (!approved)
-            {
-                throw new OperationCanceledException("User declined to trust the Python script.");
-            }
-
-            _pythonScriptTrustService.StoreTrust(scriptPath, hash);
-        }
-
-        var metadata = _pythonScriptService.ReadMetadata(scriptPath);
-
-        // Pre-flight: check for missing packages and offer to install them.
-        var missingPackages = await _pythonScriptService.GetMissingRequirementsAsync(metadata, cancellationToken);
-        if (missingPackages.Count > 0)
-        {
-            var approved = await _pythonScriptTrustService.RequestInstallAsync(metadata.Name, missingPackages);
-            if (!approved)
-            {
-                throw new OperationCanceledException("User declined to install missing Python packages.");
-            }
-
-            await _pythonScriptService.InstallRequirementsAsync(missingPackages, metadata.Platform, cancellationToken);
-        }
-
-        var detectedFormat = await clipboardData.GetAvailableFormatsAsync();
-
-        // V2 interface: script defines advanced_paste_from_*_to_*() — use unified runner.
-        if (metadata.IsV2)
-        {
-            return await _pythonScriptService.ExecuteScriptAsync(scriptPath, metadata.Platform, clipboardData, detectedFormat, cancellationToken, progress);
-        }
-
-        // Legacy paths for backward compatibility.
-        if (string.Equals(metadata.Platform, "linux", StringComparison.OrdinalIgnoreCase))
-        {
-            return await _pythonScriptService.ExecuteWslScriptAsync(scriptPath, clipboardData, detectedFormat, cancellationToken, progress);
-        }
-        else
-        {
-            // Windows mode: script modifies the clipboard in-process; we return the updated clipboard.
-            await _pythonScriptService.ExecuteWindowsScriptAsync(scriptPath, detectedFormat, cancellationToken, progress);
-
-            // Re-read clipboard after script has run.
-            return Clipboard.GetContent() is { } updatedView
-                ? await DataPackageFromViewAsync(updatedView)
-                : new DataPackage();
-        }
-    }
-
-    private static async Task<DataPackage> DataPackageFromViewAsync(DataPackageView view)
-    {
-        var pkg = new DataPackage();
-
-        if (view.Contains(StandardDataFormats.Text))
-        {
-            pkg.SetText(await view.GetTextAsync());
-        }
-        else if (view.Contains(StandardDataFormats.Html))
-        {
-            pkg.SetHtmlFormat(await view.GetHtmlFormatAsync());
-        }
-        else if (view.Contains(StandardDataFormats.StorageItems))
-        {
-            var items = await view.GetStorageItemsAsync();
-            pkg.SetStorageItems(items);
-        }
-        else if (view.Contains(StandardDataFormats.Bitmap))
-        {
-            var bitmap = await view.GetBitmapAsync();
-            pkg.SetBitmap(bitmap);
-        }
-
-        return pkg;
-    }
-
     private static void WriteTelemetry(PasteFormats format, PasteActionSource source)
     {
         switch (source)

src/modules/AdvancedPaste/AdvancedPaste/Services/PythonScripts/IPythonScriptService.cs

@@ -1,71 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-using AdvancedPaste.Models;
-using Windows.ApplicationModel.DataTransfer;
-
-namespace AdvancedPaste.Services.PythonScripts;
-
-public interface IPythonScriptService
-{
-    /// <summary>
-    /// V2 unified execution: C# reads the clipboard, pipes data as JSON to the runner,
-    /// and receives a DataPackage from JSON stdout. Works on both Windows and WSL
-    /// depending on the specified platform.
-    /// </summary>
-    Task<DataPackage> ExecuteScriptAsync(string scriptPath, string platform, DataPackageView clipboardData, ClipboardFormat detectedFormat, CancellationToken cancellationToken, IProgress<double> progress);
-
-    /// <summary>
-    /// Legacy Windows mode: the script directly manipulates the clipboard. C# waits for the process to exit.
-    /// Kept for backward compatibility with scripts that use win32clipboard directly.
-    /// </summary>
-    Task ExecuteWindowsScriptAsync(string scriptPath, ClipboardFormat detectedFormat, CancellationToken cancellationToken, IProgress<double> progress);
-
-    /// <summary>
-    /// Legacy WSL mode: C# passes data via JSON stdin, receives a DataPackage from JSON stdout.
-    /// Kept for backward compatibility with scripts that use json.load(sys.stdin) directly.
-    /// </summary>
-    Task<DataPackage> ExecuteWslScriptAsync(string scriptPath, DataPackageView clipboardData, ClipboardFormat detectedFormat, CancellationToken cancellationToken, IProgress<double> progress);
-
-    /// <summary>
-    /// Parses the @advancedpaste: header comments from a Python script file.
-    /// </summary>
-    PythonScriptMetadata ReadMetadata(string scriptPath);
-
-    /// <summary>
-    /// Discovers all .py scripts in <paramref name="folderPath"/> and returns their metadata.
-    /// </summary>
-    IReadOnlyList<PythonScriptMetadata> DiscoverScripts(string folderPath);
-
-    /// <summary>
-    /// Finds the Python executable to use. Returns null if none is found.
-    /// </summary>
-    string TryFindPythonExecutable(string overridePath = null);
-
-    /// <summary>
-    /// Returns true if wsl.exe is available on this machine.
-    /// </summary>
-    bool IsWslAvailable();
-
-    /// <summary>
-    /// Checks which of the declared requirements are not yet importable.
-    /// Returns an empty list if all packages are installed.
-    /// </summary>
-    Task<IReadOnlyList<PythonRequirement>> GetMissingRequirementsAsync(
-        PythonScriptMetadata metadata,
-        CancellationToken cancellationToken);
-
-    /// <summary>
-    /// Installs the given packages via pip / pip3.
-    /// </summary>
-    Task InstallRequirementsAsync(
-        IReadOnlyList<PythonRequirement> requirements,
-        string platform,
-        CancellationToken cancellationToken);
-}

src/modules/AdvancedPaste/AdvancedPaste/Services/PythonScripts/IPythonScriptTrustService.cs

@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace AdvancedPaste.Services.PythonScripts;
-
-public interface IPythonScriptTrustService
-{
-    /// <summary>
-    /// Returns true if the script at <paramref name="scriptPath"/> is currently trusted (hash matches stored value).
-    /// </summary>
-    bool IsTrusted(string scriptPath);
-
-    /// <summary>
-    /// Shows a UI confirmation dialog for the script. Returns true if the user approved execution.
-    /// </summary>
-    Task<bool> RequestTrustAsync(string scriptPath, string hash);
-
-    /// <summary>
-    /// Persists the trust entry for <paramref name="scriptPath"/> with the given <paramref name="hash"/>.
-    /// </summary>
-    void StoreTrust(string scriptPath, string hash);
-
-    /// <summary>
-    /// Computes the SHA-256 hash of the script file and returns the hex string.
-    /// </summary>
-    string ComputeHash(string scriptPath);
-
-    /// <summary>
-    /// Shows a confirmation dialog listing the missing packages and asking the user
-    /// whether to install them. Returns true if the user approved installation.
-    /// </summary>
-    Task<bool> RequestInstallAsync(string scriptName, IReadOnlyList<PythonRequirement> missingPackages);
-}

src/modules/AdvancedPaste/AdvancedPaste/Services/PythonScripts/PythonRequirement.cs

@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace AdvancedPaste.Services.PythonScripts;
-
-/// <summary>
-/// Represents a single Python package requirement declared via
-/// <c># @advancedpaste:requires import_name=pip_package</c>.
-/// </summary>
-/// <param name="ImportName">The Python import name used in the script (e.g. "cv2").</param>
-/// <param name="PipPackage">The pip install name (e.g. "opencv-python-headless"). Equals <see cref="ImportName"/> when not explicitly specified.</param>
-public sealed record PythonRequirement(string ImportName, string PipPackage);

src/modules/AdvancedPaste/AdvancedPaste/Services/PythonScripts/PythonScriptMetadata.cs

@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-
-using AdvancedPaste.Models;
-
-namespace AdvancedPaste.Services.PythonScripts;
-
-public sealed record PythonScriptMetadata(
-    string ScriptPath,
-    string Name,
-    string Description,
-    ClipboardFormat SupportedFormats,
-    string Platform,
-    string Version,
-    bool IsEnabled,
-    IReadOnlyList<PythonRequirement> Requirements,
-    bool IsV2 = false,
-    string OutputTypeHint = null);

src/modules/AdvancedPaste/AdvancedPaste/Services/PythonScripts/PythonScriptTrustService.cs

@@ -1,126 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Threading.Tasks;
-
-using AdvancedPaste.Helpers;
-using AdvancedPaste.Settings;
-using ManagedCommon;
-using Microsoft.UI.Xaml.Controls;
-
-namespace AdvancedPaste.Services.PythonScripts;
-
-public sealed class PythonScriptTrustService(IUserSettings userSettings) : IPythonScriptTrustService
-{
-    private readonly IUserSettings _userSettings = userSettings;
-
-    public bool IsTrusted(string scriptPath)
-    {
-        var hashes = _userSettings.TrustedScriptHashes;
-        if (hashes is null || !hashes.TryGetValue(scriptPath, out var storedHash))
-        {
-            return false;
-        }
-
-        try
-        {
-            var currentHash = ComputeHash(scriptPath);
-            return string.Equals(currentHash, storedHash, StringComparison.OrdinalIgnoreCase);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"Failed to compute hash for {scriptPath}", ex);
-            return false;
-        }
-    }
-
-    public async Task<bool> RequestTrustAsync(string scriptPath, string hash)
-    {
-        try
-        {
-            var resourceLoader = ResourceLoaderInstance.ResourceLoader;
-
-            var dialog = new ContentDialog
-            {
-                Title = resourceLoader.GetString("PythonScriptTrustTitle"),
-                Content = string.Format(
-                    System.Globalization.CultureInfo.CurrentCulture,
-                    resourceLoader.GetString("PythonScriptTrustContent"),
-                    scriptPath),
-                PrimaryButtonText = resourceLoader.GetString("PythonScriptTrustConfirm"),
-                CloseButtonText = resourceLoader.GetString("PythonScriptTrustCancel"),
-            };
-
-            // XamlRoot must be set for ContentDialog to function.
-            var mainWindow = (Microsoft.UI.Xaml.Application.Current as AdvancedPaste.App)?.GetMainWindow();
-            if (mainWindow?.Content?.XamlRoot is { } xamlRoot)
-            {
-                dialog.XamlRoot = xamlRoot;
-            }
-
-            var result = await dialog.ShowAsync();
-            return result == ContentDialogResult.Primary;
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError("Failed to show trust dialog", ex);
-            return false;
-        }
-    }
-
-    public void StoreTrust(string scriptPath, string hash)
-    {
-        _userSettings.StoreTrustedScriptHash(scriptPath, hash);
-    }
-
-    public string ComputeHash(string scriptPath)
-    {
-        using var stream = File.OpenRead(scriptPath);
-        var hashBytes = SHA256.HashData(stream);
-        return Convert.ToHexStringLower(hashBytes);
-    }
-
-    public async Task<bool> RequestInstallAsync(string scriptName, IReadOnlyList<PythonRequirement> missingPackages)
-    {
-        try
-        {
-            var resourceLoader = ResourceLoaderInstance.ResourceLoader;
-            var packageList = string.Join("\n", missingPackages.Select(r =>
-                string.Equals(r.ImportName, r.PipPackage, StringComparison.Ordinal)
-                    ? $"  • {r.PipPackage}"
-                    : $"  • {r.PipPackage}  (import: {r.ImportName})"));
-
-            var dialog = new ContentDialog
-            {
-                Title = resourceLoader.GetString("PythonPackageInstallTitle"),
-                Content = string.Format(
-                    System.Globalization.CultureInfo.CurrentCulture,
-                    resourceLoader.GetString("PythonPackageInstallContent"),
-                    scriptName,
-                    packageList),
-                PrimaryButtonText = resourceLoader.GetString("PythonPackageInstallConfirm"),
-                CloseButtonText = resourceLoader.GetString("PythonPackageInstallCancel"),
-            };
-
-            var mainWindow = (Microsoft.UI.Xaml.Application.Current as AdvancedPaste.App)?.GetMainWindow();
-            if (mainWindow?.Content?.XamlRoot is { } xamlRoot)
-            {
-                dialog.XamlRoot = xamlRoot;
-            }
-
-            var result = await dialog.ShowAsync();
-            return result == ContentDialogResult.Primary;
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError("Failed to show package install dialog", ex);
-            return false;
-        }
-    }
-}

src/modules/AdvancedPaste/AdvancedPaste/Services/PythonScripts/_runner.py

@@ -1,247 +0,0 @@
-# Copyright (c) Microsoft Corporation
-# The Microsoft Corporation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
-
-"""
-Advanced Paste – Script Runner (V3 Named Function Interface)
-
-This runner is shipped with PowerToys and is NOT user-editable.
-It loads a user script, discovers the single advanced_paste_from_<input>_to_<output>
-function by name convention, calls it with the current clipboard data, and formats
-the return value into JSON on stdout.
-
-Each script must define exactly one function matching the pattern:
-  def advanced_paste_from_<input>_to_<output>(<param>)
-
-Supported input types:
-  - text, html, image, files
-
-Required output types (declared via _to_ suffix):
-  - text, html, image, file, files
-
-Examples:
-  - advanced_paste_from_text_to_text(text: str)    → output is text
-  - advanced_paste_from_text_to_image(text: str)   → output is image
-  - advanced_paste_from_image_to_text(image_path)  → output is text
-  - advanced_paste_from_files_to_text(file_paths)  → output is text
-
-Protocol:
-  - Input:  JSON on stdin (clipboard data from C#)
-  - Output: JSON on stdout (result for C# to set on clipboard)
-  - Errors: stderr (displayed to user on failure)
-"""
-
-import importlib.util
-import json
-import os
-import re
-import sys
-from pathlib import Path
-
-
-def _apply_output_hint(result, hint: str) -> dict:
-    """
-    Force the output to the type specified by the _to_ suffix in the function name.
-    Converts the return value to match the hinted type.
-    """
-    if result is None:
-        if hint == "text":
-            return {"result_type": "text", "text": ""}
-        elif hint == "html":
-            return {"result_type": "html", "html": ""}
-        elif hint == "image":
-            return {"result_type": "image", "image_path": ""}
-        elif hint == "audio":
-            return {"result_type": "audio", "audio_path": ""}
-        elif hint == "video":
-            return {"result_type": "video", "video_path": ""}
-        elif hint in ("file", "files"):
-            return {"result_type": hint, "file_paths": []}
-
-    if hint == "text":
-        return {"result_type": "text", "text": str(result) if not isinstance(result, str) else result}
-    elif hint == "html":
-        return {"result_type": "html", "html": str(result) if not isinstance(result, str) else result}
-    elif hint == "image":
-        path = str(result)
-        return {"result_type": "image", "image_path": path}
-    elif hint == "audio":
-        path = str(result)
-        return {"result_type": "audio", "audio_path": path}
-    elif hint == "video":
-        path = str(result)
-        return {"result_type": "video", "video_path": path}
-    elif hint == "file":
-        if isinstance(result, (list, tuple)):
-            paths = [str(p) for p in result]
-        else:
-            paths = [str(result)]
-        return {"result_type": "file", "file_paths": paths}
-    elif hint == "files":
-        if isinstance(result, (list, tuple)):
-            paths = [str(p) for p in result]
-        else:
-            paths = [str(result)]
-        return {"result_type": "files", "file_paths": paths}
-
-    # Fallback (shouldn't happen with valid hints)
-    return {"result_type": "text", "text": str(result)}
-
-# Pattern matching advanced_paste_from_<input>_to_<output> function names.
-_AP_FUNCTION_PATTERN = re.compile(
-    r"^advanced_paste_from_(text|html|image|audio|video|files)_to_(text|html|image|audio|video|file|files)$"
-)
-
-
-def _load_user_module(script_path: str):
-    """Dynamically load the user script as a Python module."""
-    spec = importlib.util.spec_from_file_location("_user_script", script_path)
-    if spec is None or spec.loader is None:
-        raise ImportError(f"Cannot load script: {script_path}")
-    module = importlib.util.module_from_spec(spec)
-    # Add the script's directory to sys.path so relative imports/helpers work.
-    script_dir = os.path.dirname(os.path.abspath(script_path))
-    if script_dir not in sys.path:
-        sys.path.insert(0, script_dir)
-    spec.loader.exec_module(module)
-    return module
-
-
-def _discover_ap_function(module) -> tuple:
-    """
-    Discover the single advanced_paste_from_<input>_to_<output> function in the module.
-    Returns a tuple (input_type, output_type, function) or None if not found.
-    Exits with error if multiple functions are defined.
-    """
-    matches = []
-    for name in dir(module):
-        match = _AP_FUNCTION_PATTERN.match(name)
-        if match:
-            fn = getattr(module, name)
-            if callable(fn):
-                input_type = match.group(1)
-                output_type = match.group(2)
-                matches.append((input_type, output_type, fn))
-
-    if len(matches) == 0:
-        return None
-    if len(matches) > 1:
-        names = [f"advanced_paste_from_{m[0]}_to_{m[1]}" for m in matches]
-        print(
-            f"Error: script defines multiple advanced_paste_from_*_to_* functions "
-            f"({', '.join(names)}). Only one is allowed per script.",
-            file=sys.stderr,
-        )
-        sys.exit(1)
-    return matches[0]
-
-
-def _format_output(result, output_type: str) -> dict:
-    """
-    Format the return value according to the declared output type from the function name.
-    The output_type comes from the _to_ suffix and is always provided.
-    """
-    if result is None:
-        if output_type in ("file", "files"):
-            return {"result_type": output_type, "file_paths": []}
-        elif output_type == "image":
-            return {"result_type": "image", "image_path": ""}
-        elif output_type == "audio":
-            return {"result_type": "audio", "audio_path": ""}
-        elif output_type == "video":
-            return {"result_type": "video", "video_path": ""}
-        elif output_type == "html":
-            return {"result_type": "html", "html": ""}
-        return {"result_type": "text", "text": ""}
-
-    return _apply_output_hint(result, output_type)
-
-
-# ---------------------------------------------------------------------------
-# Main entry point
-# ---------------------------------------------------------------------------
-
-def main():
-    if len(sys.argv) < 2:
-        print("Usage: _runner.py <script_path>", file=sys.stderr)
-        sys.exit(1)
-
-    script_path = sys.argv[1]
-
-    if not os.path.isfile(script_path):
-        print(f"Error: script not found: {script_path}", file=sys.stderr)
-        sys.exit(1)
-
-    # Read input payload from stdin.
-    try:
-        data = json.load(sys.stdin)
-    except json.JSONDecodeError as e:
-        print(f"Error: invalid JSON input: {e}", file=sys.stderr)
-        sys.exit(1)
-
-    # Load the user script.
-    module = _load_user_module(script_path)
-
-    # Discover the single advanced_paste_from_* function.
-    ap_result = _discover_ap_function(module)
-
-    if ap_result is None:
-        print(
-            f"Error: script '{os.path.basename(script_path)}' does not define an "
-            f"advanced_paste_from_<input>_to_<output> function.\n"
-            f"Example: def advanced_paste_from_text_to_text(text): return text.upper()",
-            file=sys.stderr,
-        )
-        sys.exit(1)
-
-    input_type, output_type, fn = ap_result
-
-    # Determine the input data key for this function's input type.
-    input_map = {
-        "text": "text",
-        "html": "html",
-        "image": "image_path",
-        "audio": "audio_path",
-        "video": "video_path",
-        "files": "file_paths",
-    }
-
-    key = input_map.get(input_type, input_type)
-    input_value = data.get(key)
-
-    # Expose work_dir as environment variable so scripts can write output files
-    # to a location accessible from both WSL and Windows (under /mnt/c/...).
-    work_dir = data.get("work_dir", "")
-    if work_dir:
-        os.environ["ADVANCED_PASTE_WORK_DIR"] = work_dir
-
-    # Check if the clipboard has matching data for this script's input type.
-    formats = data.get("format", ["text"])
-    if isinstance(formats, str):
-        formats = [formats]
-
-    if input_type not in formats:
-        print(
-            f"Error: script expects '{input_type}' input but clipboard has [{', '.join(formats)}].",
-            file=sys.stderr,
-        )
-        sys.exit(1)
-
-    if not input_value:
-        print(
-            f"Error: no data available for format '{input_type}' "
-            f"(expected '{key}' in input payload).",
-            file=sys.stderr,
-        )
-        sys.exit(1)
-
-    # Call the function.
-    result = fn(input_value)
-    output = _format_output(result, output_type)
-
-    # Output JSON result.
-    json.dump(output, sys.stdout, ensure_ascii=False)
-
-
-if __name__ == "__main__":
-    main()

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

@@ -212,10 +212,10 @@
     <value>Delete</value>
   </data>
   <data name="CustomFormatTextBox.PlaceholderText" xml:space="preserve">
-    <value>Search or describe what format you want..</value>
+    <value>Describe what format you want..</value>
   </data>
   <data name="InputTxtBoxTooltip.Text" xml:space="preserve">
-    <value>Search or describe what format you want..</value>
+    <value>Describe what format you want..</value>
   </data>
   <data name="LearnMoreLink.Text" xml:space="preserve">
     <value>Privacy</value>
@@ -372,73 +372,4 @@
     <value>Unable to load Foundry Local model: {0}</value>
     <comment>{0} is the model identifier. Do not translate {0}.</comment>
   </data>
-  <data name="PythonNotFound" xml:space="preserve">
-    <value>Python was not found. Please install Python or configure the path in Settings.</value>
-  </data>
-  <data name="WslNotAvailable" xml:space="preserve">
-    <value>WSL is not installed or not available. Cannot run Linux scripts.</value>
-  </data>
-  <data name="PythonScriptFailed" xml:space="preserve">
-    <value>The Python script failed to execute.</value>
-  </data>
-  <data name="PythonScriptTimeout" xml:space="preserve">
-    <value>Script execution timed out ({0} seconds).</value>
-    <comment>{0} is the configured timeout in seconds. Do not translate {0}.</comment>
-  </data>
-  <data name="PythonScriptNotFound" xml:space="preserve">
-    <value>Script file not found: {0}</value>
-    <comment>{0} is the script file path. Do not translate {0}.</comment>
-  </data>
-  <data name="PythonScriptInvalidJson" xml:space="preserve">
-    <value>The script output is not valid JSON.</value>
-  </data>
-  <data name="PythonScriptTrustTitle" xml:space="preserve">
-    <value>Run Python Script?</value>
-  </data>
-  <data name="PythonScriptTrustContent" xml:space="preserve">
-    <value>This script has not been verified. Running untrusted scripts can be a security risk. Do you want to run the following script?
-
-{0}</value>
-    <comment>{0} is the script file path. Do not translate {0}.</comment>
-  </data>
-  <data name="PythonScriptTrustConfirm" xml:space="preserve">
-    <value>Run</value>
-  </data>
-  <data name="PythonScriptTrustCancel" xml:space="preserve">
-    <value>Cancel</value>
-  </data>
-  <data name="PythonPackageInstallTitle" xml:space="preserve">
-    <value>Install Missing Packages?</value>
-  </data>
-  <data name="PythonPackageInstallContent" xml:space="preserve">
-    <value>The script "{0}" requires the following Python packages that are not installed:
-
-{1}
-
-Install them now?</value>
-    <comment>{0} = script display name, {1} = bullet list of package names. Do not translate package names.</comment>
-  </data>
-  <data name="PythonPackageInstallConfirm" xml:space="preserve">
-    <value>Install</value>
-  </data>
-  <data name="PythonPackageInstallCancel" xml:space="preserve">
-    <value>Skip</value>
-  </data>
-  <data name="PythonPackageInstallFailed" xml:space="preserve">
-    <value>Failed to install package(s) "{0}": {1}</value>
-    <comment>{0} = pip package names, {1} = error detail. Do not translate package names.</comment>
-  </data>
-  <data name="PythonPackageInstallTimeout" xml:space="preserve">
-    <value>Package installation for "{0}" timed out ({1} seconds).</value>
-    <comment>{0} = pip package names, {1} = timeout in seconds. Do not translate {0} or {1}.</comment>
-  </data>
-  <data name="ShowErrorDetailsBtn.Content" xml:space="preserve">
-    <value>Show details</value>
-  </data>
-  <data name="ErrorDetailsDialogTitle" xml:space="preserve">
-    <value>Error Details</value>
-  </data>
-  <data name="ErrorDetailsDialogClose" xml:space="preserve">
-    <value>Close</value>
-  </data>
 </root>

src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs

@@ -16,7 +16,6 @@ using System.Threading.Tasks;
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using AdvancedPaste.Services;
-using AdvancedPaste.Services.PythonScripts;
 using AdvancedPaste.Settings;
 using Common.UI;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -42,7 +41,6 @@ namespace AdvancedPaste.ViewModels
         private readonly IUserSettings _userSettings;
         private readonly IPasteFormatExecutor _pasteFormatExecutor;
         private readonly IAICredentialsProvider _credentialsProvider;
-        private readonly IPythonScriptService _pythonScriptService;
 
         private CancellationTokenSource _pasteActionCancellationTokenSource;
 
@@ -102,8 +100,6 @@ namespace AdvancedPaste.ViewModels
 
         public ObservableCollection<PasteFormat> CustomActionPasteFormats { get; } = [];
 
-        public ObservableCollection<PasteFormat> PythonScriptPasteFormats { get; } = [];
-
         public bool IsCustomAIServiceEnabled
         {
             get
@@ -262,12 +258,11 @@ namespace AdvancedPaste.ViewModels
 
         public event EventHandler PreviewRequested;
 
-        public OptionsViewModel(IFileSystem fileSystem, IAICredentialsProvider credentialsProvider, IUserSettings userSettings, IPasteFormatExecutor pasteFormatExecutor, IPythonScriptService pythonScriptService)
+        public OptionsViewModel(IFileSystem fileSystem, IAICredentialsProvider credentialsProvider, IUserSettings userSettings, IPasteFormatExecutor pasteFormatExecutor)
         {
             _credentialsProvider = credentialsProvider;
             _userSettings = userSettings;
             _pasteFormatExecutor = pasteFormatExecutor;
-            _pythonScriptService = pythonScriptService;
 
             GeneratedResponses = [];
             GeneratedResponses.CollectionChanged += (s, e) =>
@@ -418,51 +413,12 @@ namespace AdvancedPaste.ViewModels
             }
 
             UpdateFormats(StandardPasteFormats, Enum.GetValues<PasteFormats>()
-                                                    .Where(format => format != PasteFormats.PythonScript &&
-                                                                     (PasteFormat.MetadataDict[format].IsCoreAction || _userSettings.AdditionalActions.Contains(format)))
+                                                    .Where(format => PasteFormat.MetadataDict[format].IsCoreAction || _userSettings.AdditionalActions.Contains(format))
                                                     .Select(CreateStandardPasteFormat));
 
             UpdateFormats(
                 CustomActionPasteFormats,
                 IsCustomAIServiceEnabled ? _userSettings.CustomActions.Select(customAction => CreateCustomAIPasteFormat(customAction.Name, customAction.Prompt, isSavedQuery: true)) : []);
-
-            UpdateFormats(
-                PythonScriptPasteFormats,
-                BuildPythonScriptFormats());
-        }
-
-        private IEnumerable<PasteFormat> BuildPythonScriptFormats()
-        {
-            if (!_userSettings.IsPythonScriptsEnabled)
-            {
-                yield break;
-            }
-
-            var folder = _userSettings.PythonScriptsFolder;
-            if (string.IsNullOrWhiteSpace(folder))
-            {
-                yield break;
-            }
-
-            var discoveredScripts = _pythonScriptService.DiscoverScripts(folder);
-            var scriptActions = _userSettings.PythonScriptActions;
-
-            // Use metadata from discovered scripts, but apply IsShown from saved settings.
-            var hiddenPaths = new System.Collections.Generic.HashSet<string>(
-                scriptActions.Where(a => !a.IsShown).Select(a => a.ScriptPath),
-                StringComparer.OrdinalIgnoreCase);
-
-            foreach (var meta in discoveredScripts)
-            {
-                if (hiddenPaths.Contains(meta.ScriptPath) || !meta.IsEnabled)
-                {
-                    continue;
-                }
-
-                // Filter by intersection: only pass clipboard formats the script supports.
-                var filteredFormats = AvailableClipboardFormats & meta.SupportedFormats;
-                yield return PasteFormat.CreatePythonScriptFormat(meta.Name, meta.ScriptPath, filteredFormats);
-            }
         }
 
         public void Dispose()
@@ -736,10 +692,7 @@ namespace AdvancedPaste.ViewModels
             _pasteActionCancellationTokenSource = new();
             TransformProgress = double.NaN;
             PasteActionError = PasteActionError.None;
-
-            // For Python scripts the Prompt field holds the file path, not a user-visible query.
-            // Setting Query to the path would show it in the AI prompt box, which is misleading.
-            Query = pasteFormat.Format == PasteFormats.PythonScript ? string.Empty : pasteFormat.Query;
+            Query = pasteFormat.Query;
 
             try
             {
@@ -779,7 +732,7 @@ namespace AdvancedPaste.ViewModels
 
         internal async Task ExecutePasteFormatAsync(VirtualKey key)
         {
-            var pasteFormat = StandardPasteFormats.Concat(CustomActionPasteFormats).Concat(PythonScriptPasteFormats)
+            var pasteFormat = StandardPasteFormats.Concat(CustomActionPasteFormats)
                                                   .Where(pasteFormat => pasteFormat.IsEnabled)
                                                   .ElementAtOrDefault(key - VirtualKey.Number1);
 

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

@@ -21,9 +21,13 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <TitleBar x:Name="titleBar" IsTabStop="False">
-            <TitleBar.IconSource>
-                <ImageIconSource ImageSource="/Assets/EnvironmentVariables/EnvironmentVariables.ico" />
-            </TitleBar.IconSource>
+            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
+            <TitleBar.LeftHeader>
+                <ImageIcon
+                    Height="16"
+                    Margin="16,0,0,0"
+                    Source="/Assets/EnvironmentVariables/EnvironmentVariables.ico" />
+            </TitleBar.LeftHeader>
         </TitleBar>
     </Grid>
 </winuiex:WindowEx>

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

@@ -27,8 +27,8 @@ namespace EnvironmentVariables
 
             ExtendsContentIntoTitleBar = true;
             SetTitleBar(titleBar);
-            AppWindow.SetIcon("Assets/EnvironmentVariables/EnvironmentVariables.ico");
 
+            AppWindow.SetIcon("Assets/EnvironmentVariables/EnvironmentVariables.ico");
             var loader = ResourceLoaderInstance.ResourceLoader;
             var title = App.GetService<IElevationHelper>().IsElevated ? loader.GetString("WindowAdminTitle") : loader.GetString("WindowTitle");
 

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

@@ -21,9 +21,13 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <TitleBar x:Name="titleBar" IsTabStop="False">
-            <TitleBar.IconSource>
-                <ImageIconSource ImageSource="/Assets/FileLocksmith/Icon.ico" />
-            </TitleBar.IconSource>
+            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
+            <TitleBar.LeftHeader>
+                <ImageIcon
+                    Height="16"
+                    Margin="16,0,0,0"
+                    Source="/Assets/FileLocksmith/Icon.ico" />
+            </TitleBar.LeftHeader>
         </TitleBar>
         <views:MainPage x:Name="mainPage" Grid.Row="1" />
     </Grid>

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

@@ -20,6 +20,7 @@ namespace FileLocksmithUI
             mainPage.ViewModel.IsElevated = isElevated;
             SetTitleBar(titleBar);
             ExtendsContentIntoTitleBar = true;
+            AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
             AppWindow.SetIcon("Assets/FileLocksmith/Icon.ico");
             WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(this.GetWindowHandle());
 

src/modules/Hosts/Hosts.FuzzTests/HostsEditor.FuzzTests.csproj

@@ -7,11 +7,6 @@
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<DefineConstants>TESTONLY</DefineConstants>
-
-		<!-- exit code 8 means no tests ran. -->
-		<!-- Doc: https://learn.microsoft.com/dotnet/core/testing/unit-testing-platform-exit-codes -->
-		<!-- This test project doesn't seem to contain any tests. -->
-		<TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --ignore-exit-code 8</TestingPlatformCommandLineArguments>
 	</PropertyGroup>
 	
 	<PropertyGroup>

src/modules/Hosts/Hosts.FuzzTests/OneFuzzConfig.json

@@ -5,7 +5,7 @@
       "fuzzer": {
         "$type": "libfuzzerDotNet",
         "dll": "HostsEditor.FuzzTests.dll",
-        "class": "Hosts.FuzzTests.FuzzTests",
+        "class": "HostsEditor.FuzzTests.FuzzTests",
         "method": "FuzzValidIPv4",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"
@@ -46,7 +46,7 @@
       "fuzzer": {
         "$type": "libfuzzerDotNet",
         "dll": "HostsEditor.FuzzTests.dll",
-        "class": "Hosts.FuzzTests.FuzzTests",
+        "class": "HostsEditor.FuzzTests.FuzzTests",
         "method": "FuzzValidIPv6",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"
@@ -87,7 +87,7 @@
       "fuzzer": {
         "$type": "libfuzzerDotNet",
         "dll": "HostsEditor.FuzzTests.dll",
-        "class": "Hosts.FuzzTests.FuzzTests",
+        "class": "HostsEditor.FuzzTests.FuzzTests",
         "method": "FuzzValidHosts",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"
@@ -128,7 +128,7 @@
       "fuzzer": {
         "$type": "libfuzzerDotNet",
         "dll": "HostsEditor.FuzzTests.dll",
-        "class": "Hosts.FuzzTests.FuzzTests",
+        "class": "HostsEditor.FuzzTests.FuzzTests",
         "method": "FuzzWriteAsync",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"

src/modules/Hosts/Hosts.Tests/HostsEditor.UnitTests.csproj

@@ -9,7 +9,6 @@
     <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\tests\Hosts.Tests\</OutputPath>
     <RootNamespace>Hosts.Tests</RootNamespace>
     <AssemblyName>PowerToys.Hosts.Tests</AssemblyName>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -21,9 +21,13 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <TitleBar x:Name="titleBar" IsTabStop="False">
-            <TitleBar.IconSource>
-                <ImageIconSource ImageSource="/Assets/Hosts/Hosts.ico" />
-            </TitleBar.IconSource>
+            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
+            <TitleBar.LeftHeader>
+                <ImageIcon
+                    Height="16"
+                    Margin="16,0,0,0"
+                    Source="/Assets/Hosts/Hosts.ico" />
+            </TitleBar.LeftHeader>
         </TitleBar>
     </Grid>
 </winuiex:WindowEx>

src/modules/MouseUtils/MouseJump.Common.UnitTests/MouseJump.Common.UnitTests.csproj

@@ -8,7 +8,7 @@
     <AssemblyName>PowerToys.MouseJump.Common.UnitTests</AssemblyName>
     <AssemblyTitle>PowerToys.MouseJump.Common.UnitTests</AssemblyTitle>
     <AssemblyDescription>PowerToys MouseJump.Common.UnitTests</AssemblyDescription>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <OutputPath>$(RepoRoot)$(Platform)\$(Configuration)\tests\MouseJump.Common.UnitTests\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>

src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/MouseWithoutBorders.UnitTests.csproj

@@ -6,13 +6,7 @@
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <OutputType>Exe</OutputType>
-
-    <!-- exit code 8 means no tests ran. -->
-    <!-- Doc: https://learn.microsoft.com/dotnet/core/testing/unit-testing-platform-exit-codes -->
-    <!-- This test project contains a single test but it's ignored. -->
-    <!-- Remove this line if more tests are added or if the test is un-ignored -->
-    <TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --ignore-exit-code 8</TestingPlatformCommandLineArguments>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
 
   <ItemGroup>

src/modules/Workspaces/WorkspacesEditorUITest/Workspaces.Editor.UITests.csproj

@@ -2,13 +2,10 @@
   <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
-    <SelfContained>true</SelfContained>
-    <RuntimeIdentifier Condition="'$(Platform)' == 'x64'">win-x64</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="'$(Platform)' == 'ARM64'">win-arm64</RuntimeIdentifier>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <RunVSTest>false</RunVSTest>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>

src/modules/ZoomIt/ZoomIt/AudioSampleGenerator.cpp

@@ -34,15 +34,13 @@ namespace winrt
     using namespace Windows::Devices::Enumeration;
 }
 
-AudioSampleGenerator::AudioSampleGenerator(bool captureMicrophone, bool captureSystemAudio, bool micMonoMix)
+AudioSampleGenerator::AudioSampleGenerator(bool captureMicrophone, bool captureSystemAudio)
     : m_captureMicrophone(captureMicrophone)
     , m_captureSystemAudio(captureSystemAudio)
-    , m_micMonoMix(micMonoMix)
 {
     OutputDebugStringA(("AudioSampleGenerator created, captureMicrophone=" +
         std::string(captureMicrophone ? "true" : "false") +
-        ", captureSystemAudio=" + std::string(captureSystemAudio ? "true" : "false") +
-        ", micMonoMix=" + std::string(micMonoMix ? "true" : "false") + "\n").c_str());
+        ", captureSystemAudio=" + std::string(captureSystemAudio ? "true" : "false") + "\n").c_str());
     m_audioEvent.create(wil::EventOptions::ManualReset);
     m_endEvent.create(wil::EventOptions::ManualReset);
     m_startEvent.create(wil::EventOptions::ManualReset);
@@ -633,30 +631,6 @@ void AudioSampleGenerator::OnAudioQuantumStarted(winrt::AudioGraph const& sender
         uint32_t expectedSamplesPerQuantum = (m_graphSampleRate / 100) * m_graphChannels;
         uint32_t numMicSamples = audioBuffer.Length() / sizeof(float);
 
-        // Apply mono mixing to microphone audio if enabled
-        // This converts stereo mic input (with same signal on both channels) to true mono
-        // by averaging the channels and writing the result to both channels
-        if (m_micMonoMix && m_captureMicrophone && numMicSamples > 0 && m_graphChannels >= 2)
-        {
-            float* micData = reinterpret_cast<float*>(sampleBuffer.data());
-            uint32_t numFrames = numMicSamples / m_graphChannels;
-            for (uint32_t i = 0; i < numFrames; i++)
-            {
-                // Sum all channels for this frame
-                float sum = 0.0f;
-                for (uint32_t ch = 0; ch < m_graphChannels; ch++)
-                {
-                    sum += micData[i * m_graphChannels + ch];
-                }
-                // Power-preserving mix: divide by sqrt(N) to maintain perceived loudness
-                float mono = sum / std::sqrt(static_cast<float>(m_graphChannels));
-                for (uint32_t ch = 0; ch < m_graphChannels; ch++)
-                {
-                    micData[i * m_graphChannels + ch] = mono;
-                }
-            }
-        }
-
         // Drain loopback samples regardless of whether we have mic audio
         if (m_loopbackCapture)
         {

src/modules/ZoomIt/ZoomIt/AudioSampleGenerator.h

@@ -5,7 +5,7 @@
 class AudioSampleGenerator
 {
 public:
-    AudioSampleGenerator(bool captureMicrophone = true, bool captureSystemAudio = true, bool micMonoMix = false);
+    AudioSampleGenerator(bool captureMicrophone = true, bool captureSystemAudio = true);
     ~AudioSampleGenerator();
 
     winrt::Windows::Foundation::IAsyncAction InitializeAsync();
@@ -70,5 +70,4 @@ private:
     std::atomic<bool> m_started = false;
     bool m_captureMicrophone = true;
     bool m_captureSystemAudio = true;
-    bool m_micMonoMix = false;
 };

src/modules/ZoomIt/ZoomIt/VideoRecordingSession.cpp

@@ -861,7 +861,6 @@ VideoRecordingSession::VideoRecordingSession(
     uint32_t frameRate,
     bool captureAudio,
     bool captureSystemAudio,
-    bool micMonoMix,
     winrt::Streams::IRandomAccessStream const& stream)
 {
     m_device = device;
@@ -940,12 +939,10 @@ VideoRecordingSession::VideoRecordingSession(
     video.PixelAspectRatio().Denominator(1);
     m_encodingProfile.Video(video);
 
-    if (captureAudio || captureSystemAudio)
-    {
-        auto audio = m_encodingProfile.Audio();
-        audio = winrt::AudioEncodingProperties::CreateAac(48000, 2, 192000);
-        m_encodingProfile.Audio(audio);
-    }
+    // Always set up audio profile for loopback capture (stereo AAC)
+    auto audio = m_encodingProfile.Audio();
+    audio = winrt::AudioEncodingProperties::CreateAac(48000, 2, 192000);
+    m_encodingProfile.Audio(audio);
 
     // Describe our input: uncompressed BGRA8 buffers
     auto properties = winrt::VideoEncodingProperties::CreateUncompressed(
@@ -966,14 +963,8 @@ VideoRecordingSession::VideoRecordingSession(
     winrt::check_hresult(m_previewSwapChain->GetBuffer(0, winrt::guid_of<ID3D11Texture2D>(), backBuffer.put_void()));
     winrt::check_hresult(m_d3dDevice->CreateRenderTargetView(backBuffer.get(), nullptr, m_renderTargetView.put()));
 
-    if (captureAudio || captureSystemAudio)
-    {
-        m_audioGenerator = std::make_unique<AudioSampleGenerator>(captureAudio, captureSystemAudio, micMonoMix);
-    }
-    else
-    {
-        m_audioGenerator = nullptr;
-    }
+    // Always create audio generator for loopback capture; captureAudio controls microphone
+    m_audioGenerator = std::make_unique<AudioSampleGenerator>(captureAudio, captureSystemAudio);
 }
 
 
@@ -1121,10 +1112,9 @@ std::shared_ptr<VideoRecordingSession> VideoRecordingSession::Create(
     uint32_t frameRate,
     bool captureAudio,
     bool captureSystemAudio,
-    bool micMonoMix,
     winrt::Streams::IRandomAccessStream const& stream)
 {
-    return std::shared_ptr<VideoRecordingSession>(new VideoRecordingSession(device, item, crop, frameRate, captureAudio, captureSystemAudio, micMonoMix, stream));
+    return std::shared_ptr<VideoRecordingSession>(new VideoRecordingSession(device, item, crop, frameRate, captureAudio, captureSystemAudio, stream));
 }
 
 //----------------------------------------------------------------------------
@@ -1215,8 +1205,14 @@ void VideoRecordingSession::OnMediaStreamSourceSampleRequested(
     {
         try
         {
-            auto sample = m_audioGenerator ? m_audioGenerator->TryGetNextSample() : std::optional<winrt::MediaStreamSample>{};
-            request.Sample(sample.has_value() ? sample.value() : nullptr);
+            if (auto sample = m_audioGenerator->TryGetNextSample())
+            {
+                request.Sample(sample.value());
+            }
+            else
+            {
+                request.Sample(nullptr);
+            }
         }
         catch (winrt::hresult_error const& error)
         {

src/modules/ZoomIt/ZoomIt/VideoRecordingSession.h

@@ -28,7 +28,6 @@ public:
         uint32_t frameRate,
         bool captureAudio,
         bool captureSystemAudio,
-        bool micMonoMix,
         winrt::Streams::IRandomAccessStream const& stream);
     ~VideoRecordingSession();
 
@@ -189,7 +188,6 @@ private:
         uint32_t frameRate,
         bool captureAudio,
         bool captureSystemAudio,
-        bool micMonoMix,
         winrt::Streams::IRandomAccessStream const& stream);
     void CloseInternal();
 

src/modules/ZoomIt/ZoomIt/ZoomIt.rc

@@ -279,7 +279,6 @@ BEGIN
     LTEXT           "To record a specific window, enter the hotkey with the Alt key in the opposite mode.",IDC_STATIC,7,55,251,19
     CONTROL         "Capture &system audio",IDC_CAPTURE_SYSTEM_AUDIO,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,149,83,10
     CONTROL         "&Capture audio input:",IDC_CAPTURE_AUDIO,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,161,83,10
-    CONTROL         "Mono",IDC_MIC_MONO_MIX,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,98,161,30,10
     COMBOBOX        IDC_MICROPHONE,81,176,152,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Microphone:",IDC_MICROPHONE_LABEL,32,178,47,8
 END

src/modules/ZoomIt/ZoomIt/ZoomItSettings.h

@@ -51,7 +51,6 @@ DWORD	g_RecordScalingMP4 = 100;
 RecordingFormat g_RecordingFormat = RecordingFormat::MP4;
 BOOLEAN g_CaptureSystemAudio = TRUE;
 BOOLEAN g_CaptureAudio = FALSE;
-BOOLEAN g_MicMonoMix = FALSE;
 TCHAR	g_MicrophoneDeviceId[MAX_PATH] = {0};
 TCHAR	g_RecordingSaveLocationBuffer[MAX_PATH] = {0};
 TCHAR	g_ScreenshotSaveLocationBuffer[MAX_PATH] = {0};
@@ -100,7 +99,6 @@ REG_SETTING RegSettings[] = {
     { L"RecordScalingMP4", SETTING_TYPE_DWORD, 0, &g_RecordScalingMP4, static_cast<DOUBLE>(g_RecordScalingMP4) },
     { L"CaptureAudio", SETTING_TYPE_BOOLEAN, 0, &g_CaptureAudio, static_cast<DOUBLE>(g_CaptureAudio) },
     { L"CaptureSystemAudio", SETTING_TYPE_BOOLEAN, 0, &g_CaptureSystemAudio, static_cast<DOUBLE>(g_CaptureSystemAudio) },
-    { L"MicMonoMix", SETTING_TYPE_BOOLEAN, 0, &g_MicMonoMix, static_cast<DOUBLE>(g_MicMonoMix) },
     { L"MicrophoneDeviceId", SETTING_TYPE_STRING, sizeof(g_MicrophoneDeviceId), g_MicrophoneDeviceId, static_cast<DOUBLE>(0) },
     { L"RecordingSaveLocation", SETTING_TYPE_STRING, sizeof(g_RecordingSaveLocationBuffer), g_RecordingSaveLocationBuffer, static_cast<DOUBLE>(0) },
     { L"ScreenshotSaveLocation", SETTING_TYPE_STRING, sizeof(g_ScreenshotSaveLocationBuffer), g_ScreenshotSaveLocationBuffer, static_cast<DOUBLE>(0) },

src/modules/ZoomIt/ZoomIt/Zoomit.cpp

@@ -3840,9 +3840,6 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
         CheckDlgButton( g_OptionsTabs[RECORD_PAGE].hPage, IDC_CAPTURE_AUDIO,
             g_CaptureAudio ? BST_CHECKED: BST_UNCHECKED );
 
-        CheckDlgButton( g_OptionsTabs[RECORD_PAGE].hPage, IDC_MIC_MONO_MIX,
-            g_MicMonoMix ? BST_CHECKED: BST_UNCHECKED );
-
         //
         // The framerate drop down list is not used in the current version (might be added in the future)
         //
@@ -4263,7 +4260,6 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
             g_ShowExpiredTime = IsDlgButtonChecked(  g_OptionsTabs[BREAK_PAGE].hPage, IDC_CHECK_SHOW_EXPIRED ) == BST_CHECKED;
             g_CaptureSystemAudio = IsDlgButtonChecked(g_OptionsTabs[RECORD_PAGE].hPage, IDC_CAPTURE_SYSTEM_AUDIO) == BST_CHECKED;
             g_CaptureAudio = IsDlgButtonChecked(g_OptionsTabs[RECORD_PAGE].hPage, IDC_CAPTURE_AUDIO) == BST_CHECKED;
-            g_MicMonoMix = IsDlgButtonChecked(g_OptionsTabs[RECORD_PAGE].hPage, IDC_MIC_MONO_MIX) == BST_CHECKED;
             GetDlgItemText( g_OptionsTabs[BREAK_PAGE].hPage, IDC_TIMER, text, 3 );
             text[2] = 0;
             newTimeout = _tstoi( text );
@@ -5507,29 +5503,9 @@ auto GetUniqueRecordingFilename()
     return GetUniqueFilename(g_RecordingSaveLocation, defaultFile, FOLDERID_Videos);
 }
 
-//----------------------------------------------------------------------------
-//
-// GetUniqueScreenshotFilename
-//
-// Gets a unique file name for screenshot saves, using the current date and
-// time as a suffix. This reduces the chance that the user could overwrite an
-// existing file if they are saving multiple captures in the same folder, and
-// also ensures that ordering is correct when sorted by name.
-//
-//----------------------------------------------------------------------------
 auto GetUniqueScreenshotFilename()
 {
-    SYSTEMTIME lt;
-    GetLocalTime(&lt);
-
-    // Format: "ZoomIt YYYY-MM-DD HHMMSS.png"
-    wchar_t buffer[MAX_PATH];
-    swprintf_s(buffer, L"%s %04d-%02d-%02d %02d%02d%02d.png",
-        APPNAME,
-        lt.wYear, lt.wMonth, lt.wDay,
-        lt.wHour, lt.wMinute, lt.wSecond);
-
-    return std::wstring(buffer);
+    return GetUniqueFilename(g_ScreenshotSaveLocation, DEFAULT_SCREENSHOT_FILE, FOLDERID_Pictures);
 }
 
 //----------------------------------------------------------------------------
@@ -5629,7 +5605,6 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
                                         g_RecordFrameRate,
                                         g_CaptureAudio,
                                         g_CaptureSystemAudio,
-                                        g_MicMonoMix,
                                         stream );
 
         recordingStarted = (g_RecordingSession != nullptr);
@@ -7316,8 +7291,7 @@ LRESULT APIENTRY MainWndProc(
     case WM_IME_CHAR:
     case WM_CHAR:
 
-        if( (g_TypeMode != TypeModeOff) &&
-            (iswprint(static_cast<TCHAR>(wParam)) || (static_cast<TCHAR>(wParam) == L'&')) ) {
+        if( (g_TypeMode != TypeModeOff) && iswprint(static_cast<TCHAR>(wParam)) || (static_cast<TCHAR>(wParam) == L'&')) {
             g_HaveTyped = TRUE;
 
             TCHAR	 vKey = static_cast<TCHAR>(wParam);
@@ -7425,8 +7399,9 @@ LRESULT APIENTRY MainWndProc(
 
     case WM_KEYDOWN:
 
-        if( (g_TypeMode != TypeModeOff) && g_HaveTyped &&
-            (wParam == VK_RETURN || wParam == VK_DELETE || wParam == VK_BACK) ) {
+        if( (g_TypeMode != TypeModeOff) && g_HaveTyped && static_cast<char>(wParam) != VK_UP && static_cast<char>(wParam) != VK_DOWN &&
+            (isprint( static_cast<char>(wParam)) ||
+            wParam == VK_RETURN || wParam == VK_DELETE || wParam == VK_BACK )) {
 
             if( wParam == VK_RETURN ) {
 

src/modules/ZoomIt/ZoomIt/resource.h

@@ -111,7 +111,6 @@
 #define IDC_SMOOTH_IMAGE				1107
 #define IDC_CAPTURE_SYSTEM_AUDIO        1108
 #define IDC_MICROPHONE_LABEL            1109
-#define IDC_MIC_MONO_MIX                1110
 #define IDC_SAVE                        40002
 #define IDC_COPY                        40004
 #define IDC_RECORD                      40006

src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.cpp

@@ -21,25 +21,6 @@ namespace NonLocalizable
 {
     const static wchar_t* TOOL_WINDOW_CLASS_NAME = L"AlwaysOnTopWindow";
     const static wchar_t* WINDOW_IS_PINNED_PROP = L"AlwaysOnTop_Pinned";
-    constexpr UINT SYSTEM_MENU_TOGGLE_ALWAYS_ON_TOP_COMMAND = 0xEFE0;
-    constexpr DWORD SYSTEM_EVENT_MENU_POPUP_START = 0x0006;
-    constexpr DWORD SYSTEM_EVENT_MENU_POPUP_END = 0x0007;
-}
-
-namespace
-{
-    void UnsubscribeEvents(std::vector<HWINEVENTHOOK>& hooks) noexcept
-    {
-        for (const auto hook : hooks)
-        {
-            if (hook)
-            {
-                UnhookWinEvent(hook);
-            }
-        }
-
-        hooks.clear();
-    }
 }
 
 bool isExcluded(HWND window)
@@ -51,7 +32,7 @@ bool isExcluded(HWND window)
 }
 
 AlwaysOnTop::AlwaysOnTop(bool useLLKH, DWORD mainThreadId) :
-    SettingsObserver({SettingId::FrameEnabled, SettingId::Hotkey, SettingId::ExcludeApps, SettingId::ShowInSystemMenu}),
+    SettingsObserver({SettingId::FrameEnabled, SettingId::Hotkey, SettingId::ExcludeApps}),
     m_hinstance(reinterpret_cast<HINSTANCE>(&__ImageBase)),
     m_useCentralizedLLKH(useLLKH),
     m_mainThreadId(mainThreadId),
@@ -72,11 +53,6 @@ AlwaysOnTop::AlwaysOnTop(bool useLLKH, DWORD mainThreadId) :
         
         SubscribeToEvents();
         StartTrackingTopmostWindows();
-
-        if (HWND foregroundWindow = GetForegroundWindow())
-        {
-            UpdateSystemMenuItem(foregroundWindow);
-        }
     }
     else
     {
@@ -168,13 +144,6 @@ void AlwaysOnTop::SettingsUpdate(SettingId id)
         }
     }
     break;
-    case SettingId::ShowInSystemMenu:
-    {
-        UpdateSystemMenuEventHooks(AlwaysOnTopSettings::settings().showInSystemMenu);
-        m_lastSystemMenuWindow = nullptr;
-        UpdateSystemMenuItem(GetForegroundWindow());
-    }
-    break;
     default:
         break;
     }
@@ -256,8 +225,6 @@ void AlwaysOnTop::ProcessCommand(HWND window)
     {
         m_sound.Play(soundType);    
     }
-
-    UpdateSystemMenuItem(window);
 }
 
 void AlwaysOnTop::StartTrackingTopmostWindows()
@@ -447,86 +414,6 @@ void AlwaysOnTop::SubscribeToEvents()
             Logger::error(L"Failed to set win event hook");
         }
     }
-
-    UpdateSystemMenuEventHooks(AlwaysOnTopSettings::settings().showInSystemMenu);
-}
-
-void AlwaysOnTop::UpdateSystemMenuEventHooks(bool enable)
-{
-    constexpr std::array<DWORD, 3> menu_events_to_subscribe = {
-        NonLocalizable::SYSTEM_EVENT_MENU_POPUP_START,
-        NonLocalizable::SYSTEM_EVENT_MENU_POPUP_END,
-        EVENT_OBJECT_INVOKED,
-    };
-
-    if (enable)
-    {
-        if (m_systemMenuWinEventHooks.size() == menu_events_to_subscribe.size())
-        {
-            return;
-        }
-
-        // Recover from any partial hook registration before re-registering.
-        UnsubscribeEvents(m_systemMenuWinEventHooks);
-
-        for (const auto event : menu_events_to_subscribe)
-        {
-            auto hook = SetWinEventHook(event, event, nullptr, WinHookProc, 0, 0, WINEVENT_OUTOFCONTEXT | WINEVENT_SKIPOWNPROCESS);
-            if (hook)
-            {
-                m_systemMenuWinEventHooks.emplace_back(hook);
-            }
-            else
-            {
-                Logger::error(L"Failed to set system menu win event hook");
-            }
-        }
-    }
-    else
-    {
-        UnsubscribeEvents(m_systemMenuWinEventHooks);
-    }
-}
-
-void AlwaysOnTop::UpdateSystemMenuItem(HWND window) const noexcept
-{
-    if (!window || !IsWindow(window))
-    {
-        return;
-    }
-
-    const auto systemMenu = GetSystemMenu(window, false);
-    if (!systemMenu)
-    {
-        return;
-    }
-
-    if (!AlwaysOnTopSettings::settings().showInSystemMenu)
-    {
-        if (GetMenuState(systemMenu, NonLocalizable::SYSTEM_MENU_TOGGLE_ALWAYS_ON_TOP_COMMAND, MF_BYCOMMAND) != static_cast<UINT>(-1))
-        {
-            RemoveMenu(systemMenu, NonLocalizable::SYSTEM_MENU_TOGGLE_ALWAYS_ON_TOP_COMMAND, MF_BYCOMMAND);
-        }
-        return;
-    }
-
-    auto text = GET_RESOURCE_STRING(IDS_SYSTEM_MENU_TOGGLE_ALWAYS_ON_TOP);
-    MENUITEMINFOW menuItemInfo{};
-    menuItemInfo.cbSize = sizeof(menuItemInfo);
-    menuItemInfo.fMask = MIIM_ID | MIIM_STATE | MIIM_STRING;
-    menuItemInfo.wID = NonLocalizable::SYSTEM_MENU_TOGGLE_ALWAYS_ON_TOP_COMMAND;
-    menuItemInfo.fState = IsPinned(window) ? MFS_CHECKED : MFS_UNCHECKED;
-    menuItemInfo.dwTypeData = text.data();
-
-    if (GetMenuState(systemMenu, NonLocalizable::SYSTEM_MENU_TOGGLE_ALWAYS_ON_TOP_COMMAND, MF_BYCOMMAND) == static_cast<UINT>(-1))
-    {
-        InsertMenuItemW(systemMenu, SC_CLOSE, FALSE, &menuItemInfo);
-    }
-    else
-    {
-        menuItemInfo.fMask = MIIM_STATE | MIIM_STRING;
-        SetMenuItemInfoW(systemMenu, NonLocalizable::SYSTEM_MENU_TOGGLE_ALWAYS_ON_TOP_COMMAND, FALSE, &menuItemInfo);
-    }
 }
 
 void AlwaysOnTop::UnpinAll()
@@ -547,9 +434,6 @@ void AlwaysOnTop::UnpinAll()
 
 void AlwaysOnTop::CleanUp()
 {
-    UnsubscribeEvents(m_systemMenuWinEventHooks);
-    UnsubscribeEvents(m_staticWinEventHooks);
-
     UnpinAll();
     if (m_window)
     {
@@ -608,79 +492,6 @@ bool AlwaysOnTop::IsTracked(HWND window) const noexcept
 
 void AlwaysOnTop::HandleWinHookEvent(WinHookEvent* data) noexcept
 {
-    switch (data->event)
-    {
-    case NonLocalizable::SYSTEM_EVENT_MENU_POPUP_START:
-    {
-        if (data->idObject == OBJID_SYSMENU && data->hwnd)
-        {
-            m_lastSystemMenuWindow = AlwaysOnTopSettings::settings().showInSystemMenu ? data->hwnd : nullptr;
-            UpdateSystemMenuItem(data->hwnd);
-        }
-    }
-    return;
-    case NonLocalizable::SYSTEM_EVENT_MENU_POPUP_END:
-    {
-        if (data->idObject == OBJID_SYSMENU && data->hwnd == m_lastSystemMenuWindow)
-        {
-            m_lastSystemMenuWindow = nullptr;
-        }
-    }
-    return;
-    case EVENT_OBJECT_INVOKED:
-    {
-        if (!AlwaysOnTopSettings::settings().showInSystemMenu)
-        {
-            return;
-        }
-
-        if (data->idChild != static_cast<LONG>(NonLocalizable::SYSTEM_MENU_TOGGLE_ALWAYS_ON_TOP_COMMAND))
-        {
-            return;
-        }
-
-        const bool isMenuRelatedObject = (data->idObject == OBJID_SYSMENU || data->idObject == OBJID_MENU || data->idObject == OBJID_CLIENT);
-        if (!isMenuRelatedObject && (!m_lastSystemMenuWindow || !IsWindow(m_lastSystemMenuWindow)))
-        {
-            return;
-        }
-
-        const auto hasToggleMenuItem = [](HWND window) -> bool {
-            if (!window || !IsWindow(window))
-            {
-                return false;
-            }
-
-            const auto systemMenu = GetSystemMenu(window, false);
-            return systemMenu &&
-                   GetMenuState(systemMenu, NonLocalizable::SYSTEM_MENU_TOGGLE_ALWAYS_ON_TOP_COMMAND, MF_BYCOMMAND) != static_cast<UINT>(-1);
-        };
-
-        HWND commandWindow = nullptr;
-        const auto trySetCommandWindow = [&](HWND candidate) noexcept {
-            if (!commandWindow && hasToggleMenuItem(candidate))
-            {
-                commandWindow = candidate;
-            }
-        };
-
-        if (m_lastSystemMenuWindow && IsWindow(m_lastSystemMenuWindow))
-        {
-            trySetCommandWindow(m_lastSystemMenuWindow);
-        }
-        trySetCommandWindow(data->hwnd);
-        trySetCommandWindow(GetForegroundWindow());
-
-        if (commandWindow)
-        {
-            ProcessCommand(commandWindow);
-        }
-    }
-    return;
-    default:
-        break;
-    }
-
     if (!AlwaysOnTopSettings::settings().enableFrame || !data->hwnd)
     {
         return;
@@ -755,8 +566,6 @@ void AlwaysOnTop::HandleWinHookEvent(WinHookEvent* data) noexcept
     break;
     case EVENT_SYSTEM_FOREGROUND:
     {
-        UpdateSystemMenuItem(data->hwnd);
-
         if (!is_process_elevated() && IsProcessOfWindowElevated(data->hwnd))
         {
             m_notificationUtil->WarnIfElevationIsRequired(GET_RESOURCE_STRING(IDS_ALWAYSONTOP),
@@ -967,4 +776,4 @@ void AlwaysOnTop::RestoreWindowAlpha(HWND window)
             SetWindowLong(window, GWL_EXSTYLE, exStyle & ~WS_EX_LAYERED);
         }
     }
-}
+}

src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.h

@@ -45,7 +45,6 @@ private:
 
     static inline AlwaysOnTop* s_instance = nullptr;
     std::vector<HWINEVENTHOOK> m_staticWinEventHooks{};
-    std::vector<HWINEVENTHOOK> m_systemMenuWinEventHooks{};
     Sound m_sound;
     VirtualDesktopUtils m_virtualDesktopUtils;
 
@@ -70,18 +69,15 @@ private:
     std::thread m_thread;
     const bool m_useCentralizedLLKH;
     bool m_running = true;
-    HWND m_lastSystemMenuWindow{ nullptr };
     std::unique_ptr<notifications::NotificationUtil> m_notificationUtil;
 
     LRESULT WndProc(HWND, UINT, WPARAM, LPARAM) noexcept;
     void HandleWinHookEvent(WinHookEvent* data) noexcept;
-    void UpdateSystemMenuItem(HWND window) const noexcept;
     
     bool InitMainWindow();
     void RegisterHotkey() const;
     void RegisterLLKH();
     void SubscribeToEvents();
-    void UpdateSystemMenuEventHooks(bool enable);
 
     void ProcessCommand(HWND window);
     void StartTrackingTopmostWindows();

src/modules/alwaysontop/AlwaysOnTop/Resources.resx

@@ -131,7 +131,4 @@
   <data name="System_Foreground_Elevated_Dialog_Dont_Show_Again" xml:space="preserve">
     <value>Don't show again</value>
   </data>
-  <data name="System_Menu_Toggle_Always_On_Top" xml:space="preserve">
-    <value>Always on top</value>
-  </data>
-</root>
+</root>

src/modules/alwaysontop/AlwaysOnTop/Settings.cpp

@@ -14,7 +14,6 @@ namespace NonLocalizable
 
     const static wchar_t* HotkeyID = L"hotkey";
     const static wchar_t* SoundEnabledID = L"sound-enabled";
-    const static wchar_t* ShowInSystemMenuID = L"show-in-system-menu";
     const static wchar_t* FrameEnabledID = L"frame-enabled";
     const static wchar_t* FrameThicknessID = L"frame-thickness";
     const static wchar_t* FrameColorID = L"frame-color";
@@ -116,16 +115,6 @@ void AlwaysOnTopSettings::LoadSettings()
             }
         }
 
-        if (const auto jsonVal = values.get_bool_value(NonLocalizable::ShowInSystemMenuID))
-        {
-            auto val = *jsonVal;
-            if (m_settings.showInSystemMenu != val)
-            {
-                m_settings.showInSystemMenu = val;
-                NotifyObservers(SettingId::ShowInSystemMenu);
-            }
-        }
-
         if (const auto jsonVal = values.get_int_value(NonLocalizable::FrameThicknessID))
         {
             auto val = *jsonVal;

src/modules/alwaysontop/AlwaysOnTop/Settings.h

@@ -18,7 +18,6 @@ struct Settings
     static constexpr int minTransparencyPercentage = 20; // minimum transparency (can't go below 20%)
     static constexpr int maxTransparencyPercentage = 100; // maximum (fully opaque)
     static constexpr int transparencyStep = 10; // step size for +/- adjustment
-    bool showInSystemMenu = false;
     bool enableFrame = true;
     bool enableSound = true;
     bool roundCornersEnabled = true;
@@ -57,4 +56,4 @@ private:
     std::unordered_set<SettingsObserver*> m_observers;
 
     void NotifyObservers(SettingId id) const;
-};
+};

src/modules/alwaysontop/AlwaysOnTop/SettingsConstants.h

@@ -4,7 +4,6 @@ enum class SettingId
 {
     Hotkey = 0,
     SoundEnabled,
-    ShowInSystemMenu,
     FrameEnabled,
     FrameThickness,
     FrameColor,
@@ -13,4 +12,4 @@ enum class SettingId
     ExcludeApps,
     FrameAccentColor,
     RoundCornersEnabled
-};
+};

src/modules/cmdpal/.editorconfig

@@ -264,15 +264,3 @@ dotnet_style_prefer_simplified_interpolation = true:suggestion
 [*.{cs,vb}]
 # CS8305: Type is for evaluation purposes only and is subject to change or removal in future updates.
 dotnet_diagnostic.CS8305.severity = suggestion
-
-##################################################
-# Solutions and projects
-##################################################
-
-[*.{*proj,props,target}]
-tab_width = 2
-indent_size = 2
-end_of_line = crlf
-indent_style = space
-insert_final_newline = true
-trim_trailing_whitespace = true

src/modules/cmdpal/CommandPalette.slnf

@@ -3,7 +3,6 @@
     "path": "..\\..\\..\\PowerToys.slnx",
     "projects": [
       "src\\common\\CalculatorEngineCommon\\CalculatorEngineCommon.vcxproj",
-      "src\\common\\Common.UI.Controls\\Common.UI.Controls.csproj",
       "src\\common\\ManagedCommon\\ManagedCommon.csproj",
       "src\\common\\ManagedCsWin32\\ManagedCsWin32.csproj",
       "src\\common\\ManagedTelemetry\\Telemetry\\ManagedTelemetry.csproj",
@@ -11,11 +10,12 @@
       "src\\common\\version\\version.vcxproj",
       "src\\modules\\cmdpal\\CmdPalKeyboardService\\CmdPalKeyboardService.vcxproj",
       "src\\modules\\cmdpal\\CmdPalModuleInterface\\CmdPalModuleInterface.vcxproj",
-      "src\\modules\\cmdpal\\Microsoft.CmdPal.Common\\Microsoft.CmdPal.Common.csproj",
+      "src\\modules\\cmdpal\\Core\\Microsoft.CmdPal.Core.Common\\Microsoft.CmdPal.Core.Common.csproj",
+      "src\\modules\\cmdpal\\Core\\Microsoft.CmdPal.Core.ViewModels\\Microsoft.CmdPal.Core.ViewModels.csproj",
       "src\\modules\\cmdpal\\Microsoft.CmdPal.UI.ViewModels\\Microsoft.CmdPal.UI.ViewModels.csproj",
       "src\\modules\\cmdpal\\Microsoft.CmdPal.UI\\Microsoft.CmdPal.UI.csproj",
       "src\\modules\\cmdpal\\Microsoft.Terminal.UI\\Microsoft.Terminal.UI.vcxproj",
-      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Common.UnitTests\\Microsoft.CmdPal.Common.UnitTests.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Core.Common.UnitTests\\Microsoft.CmdPal.Core.Common.UnitTests.csproj",
       "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.Apps.UnitTests\\Microsoft.CmdPal.Ext.Apps.UnitTests.csproj",
       "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.Bookmarks.UnitTests\\Microsoft.CmdPal.Ext.Bookmarks.UnitTests.csproj",
       "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.Calc.UnitTests\\Microsoft.CmdPal.Ext.Calc.UnitTests.csproj",
@@ -36,7 +36,6 @@
       "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.Calc\\Microsoft.CmdPal.Ext.Calc.csproj",
       "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.ClipboardHistory\\Microsoft.CmdPal.Ext.ClipboardHistory.csproj",
       "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.Indexer\\Microsoft.CmdPal.Ext.Indexer.csproj",
-      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.PerformanceMonitor\\Microsoft.CmdPal.Ext.PerformanceMonitor.csproj",
       "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.Registry\\Microsoft.CmdPal.Ext.Registry.csproj",
       "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.RemoteDesktop\\Microsoft.CmdPal.Ext.RemoteDesktop.csproj",
       "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.Shell\\Microsoft.CmdPal.Ext.Shell.csproj",

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/AppPackagingFlavor.cs

@@ -2,7 +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.
 
-namespace Microsoft.CmdPal.Common;
+namespace Microsoft.CmdPal.Core.Common;
 
 /// <summary>
 /// Represents the packaging flavor of the application.

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/CoreLogger.cs

@@ -2,7 +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.
 
-namespace Microsoft.CmdPal.Common;
+namespace Microsoft.CmdPal.Core.Common;
 
 public static class CoreLogger
 {

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/DiagnosticsHelper.cs

@@ -2,9 +2,10 @@
 // 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.Runtime.InteropServices;
 
-namespace Microsoft.CmdPal.Common.Helpers;
+namespace Microsoft.CmdPal.Core.Common.Helpers;
 
 /// <summary>
 /// Provides utility methods for building diagnostic and error messages.

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/ExtensionHostInstance.cs

@@ -2,10 +2,12 @@
 // 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.Threading.Tasks;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
-namespace Microsoft.CmdPal.Common;
+namespace Microsoft.CmdPal.Core.Common;
 
 public partial class ExtensionHostInstance
 {

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/IPrecomputedListItem.cs

@@ -2,9 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Common.Text;
+using Microsoft.CmdPal.Core.Common.Text;
 
-namespace Microsoft.CmdPal.Common.Helpers;
+namespace Microsoft.CmdPal.Core.Common.Helpers;
 
 /// <summary>
 /// Represents an item that can provide precomputed fuzzy matching targets for its title and subtitle.

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/InterlockedBoolean.cs

@@ -2,7 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.CmdPal.Common.Helpers;
+using System.Threading;
+
+namespace Microsoft.CmdPal.Core.Common.Helpers;
 
 /// <summary>
 /// Thread-safe boolean implementation using atomic operations

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/InternalListHelpers.cs

@@ -4,9 +4,9 @@
 
 using System.Buffers;
 using System.Diagnostics;
-using Microsoft.CmdPal.Common.Text;
+using Microsoft.CmdPal.Core.Common.Text;
 
-namespace Microsoft.CmdPal.Common.Helpers;
+namespace Microsoft.CmdPal.Core.Common.Helpers;
 
 public static partial class InternalListHelpers
 {

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/NativeEventWaiter.cs

@@ -2,9 +2,12 @@
 // 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.Threading;
+
 using Microsoft.UI.Dispatching;
 
-namespace Microsoft.CmdPal.Common.Helpers;
+namespace Microsoft.CmdPal.Core.Common.Helpers;
 
 public static partial class NativeEventWaiter
 {

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/PathHelper.cs

@@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
 using Windows.Win32;
 using Windows.Win32.Storage.FileSystem;
 
-namespace Microsoft.CmdPal.Common.Helpers;
+namespace Microsoft.CmdPal.Core.Common.Helpers;
 
 public static class PathHelper
 {

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/PinnedDockItem.cs

@@ -5,7 +5,7 @@
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
-namespace Microsoft.CmdPal.Common.Helpers;
+namespace Microsoft.CmdPal.Core.Common.Helpers;
 
 public partial class PinnedDockItem : WrappedDockItem
 {

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/SupersedingAsyncGate.cs

@@ -2,7 +2,11 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.CmdPal.Common.Helpers;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.CmdPal.Core.Common.Helpers;
 
 /// <summary>
 /// An async gate that ensures only one operation runs at a time.

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/SupersedingAsyncValueGate`1.cs

@@ -2,7 +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.
 
-namespace Microsoft.CmdPal.Common.Helpers;
+namespace Microsoft.CmdPal.Core.Common.Helpers;
 
 /// <summary>
 /// An async gate that ensures only one value computation runs at a time.