fix

.gitignore

@@ -56,7 +56,7 @@ project.lock.json
 project.fragment.lock.json
 artifacts/
 **/Properties/launchSettings.json
-!src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PowerToys/Properties/launchSettings.json
+!src/modules/cmdpal/**/Properties/launchSettings.json
 
 # StyleCop
 StyleCopReport.xml

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

@@ -480,30 +480,6 @@ jobs:
       }
     displayName: Locate the CmdPal MSIX
 
-  - pwsh: |-
-      $Packages = Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.Ext.PowerToys_*.msix"
-      Write-Host "Found $($Packages.Count) CmdPal PowerToys extension MSIX package(s):"
-      foreach ($pkg in $Packages) {
-          Write-Host "  - $($pkg.FullName)"
-      }
-      
-      if ($Packages.Count -gt 0) {
-          $PlatformPackage = $Packages | Where-Object { $_.Name -match "Microsoft\.CmdPal\.Ext\.PowerToys_.*_(x64|arm64)\.msix$" } | Select-Object -First 1
-          if ($PlatformPackage) {
-              $Package = $PlatformPackage
-              Write-Host "Using platform-specific package: $($Package.FullName)"
-          } else {
-              $Package = $Packages | Select-Object -First 1
-              Write-Host "Using first available package: $($Package.FullName)"
-          }
-          
-          $PackageFilename = $Package.FullName
-          Write-Host "##vso[task.setvariable variable=CmdPalExtPowerToysPackagePath]${PackageFilename}"
-      } else {
-          Write-Warning "No CmdPal PowerToys extension MSIX packages found!"
-      }
-    displayName: Locate the CmdPal PowerToys extension MSIX
-
   - ${{ if eq(parameters.codeSign, true) }}:
     - pwsh: |-
         & "$(MakeAppxPath)" unpack /p "$(CmdPalPackagePath)" /d "$(JobOutputDirectory)/CmdPalPackageContents"
@@ -528,37 +504,6 @@ jobs:
         Remove-Item -Force -Recurse "$(JobOutputDirectory)/_appx" -ErrorAction:Ignore
       displayName: Re-pack the new CmdPal package after signing
 
-    - pwsh: |-
-        if ([string]::IsNullOrWhiteSpace("$(CmdPalExtPowerToysPackagePath)")) {
-            Write-Host "No CmdPal PowerToys extension MSIX package found; skipping signing."
-            exit 0
-        }
-        & "$(MakeAppxPath)" unpack /p "$(CmdPalExtPowerToysPackagePath)" /d "$(JobOutputDirectory)/CmdPalExtPowerToysPackageContents"
-      displayName: Unpack the CmdPal PowerToys extension MSIX for signing
-
-    - template: steps-esrp-signing.yml
-      parameters:
-        displayName: Sign CmdPal PowerToys extension MSIX content
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: '$(JobOutputDirectory)/CmdPalExtPowerToysPackageContents'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_cmdpal_msix_content.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-    - pwsh: |-
-        if ([string]::IsNullOrWhiteSpace("$(CmdPalExtPowerToysPackagePath)")) {
-            Write-Host "No CmdPal PowerToys extension MSIX package found; skipping signing."
-            exit 0
-        }
-        $outDir = New-Item -Type Directory "$(JobOutputDirectory)/_appx_ext" -ErrorAction:Ignore
-        $PackageFilename = Join-Path $outDir.FullName (Split-Path -Leaf "$(CmdPalExtPowerToysPackagePath)")
-        & "$(MakeAppxPath)" pack /h SHA256 /o /p $PackageFilename /d "$(JobOutputDirectory)/CmdPalExtPowerToysPackageContents"
-        Copy-Item -Force $PackageFilename "$(CmdPalExtPowerToysPackagePath)"
-        Remove-Item -Force -Recurse "$(JobOutputDirectory)/CmdPalExtPowerToysPackageContents" -ErrorAction:Ignore
-        Remove-Item -Force -Recurse "$(JobOutputDirectory)/_appx_ext" -ErrorAction:Ignore
-      displayName: Re-pack the CmdPal PowerToys extension package after signing
-
     - template: steps-esrp-signing.yml
       parameters:
         displayName: Sign Core PowerToys
@@ -583,14 +528,6 @@ jobs:
       Copy-Item -Verbose -Force "$(CmdPalPackagePath)" "$(JobOutputDirectory)"
     displayName: Stage the final CmdPal package
 
-  - pwsh: |-
-      if ([string]::IsNullOrWhiteSpace("$(CmdPalExtPowerToysPackagePath)")) {
-          Write-Host "No CmdPal PowerToys extension MSIX package found; skipping staging."
-          exit 0
-      }
-      Copy-Item -Verbose -Force "$(CmdPalExtPowerToysPackagePath)" "$(JobOutputDirectory)"
-    displayName: Stage the final CmdPal PowerToys extension package
-
 
 
   - template: steps-build-installer-vnext.yml
@@ -687,4 +624,4 @@ jobs:
     - publish: $(JobOutputDirectory)
       artifact: $(JobOutputArtifactName)-failure-$(System.JobAttempt)
       displayName: Publish failure logs
-      condition: or(failed(), canceled())
+      condition: or(failed(), canceled())

.pipelines/versionAndSignCheck.ps1

@@ -7,7 +7,7 @@ Param(
 )
 
 $DirPath = $targetDir; #this file is in pipeline, we need root.
-$items = Get-ChildItem -Path $DirPath -File -Include *.exe, *.dll, *.ttf, *.msix, PTCustomActions -Recurse -Force -ErrorAction SilentlyContinue
+$items = Get-ChildItem -Path $DirPath -File -Include *.exe, *.dll, *.ttf, PTCustomActions -Recurse -Force -ErrorAction SilentlyContinue
 $versionExceptions = @(
     "AdaptiveCards.Templating.dll",
     "Microsoft.Windows.ApplicationModel.DynamicDependency.Projection.dll",
@@ -104,4 +104,4 @@ if ($totalFailure -gt 0) {
     exit 1
 }
 
-exit 0
+exit 0

installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(Platform)' == 'x64'">
   <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion)</DefineConstants>    <!-- THIS IS AN INNER LOOP OPTIMIZATION
     The build pipeline builds the Settings and Launcher projects for Publication