Fixing slnx and slnf

This doesn't actually have a UX to expose this yet - we need to stack a
couple of PRs up to get to that.

But this adds plumbing such that we can now stash away a command ID, and
retrieve it later as a top-level command. Kinda like pinning for apps,
but for _anything_.

It works off of a new command provider interface `ICommandProvider4`,
which lets us look up Command**Item**s by ID. If we see a command ID
stored in that command provider's settings, we will try to look it up,
and then load it from the command provider.

e.g.

```json
    "com.microsoft.cmdpal.builtin.system": {
      "IsEnabled": true,
      "FallbackCommands": {
        "com.microsoft.cmdpal.builtin.system.fallback": {
          "IsEnabled": true,
          "IncludeInGlobalResults": true
        }
      },
      "PinnedCommandIds": [
        "com.microsoft.cmdpal.builtin.system.lock",
        "com.microsoft.cmdpal.builtin.system.restart_shell"
      ]
    },
```
will get us
<img width="840" height="197" alt="image"
src="https://github.com/user-attachments/assets/9ed19003-8361-4318-8dc9-055414456a51"
/>

Then it's just a matter of plumbing the command provider ID through the
layers, so that the command item knows who it is from. We'll need that
later for actually wiring this to the command's context menu.

related to #45191 
related to #45201

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

@@ -207,6 +207,7 @@ 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\.Core\.Common\.UnitTests/.*\.TestData\.cs$
-^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Core\.Common\.UnitTests/Text/.*\.cs$
+^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Common\.UnitTests/.*\.TestData\.cs$
+^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.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,3 +143,5 @@ 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,6 +18,7 @@
             "StylesReportTool\\PowerToys.StylesReportTool.exe",
 
             "CalculatorEngineCommon.dll",
+            "PowerToys.Common.UI.Controls.dll",
             "PowerToys.ManagedTelemetry.dll",
             "PowerToys.ManagedCommon.dll",
             "PowerToys.ManagedCsWin32.dll",

.pipelines/UpdateVersions.ps1

@@ -13,9 +13,36 @@ 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"
+  [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"
 )
 
+# Script-level constants
+$script:PackageVersionRegex = '^(.+?)\.(\d+\..*)$'
+
 
 
 function Read-FileWithEncoding {
@@ -57,7 +84,7 @@ function Add-NuGetSourceAndMapping {
 
     # Ensure packageSources exists
     if (-not $Xml.configuration.packageSources) {
-        $Xml.configuration.AppendChild($Xml.CreateElement("packageSources")) | Out-Null
+        $null = $Xml.configuration.AppendChild($Xml.CreateElement("packageSources"))
     }
     $sources = $Xml.configuration.packageSources
 
@@ -66,13 +93,13 @@ function Add-NuGetSourceAndMapping {
     if (-not $sourceNode) {
         $sourceNode = $Xml.CreateElement("add")
         $sourceNode.SetAttribute("key", $Key)
-        $sources.AppendChild($sourceNode) | Out-Null
+        $null = $sources.AppendChild($sourceNode)
     }
     $sourceNode.SetAttribute("value", $Value)
 
     # Ensure packageSourceMapping exists
     if (-not $Xml.configuration.packageSourceMapping) {
-        $Xml.configuration.AppendChild($Xml.CreateElement("packageSourceMapping")) | Out-Null
+        $null = $Xml.configuration.AppendChild($Xml.CreateElement("packageSourceMapping"))
     }
     $mapping = $Xml.configuration.packageSourceMapping
 
@@ -80,7 +107,7 @@ function Add-NuGetSourceAndMapping {
     $invalidNodes = $mapping.SelectNodes("packageSource[not(@key) or @key='']")
     if ($invalidNodes) {
         foreach ($node in $invalidNodes) {
-            $mapping.RemoveChild($node) | Out-Null
+            $null = $mapping.RemoveChild($node)
         }
     }
 
@@ -91,9 +118,9 @@ function Add-NuGetSourceAndMapping {
         $mappingSource.SetAttribute("key", $Key)
         # Insert at top for priority
         if ($mapping.HasChildNodes) {
-            $mapping.InsertBefore($mappingSource, $mapping.FirstChild) | Out-Null
+            $null = $mapping.InsertBefore($mappingSource, $mapping.FirstChild)
         } else {
-            $mapping.AppendChild($mappingSource) | Out-Null
+            $null = $mapping.AppendChild($mappingSource)
         }
     }
     
@@ -110,14 +137,273 @@ function Add-NuGetSourceAndMapping {
     foreach ($pattern in $Patterns) {
         $pkg = $Xml.CreateElement("package")
         $pkg.SetAttribute("pattern", $pattern)
-        $mappingSource.AppendChild($pkg) | Out-Null
+        $null = $mappingSource.AppendChild($pkg)
     }
 }
 
+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"
-    New-Item -ItemType Directory -Path $installDir -Force | Out-Null
+    $null = New-Item -ItemType Directory -Path $installDir -Force
 
     # Create a temporary nuget.config to avoid interference from the repo's config
     $tempConfig = Join-Path $env:TEMP "nuget_$(Get-Random).config"
@@ -131,14 +417,24 @@ 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..."
-                $nugetArgsBuildTools = "install Microsoft.Windows.SDK.BuildTools -Version $buildToolsVersion -ConfigFile $tempConfig -OutputDirectory $installDir -NonInteractive -NoCache"
-                Invoke-Expression "nuget $nugetArgsBuildTools" | Out-Null
+                & nuget install Microsoft.Windows.SDK.BuildTools `
+                    -Version $buildToolsVersion `
+                    -ConfigFile $tempConfig `
+                    -OutputDirectory $installDir `
+                    -NonInteractive `
+                    -NoCache `
+                    | Out-Null
             }
         }
 
         # Download package to inspect nuspec and keep it for the build
-        $nugetArgs = "install Microsoft.WindowsAppSDK -Version $WinAppSDKVersion -ConfigFile $tempConfig -OutputDirectory $installDir -NonInteractive -NoCache"
-        Invoke-Expression "nuget $nugetArgs" | Out-Null
+        & nuget install Microsoft.WindowsAppSDK `
+            -Version $WinAppSDKVersion `
+            -ConfigFile $tempConfig `
+            -OutputDirectory $installDir `
+            -NonInteractive `
+            -NoCache `
+            | Out-Null
 
         # Parse dependencies from the installed folders
         # Folder structure is typically {PackageId}.{Version}
@@ -172,52 +468,101 @@ function Resolve-WinAppSdkSplitDependencies {
     }
 }
 
-# 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
-}
+# 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"
 
-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 ([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
+    }
 
-if ($latestVersion) {
-    $WinAppSDKVersion = $latestVersion
-    Write-Host "Extracted version: $WinAppSDKVersion"
+    # 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"
+
 } else {
-    Write-Host "Failed to extract version number from nuget list output"
-    exit 1
+    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
 }
 
-# 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
@@ -226,9 +571,16 @@ 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,3 +1,8 @@
+# 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:
@@ -37,6 +42,23 @@ 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
@@ -49,3 +71,7 @@ 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,6 +74,25 @@ 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:
@@ -226,6 +245,12 @@ 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,9 +108,6 @@ jobs:
       sdk: true
       version: '9.0'
 
-  - task: VisualStudioTestPlatformInstaller@1
-    displayName: Ensure VSTest Platform
-
   - pwsh: |-
       & '$(build.sourcesdirectory)\.pipelines\InstallWinAppDriver.ps1'
     displayName: Download and install WinAppDriver
@@ -152,46 +149,7 @@ jobs:
       inputs:
         displaySettings: 'optimal'
 
-  - ${{ 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') }}
+  - 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"

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

@@ -34,6 +34,25 @@ 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 }}:
@@ -65,6 +84,12 @@ 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,6 +5,25 @@ 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
@@ -12,12 +31,20 @@ 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)'
@@ -36,3 +63,4 @@ steps:
     feedsToUse: 'config'
     nugetConfigPath: '$(build.sourcesdirectory)\nuget.config'
     workingDirectory: '$(build.sourcesdirectory)'
+    arguments: '/p:NoWarn=NU1602,NU1604'

.pipelines/verifyNoticeMdAgainstNugetPackages.ps1

@@ -93,7 +93,8 @@ 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"
+	"- Moq",
+	"- MSTest"
 )
 
 if (!$noticeFile.Trim().EndsWith($returnList.Trim()))

Directory.Build.props

@@ -20,6 +20,23 @@
     <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>
 
   <!--
@@ -82,7 +99,15 @@
     </PackageReference>
   </ItemGroup>
 
-  <!-- Add ability to run tests via "msbuild /t:Test" -->
+  <!-- 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# -->
   <!--
     Work around an MSBuild bug where Microsoft.Common.Test.targets is missing from the Arm64 installation.
     See: https://github.com/dotnet/msbuild/pull/9984
@@ -92,11 +117,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'">
+  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64' AND ('$(Language)' == 'C++' OR '$(MSBuildProjectExtension)' == '.vcxproj')">
     <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>
+  <PropertyGroup Condition="'$(Language)' == 'C++' OR '$(MSBuildProjectExtension)' == '.vcxproj'">
     <VSTestLogger>trx</VSTestLogger>
     <!--
       RunVSTest by default uses %VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe,

Directory.Packages.props

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <MSTestVersion>3.8.3</MSTestVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
@@ -86,7 +87,8 @@
     <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="3.8.3" />
+    <PackageVersion Include="MSTest" Version="$(MSTestVersion)" />
+    <PackageVersion Include="MSTest.TestFramework" Version="$(MSTestVersion)" />
     <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,6 +1582,7 @@ SOFTWARE.
 - ModernWpfUI
 - Moq
 - MSTest
+- MSTest.TestFramework
 - NJsonSchema
 - NLog
 - NLog.Extensions.Logging
@@ -1602,4 +1603,4 @@ SOFTWARE.
 - WinUIEx
 - WmiLight
 - WPF-UI
-- WyHash
+- WyHash

PowerToys.slnx

@@ -196,6 +196,10 @@
   <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">
@@ -275,16 +279,6 @@
       <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" />
@@ -305,7 +299,7 @@
     </Project>
   </Folder>
   <Folder Name="/modules/CommandPalette/Tests/">
-    <Project Path="src/modules/cmdpal/Tests/Microsoft.CmdPal.Core.Common.UnitTests/Microsoft.CmdPal.Core.Common.UnitTests.csproj">
+    <Project Path="src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Microsoft.CmdPal.Common.UnitTests.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>

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,8 +4,9 @@
   <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />
 
   <PropertyGroup>
+    <CoreTargetFramework>net9.0</CoreTargetFramework>
     <WindowsSdkPackageVersion>10.0.26100.68-preview</WindowsSdkPackageVersion>
-    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>$(CoreTargetFramework)-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,4 +7,13 @@
   <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/common/UITestAutomation/Element/Element.cs

@@ -8,7 +8,6 @@ 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,7 +15,8 @@
 
   <ItemGroup>
     <PackageReference Include="Appium.WebDriver" />
-    <PackageReference Include="MSTest" />
+    <!-- Test libraries/utilities should not use the metapackage. -->
+    <PackageReference Include="MSTest.TestFramework" />
     <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>Library</OutputType>
+    <OutputType>Exe</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,6 +3,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>
+    <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,6 +46,7 @@
     <Message Text="Generating DSC resource JSON files to DSCModules subfolder..." Importance="high" />
     <MakeDir Directories="$(TargetDir)DSCModules" />
     
-    <Exec Command="dotnet &quot;$(TargetPath)&quot; manifest --resource settings --outputDir &quot;$(TargetDir)DSCModules&quot;" />
+    <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'" />
   </Target>
 </Project>

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

@@ -6,6 +6,12 @@
 		<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,11 +3,14 @@
   <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>
-    <IsTestProject>true</IsTestProject>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -7,6 +7,11 @@
 		<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.Tests/HostsEditor.UnitTests.csproj

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

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>Library</OutputType>
+    <OutputType>Exe</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,7 +6,13 @@
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <OutputType>Library</OutputType>
+    <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>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -2,10 +2,13 @@
   <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>Library</OutputType>
+    <OutputType>Exe</OutputType>
     <RunVSTest>false</RunVSTest>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>

src/modules/ZoomIt/ZoomIt/AudioSampleGenerator.cpp

@@ -34,13 +34,15 @@ namespace winrt
     using namespace Windows::Devices::Enumeration;
 }
 
-AudioSampleGenerator::AudioSampleGenerator(bool captureMicrophone, bool captureSystemAudio)
+AudioSampleGenerator::AudioSampleGenerator(bool captureMicrophone, bool captureSystemAudio, bool micMonoMix)
     : m_captureMicrophone(captureMicrophone)
     , m_captureSystemAudio(captureSystemAudio)
+    , m_micMonoMix(micMonoMix)
 {
     OutputDebugStringA(("AudioSampleGenerator created, captureMicrophone=" +
         std::string(captureMicrophone ? "true" : "false") +
-        ", captureSystemAudio=" + std::string(captureSystemAudio ? "true" : "false") + "\n").c_str());
+        ", captureSystemAudio=" + std::string(captureSystemAudio ? "true" : "false") +
+        ", micMonoMix=" + std::string(micMonoMix ? "true" : "false") + "\n").c_str());
     m_audioEvent.create(wil::EventOptions::ManualReset);
     m_endEvent.create(wil::EventOptions::ManualReset);
     m_startEvent.create(wil::EventOptions::ManualReset);
@@ -631,6 +633,30 @@ 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);
+    AudioSampleGenerator(bool captureMicrophone = true, bool captureSystemAudio = true, bool micMonoMix = false);
     ~AudioSampleGenerator();
 
     winrt::Windows::Foundation::IAsyncAction InitializeAsync();
@@ -70,4 +70,5 @@ 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,6 +861,7 @@ VideoRecordingSession::VideoRecordingSession(
     uint32_t frameRate,
     bool captureAudio,
     bool captureSystemAudio,
+    bool micMonoMix,
     winrt::Streams::IRandomAccessStream const& stream)
 {
     m_device = device;
@@ -964,7 +965,7 @@ VideoRecordingSession::VideoRecordingSession(
     winrt::check_hresult(m_d3dDevice->CreateRenderTargetView(backBuffer.get(), nullptr, m_renderTargetView.put()));
 
     // Always create audio generator for loopback capture; captureAudio controls microphone
-    m_audioGenerator = std::make_unique<AudioSampleGenerator>(captureAudio, captureSystemAudio);
+    m_audioGenerator = std::make_unique<AudioSampleGenerator>(captureAudio, captureSystemAudio, micMonoMix);
 }
 
 
@@ -1112,9 +1113,10 @@ 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, stream));
+    return std::shared_ptr<VideoRecordingSession>(new VideoRecordingSession(device, item, crop, frameRate, captureAudio, captureSystemAudio, micMonoMix, stream));
 }
 
 //----------------------------------------------------------------------------

src/modules/ZoomIt/ZoomIt/VideoRecordingSession.h

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

src/modules/ZoomIt/ZoomIt/ZoomIt.rc

@@ -279,6 +279,7 @@ 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,6 +51,7 @@ 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};
@@ -99,6 +100,7 @@ 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,6 +3840,9 @@ 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)
         //
@@ -4260,6 +4263,7 @@ 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 );
@@ -5605,6 +5609,7 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
                                         g_RecordFrameRate,
                                         g_CaptureAudio,
                                         g_CaptureSystemAudio,
+                                        g_MicMonoMix,
                                         stream );
 
         recordingStarted = (g_RecordingSession != nullptr);
@@ -7291,7 +7296,8 @@ 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);
@@ -7399,9 +7405,8 @@ LRESULT APIENTRY MainWndProc(
 
     case WM_KEYDOWN:
 
-        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( (g_TypeMode != TypeModeOff) && g_HaveTyped &&
+            (wParam == VK_RETURN || wParam == VK_DELETE || wParam == VK_BACK) ) {
 
             if( wParam == VK_RETURN ) {
 

src/modules/ZoomIt/ZoomIt/resource.h

@@ -111,6 +111,7 @@
 #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/cmdpal/CommandPalette.slnf

@@ -11,12 +11,11 @@
       "src\\common\\version\\version.vcxproj",
       "src\\modules\\cmdpal\\CmdPalKeyboardService\\CmdPalKeyboardService.vcxproj",
       "src\\modules\\cmdpal\\CmdPalModuleInterface\\CmdPalModuleInterface.vcxproj",
-      "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.Common\\Microsoft.CmdPal.Common.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.Core.Common.UnitTests\\Microsoft.CmdPal.Core.Common.UnitTests.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Common.UnitTests\\Microsoft.CmdPal.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",

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Microsoft.CmdPal.Core.Common.csproj

@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\CoreCommonProps.props" />
-
-  <PropertyGroup>
-    <RootNamespace>Microsoft.CmdPal.Core.Common</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-
-</Project>

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/Sanitizer/PiiRuleProvider.cs

@@ -1,83 +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.Text.RegularExpressions;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
-
-namespace Microsoft.CmdPal.Core.Common.Services.Sanitizer;
-
-internal sealed partial class PiiRuleProvider : ISanitizationRuleProvider
-{
-    public IEnumerable<SanitizationRule> GetRules()
-    {
-        yield return new(EmailRx(), "[EMAIL_REDACTED]", "Email addresses");
-        yield return new(SsnRx(), "[SSN_REDACTED]", "Social Security Numbers");
-        yield return new(CreditCardRx(), "[CARD_REDACTED]", "Credit card numbers");
-
-        // phone number regex is the most generic, so it goes last
-        // we can't make this too generic; otherwise we over-redact error codes, dates, etc.
-        yield return new(PhoneRx(), "[PHONE_REDACTED]", "Phone numbers");
-    }
-
-    [GeneratedRegex(@"\b[a-zA-Z0-9]([a-zA-Z0-9._%-]*[a-zA-Z0-9])?@[a-zA-Z0-9]([a-zA-Z0-9.-]*[a-zA-Z0-9])?\.[a-zA-Z]{2,}\b",
-        SanitizerDefaults.DefaultOptions, SanitizerDefaults.DefaultMatchTimeoutMs)]
-    private static partial Regex EmailRx();
-
-    [GeneratedRegex("""
-                    (?xi)
-                    # ---------- boundaries ----------
-                    (?<!\w)                          # not after a letter/digit/underscore
-                    (?<![A-Za-z0-9]-)                # avoid starting inside hyphenated tokens (GUID middles, etc.)
-
-                    # ---------- global do-not-match guards ----------
-                    (?!                              # ISO date (yyyy-mm-dd / yyyy.mm.dd / yyyy/mm/dd)
-                       (?:19|20)\d{2}[-./](?:0[1-9]|1[0-2])[-./](?:0[1-9]|[12]\d|3[01])\b
-                    )
-                    (?!                              # EU date (dd-mm-yyyy / dd.mm.yyyy / dd/mm/yyyy)
-                       (?:0[1-9]|[12]\d|3[01])[-./](?:0[1-9]|1[0-2])[-./](?:19|20)\d{2}\b
-                    )
-                    (?!                              # ISO datetime like 2025-08-24T14:32[:ss][Z|±hh:mm]
-                       (?:19|20)\d{2}-\d{2}-\d{2}[T\s]\d{2}:\d{2}(?::\d{2})?(?:Z|[+-]\d{2}:\d{2})?\b
-                    )
-                    (?!\b(?:\d{1,3}\.){3}\d{1,3}(?::\d{1,5})?\b)   # IPv4 with optional :port
-                    (?!\b[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}\b)  # GUID, lowercase
-                    (?!\b[0-9A-F]{8}-(?:[0-9A-F]{4}-){3}[0-9A-F]{12}\b)  # GUID, uppercase
-                    (?!\bv?\d+(?:\.\d+){2,}\b)       # semantic/file versions like 1.2.3 or 10.0.22631.3448
-                    (?!\b(?:[0-9A-F]{2}[:-]){5}[0-9A-F]{2}\b)       # MAC address
-
-                    # ---------- digit budget ----------
-                    (?=(?:\D*\d){7,15})              # 7–15 digits in total
-
-                    # ---------- number body ----------
-                    (?:
-                      # A with explicit country code, allow compact digits (E.164-ish) or grouped
-                      (?:\+|00)[1-9]\d{0,2}
-                      (?:
-                        [\p{Zs}.\-\/]*\d{6,14}
-                        |
-                        [\p{Zs}.\-\/]* (?:\(\d{1,4}\)|\d{1,4})
-                        (?:[\p{Zs}.\-\/]+(?:\(\d{2,4}\)|\d{2,4})){1,6}
-                      )
-                      |
-                      # B no country code => require separators between blocks (avoid plain big ints)
-                      (?:\(\d{1,4}\)|\d{1,4})
-                      (?:[\p{Zs}.\-\/]+(?:\(\d{2,4}\)|\d{2,4})){1,6}
-                    )
-
-                    # ---------- optional extension ----------
-                    (?:[\p{Zs}.\-,:;]* (?:ext\.?|x) [\p{Zs}]* (?<ext>\d{1,6}))?
-
-                    (?!-\w)                           # don't end just before '-letter'/'-digit'
-                    """,
-        SanitizerDefaults.DefaultOptions | RegexOptions.IgnorePatternWhitespace, SanitizerDefaults.DefaultMatchTimeoutMs)]
-    private static partial Regex PhoneRx();
-
-    [GeneratedRegex(@"\b\d{3}-\d{2}-\d{4}\b",
-        SanitizerDefaults.DefaultOptions, SanitizerDefaults.DefaultMatchTimeoutMs)]
-    private static partial Regex SsnRx();
-
-    [GeneratedRegex(@"\b\d{4}[-\s]?\d{4}[-\s]?\d{4}[-\s]?\d{4}\b",
-        SanitizerDefaults.DefaultOptions, SanitizerDefaults.DefaultMatchTimeoutMs)]
-    private static partial Regex CreditCardRx();
-}

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/HideDetailsMessage.cs

@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
-namespace Microsoft.CmdPal.Core.ViewModels.Messages;
-
-public record HideDetailsMessage()
-{
-}

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/LaunchUriMessage.cs

@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
-namespace Microsoft.CmdPal.Core.ViewModels.Messages;
-
-public record LaunchUriMessage(Uri Uri)
-{
-}

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowDetailsMessage.cs

@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
-namespace Microsoft.CmdPal.Core.ViewModels.Messages;
-
-public record ShowDetailsMessage(DetailsViewModel Details)
-{
-}

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Microsoft.CmdPal.Core.ViewModels.csproj

@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\CoreCommonProps.props" />
-
-  <PropertyGroup>
-    <EnableCoreMrtTooling>false</EnableCoreMrtTooling>
-  </PropertyGroup>
-	
-  <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Common" />
-    <PackageReference Include="CommunityToolkit.Mvvm" />
-  </ItemGroup>
-		
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.CmdPal.Core.Common\Microsoft.CmdPal.Core.Common.csproj" />
-  </ItemGroup>
-		
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-</Project>

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/NativeMethods.json

@@ -1,4 +0,0 @@
-{
-  "$schema": "https://aka.ms/CsWin32.schema.json",
-  "allowMarshaling": false
-}

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/NativeMethods.txt

@@ -1,19 +0,0 @@
-GetPhysicallyInstalledSystemMemory
-GlobalMemoryStatusEx
-GetSystemInfo
-CoCreateInstance
-SetForegroundWindow
-IsIconic
-RegisterHotKey
-SetWindowLongPtr
-CallWindowProc
-ShowWindow
-SetForegroundWindow
-SetFocus
-SetActiveWindow
-MonitorFromWindow
-GetMonitorInfo
-SHCreateStreamOnFileEx
-CoAllowSetForegroundWindow
-SHCreateStreamOnFileEx
-SHLoadIndirectString

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Properties/Resources.Designer.cs

@@ -1,72 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.CmdPal.Core.ViewModels.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CmdPal.Core.ViewModels.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Show details.
-        /// </summary>
-        public static string ShowDetailsCommand {
-            get {
-                return ResourceManager.GetString("ShowDetailsCommand", resourceCulture);
-            }
-        }
-    }
-}

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Properties/Resources.resx

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="ShowDetailsCommand" xml:space="preserve">
-    <value>Show details</value>
-    <comment>Name for the command that shows details of an item</comment>
-  </data>
-</root>

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

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

@@ -4,7 +4,7 @@
 
 using System;
 
-namespace Microsoft.CmdPal.Core.Common;
+namespace Microsoft.CmdPal.Common;
 
 public static class CoreLogger
 {

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

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

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

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

src/modules/cmdpal/Microsoft.CmdPal.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.Core.Common.Text;
+using Microsoft.CmdPal.Common.Text;
 
-namespace Microsoft.CmdPal.Core.Common.Helpers;
+namespace Microsoft.CmdPal.Common.Helpers;
 
 /// <summary>
 /// Represents an item that can provide precomputed fuzzy matching targets for its title and subtitle.

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

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

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

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

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

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

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

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

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

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

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

src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/VersionHelper.cs

@@ -5,7 +5,7 @@
 using System.Diagnostics;
 using Windows.ApplicationModel;
 
-namespace Microsoft.CmdPal.Core.Common.Helpers;
+namespace Microsoft.CmdPal.Common.Helpers;
 
 /// <summary>
 /// Helper class for retrieving application version information safely.

src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/WellKnownKeyChords.cs

@@ -4,10 +4,9 @@
 
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-
 using Windows.System;
 
-namespace Microsoft.CmdPal.Core.Common.Helpers;
+namespace Microsoft.CmdPal.Common.Helpers;
 
 /// <summary>
 /// Well-known key chords used in the Command Palette and extensions.

src/modules/cmdpal/Microsoft.CmdPal.Common/Microsoft.CmdPal.Common.csproj

@@ -1,7 +1,9 @@
-<Project>
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\Common.Dotnet.AotCompatibility.props" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\..\..\Common.Dotnet.AotCompatibility.props" />
+
   <PropertyGroup>
+    <RootNamespace>Microsoft.CmdPal.Core.Common</RootNamespace> 
     <Nullable>enable</Nullable>
     <!-- For MVVM Toolkit Partial Properties/AOT support -->
     <LangVersion>preview</LangVersion>
@@ -18,11 +20,19 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
   <PropertyGroup>
     <CsWinRTAotOptimizerEnabled>true</CsWinRTAotOptimizerEnabled>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" />
     <PackageReference Include="Microsoft.Windows.CsWin32">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -32,21 +42,14 @@
     <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="$(MSBuildThisFileDirectory)\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
        <_Parameter1>$(AssemblyName).UnitTests</_Parameter1>
     </AssemblyAttribute>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
+  </ItemGroup>
+
 </Project>

src/modules/cmdpal/Microsoft.CmdPal.Common/Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.CmdPal.Core.Common.Properties {
+namespace Microsoft.CmdPal.Common.Properties {
     using System;
     
     

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/ApplicationInfoService.cs

@@ -5,11 +5,11 @@
 using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
-using Microsoft.CmdPal.Core.Common.Helpers;
+using Microsoft.CmdPal.Common.Helpers;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.ApplicationModel;
 
-namespace Microsoft.CmdPal.Core.Common.Services;
+namespace Microsoft.CmdPal.Common.Services;
 
 /// <summary>
 /// Implementation of IApplicationInfoService providing application-wide information.

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IApplicationInfoService.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.Core.Common.Services;
+namespace Microsoft.CmdPal.Common.Services;
 
 /// <summary>
 /// Provides access to application-wide information such as version, packaging flavor, and directory paths.

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IExtensionService.cs

@@ -2,11 +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 System.Collections.Generic;
-using System.Threading.Tasks;
 using Windows.Foundation;
 
-namespace Microsoft.CmdPal.Core.Common.Services;
+namespace Microsoft.CmdPal.Common.Services;
 
 public interface IExtensionService
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IExtensionWrapper.cs

@@ -2,13 +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.Collections.Generic;
-using System.Threading.Tasks;
 using Microsoft.CommandPalette.Extensions;
 using Windows.ApplicationModel;
 
-namespace Microsoft.CmdPal.Core.Common.Services;
+namespace Microsoft.CmdPal.Common.Services;
 
 public interface IExtensionWrapper
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IRunHistoryService.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.Core.Common.Services;
+namespace Microsoft.CmdPal.Common.Services;
 
 public interface IRunHistoryService
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Reports/ErrorReportBuilder.cs

@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Runtime.InteropServices;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer;
+using Microsoft.CmdPal.Common.Services.Sanitizer;
 
-namespace Microsoft.CmdPal.Core.Common.Services.Reports;
+namespace Microsoft.CmdPal.Common.Services.Reports;
 
 public sealed class ErrorReportBuilder : IErrorReportBuilder
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Reports/IErrorReportBuilder.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.Core.Common.Services.Reports;
+namespace Microsoft.CmdPal.Common.Services.Reports;
 
 /// <summary>
 /// Defines a contract for creating human-readable error reports from exceptions,

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/Abstraction/ITextSanitizer.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.Core.Common.Services.Sanitizer.Abstraction;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 
 /// <summary>
 /// Defines a service that sanitizes text by applying a set of configurable, regex-based rules.

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/Abstraction/SanitizationRule.cs

@@ -4,7 +4,7 @@
 
 using System.Text.RegularExpressions;
 
-namespace Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 
 public readonly record struct SanitizationRule
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/ConnectionStringRuleProvider.cs

@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.RegularExpressions;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 
-namespace Microsoft.CmdPal.Core.Common.Services.Sanitizer;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer;
 
 internal sealed partial class ConnectionStringRuleProvider : ISanitizationRuleProvider
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/EnvironmentPropertiesRuleProvider.cs

@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.RegularExpressions;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 
-namespace Microsoft.CmdPal.Core.Common.Services.Sanitizer;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer;
 
 internal sealed class EnvironmentPropertiesRuleProvider : ISanitizationRuleProvider
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/ErrorReportSanitizer.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.Core.Common.Services.Sanitizer.Abstraction;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 
-namespace Microsoft.CmdPal.Core.Common.Services.Sanitizer;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer;
 
 /// <summary>
 /// Specific sanitizer used for error report content. Builds on top of the generic TextSanitizer.

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/FilenameMaskRuleProvider.cs

@@ -4,9 +4,9 @@
 
 using System.Collections.Frozen;
 using System.Text.RegularExpressions;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 
-namespace Microsoft.CmdPal.Core.Common.Services.Sanitizer;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer;
 
 internal sealed class FilenameMaskRuleProvider : ISanitizationRuleProvider
 {
@@ -25,6 +25,7 @@ internal sealed class FilenameMaskRuleProvider : ISanitizationRuleProvider
         "env",
         "environment",
         "manifest",
+        "log",
     }.ToFrozenSet(StringComparer.OrdinalIgnoreCase);
 
     public IEnumerable<SanitizationRule> GetRules()
@@ -61,6 +62,11 @@ internal sealed class FilenameMaskRuleProvider : ISanitizationRuleProvider
                 return full;
             }
 
+            if (IsVersionSegment(file))
+            {
+                return full;
+            }
+
             string stem, ext;
             if (dot > 0 && dot < file.Length - 1)
             {
@@ -106,4 +112,30 @@ internal sealed class FilenameMaskRuleProvider : ISanitizationRuleProvider
         var maskedCount = Math.Max(1, stem.Length - keep);
         return stem[..keep] + new string('*', maskedCount);
     }
+
+    private static bool IsVersionSegment(string file)
+    {
+        var dotIndex = file.IndexOf('.');
+        if (dotIndex <= 0 || dotIndex == file.Length - 1)
+        {
+            return false;
+        }
+
+        var hasDot = false;
+        foreach (var ch in file)
+        {
+            if (ch == '.')
+            {
+                hasDot = true;
+                continue;
+            }
+
+            if (!char.IsDigit(ch))
+            {
+                return false;
+            }
+        }
+
+        return hasDot;
+    }
 }

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/GuardrailEventArgs.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.Core.Common.Services.Sanitizer;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer;
 
 public record GuardrailEventArgs(
     string RuleDescription,

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/ISanitizationRuleProvider.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.Core.Common.Services.Sanitizer.Abstraction;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 
-namespace Microsoft.CmdPal.Core.Common.Services.Sanitizer;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer;
 
 internal interface ISanitizationRuleProvider
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/NetworkRuleProvider.cs

@@ -3,15 +3,17 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.RegularExpressions;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 
-namespace Microsoft.CmdPal.Core.Common.Services.Sanitizer;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer;
 
 internal sealed partial class NetworkRuleProvider : ISanitizationRuleProvider
 {
     public IEnumerable<SanitizationRule> GetRules()
     {
-        yield return new(Ipv4Rx(), "[IP4_REDACTED]", "IP addresses");
+        // Disabled for now as these rules can be too aggressive and cause over-sanitization, especially in scenarios like
+        // error report sanitization where we want to preserve as much useful information as possible while still protecting sensitive data.
+        // yield return new(Ipv4Rx(), "[IP4_REDACTED]", "IP addresses");
         yield return new(Ipv6BracketedRx(), "[IP6_REDACTED]", "IPv6 addresses (bracketed/with port)");
         yield return new(Ipv6Rx(), "[IP6_REDACTED]", "IPv6 addresses");
         yield return new(MacAddressRx(), "[MAC_ADDRESS_REDACTED]", "MAC addresses");

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/PiiRuleProvider.cs

@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Text.RegularExpressions;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
+
+namespace Microsoft.CmdPal.Common.Services.Sanitizer;
+
+internal sealed partial class PiiRuleProvider : ISanitizationRuleProvider
+{
+    public IEnumerable<SanitizationRule> GetRules()
+    {
+        yield return new(EmailRx(), "[EMAIL_REDACTED]", "Email addresses");
+        yield return new(SsnRx(), "[SSN_REDACTED]", "Social Security Numbers");
+        yield return new(CreditCardRx(), "[CARD_REDACTED]", "Credit card numbers");
+
+        // phone number regex is the most generic, so it goes last
+        // we can't make this too generic; otherwise we over-redact error codes, dates, etc.
+        yield return new(PhoneRx(), "[PHONE_REDACTED]", "Phone numbers");
+    }
+
+    [GeneratedRegex(@"\b[a-zA-Z0-9]([a-zA-Z0-9._%-]*[a-zA-Z0-9])?@[a-zA-Z0-9]([a-zA-Z0-9.-]*[a-zA-Z0-9])?\.[a-zA-Z]{2,}\b",
+        SanitizerDefaults.DefaultOptions, SanitizerDefaults.DefaultMatchTimeoutMs)]
+    private static partial Regex EmailRx();
+
+    [GeneratedRegex("""
+                (?xi)
+                # ---------- boundaries ----------
+                (?<!\w)                          # not after a letter/digit/underscore
+                (?<![A-Za-z0-9]-)                # avoid starting inside hyphenated tokens (GUID middles, etc.)
+
+                # ---------- global do-not-match guards ----------
+                (?!                              # ISO date (yyyy-mm-dd / yyyy.mm.dd / yyyy/mm/dd)
+                   (?:19|20)\d{2}[-./](?:0[1-9]|1[0-2])[-./](?:0[1-9]|[12]\d|3[01])\b
+                )
+                (?!                              # EU date (dd-mm-yyyy / dd.mm.yyyy / dd/mm/yyyy)
+                   (?:0[1-9]|[12]\d|3[01])[-./](?:0[1-9]|1[0-2])[-./](?:19|20)\d{2}\b
+                )
+                (?!                              # ISO datetime like 2025-08-24T14:32[:ss][Z|±hh:mm]
+                   (?:19|20)\d{2}-\d{2}-\d{2}[T\s]\d{2}:\d{2}(?::\d{2})?(?:Z|[+-]\d{2}:\d{2})?\b
+                )
+                (?!\b(?:\d{1,3}\.){3}\d{1,3}(?::\d{1,5})?\b)   # IPv4 with optional :port
+                (?!\b[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}\b)  # GUID, lowercase
+                (?!\b[0-9A-F]{8}-(?:[0-9A-F]{4}-){3}[0-9A-F]{12}\b)  # GUID, uppercase
+                (?!\bv?\d+(?:\.\d+){2,}\b)       # semantic/file versions like 1.2.3 or 10.0.22631.3448
+                (?!\b(?:[0-9A-F]{2}[:-]){5}[0-9A-F]{2}\b)       # MAC address
+
+                # ---------- digit budget ----------
+                (?=(?:[^\r\n]*\d){7,15}[^\r\n]*(?:\r\n|$))
+                (?=(?:\D*\d){7,15})              # 7–15 digits in total
+
+                # ---------- number body ----------
+                (?:
+                # A with explicit country code, allow compact digits (E.164-ish) or grouped
+                  (?:\+|00)[1-9]\d{0,2}
+                  (?:
+                    [\p{Zs}.\-\/]*\d{6,14}
+                    |
+                    [\p{Zs}.\-\/]* (?:\(\d{1,4}\)|\d{1,4})
+                    (?:[\p{Zs}.\-\/]+(?:\(\d{2,4}\)|\d{2,4})){1,6}
+                  )
+                  |
+                      # B no country code => require separators between blocks (avoid plain big ints)
+                  (?:\(\d{1,4}\)|\d{1,4})
+                  (?:[\p{Zs}.\-\/]+(?:\(\d{2,4}\)|\d{2,4})){1,6}
+                )
+
+                # ---------- optional extension ----------
+                (?:[\p{Zs}.\-,:;]* (?:ext\.?|x) [\p{Zs}]* (?<ext>\d{1,6}))?
+
+                # ---------- end boundary (allow whitespace/newlines at edges) ----------
+                (?!-\w)                          # don't end just before '-letter'/'-digit'
+                (?!\w)                           # don't be immediately followed by a word char
+                """,
+    SanitizerDefaults.DefaultOptions | RegexOptions.IgnorePatternWhitespace,
+    SanitizerDefaults.DefaultMatchTimeoutMs)]
+    private static partial Regex PhoneRx();
+
+    [GeneratedRegex(@"\b\d{3}-\d{2}-\d{4}\b",
+        SanitizerDefaults.DefaultOptions, SanitizerDefaults.DefaultMatchTimeoutMs)]
+    private static partial Regex SsnRx();
+
+    [GeneratedRegex(@"\b\d{4}[-\s]?\d{4}[-\s]?\d{4}[-\s]?\d{4}\b",
+        SanitizerDefaults.DefaultOptions, SanitizerDefaults.DefaultMatchTimeoutMs)]
+    private static partial Regex CreditCardRx();
+}

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/ProfilePathAndUsernameRuleProvider.cs

@@ -4,9 +4,9 @@
 
 using System.Collections.Frozen;
 using System.Text.RegularExpressions;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 
-namespace Microsoft.CmdPal.Core.Common.Services.Sanitizer;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer;
 
 internal sealed class ProfilePathAndUsernameRuleProvider : ISanitizationRuleProvider
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/SanitizerDefaults.cs

@@ -4,7 +4,7 @@
 
 using System.Text.RegularExpressions;
 
-namespace Microsoft.CmdPal.Core.Common.Services.Sanitizer;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer;
 
 internal static class SanitizerDefaults
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/SecretKeyValueRulesProvider.cs

@@ -4,9 +4,9 @@
 
 using System.Collections.Frozen;
 using System.Text.RegularExpressions;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 
-namespace Microsoft.CmdPal.Core.Common.Services.Sanitizer;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer;
 
 internal sealed class SecretKeyValueRulesProvider : ISanitizationRuleProvider
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/TextSanitizer.cs

@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.RegularExpressions;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 
-namespace Microsoft.CmdPal.Core.Common.Services.Sanitizer;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer;
 
 /// <summary>
 /// Generic text sanitizer that applies a sequence of regex-based rules over input text.

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/TokenRuleProvider.cs

@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.RegularExpressions;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 
-namespace Microsoft.CmdPal.Core.Common.Services.Sanitizer;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer;
 
 internal sealed partial class TokenRuleProvider : ISanitizationRuleProvider
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/Sanitizer/UrlRuleProvider.cs

@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.RegularExpressions;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 
-namespace Microsoft.CmdPal.Core.Common.Services.Sanitizer;
+namespace Microsoft.CmdPal.Common.Services.Sanitizer;
 
 internal sealed partial class UrlRuleProvider : ISanitizationRuleProvider
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Text/BloomFilter.cs

@@ -4,7 +4,7 @@
 
 using System.Runtime.CompilerServices;
 
-namespace Microsoft.CmdPal.Core.Common.Text;
+namespace Microsoft.CmdPal.Common.Text;
 
 public sealed class BloomFilter : IBloomFilter
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Text/FuzzyMatcherProvider.cs

@@ -4,7 +4,7 @@
 
 using System.Globalization;
 
-namespace Microsoft.CmdPal.Core.Common.Text;
+namespace Microsoft.CmdPal.Common.Text;
 
 public sealed class FuzzyMatcherProvider : IFuzzyMatcherProvider
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Text/FuzzyQuery.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.Core.Common.Text;
+namespace Microsoft.CmdPal.Common.Text;
 
 public readonly struct FuzzyQuery
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Text/FuzzyTarget.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.Core.Common.Text;
+namespace Microsoft.CmdPal.Common.Text;
 
 public readonly struct FuzzyTarget
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Text/FuzzyTargetCache.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.Core.Common.Text;
+namespace Microsoft.CmdPal.Common.Text;
 
 public struct FuzzyTargetCache
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Text/IBloomFilter.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.Core.Common.Text;
+namespace Microsoft.CmdPal.Common.Text;
 
 public interface IBloomFilter
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Text/IFuzzyMatcherProvider.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.Core.Common.Text;
+namespace Microsoft.CmdPal.Common.Text;
 
 public interface IFuzzyMatcherProvider
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Text/IPrecomputedFuzzyMatcher.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.Core.Common.Text;
+namespace Microsoft.CmdPal.Common.Text;
 
 public interface IPrecomputedFuzzyMatcher
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Text/IStringFolder.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.Core.Common.Text;
+namespace Microsoft.CmdPal.Common.Text;
 
 public interface IStringFolder
 {

src/modules/cmdpal/Microsoft.CmdPal.Common/Text/PinyinFuzzyMatcherOptions.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.Core.Common.Text;
+namespace Microsoft.CmdPal.Common.Text;
 
 public sealed class PinyinFuzzyMatcherOptions
 {