Swap the POC for TRA in PowerToys

.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/Exts/Microsoft.CmdPal.Ext.Apps/AllAppsPage.cs

@@ -68,14 +68,18 @@ internal static List<AppItem> GetPrograms()
         var win32Results = win32s
             .Where((application) => application.Enabled /*&& application.Valid*/)
             .Select(app =>
-                new AppItem
+            {
+                return new AppItem
                 {
                     Name = app.Name,
                     Subtitle = app.Description,
-                    IcoPath = app.FullPath, // similarly, this should be IcoPath, but :shrug:
-                    ExePath = app.LnkFilePath ?? app.FullPath,
+                    IcoPath = app.AppType == Win32Program.ApplicationType.InternetShortcutApplication ?
+                       app.IcoPath :
+                       app.FullPath,
+                    ExePath = !string.IsNullOrEmpty(app.LnkFilePath) ? app.LnkFilePath : app.FullPath,
                     DirPath = app.Location,
-                });
+                };
+            });
 
         return uwpResults.Concat(win32Results).OrderBy(app => app.Name).ToList();
     }

src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs

@@ -8,6 +8,7 @@
 using System.IO;
 using System.Linq;
 using System.Security;
+using System.Text.RegularExpressions;
 using Microsoft.Win32;
 
 namespace Microsoft.CmdPal.Ext.Apps.Programs;
@@ -222,10 +223,82 @@ private static Win32Program CreateWin32Program(string path)
         }
     }
 
+    private static readonly Regex InternetShortcutURLPrefixes = new(@"^steam:\/\/(rungameid|run|open)\/|^com\.epicgames\.launcher:\/\/apps\/", RegexOptions.Compiled);
+
     // This function filters Internet Shortcut programs
     private static Win32Program InternetShortcutProgram(string path)
     {
-        return InvalidProgram;
+        try
+        {
+            // We don't want to read the whole file if we don't need to
+            var lines = File.ReadLines(path);
+            var iconPath = string.Empty;
+            var urlPath = string.Empty;
+            var validApp = false;
+
+            const string urlPrefix = "URL=";
+            const string iconFilePrefix = "IconFile=";
+
+            foreach (var line in lines)
+            {
+                // Using OrdinalIgnoreCase since this is used internally
+                if (line.StartsWith(urlPrefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    urlPath = line.Substring(urlPrefix.Length);
+
+                    if (!Uri.TryCreate(urlPath, UriKind.RelativeOrAbsolute, out var _))
+                    {
+                        // ProgramLogger.Warn("url could not be parsed", null, MethodBase.GetCurrentMethod().DeclaringType, urlPath);
+                        return InvalidProgram;
+                    }
+
+                    // To filter out only those steam shortcuts which have 'run' or 'rungameid' as the hostname
+                    if (InternetShortcutURLPrefixes.Match(urlPath).Success)
+                    {
+                        validApp = true;
+                    }
+                }
+                else if (line.StartsWith(iconFilePrefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    iconPath = line.Substring(iconFilePrefix.Length);
+                }
+
+                // If we resolved an urlPath & and an iconPath quit reading the file
+                if (!string.IsNullOrEmpty(urlPath) && !string.IsNullOrEmpty(iconPath))
+                {
+                    break;
+                }
+            }
+
+            if (!validApp)
+            {
+                return InvalidProgram;
+            }
+
+            try
+            {
+                return new Win32Program
+                {
+                    Name = Path.GetFileNameWithoutExtension(path),
+                    ExecutableName = Path.GetFileName(path),
+                    IcoPath = iconPath,
+                    FullPath = urlPath,
+                    UniqueIdentifier = path,
+                    ParentDirectory = Directory.GetParent(path)?.FullName ?? string.Empty,
+                    Valid = true,
+                    Enabled = true,
+                    AppType = ApplicationType.InternetShortcutApplication,
+                };
+            }
+            catch (Exception e) when (e is SecurityException || e is UnauthorizedAccessException)
+            {
+                return InvalidProgram;
+            }
+        }
+        catch (Exception)
+        {
+            return InvalidProgram;
+        }
     }
 
     private static Win32Program LnkProgram(string path)
@@ -422,7 +495,7 @@ private static IEnumerable<string> ProgramPaths(string directory, IList<string>
                     {
                         files.AddRange(Directory.EnumerateFiles(currentDirectory, $"*.{suffix}", SearchOption.TopDirectoryOnly));
                     }
-                    catch (DirectoryNotFoundException )
+                    catch (DirectoryNotFoundException)
                     {
                         // ProgramLogger.Warn("|The directory trying to load the program from does not exist", e, MethodBase.GetCurrentMethod().DeclaringType, currentDirectory);
                     }
@@ -432,7 +505,7 @@ private static IEnumerable<string> ProgramPaths(string directory, IList<string>
             {
                 // ProgramLogger.Warn($"|Permission denied when trying to load programs from {currentDirectory}", e, MethodBase.GetCurrentMethod().DeclaringType, currentDirectory);
             }
-            catch (Exception )
+            catch (Exception)
             {
                 // ProgramLogger.Exception($"|An unexpected error occurred in the calling method ProgramPaths at {currentDirectory}", e, MethodBase.GetCurrentMethod().DeclaringType, currentDirectory);
             }
@@ -460,7 +533,7 @@ private static IEnumerable<string> ProgramPaths(string directory, IList<string>
             {
                 // ProgramLogger.Warn($"|Permission denied when trying to load programs from {currentDirectory}", e, MethodBase.GetCurrentMethod().DeclaringType, currentDirectory);
             }
-            catch (Exception )
+            catch (Exception)
             {
                 // ProgramLogger.Exception($"|An unexpected error occurred in the calling method ProgramPaths at {currentDirectory}", e, MethodBase.GetCurrentMethod().DeclaringType, currentDirectory);
             }
@@ -617,12 +690,9 @@ private sealed class Win32ProgramEqualityComparer : IEqualityComparer<Win32Progr
 
         public bool Equals(Win32Program? app1, Win32Program? app2)
         {
-            if (app1 == null && app2 == null)
-            {
-                return true;
-            }
-
-            return app1 != null
+            return app1 == null && app2 == null
+                ? true
+                : app1 != null
                    && app2 != null
                    && (app1.Name?.ToUpperInvariant(), app1.ExecutableName?.ToUpperInvariant(), app1.FullPath?.ToUpperInvariant())
                    .Equals((app2.Name?.ToUpperInvariant(), app2.ExecutableName?.ToUpperInvariant(), app2.FullPath?.ToUpperInvariant()));
@@ -682,7 +752,7 @@ private static bool TryGetIcoPathForRunCommandProgram(Win32Program program, out
             icoPath = ExpandEnvironmentVariables(redirectionPath);
             return true;
         }
-        catch (IOException )
+        catch (IOException)
         {
             // ProgramLogger.Warn($"|Error whilst retrieving the redirection path from app execution alias {program.FullPath}", e, MethodBase.GetCurrentMethod().DeclaringType, program.FullPath);
         }
@@ -746,7 +816,7 @@ public static IList<Win32Program> All()
 
             return DeduplicatePrograms(programs.Concat(runCommandPrograms).Where(program => program?.Valid == true));
         }
-        catch (Exception )
+        catch (Exception)
         {
             // ProgramLogger.Exception("An unexpected error occurred", e, MethodBase.GetCurrentMethod().DeclaringType, "Not available");
             return Array.Empty<Win32Program>();

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>
@@ -52,7 +51,7 @@
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
     <PackageReference Include="CommunityToolkit.WinUI.Converters" />
-	<PackageReference Include="CommunityToolkit.WinUI.Animations" />
+    <PackageReference Include="CommunityToolkit.WinUI.Animations" />
     <PackageReference Include="CommunityToolkit.WinUI.Extensions" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />

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;