Swap the POC for TRA in PowerToys (#246)

I think this swaps the POC for TRA in PowerToys. 

I don't think I have enough disk space left on this machine currently to actually _build_ PowerToys all up (🙃) so I'm gonna see what CI comes up with. 

---------

Co-authored-by: Mike Griese <zadjii@gmail.com>
Co-authored-by: Stefan Markovic <stefan@janeasystems.com>

.pipelines/ESRPSigning_core.json

@@ -221,7 +221,7 @@
                 "WinUI3Apps\\PowerToys.Settings.exe",
 
                 "PowerToys.CmdPalModuleInterface.dll",
-                "*Microsoft.CmdPal.UI.Poc_*.msix"
+                "*Microsoft.CmdPal.UI_*.msix"
             ],
             "SigningInfo": {
                 "Operations": [

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

@@ -389,7 +389,7 @@ jobs:
 
   - ${{ if eq(parameters.codeSign, true) }}:
     - pwsh: |-
-        $Package = (Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI.Poc*.msix" | Select -First 1)
+        $Package = (Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix" | Select -First 1)
         $PackageFilename = $Package.FullName
         Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}"
       displayName: Locate the MSIX
@@ -403,7 +403,7 @@ jobs:
         displayName: Sign CmdPal MSIX content
         signingIdentity: ${{ parameters.signingIdentity }}
         inputs:
-          FolderPath: '$(JobOutputDirectory)/CmdPalPackageContents' # Video conf uses x86 and x64.
+          FolderPath: '$(JobOutputDirectory)/CmdPalPackageContents'
           signType: batchSigning
           batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_cmdpal_msix_content.json'
           ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'

.pipelines/v2/templates/steps-build-installer.yml

@@ -95,7 +95,7 @@ steps:
       $searchDir = "extractedMsi\File"
 
       # Define the regex pattern for MSIX files
-      $pattern = '^Microsoft.CmdPal.UI.Poc.*\.msix$'
+      $pattern = '^Microsoft.CmdPal.UI.*\.msix$'
 
       # Get all files in the directory and subdirectories
       $msixFile = Get-ChildItem -Path $searchDir -Recurse -File | Where-Object {

.pipelines/versionSetting.ps1

@@ -78,7 +78,7 @@ Write-Host "NewPlusContextMenu version" $newPlusContextMenuAppManifest.Package.I
 $newPlusContextMenuAppManifest.Save($newPlusContextMenuAppManifestWriteFileLocation);
 
 # Set package version in Package.appxmanifest
-$cmdPalAppManifestWriteFileLocation = $PSScriptRoot + '/../src/modules/cmdpal/WindowsCommandPalette/Package.appxmanifest';
+$cmdPalAppManifestWriteFileLocation = $PSScriptRoot + '/../src/modules/cmdpal/Microsoft.CmdPal.UI/Package.appxmanifest';
 $cmdPalAppManifestReadFileLocation = $cmdPalAppManifestWriteFileLocation;
 
 [XML]$cmdPalAppManifest = Get-Content $cmdPalAppManifestReadFileLocation

installer/PowerToysSetup/CmdPal.wxs

@@ -17,38 +17,38 @@
       </Directory>
     </DirectoryRef>
 
-    <DirectoryRef Id="CmdPalInstallFolder" FileSource="$(var.BinDir)\WinUI3Apps\CmdPal.POC\AppPackages\Microsoft.CmdPal.UI.Poc_$(var.Version).0_Test">
+    <DirectoryRef Id="CmdPalInstallFolder" FileSource="$(var.BinDir)\WinUI3Apps\CmdPal\AppPackages\Microsoft.CmdPal.UI_$(var.Version).0_Test">
       <Component Id="Module_CmdPal" Win64="yes" Guid="3A4942B2-1A86-4182-B3B4-65157365A980">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_CmdPal" Value="" KeyPath="yes"/>
         </RegistryKey>
         <?if $(sys.BUILDARCH) = x64 ?>
-        <File Source="$(var.BinDir)\WinUI3Apps\CmdPal.POC\AppPackages\Microsoft.CmdPal.UI.Poc_$(var.Version).0_Test\Microsoft.CmdPal.UI.Poc_$(var.Version).0_x64.msix" />
+        <File Source="$(var.BinDir)\WinUI3Apps\CmdPal\AppPackages\Microsoft.CmdPal.UI_$(var.Version).0_Test\Microsoft.CmdPal.UI_$(var.Version).0_x64.msix" />
         <?else ?>
-        <File Source="$(var.BinDir)\WinUI3Apps\CmdPal.POC\AppPackages\Microsoft.CmdPal.UI.Poc_$(var.Version).0_Test\Microsoft.CmdPal.UI.Poc_$(var.Version).0_arm64.msix" />
+        <File Source="$(var.BinDir)\WinUI3Apps\CmdPal\AppPackages\Microsoft.CmdPal.UI_$(var.Version).0_Test\Microsoft.CmdPal.UI_$(var.Version).0_arm64.msix" />
         <?endif ?>
 
       </Component>
     </DirectoryRef>
 
     <?if $(sys.BUILDARCH) = x64 ?>
-    <DirectoryRef Id="CmdPalDepsx64InstallFolder" FileSource="$(var.BinDir)\WinUI3Apps\CmdPal.POC\AppPackages\Microsoft.CmdPal.UI.Poc_$(var.Version).0_Test\Dependencies\x64">
+    <DirectoryRef Id="CmdPalDepsx64InstallFolder" FileSource="$(var.BinDir)\WinUI3Apps\CmdPal\AppPackages\Microsoft.CmdPal.UI_$(var.Version).0_Test\Dependencies\x64">
       <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Source="$(var.BinDir)\WinUI3Apps\CmdPal.POC\AppPackages\Microsoft.CmdPal.UI.Poc_$(var.Version).0_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
-        <File Source="$(var.BinDir)\WinUI3Apps\CmdPal.POC\AppPackages\Microsoft.CmdPal.UI.Poc_$(var.Version).0_Test\Dependencies\x64\Microsoft.WindowsAppRuntime.1.6.msix" />
+        <File Source="$(var.BinDir)\WinUI3Apps\CmdPal\AppPackages\Microsoft.CmdPal.UI_$(var.Version).0_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
+        <File Source="$(var.BinDir)\WinUI3Apps\CmdPal\AppPackages\Microsoft.CmdPal.UI_$(var.Version).0_Test\Dependencies\x64\Microsoft.WindowsAppRuntime.1.6.msix" />
       </Component>
     </DirectoryRef>
     <?else ?>
-    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.BinDir)\WinUI3Apps\CmdPal.POC\AppPackages\Microsoft.CmdPal.UI.Poc_$(var.Version).0_Test\Dependencies\arm64">
+    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.BinDir)\WinUI3Apps\CmdPal\AppPackages\Microsoft.CmdPal.UI_$(var.Version).0_Test\Dependencies\arm64">
       <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Source="$(var.BinDir)\WinUI3Apps\CmdPal.POC\AppPackages\Microsoft.CmdPal.UI.Poc_$(var.Version).0_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
-        <File Source="$(var.BinDir)\WinUI3Apps\CmdPal.POC\AppPackages\Microsoft.CmdPal.UI.Poc_$(var.Version).0_Test\Dependencies\arm64\Microsoft.WindowsAppRuntime.1.6.msix" />
+        <File Source="$(var.BinDir)\WinUI3Apps\CmdPal\AppPackages\Microsoft.CmdPal.UI_$(var.Version).0_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
+        <File Source="$(var.BinDir)\WinUI3Apps\CmdPal\AppPackages\Microsoft.CmdPal.UI_$(var.Version).0_Test\Dependencies\arm64\Microsoft.WindowsAppRuntime.1.6.msix" />
       </Component>
     </DirectoryRef>
     <?endif ?>

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

@@ -15,7 +15,6 @@
     <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
   </PropertyGroup>
 
-
   <PropertyGroup>
     <!-- This lets us actually reference types from Microsoft.Terminal.UI -->
     <CsWinRTIncludes>Microsoft.Terminal.UI</CsWinRTIncludes>

src/modules/cmdpal/Microsoft.CmdPal.UI/ShellPage.xaml

@@ -50,9 +50,7 @@
                     <ColumnDefinition x:Name="DetailsColumn" Width="Auto" />
                 </Grid.ColumnDefinitions>
 
-                <Frame
-                    Name="RootFrame"
-                    IsNavigationStackEnabled="True" />
+                <Frame Name="RootFrame" IsNavigationStackEnabled="True" />
 
                 <Grid
                     x:Name="DetailsContent"

src/settings-ui/Settings.UI/ViewModels/CmdPalViewModel.cs

@@ -21,7 +21,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 {
     public class CmdPalViewModel : Observable
     {
-        private static readonly string PackageName = "Microsoft.CmdPal.POC";
+        private static readonly string PackageName = "Microsoft.CmdPal";
 
         private GpoRuleConfigured _enabledGpoRuleConfiguration;
         private bool _isEnabled;