From 8bbd0846c318d063750ebccef26afd6e7b4ef2aa Mon Sep 17 00:00:00 2001
From: Andrew Whitechapel <andreww-msft@outlook.com>
Date: Tue, 18 Jun 2024 16:31:47 -0700
Subject: [PATCH 1/7] Update registering external tools

---
 .../DevHome.PI/Controls/AddToolControl.xaml   | 144 ++++---
 .../Controls/AddToolControl.xaml.cs           | 353 ++++++++++++++++--
 .../DevHome.PI/Controls/ProgressTextRing.xaml |  33 ++
 .../Controls/ProgressTextRing.xaml.cs         |  74 ++++
 tools/PI/DevHome.PI/DevHome.PI.csproj         |  16 +
 tools/PI/DevHome.PI/Helpers/ExternalTool.cs   | 177 +++++----
 .../Helpers/ExternalToolCollection.cs         |  25 ++
 .../PI/DevHome.PI/Helpers/ExternalTool_v1.cs  |  59 +++
 .../DevHome.PI/Helpers/ExternalToolsHelper.cs |  86 ++++-
 tools/PI/DevHome.PI/Helpers/WindowHelper.cs   |  65 ++++
 .../PI/DevHome.PI/Models/InstalledAppInfo.cs  |  48 +++
 .../DevHome.PI/Strings/en-us/Resources.resw   |  86 ++++-
 12 files changed, 989 insertions(+), 177 deletions(-)
 create mode 100644 tools/PI/DevHome.PI/Controls/ProgressTextRing.xaml
 create mode 100644 tools/PI/DevHome.PI/Controls/ProgressTextRing.xaml.cs
 create mode 100644 tools/PI/DevHome.PI/Helpers/ExternalToolCollection.cs
 create mode 100644 tools/PI/DevHome.PI/Helpers/ExternalTool_v1.cs
 create mode 100644 tools/PI/DevHome.PI/Models/InstalledAppInfo.cs

diff --git a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml
index 672b6c1083..c0c4e51f01 100644
--- a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml
+++ b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml
@@ -5,6 +5,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:local="using:DevHome.PI.Controls"
     mc:Ignorable="d">
 
     <Grid>
@@ -17,21 +19,79 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-        <StackPanel Orientation="Vertical">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
             <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="100"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Button
+                    x:Name="AppListButton" x:Uid="AppListButton" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="100" Click="AppListButton_Click"/>
+                <controls:DataGrid
+                    x:Name="AppsDataGrid" Grid.Column="1"
+                    VerticalScrollBarVisibility="Visible"
+                    AlternatingRowBackground="Transparent"
+                    AlternatingRowForeground="Gray"
+                    AreRowDetailsFrozen="False"
+                    AreRowGroupHeadersFrozen="True"
+                    AutoGenerateColumns="False"
+                    CanUserReorderColumns="True"
+                    CanUserResizeColumns="True"
+                    ColumnHeaderHeight="32"
+                    FrozenColumnCount="0"
+                    GridLinesVisibility="None"
+                    HeadersVisibility="Column"
+                    ItemsSource="{x:Bind SortedApps, Mode=OneWay}"
+                    SelectionChanged="AppsDataGrid_SelectionChanged"
+                    Sorting="AppsDataGrid_Sorting"
+                    HorizontalAlignment="Stretch"
+                    MinHeight="200"
+                    MaxHeight="300">
+                    <controls:DataGrid.Columns>
+                        <controls:DataGridTemplateColumn CanUserSort="False" x:Uid="AppsDataGridIconColumn">
+                            <controls:DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <Image Source="{Binding Icon}" Width="24" Height="24"/>
+                                </DataTemplate>
+                            </controls:DataGridTemplateColumn.CellTemplate>
+                        </controls:DataGridTemplateColumn>
+                        <controls:DataGridTextColumn x:Uid="AppsDataGridNameColumn" Binding="{Binding Name}" Width="200"/>
+                    </controls:DataGrid.Columns>
+                </controls:DataGrid>
+            </Grid>
+
+            <!-- Occupies the same grid row as the DataGrid. -->
+            <local:ProgressTextRing 
+                x:Name="LoadingProgressTextRing"
+                Foreground="BlueViolet" 
+                Diameter="60" 
+                FontSize="16" 
+                FontFamily="Segoe UI"
+                IsActive="{x:Bind IsLoading, Mode=OneWay}" 
+                Value="{x:Bind ProgressPercentage, Mode=OneWay}"/>
+
+            <Grid Grid.Row="1" Margin="0,6,0,0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="100"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <Button 
-                    x:Name="ToolBrowseButton" x:Uid="ToolBrowseButton" 
-                    HorizontalAlignment="Left" MinWidth="100"
-                    Click="ToolBrowseButton_Click"/>
+                    x:Name="ToolBrowseButton" x:Uid="ToolBrowseButton" HorizontalAlignment="Left" MinWidth="100" Click="ToolBrowseButton_Click"/>
                 <TextBox 
-                    x:Name="ToolPathTextBox" Grid.Column="1" MinWidth="800" Margin="8,0,0,0" 
-                    IsReadOnly="True"/>
+                    x:Name="ToolPathTextBox" Grid.Column="1" MinWidth="800" Margin="8,0,0,0" IsReadOnly="True" HorizontalAlignment="Stretch"/>
             </Grid>
-            <Grid Margin="0,6,0,0">
+            
+            <Grid Grid.Row="2" Margin="0,6,0,0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="100"/>
                     <ColumnDefinition Width="200"/>
@@ -39,67 +99,43 @@
                 <TextBlock x:Uid="ToolNameHeaderTextBlock" VerticalAlignment="Center" MinWidth="100"/>
                 <TextBox x:Name="ToolNameTextBox" Grid.Column="1" HorizontalAlignment="Stretch" Margin="8,0,0,0" />
             </Grid>
-        </StackPanel>
+        </Grid>
 
-        <Grid Grid.Row="1" Margin="0,12,0,0">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <TextBlock x:Uid="BasicArgumentsTextBlock"/>
-            <Grid Grid.Row="1" Margin="0,6,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                    <RadioButton 
-                        x:Uid="NoneRadio" x:Name="NoneRadio" IsChecked="True" GroupName="SwitchGroup" 
-                        Checked="UpdateSampleCommandline"/>
-                    <RadioButton 
-                        x:Uid="HwndRadio" x:Name="HwndRadio" GroupName="SwitchGroup" 
-                        Checked="UpdateSampleCommandline"/>
-                    <RadioButton 
-                        x:Uid="ProcessIdRadio" x:Name="ProcessIdRadio" GroupName="SwitchGroup" 
-                        Checked="UpdateSampleCommandline"/>
-                </StackPanel>
-                <TextBlock 
-                    x:Uid="PrefixTextBlock" Grid.Column="1" Margin="0,0,8,0"
-                    VerticalAlignment="Center" HorizontalAlignment="Right"/>
-                <TextBox 
-                    x:Name="PrefixTextBox" Grid.Column="2" MinWidth="150" HorizontalAlignment="Right" 
-                    TextChanged="UpdateSampleCommandline"/>
-            </Grid>
+        <Grid Grid.Row="3" Margin="0,6,0,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock x:Uid="ActivationTextBlock" HorizontalAlignment="Left"/>
+            <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="6,0,0,0">
+                <RadioButton x:Name="LaunchRadio" GroupName="ActivationGroup" x:Uid="LaunchRadio" IsChecked="True"/>
+                <RadioButton x:Name="ProtocolRadio" GroupName="ActivationGroup" x:Uid="ProtocolRadio"/>
+            </StackPanel>
         </Grid>
 
-        <Grid Grid.Row="2" Margin="0,12,0,0">
+        <Grid Grid.Row="4" Margin="0,6,0,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <TextBlock x:Uid="OtherArgumentsTextBlock"/>
-            <TextBox
-                x:Name="OtherArgsTextBox" Grid.Row="1" TextWrapping="Wrap" MinHeight="60"
-                TextChanged="UpdateSampleCommandline"/>
-        </Grid>
-
-        <Grid Grid.Row="3" Margin="0,12,0,0">
-            <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <TextBlock x:Uid="SampleCommandLineTextBlock"/>
-            <TextBox
-                x:Name="SampleCommandTextBox" Grid.Row="1" MinHeight="60"
-                TextWrapping="Wrap" IsReadOnly="True"/>
+            <TextBlock x:Uid="ArgumentsHeaderTextBlock" HorizontalAlignment="Left"/>
+            <TextBlock x:Uid="ArgumentsDescriptionTextBlock" Grid.Column="1" HorizontalAlignment="Stretch" TextWrapping="Wrap" Margin="6,0,0,0"/>
+            <TextBlock x:Uid="LaunchExampleTextBlock" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left" TextWrapping="Wrap" Margin="6,0,0,0"/>
+            <TextBlock x:Uid="ProtocolExampleTextBlock" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left" TextWrapping="Wrap" Margin="6,0,0,0"/>
+            <TextBox x:Name="ArgumentsTextBox" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Stretch" Margin="6,0,0,0"/>
         </Grid>
 
         <ToggleSwitch 
             x:Uid="IsPinnedToggleSwitch" x:Name="IsPinnedToggleSwitch" HorizontalContentAlignment="Left"
-            Grid.Row="4" Margin="0,12,0,0" HorizontalAlignment="Left" IsOn="True"/>
+            Grid.Row="5" HorizontalAlignment="Left" IsOn="True"/>
         
-        <StackPanel Orientation="Horizontal" Grid.Row="5" HorizontalAlignment="Right" Margin="0,12,0,0" Spacing="6">
+        <StackPanel Orientation="Horizontal" Grid.Row="6" HorizontalAlignment="Right" Margin="0,12,0,0" Spacing="6">
             <Button 
                 x:Uid="AddToolsOkButton" x:Name="OkButton" MinWidth="100"
                 Click="OkButton_Click"/>
diff --git a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
index 3dd4b78e56..43a56e6a16 100644
--- a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
+++ b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
@@ -1,24 +1,87 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.WindowsRuntime;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using CommunityToolkit.WinUI.UI.Controls;
 using DevHome.Common.Extensions;
 using DevHome.PI.Helpers;
+using DevHome.PI.Models;
+using IWshRuntimeLibrary;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Serilog;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Core;
+using Windows.Foundation;
+using Windows.Graphics.Imaging;
+using Windows.Management.Deployment;
+using Windows.Storage;
+using Windows.Storage.Streams;
 using Windows.Win32;
 using Windows.Win32.UI.Controls.Dialogs;
 
 namespace DevHome.PI.Controls;
 
-public sealed partial class AddToolControl : UserControl
+public sealed partial class AddToolControl : UserControl, INotifyPropertyChanged
 {
+    private static readonly ILogger _log = Log.ForContext("SourceContext", nameof(AddToolControl));
+
     private readonly string invalidToolInfo = CommonHelper.GetLocalizedString("InvalidToolInfoMessage");
     private readonly string messageCloseText = CommonHelper.GetLocalizedString("MessageCloseText");
 
+    // We have 3 sets of operations, and we arbitrarily divide the progress timing into 3 equal segments.
+    private const int ShortcutProcessingEndIndex = 33;
+    private const int PackageProcessingEndIndex = 67;
+
+    private InstalledAppInfo? selectedApp;
+    private List<string>? shortcuts;
+    private List<Package>? packages;
+    private List<InstalledAppInfo> allApps = [];
+    private int itemCount;
+
+    public ObservableCollection<InstalledAppInfo> SortedApps { get; set; } = [];
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    private bool isLoading;
+
+    public bool IsLoading
+    {
+        get => isLoading;
+        set
+        {
+            isLoading = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoading)));
+        }
+    }
+
+    private int progressPercentage;
+
+    public int ProgressPercentage
+    {
+        get => progressPercentage;
+        set
+        {
+            progressPercentage = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ProgressPercentage)));
+        }
+    }
+
     public AddToolControl()
     {
         InitializeComponent();
+        LoadingProgressTextRing.DataContext = this;
     }
 
     private void ToolBrowseButton_Click(object sender, RoutedEventArgs e)
@@ -60,10 +123,7 @@ private void HandleBrowseButton()
         if (fileName != string.Empty)
         {
             ToolPathTextBox.Text = fileName;
-            if (ToolNameTextBox.Text == string.Empty)
-            {
-                ToolNameTextBox.Text = System.IO.Path.GetFileNameWithoutExtension(fileName);
-            }
+            ToolNameTextBox.Text = Path.GetFileNameWithoutExtension(fileName);
         }
 
         return;
@@ -87,10 +147,10 @@ private void ClearValues()
     {
         ToolNameTextBox.Text = string.Empty;
         ToolPathTextBox.Text = string.Empty;
-        NoneRadio.IsChecked = true;
-        PrefixTextBox.Text = string.Empty;
-        OtherArgsTextBox.Text = string.Empty;
+        LaunchRadio.IsChecked = true;
+        ArgumentsTextBox.Text = string.Empty;
         IsPinnedToggleSwitch.IsOn = true;
+        selectedApp = null;
     }
 
     private ExternalTool? GetCurrentToolDefinition()
@@ -101,55 +161,290 @@ private void ClearValues()
             return null;
         }
 
-        var argType = ExternalToolArgType.None;
-
-        if (HwndRadio.IsChecked ?? false)
+        var activationType = ToolActivationType.Launch;
+        if (ProtocolRadio.IsChecked ?? false)
         {
-            argType = ExternalToolArgType.Hwnd;
+            activationType = ToolActivationType.Protocol;
         }
-        else if (ProcessIdRadio.IsChecked ?? false)
+        else if (selectedApp is not null && selectedApp.IsMsix)
         {
-            argType = ExternalToolArgType.ProcessId;
+            activationType = ToolActivationType.Msix;
         }
 
         return new(
             ToolNameTextBox.Text,
             ToolPathTextBox.Text,
-            argType,
-            PrefixTextBox.Text ?? string.Empty,
-            OtherArgsTextBox.Text ?? string.Empty,
+            activationType,
+            ArgumentsTextBox.Text,
+            selectedApp?.AppUserModelId ?? string.Empty,
+            selectedApp?.IconFilePath ?? string.Empty,
             IsPinnedToggleSwitch.IsOn);
     }
 
-    private void UpdateSampleCommandline(object sender, TextChangedEventArgs e)
+    private void CancelButton_Click(object sender, RoutedEventArgs e)
     {
-        UpdateSampleCommandline();
+        ClearValues();
     }
 
-    private void UpdateSampleCommandline(object sender, RoutedEventArgs e)
+    private async void AppListButton_Click(object sender, RoutedEventArgs e)
     {
-        UpdateSampleCommandline();
+        allApps.Clear();
+        SortedApps.Clear();
+
+        itemCount = GetShortcuts();
+        if (itemCount == 0)
+        {
+            Log.Error("Error getting shortcuts");
+        }
+
+        var packageCount = GetPackages();
+        if (packageCount == 0)
+        {
+            Log.Error("Error getting packages");
+        }
+
+        itemCount += packageCount;
+        if (itemCount == 0)
+        {
+            Log.Error("Error getting list of installed apps");
+            return;
+        }
+
+        // We get most of the data on a background thread, which
+        // reports intermittent progress.
+        IsLoading = true;
+        var progress = new Progress<int>(percent =>
+        {
+            // Update the progress report.
+            LoadingProgressTextRing.Value = percent;
+        });
+
+        await ProcessItemsAsync(progress);
+
+        foreach (var app in allApps)
+        {
+            SortedApps.Add(app);
+        }
+
+        IsLoading = false;
+    }
+
+    private int GetShortcuts()
+    {
+        var count = 0;
+
+        // Search for .lnk files in the per-user and all-users Start Menu Programs directories.
+        // %APPDATA%\Microsoft\Windows\Start Menu\Programs
+        var startMenuProgramsPath =
+            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), "Programs");
+
+        // %ProgramData%\Microsoft\Windows\Start Menu\Programs
+        var commonStartMenuProgramsPath =
+            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonStartMenu), "Programs");
+
+        shortcuts = [];
+        if (Directory.Exists(startMenuProgramsPath))
+        {
+            shortcuts.AddRange(Directory.GetFiles(startMenuProgramsPath, "*.lnk", SearchOption.AllDirectories));
+        }
+
+        if (Directory.Exists(commonStartMenuProgramsPath))
+        {
+            shortcuts.AddRange(Directory.GetFiles(commonStartMenuProgramsPath, "*.lnk", SearchOption.AllDirectories));
+        }
+
+        if (shortcuts is not null)
+        {
+            count = shortcuts.Count;
+        }
+
+        return count;
     }
 
-    private void UpdateSampleCommandline()
+    private int GetPackages()
     {
-        if (SampleCommandTextBox is null)
+        var count = 0;
+        var packageManager = new PackageManager();
+        packages = packageManager.FindPackagesForUserWithPackageTypes(string.Empty, PackageTypes.Main).ToList();
+        if (packages is not null)
+        {
+            count = packages.Count;
+        }
+
+        return count;
+    }
+
+    private async Task ProcessItemsAsync(IProgress<int> progress)
+    {
+        // Recursively search for .lnk files.
+        var currentCount = 0;
+        for (var i = 0; i < shortcuts?.Count; i++)
+        {
+            await Task.Run(() => ProcessShortcut(shortcuts[i]));
+
+            // Report progress.
+            currentCount++;
+            var percentComplete = (i + 1) * ShortcutProcessingEndIndex / itemCount;
+            progress.Report(percentComplete);
+        }
+
+        for (var j = 0; j < packages?.Count; j++)
+        {
+            await Task.Run(() => ProcessPackage(packages[j]));
+
+            // Report progress.
+            currentCount++;
+            var percentComplete = ShortcutProcessingEndIndex + ((j + 1) * ShortcutProcessingEndIndex / itemCount);
+            progress.Report(percentComplete);
+        }
+
+        allApps = allApps.OrderBy(app => app.Name).ToList();
+
+        // We get the icon data on the UI thread, because BitmapImages must be created on the UI thread.
+        for (var k = 0; k < allApps.Count; k++)
+        {
+            var app = allApps[k];
+            if (app.IsMsix)
+            {
+                if (app.AppPackage is not null)
+                {
+                    try
+                    {
+                        // The package might be in a bad state, and accessing its
+                        // properties might throw an exception.
+                        app.Icon = new BitmapImage(app.AppPackage.Logo);
+                        app.IconFilePath = app.AppPackage.Logo.LocalPath;
+                    }
+                    catch
+                    {
+                    }
+                }
+            }
+            else
+            {
+                if (!string.IsNullOrEmpty(app.TargetPath))
+                {
+                    app.Icon = WindowHelper.GetBitmapImageFromFile(app.TargetPath);
+                }
+            }
+
+            currentCount++;
+            var percentComplete = PackageProcessingEndIndex + ((k + 1) * ShortcutProcessingEndIndex / itemCount);
+            progress.Report(percentComplete);
+
+            // Yield to make sure the UI thread can update the progress output.
+            await Task.Delay(1);
+        }
+    }
+
+    public void ProcessShortcut(string filePath)
+    {
+        var appName = Path.GetFileNameWithoutExtension(filePath);
+
+        // Exclude Microsoft Virtual Desktop and WSA shortcuts.
+        if (appName.Contains("Microsoft Virtual Desktop", StringComparison.OrdinalIgnoreCase))
         {
-            // The window is still initializing.
             return;
         }
 
-        var tool = GetCurrentToolDefinition();
-        if (tool is null)
+        var wshShell = new WshShell();
+        var shortcut = (IWshShortcut)wshShell.CreateShortcut(filePath);
+        var targetPath = shortcut.TargetPath;
+
+        // Exclude shortcuts that point to empty targets, filesystem folders, or WSA apps.
+        if (string.IsNullOrEmpty(targetPath)
+            || Directory.Exists(targetPath)
+            || targetPath.Contains("WsaClient.exe", StringComparison.OrdinalIgnoreCase))
+        {
+            return;
+        }
+
+        // Exclude *.chm, *.url, *.html, *.ico targets.
+        var extension = Path.GetExtension(targetPath);
+        if (extension.Equals(".chm", StringComparison.OrdinalIgnoreCase)
+            || extension.Equals(".url", StringComparison.OrdinalIgnoreCase)
+            || extension.Equals(".html", StringComparison.OrdinalIgnoreCase)
+            || extension.Equals(".ico", StringComparison.OrdinalIgnoreCase))
         {
             return;
         }
 
-        SampleCommandTextBox.Text = tool.CreateFullCommandLine(123, (Windows.Win32.Foundation.HWND)123);
+        allApps.Add(new InstalledAppInfo
+        {
+            Name = appName,
+            ShortcutFilePath = filePath,
+            TargetPath = targetPath,
+        });
     }
 
-    private void CancelButton_Click(object sender, RoutedEventArgs e)
+    public void ProcessPackage(Package package)
     {
-        ClearValues();
+        var op = package.GetAppListEntriesAsync();
+        var task = op.AsTask();
+        task.Wait();
+        var entries = task.Result;
+
+        // We only get the icon for apps that have an AppListEntry,
+        // because the others are not likely to be activatable from the UI.
+        if (entries.Count > 0)
+        {
+            // We only get the icon for the first AppListEntry, ignoring MAPs.
+            // Note we use Package.Logo, not AppListEntry.DisplayInfo.GetLogo
+            // because the latter doesn't get consistently-sized icons.
+            var appListEntry = entries[0];
+            allApps.Add(new InstalledAppInfo
+            {
+                Name = package.DisplayName,
+                AppUserModelId = appListEntry.AppUserModelId,
+                AppPackage = package,
+            });
+        }
+    }
+
+    private void AppsDataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (AppsDataGrid.SelectedItem is InstalledAppInfo app)
+        {
+            selectedApp = app;
+            if (!string.IsNullOrEmpty(app.TargetPath))
+            {
+                ToolPathTextBox.Text = app.TargetPath;
+            }
+            else if (!string.IsNullOrEmpty(app.AppUserModelId))
+            {
+                ToolPathTextBox.Text = app.AppUserModelId;
+            }
+
+            ToolNameTextBox.Text = app.Name;
+        }
+        else
+        {
+            selectedApp = null;
+            ToolPathTextBox.Text = string.Empty;
+            ToolNameTextBox.Text = string.Empty;
+        }
+    }
+
+    private void AppsDataGrid_Sorting(object sender, DataGridColumnEventArgs e)
+    {
+        var header = e.Column.Header.ToString();
+        switch (header)
+        {
+            case "Name":
+                if (e.Column.SortDirection == null || e.Column.SortDirection == DataGridSortDirection.Descending)
+                {
+                    AppsDataGrid.ItemsSource = new ObservableCollection<InstalledAppInfo>(
+                        from item in SortedApps orderby item.Name ascending select item);
+                    e.Column.SortDirection = DataGridSortDirection.Ascending;
+                }
+                else
+                {
+                    AppsDataGrid.ItemsSource = new ObservableCollection<InstalledAppInfo>(
+                        from item in SortedApps orderby item.Name descending select item);
+                    e.Column.SortDirection = DataGridSortDirection.Descending;
+                }
+
+                break;
+        }
     }
 }
diff --git a/tools/PI/DevHome.PI/Controls/ProgressTextRing.xaml b/tools/PI/DevHome.PI/Controls/ProgressTextRing.xaml
new file mode 100644
index 0000000000..b75ce7bcec
--- /dev/null
+++ b/tools/PI/DevHome.PI/Controls/ProgressTextRing.xaml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<UserControl
+    x:Class="DevHome.PI.Controls.ProgressTextRing"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:DevHome.PI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid>
+
+        <ProgressRing 
+            x:Name="ProgressRingControl" 
+            IsIndeterminate="False"
+            IsActive="{x:Bind IsActive, Mode=OneWay}" 
+            Foreground="{x:Bind Foreground, Mode=OneWay}" 
+            Width="{x:Bind Diameter, Mode=OneWay}" 
+            Height="{x:Bind Diameter, Mode=OneWay}"
+            Value="{x:Bind Value, Mode=OneWay}"/>
+
+        <TextBlock 
+            x:Name="TextBlockControl" 
+            Visibility="{x:Bind TextBlockVisibility, Mode=OneWay}" 
+            Foreground="{x:Bind Foreground, Mode=OneWay}" 
+            FontSize="{x:Bind TextBlockFontSize, Mode=OneWay}"
+            FontFamily="{x:Bind FontFamily, Mode=OneWay}"
+            Text="{x:Bind PercentageText, Mode=OneWay}"
+            HorizontalAlignment="Center" 
+            VerticalAlignment="Center"/>
+
+    </Grid>
+</UserControl>
diff --git a/tools/PI/DevHome.PI/Controls/ProgressTextRing.xaml.cs b/tools/PI/DevHome.PI/Controls/ProgressTextRing.xaml.cs
new file mode 100644
index 0000000000..f9c3f6e7de
--- /dev/null
+++ b/tools/PI/DevHome.PI/Controls/ProgressTextRing.xaml.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System.ComponentModel;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace DevHome.PI.Controls;
+
+public sealed partial class ProgressTextRing : UserControl, INotifyPropertyChanged
+{
+    public ProgressTextRing()
+    {
+        InitializeComponent();
+    }
+
+    public static readonly DependencyProperty IsActiveProperty =
+        DependencyProperty.Register(nameof(IsActive), typeof(bool), typeof(ProgressTextRing), new PropertyMetadata(false, OnIsActivePropertyChanged));
+
+    public bool IsActive
+    {
+        get => (bool)GetValue(IsActiveProperty);
+        set => SetValue(IsActiveProperty, value);
+    }
+
+    private static void OnIsActivePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var control = (ProgressTextRing)d;
+        control.OnPropertyChanged(nameof(TextBlockVisibility));
+    }
+
+    public static readonly DependencyProperty DiameterProperty =
+        DependencyProperty.Register(nameof(Diameter), typeof(double), typeof(ProgressTextRing), new PropertyMetadata(0.0, OnDiameterPropertyChanged));
+
+    public double Diameter
+    {
+        get => (double)GetValue(DiameterProperty);
+        set => SetValue(DiameterProperty, value);
+    }
+
+    private static void OnDiameterPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var control = (ProgressTextRing)d;
+        control.OnPropertyChanged(nameof(TextBlockFontSize));
+    }
+
+    public static readonly DependencyProperty ValueProperty =
+        DependencyProperty.Register(nameof(Value), typeof(double), typeof(ProgressTextRing), new PropertyMetadata(0.0, OnValuePropertyChanged));
+
+    public double Value
+    {
+        get => (double)GetValue(ValueProperty);
+        set => SetValue(ValueProperty, value);
+    }
+
+    private static void OnValuePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var control = (ProgressTextRing)d;
+        control.OnPropertyChanged(nameof(PercentageText));
+    }
+
+    private Visibility TextBlockVisibility => IsActive ? Visibility.Visible : Visibility.Collapsed;
+
+    private double TextBlockFontSize => FontSize > 0 ? FontSize : Diameter / 3.6;
+
+    public string PercentageText => $"{Value}%";
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    private void OnPropertyChanged(string propertyName)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+}
diff --git a/tools/PI/DevHome.PI/DevHome.PI.csproj b/tools/PI/DevHome.PI/DevHome.PI.csproj
index d14a91b700..ff1c07ffca 100644
--- a/tools/PI/DevHome.PI/DevHome.PI.csproj
+++ b/tools/PI/DevHome.PI/DevHome.PI.csproj
@@ -28,6 +28,7 @@
     <None Remove="Controls\ExpandedViewControl.xaml" />
     <None Remove="Controls\GlowButton.xaml" />
     <None Remove="Controls\PISeparator.xaml" />
+    <None Remove="Controls\ProgressTextRing.xaml" />
     <None Remove="errors.db" />
     <None Remove="Images\PI.ico" />
     <None Remove="Pages\AboutPage.xaml" />
@@ -98,6 +99,18 @@
     <None Remove="$(PkgMicrosoft_Diagnostics_Tracing_TraceEvent)\lib\netstandard2.0\Dia2Lib.dll" />
   </ItemGroup>
 
+  <ItemGroup>
+    <COMReference Include="IWshRuntimeLibrary">
+      <WrapperTool>tlbimp</WrapperTool>
+      <VersionMinor>0</VersionMinor>
+      <VersionMajor>1</VersionMajor>
+      <Guid>f935dc20-1cf0-11d0-adb9-00c04fd58a0b</Guid>
+      <Lcid>0</Lcid>
+      <Isolated>false</Isolated>
+      <EmbedInteropTypes>true</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
+
   <!--
     Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
     Tools extension to be activated for this project even if the Windows App SDK Nuget
@@ -151,6 +164,9 @@
     <None Update="appsettings_pi.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <Page Update="Controls\ProgressTextRing.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Controls\PISeparator.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/tools/PI/DevHome.PI/Helpers/ExternalTool.cs b/tools/PI/DevHome.PI/Helpers/ExternalTool.cs
index e998c2b83d..55163feb1d 100644
--- a/tools/PI/DevHome.PI/Helpers/ExternalTool.cs
+++ b/tools/PI/DevHome.PI/Helpers/ExternalTool.cs
@@ -2,23 +2,27 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Text.Json.Serialization;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Serilog;
-using Windows.Graphics.Imaging;
+using Windows.System;
 using Windows.Win32.Foundation;
 using static DevHome.PI.Helpers.WindowHelper;
 
 namespace DevHome.PI.Helpers;
 
-public enum ExternalToolArgType
+public enum ToolActivationType
 {
-    None,
-    ProcessId,
-    Hwnd,
+    Protocol,
+    Msix,
+    Launch,
 }
 
 // ExternalTool represents an imported tool
@@ -30,28 +34,24 @@ public partial class ExternalTool : ObservableObject
 
     public string Name { get; private set; }
 
-    public string Executable { get; private set; }
-
-    [JsonConverter(typeof(EnumStringConverter<ExternalToolArgType>))]
-    public ExternalToolArgType ArgType { get; private set; } = ExternalToolArgType.None;
-
-    public string ArgPrefix
-    {
-        get; private set;
-    }
+    public string Executable { get; private set; }
+
+    [JsonConverter(typeof(EnumStringConverter<ToolActivationType>))]
+    public ToolActivationType ActivationType { get; private set; } = ToolActivationType.Launch;
 
-    public string OtherArgs
-    {
-        get; private set;
-    }
+    public string Arguments { get; private set; }
 
-    [ObservableProperty]
-    private string _pinGlyph;
+    public string AppUserModelId { get; private set; }
 
+    public string IconFilePath { get; private set; }
+
     [ObservableProperty]
     private bool _isPinned;
 
-    // Note the additional "property:" syntax to ensure the JsonIgnore is propagated to the generated property.
+    [ObservableProperty]
+    [property: JsonIgnore]
+    private string _pinGlyph;
+
     [ObservableProperty]
     [property: JsonIgnore]
     private SoftwareBitmapSource? _toolIcon;
@@ -60,27 +60,26 @@ public string OtherArgs
     [property: JsonIgnore]
     private ImageIcon? _menuIcon;
 
-    [JsonIgnore]
-    private SoftwareBitmap? _softwareBitmap;
-
     public ExternalTool(
         string name,
         string executable,
-        ExternalToolArgType argtype,
-        string argprefix = "",
-        string otherArgs = "",
+        ToolActivationType activationType,
+        string arguments = "",
+        string appUserModelId = "",
+        string iconFilePath = "",
         bool isPinned = false)
     {
         Name = name;
         Executable = executable;
-        ArgType = argtype;
-        ArgPrefix = argprefix;
-        OtherArgs = otherArgs;
+        ActivationType = activationType;
+        Arguments = arguments;
+        AppUserModelId = appUserModelId;
+        IconFilePath = iconFilePath;
         IsPinned = isPinned;
         PinGlyph = IsPinned ? CommonHelper.UnpinGlyph : CommonHelper.PinGlyph;
 
-        ID = Guid.NewGuid().ToString();
-
+        ID = Guid.NewGuid().ToString();
+
         if (!string.IsNullOrEmpty(executable))
         {
             GetIcons();
@@ -96,10 +95,17 @@ private async void GetIcons()
     {
         try
         {
-            _softwareBitmap ??= GetSoftwareBitmapFromExecutable(Executable);
-            if (_softwareBitmap is not null)
+            if (!string.IsNullOrEmpty(IconFilePath))
+            {
+                ToolIcon = await GetSoftwareBitmapSourceFromImageFilePath(IconFilePath);
+            }
+            else
             {
-                ToolIcon = await GetSoftwareBitmapSourceFromSoftwareBitmapAsync(_softwareBitmap);
+                var softwareBitmap = GetSoftwareBitmapFromExecutable(Executable);
+                if (softwareBitmap is not null)
+                {
+                    ToolIcon = await GetSoftwareBitmapSourceFromSoftwareBitmapAsync(softwareBitmap);
+                }
             }
 
             MenuIcon = new ImageIcon
@@ -113,44 +119,81 @@ private async void GetIcons()
         }
     }
 
-    internal string CreateFullCommandLine(int? pid, HWND? hwnd)
-    {
-        return "\"" + Executable + "\"" + CreateCommandLine(pid, hwnd);
-    }
-
-    internal string CreateCommandLine(int? pid, HWND? hwnd)
-    {
-        var commandLine = $" {OtherArgs}";
-
-        if (ArgType == ExternalToolArgType.Hwnd && hwnd is not null)
-        {
-            commandLine = $" {ArgPrefix} {hwnd:D} {OtherArgs}";
-        }
-        else if (ArgType == ExternalToolArgType.ProcessId && pid is not null)
-        {
-            commandLine = $" {ArgPrefix} {pid:D} {OtherArgs}";
-        }
-
-        return commandLine;
-    }
+    internal async Task<bool> Invoke(int? pid, HWND? hwnd)
+    {
+        var result = false;
 
-    internal virtual Process? Invoke(int? pid, HWND? hwnd)
-    {
         try
-        {
-            var toolProcess = new Process();
-            toolProcess.StartInfo.FileName = Executable;
-            toolProcess.StartInfo.Arguments = CreateCommandLine(pid, hwnd);
-            toolProcess.StartInfo.UseShellExecute = false;
-            toolProcess.StartInfo.RedirectStandardOutput = true;
-            toolProcess.Start();
-            return toolProcess;
+        {
+            var parsedArguments = string.Empty;
+            if (!string.IsNullOrEmpty(Arguments))
+            {
+                var argumentVariables = new Dictionary<string, int>();
+                if (pid.HasValue)
+                {
+                    argumentVariables.Add("pid", pid.Value);
+                }
+
+                if (hwnd.HasValue)
+                {
+                    argumentVariables.Add("hwnd", (int)hwnd.Value);
+                }
+
+                parsedArguments = ReplaceKnownVariables(Arguments, argumentVariables);
+            }
+
+            if (ActivationType == ToolActivationType.Protocol)
+            {
+                result = await Launcher.LaunchUriAsync(new Uri($"{parsedArguments}"));
+            }
+            else
+            {
+                if (ActivationType == ToolActivationType.Msix)
+                {
+                    var process = Process.Start("explorer.exe", $"shell:AppsFolder\\{AppUserModelId}");
+                    result = process is not null;
+                }
+                else
+                {
+                    var startInfo = new ProcessStartInfo(Executable)
+                    {
+                        Arguments = parsedArguments,
+                        UseShellExecute = true,
+                    };
+                    var process = Process.Start(startInfo);
+                    result = process is not null;
+                }
+            }
         }
         catch (Exception ex)
         {
             _log.Error(ex, "Tool launched failed");
-            return null;
-        }
+        }
+
+        return result;
+    }
+
+    private string ReplaceKnownVariables(string input, Dictionary<string, int> argumentValues)
+    {
+        // Process the input string to replace any instance of defined variables with "real" values.
+        // Eg, replace {pid} with 123, {hwnd} with 456.
+        var pattern = @"\{(\w+)\}";
+
+        var result = Regex.Replace(input, pattern, match =>
+        {
+            var variable = match.Groups[1].Value;
+
+            // Check if the variable exists in the dictionary; if so, replace it.
+            if (argumentValues.TryGetValue(variable, out var replacementValue))
+            {
+                return replacementValue.ToString(CultureInfo.InvariantCulture);
+            }
+
+            // If the variable is not found, keep it as is.
+            return match.Value;
+        });
+
+        return result;
     }
 
     public void TogglePinnedState()
diff --git a/tools/PI/DevHome.PI/Helpers/ExternalToolCollection.cs b/tools/PI/DevHome.PI/Helpers/ExternalToolCollection.cs
new file mode 100644
index 0000000000..ef977aba4a
--- /dev/null
+++ b/tools/PI/DevHome.PI/Helpers/ExternalToolCollection.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System.Collections.ObjectModel;
+
+namespace DevHome.PI.Helpers;
+
+public class ExternalToolCollection
+{
+    public int Version { get; set; }
+
+    public ObservableCollection<ExternalTool> ExternalTools { get; set; }
+
+    public ExternalToolCollection()
+    {
+        Version = ExternalToolsHelper.ToolsCollectionVersion;
+        ExternalTools = [];
+    }
+
+    public ExternalToolCollection(int version, ObservableCollection<ExternalTool> tools)
+    {
+        Version = version;
+        ExternalTools = tools;
+    }
+}
diff --git a/tools/PI/DevHome.PI/Helpers/ExternalTool_v1.cs b/tools/PI/DevHome.PI/Helpers/ExternalTool_v1.cs
new file mode 100644
index 0000000000..5ea11a62a4
--- /dev/null
+++ b/tools/PI/DevHome.PI/Helpers/ExternalTool_v1.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Text.Json.Serialization;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace DevHome.PI.Helpers;
+
+public enum ExternalToolArgType
+{
+    None,
+    ProcessId,
+    Hwnd,
+}
+
+public partial class ExternalTool_v1 : ObservableObject
+{
+    public string ID { get; private set; }
+
+    public string Name { get; private set; }
+
+    public string Executable { get; private set; }
+
+    [JsonConverter(typeof(EnumStringConverter<ExternalToolArgType>))]
+    public ExternalToolArgType ArgType { get; private set; } = ExternalToolArgType.None;
+
+    public string ArgPrefix
+    {
+        get; private set;
+    }
+
+    public string OtherArgs
+    {
+        get; private set;
+    }
+
+    public bool IsPinned
+    {
+        get; private set;
+    }
+
+    public ExternalTool_v1(
+        string name,
+        string executable,
+        ExternalToolArgType argtype,
+        string argprefix = "",
+        string otherArgs = "",
+        bool isPinned = false)
+    {
+        Name = name;
+        Executable = executable;
+        ArgType = argtype;
+        ArgPrefix = argprefix;
+        OtherArgs = otherArgs;
+        IsPinned = isPinned;
+        ID = Guid.NewGuid().ToString();
+    }
+}
diff --git a/tools/PI/DevHome.PI/Helpers/ExternalToolsHelper.cs b/tools/PI/DevHome.PI/Helpers/ExternalToolsHelper.cs
index 02de51d806..44928a466c 100644
--- a/tools/PI/DevHome.PI/Helpers/ExternalToolsHelper.cs
+++ b/tools/PI/DevHome.PI/Helpers/ExternalToolsHelper.cs
@@ -6,8 +6,10 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using DevHome.Common.Helpers;
 using Serilog;
 using Windows.Storage;
@@ -58,6 +60,8 @@ public ObservableCollection<ExternalTool> AllExternalTools
     // The bar shows only the pinned tools.
     public ReadOnlyObservableCollection<ExternalTool> FilteredExternalTools { get; private set; }
 
+    internal static int ToolsCollectionVersion { get; private set; } = 2;
+
     private ExternalToolsHelper()
     {
         string localFolder;
@@ -82,10 +86,11 @@ internal void Init()
         allExternalTools.Clear();
         if (File.Exists(toolInfoFileName))
         {
+            var jsonData = File.ReadAllText(toolInfoFileName);
             try
             {
-                var jsonData = File.ReadAllText(toolInfoFileName);
-                var existingData = JsonSerializer.Deserialize<ExternalTool[]>(jsonData) ?? [];
+                var toolCollection = JsonSerializer.Deserialize<ExternalToolCollection>(jsonData);
+                var existingData = toolCollection?.ExternalTools ?? [];
                 foreach (var toolItem in existingData)
                 {
                     allExternalTools.Add(toolItem);
@@ -94,13 +99,55 @@ internal void Init()
             }
             catch (Exception ex)
             {
-                // TODO If we failed to parse the JSON file, we should rename it (using DateTime.Now),
-                // create a new one, and report to the user.
-                _log.Error(ex, $"Failed to parse {toolInfoFileName}");
+                _log.Error(ex, $"Failed to parse {toolInfoFileName}, attempting migration");
+                MigrateOldTools(jsonData);
             }
         }
     }
 
+    private void MigrateOldTools(string jsonData)
+    {
+        try
+        {
+            var oldFormatData = JsonSerializer.Deserialize<ExternalTool_v1[]>(jsonData) ?? [];
+            foreach (var oldTool in oldFormatData)
+            {
+                var arguments = string.Empty;
+                if (oldTool.ArgType == ExternalToolArgType.ProcessId)
+                {
+                    arguments = $" {oldTool.ArgPrefix}{{pid}} {oldTool.OtherArgs}";
+                }
+                else if (oldTool.ArgType == ExternalToolArgType.Hwnd)
+                {
+                    arguments = $" {oldTool.ArgPrefix}{{hwnd}} {oldTool.OtherArgs}";
+                }
+                else
+                {
+                    arguments = oldTool.OtherArgs;
+                }
+
+                var newTool = new ExternalTool(
+                    oldTool.Name,
+                    oldTool.Executable,
+                    ToolActivationType.Launch,
+                    arguments,
+                    string.Empty,
+                    string.Empty,
+                    oldTool.IsPinned);
+
+                allExternalTools.Add(newTool);
+                newTool.PropertyChanged += ToolItem_PropertyChanged;
+            }
+
+            // Write out the updated data with the new file format.
+            WriteToolsJsonFile();
+        }
+        catch (Exception ex)
+        {
+            _log.Error(ex, "Failed to migrate old tools");
+        }
+    }
+
     private void ToolItem_PropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
         // The user can change the IsPinned property of a tool, to pin or unpin it on the bar.
@@ -119,7 +166,28 @@ private void ToolItem_PropertyChanged(object? sender, PropertyChangedEventArgs e
             }
         }
 
-        WriteToolsJsonFile();
+        // Only update the JSON file if the property is not attributed [JsonIgnore].
+        if (!IsJsonIgnoreProperty<ExternalTool>(e.PropertyName))
+        {
+            WriteToolsJsonFile();
+        }
+    }
+
+    private bool IsJsonIgnoreProperty<T>(string? propertyName)
+    {
+        if (string.IsNullOrEmpty(propertyName))
+        {
+            return false;
+        }
+
+        var property = typeof(T).GetProperty(propertyName);
+        if (property is not null)
+        {
+            var jsonIgnoreAttribute = property.GetCustomAttributes(typeof(JsonIgnoreAttribute), false).FirstOrDefault();
+            return jsonIgnoreAttribute is not null;
+        }
+
+        return false;
     }
 
     public ExternalTool AddExternalTool(ExternalTool tool)
@@ -139,7 +207,8 @@ public void RemoveExternalTool(ExternalTool tool)
 
     private void WriteToolsJsonFile()
     {
-        var updatedJson = JsonSerializer.Serialize(allExternalTools, serializerOptions);
+        var toolCollection = new ExternalToolCollection(ToolsCollectionVersion, allExternalTools);
+        var updatedJson = JsonSerializer.Serialize(toolCollection, serializerOptions);
 
         try
         {
@@ -147,9 +216,6 @@ private void WriteToolsJsonFile()
         }
         catch (Exception ex)
         {
-            // TODO If we're unable to write to the file, we should figure out why.
-            // If the file has become corrupted, we should rename it (using DateTime.Now),
-            // create a new one, and report to the user. If it's locked, we just report to the user.
             _log.Error(ex, "WriteToolsJsonFile unable to write to file");
         }
     }
diff --git a/tools/PI/DevHome.PI/Helpers/WindowHelper.cs b/tools/PI/DevHome.PI/Helpers/WindowHelper.cs
index 50890626d3..735a1f126c 100644
--- a/tools/PI/DevHome.PI/Helpers/WindowHelper.cs
+++ b/tools/PI/DevHome.PI/Helpers/WindowHelper.cs
@@ -5,6 +5,7 @@
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Drawing;
+using System.IO;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
@@ -19,6 +20,7 @@
 using Windows.Foundation;
 using Windows.Graphics;
 using Windows.Graphics.Imaging;
+using Windows.Storage.Streams;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.Graphics.Dwm;
@@ -337,6 +339,69 @@ public static async Task<SoftwareBitmapSource> GetSoftwareBitmapSourceFromSoftwa
         return softwareBitmapSource;
     }
 
+    internal static BitmapImage? GetBitmapImageFromFile(string filePath)
+    {
+        BitmapImage? bitmapImage = null;
+        try
+        {
+            // Creating a BitmapImage must be done on the UI thread.
+            bitmapImage = new BitmapImage();
+            var icon = Icon.ExtractAssociatedIcon(filePath);
+            if (icon is not null)
+            {
+                using var bitmap = icon.ToBitmap();
+                using var stream = new MemoryStream();
+                bitmap.Save(stream, System.Drawing.Imaging.ImageFormat.Png);
+
+                stream.Seek(0, SeekOrigin.Begin);
+                var randomAccessStream = new InMemoryRandomAccessStream();
+                var outputStream = randomAccessStream.GetOutputStreamAt(0);
+                var writer = new DataWriter(outputStream);
+                writer.WriteBytes(stream.ToArray());
+                writer.StoreAsync().GetResults();
+                randomAccessStream.Seek(0);
+
+                bitmapImage.SetSource(randomAccessStream);
+            }
+        }
+        catch (Exception ex)
+        {
+            _log.Error($"Error creating BitmapImage from filePath: {ex.Message}");
+        }
+
+        return bitmapImage;
+    }
+
+    internal static async Task<SoftwareBitmapSource?> GetSoftwareBitmapSourceFromImageFilePath(string iconFilePath)
+    {
+        SoftwareBitmapSource? softwareBitmapSource = null;
+
+        try
+        {
+            var fileStream = File.OpenRead(iconFilePath);
+            var decoder = await BitmapDecoder.CreateAsync(fileStream.AsRandomAccessStream());
+            var softwareBitmap = await decoder.GetSoftwareBitmapAsync();
+
+            // SoftwareBitmapSource::SetBitmapAsync only supports SoftwareBitmap with
+            // bgra8 pixel format and pre-multiplied or no alpha.
+            if (softwareBitmap.BitmapPixelFormat != BitmapPixelFormat.Bgra8
+                || softwareBitmap.BitmapAlphaMode == BitmapAlphaMode.Straight)
+            {
+                softwareBitmap = SoftwareBitmap.Convert(
+                    softwareBitmap, BitmapPixelFormat.Bgra8, BitmapAlphaMode.Premultiplied);
+            }
+
+            softwareBitmapSource = new SoftwareBitmapSource();
+            await softwareBitmapSource.SetBitmapAsync(softwareBitmap);
+        }
+        catch (Exception ex)
+        {
+            _log.Error($"Error creating SoftwareBitmapSource from file path: {ex.Message}");
+        }
+
+        return softwareBitmapSource;
+    }
+
     internal static unsafe uint GetProcessIdFromWindow(HWND hWnd)
     {
         uint processID = 0;
diff --git a/tools/PI/DevHome.PI/Models/InstalledAppInfo.cs b/tools/PI/DevHome.PI/Models/InstalledAppInfo.cs
new file mode 100644
index 0000000000..95eced148b
--- /dev/null
+++ b/tools/PI/DevHome.PI/Models/InstalledAppInfo.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.UI.Xaml.Media.Imaging;
+using Windows.ApplicationModel;
+
+namespace DevHome.PI.Models;
+
+public class InstalledAppInfo
+{
+    public string? Name { get; set; }
+
+    public BitmapImage? Icon { get; set; }
+
+    public string? ShortcutFilePath { get; set; }
+
+    public string? TargetPath { get; set; }
+
+    public string? AppUserModelId { get; set; }
+
+    public Package? AppPackage { get; set; }
+
+    public string? IconFilePath { get; set; }
+
+    public bool IsMsix
+    {
+        get
+        {
+            if (AppUserModelId is not null)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        set
+        {
+        }
+    }
+
+    public override string ToString()
+    {
+        return Name ?? base.ToString()!;
+    }
+}
diff --git a/tools/PI/DevHome.PI/Strings/en-us/Resources.resw b/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
index ca181df36f..27074de28a 100644
--- a/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
+++ b/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
@@ -357,26 +357,10 @@
     <value>None</value>
     <comment>Refers to the type of data being shown</comment>
   </data>
-  <data name="HwndRadio.Content" xml:space="preserve">
-    <value>Hwnd</value>
-    <comment>Refers to a Windows operating system data type (HWND) a window handle</comment>
-  </data>
-  <data name="ProcessIdRadio.Content" xml:space="preserve">
-    <value>ProcessId</value>
-    <comment>Refers to a Windows operating system process identifier (PID)</comment>
-  </data>
   <data name="PrefixTextBlock.Text" xml:space="preserve">
     <value>Prefix (if any)</value>
     <comment>Refers to arguments that can be passed to a process when it is created</comment>
   </data>
-  <data name="OtherArgumentsTextBlock.Text" xml:space="preserve">
-    <value>Any other arguments</value>
-    <comment>Refers to arguments that can be passed to a process when it is created</comment>
-  </data>
-  <data name="SampleCommandLineTextBlock.Text" xml:space="preserve">
-    <value>Sample command line</value>
-    <comment>What the commandline to start the executable/application will look like</comment>
-  </data>
   <data name="AddToolsOkButton.Content" xml:space="preserve">
     <value>OK</value>
     <comment>An affirmative value for a button</comment>
@@ -814,7 +798,7 @@
     <comment>Label for the link to the documentation for the product.</comment>
   </data>
   <data name="SettingsDocumentationLink.NavigateUri" xml:space="preserve">
-    <value>https://github.com/microsoft/devhome/issues/2796</value>
+    <value>https://go.microsoft.com/fwlink/?linkid=2275140</value>
     <comment>Link to the documentation for the product.</comment>
   </data>
   <data name="SettingsPrivacyPolicyLink.Content" xml:space="preserve">
@@ -957,4 +941,72 @@
     <value>Detach the diagnostic bar from the target application</value>
     <comment>The tooltip text for a button that detaches the bar from the target application.</comment>
   </data>
+  <data name="ActivationTextBlock.Text" xml:space="preserve">
+    <value>Activation</value>
+    <comment>Header text for a group of radio buttons indicating the activation type</comment>
+  </data>
+  <data name="AppListButton.Content" xml:space="preserve">
+    <value>App list</value>
+    <comment>Text for a button to get a list of apps</comment>
+  </data>
+  <data name="AppsDataGridIconColumn.Header" xml:space="preserve">
+    <value>Icon</value>
+    <comment>Column heading for the icon column in a datagrid</comment>
+  </data>
+  <data name="AppsDataGridNameColumn.Header" xml:space="preserve">
+    <value>Name</value>
+    <comment>Column heading for the name column in a datagrid</comment>
+  </data>
+  <data name="ArgumentsDescriptionTextBlock.Text" xml:space="preserve">
+    <value>Provide the command-line or protocol arguments here. Use {pid} or {hwnd} if you want Project Ironsides to substitute the target app's process ID or window handle. For example:</value>
+    <comment>Description text for a section where the user can type in the arguments to be used for the app</comment>
+  </data>
+  <data name="ArgumentsHeaderTextBlock.Text" xml:space="preserve">
+    <value>Arguments</value>
+    <comment>Header text for a section describing the arguments to be used for the app</comment>
+  </data>
+  <data name="LaunchRadio.Content" xml:space="preserve">
+    <value>Launch</value>
+    <comment>Text for a radio button for the launch activation option</comment>
+  </data>
+  <data name="ProtocolRadio.Content" xml:space="preserve">
+    <value>Protocol</value>
+    <comment>Text for a radio button for the protocol option</comment>
+  </data>
+  <data name="LaunchExampleTextBlock.Text" xml:space="preserve">
+    <value>Launch example:  /something /process={pid} /another={hwnd}</value>
+    <comment>Example launch activation argument string</comment>
+  </data>
+  <data name="ProtocolExampleTextBlock.Text" xml:space="preserve">
+    <value>Protocol example:  myprotocol:///args?one=ABC&amp;two={pid}&amp;three={hwnd}</value>
+    <comment>Example protocol argument string</comment>
+  </data>
+  <data name="ActivationTextBlock.ToolTipService.ToolTip" xml:space="preserve">
+    <value>The type of activation for this tool</value>
+    <comment>Describes the section where the user can specify the type of tool activation to use.</comment>
+  </data>
+  <data name="AppListButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Get a list of installed apps</value>
+    <comment>Describes a button that will get a list of installed apps.</comment>
+  </data>
+  <data name="IsPinnedToggleSwitch.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Pin this tool to the toolbar, as well as adding it to the menu</value>
+    <comment>Describes a toggle switch for pinning a tool to the toolbar.</comment>
+  </data>
+  <data name="LaunchRadio.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Launch this tool by its path or package identity</value>
+    <comment>Describes a radio button that specifies how to launch the selected tool.</comment>
+  </data>
+  <data name="ProtocolRadio.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Launch this tool by its registered protocol</value>
+    <comment>Describes a radio button that specifies how to launch the selected tool.</comment>
+  </data>
+  <data name="ToolBrowseButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Browse the filesystem to find a tool</value>
+    <comment>Describes a button for browsing the filesystem.</comment>
+  </data>
+  <data name="ToolNameHeaderTextBlock.ToolTipService.ToolTip" xml:space="preserve">
+    <value>The name you want to use for this tool in the menu and toolbar</value>
+    <comment>Describes a textbox where the user can enter a name for the tool.</comment>
+  </data>
 </root>
\ No newline at end of file

From da1d88d2acecef0695038dbf1cb5ed1bb1abbed0 Mon Sep 17 00:00:00 2001
From: Andrew Whitechapel <andreww-msft@outlook.com>
Date: Thu, 20 Jun 2024 11:42:46 -0700
Subject: [PATCH 2/7] Updates per feedback

---
 .../DevHome.PI/Controls/AddToolControl.xaml   | 56 +++++++-----------
 .../Controls/AddToolControl.xaml.cs           | 58 ++++++-------------
 .../DevHome.PI/Controls/ProgressTextRing.xaml |  1 -
 .../PI/DevHome.PI/Helpers/ExternalTool_v1.cs  | 15 +----
 tools/PI/DevHome.PI/Helpers/WindowHelper.cs   |  2 +-
 .../PI/DevHome.PI/Models/InstalledAppInfo.cs  | 12 +---
 6 files changed, 44 insertions(+), 100 deletions(-)

diff --git a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml
index c0c4e51f01..4d59b92304 100644
--- a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml
+++ b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml
@@ -6,6 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:models="using:DevHome.PI.Models"
     xmlns:local="using:DevHome.PI.Controls"
     mc:Ignorable="d">
 
@@ -37,40 +38,25 @@
                 </Grid.ColumnDefinitions>
                 <Button
                     x:Name="AppListButton" x:Uid="AppListButton" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="100" Click="AppListButton_Click"/>
-                <controls:DataGrid
-                    x:Name="AppsDataGrid" Grid.Column="1"
-                    VerticalScrollBarVisibility="Visible"
-                    AlternatingRowBackground="Transparent"
-                    AlternatingRowForeground="Gray"
-                    AreRowDetailsFrozen="False"
-                    AreRowGroupHeadersFrozen="True"
-                    AutoGenerateColumns="False"
-                    CanUserReorderColumns="True"
-                    CanUserResizeColumns="True"
-                    ColumnHeaderHeight="32"
-                    FrozenColumnCount="0"
-                    GridLinesVisibility="None"
-                    HeadersVisibility="Column"
-                    ItemsSource="{x:Bind SortedApps, Mode=OneWay}"
-                    SelectionChanged="AppsDataGrid_SelectionChanged"
-                    Sorting="AppsDataGrid_Sorting"
+                <ListView 
+                    x:Name="AppsListView" 
+                    Grid.Column="1" 
+                    SelectionChanged="AppsListView_SelectionChanged" 
                     HorizontalAlignment="Stretch"
-                    MinHeight="200"
-                    MaxHeight="300">
-                    <controls:DataGrid.Columns>
-                        <controls:DataGridTemplateColumn CanUserSort="False" x:Uid="AppsDataGridIconColumn">
-                            <controls:DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <Image Source="{Binding Icon}" Width="24" Height="24"/>
-                                </DataTemplate>
-                            </controls:DataGridTemplateColumn.CellTemplate>
-                        </controls:DataGridTemplateColumn>
-                        <controls:DataGridTextColumn x:Uid="AppsDataGridNameColumn" Binding="{Binding Name}" Width="200"/>
-                    </controls:DataGrid.Columns>
-                </controls:DataGrid>
+                    Height="200" 
+                    ItemsSource="{x:Bind SortedApps, Mode=OneWay}">
+                    <ListView.ItemTemplate>
+                        <DataTemplate x:DataType="models:InstalledAppInfo">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Source="{x:Bind Icon}" Width="24" Height="24"/>
+                                <TextBlock Text="{x:Bind Name}" Margin="6,0,0,0"/>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                </ListView>
             </Grid>
 
-            <!-- Occupies the same grid row as the DataGrid. -->
+            <!-- Occupies the same grid row as the apps list. -->
             <local:ProgressTextRing 
                 x:Name="LoadingProgressTextRing"
                 Foreground="BlueViolet" 
@@ -90,7 +76,7 @@
                 <TextBox 
                     x:Name="ToolPathTextBox" Grid.Column="1" MinWidth="800" Margin="8,0,0,0" IsReadOnly="True" HorizontalAlignment="Stretch"/>
             </Grid>
-            
+
             <Grid Grid.Row="2" Margin="0,6,0,0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="100"/>
@@ -106,8 +92,8 @@
                 <ColumnDefinition Width="100"/>
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
-            <TextBlock x:Uid="ActivationTextBlock" HorizontalAlignment="Left"/>
-            <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="6,0,0,0">
+            <TextBlock x:Uid="ActivationTextBlock" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+            <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="8,0,0,0">
                 <RadioButton x:Name="LaunchRadio" GroupName="ActivationGroup" x:Uid="LaunchRadio" IsChecked="True"/>
                 <RadioButton x:Name="ProtocolRadio" GroupName="ActivationGroup" x:Uid="ProtocolRadio"/>
             </StackPanel>
@@ -133,7 +119,7 @@
 
         <ToggleSwitch 
             x:Uid="IsPinnedToggleSwitch" x:Name="IsPinnedToggleSwitch" HorizontalContentAlignment="Left"
-            Grid.Row="5" HorizontalAlignment="Left" IsOn="True"/>
+            Grid.Row="5" HorizontalAlignment="Left" IsOn="True" Margin="0,-6,0,0"/>
         
         <StackPanel Orientation="Horizontal" Grid.Row="6" HorizontalAlignment="Right" Margin="0,12,0,0" Spacing="6">
             <Button 
diff --git a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
index 43a56e6a16..9847763293 100644
--- a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
+++ b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
@@ -5,14 +5,10 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.WindowsRuntime;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using CommunityToolkit.WinUI.UI.Controls;
 using DevHome.Common.Extensions;
 using DevHome.PI.Helpers;
 using DevHome.PI.Models;
@@ -22,12 +18,7 @@
 using Microsoft.UI.Xaml.Media.Imaging;
 using Serilog;
 using Windows.ApplicationModel;
-using Windows.ApplicationModel.Core;
-using Windows.Foundation;
-using Windows.Graphics.Imaging;
 using Windows.Management.Deployment;
-using Windows.Storage;
-using Windows.Storage.Streams;
 using Windows.Win32;
 using Windows.Win32.UI.Controls.Dialogs;
 
@@ -120,7 +111,7 @@ private void HandleBrowseButton()
             }
         }
 
-        if (fileName != string.Empty)
+        if (!string.IsNullOrEmpty(fileName))
         {
             ToolPathTextBox.Text = fileName;
             ToolNameTextBox.Text = Path.GetFileNameWithoutExtension(fileName);
@@ -194,19 +185,19 @@ private async void AppListButton_Click(object sender, RoutedEventArgs e)
         itemCount = GetShortcuts();
         if (itemCount == 0)
         {
-            Log.Error("Error getting shortcuts");
+            _log.Error("Error getting shortcuts");
         }
 
         var packageCount = GetPackages();
         if (packageCount == 0)
         {
-            Log.Error("Error getting packages");
+            _log.Error("Error getting packages");
         }
 
         itemCount += packageCount;
         if (itemCount == 0)
         {
-            Log.Error("Error getting list of installed apps");
+            _log.Error("Error getting list of installed apps");
             return;
         }
 
@@ -276,7 +267,7 @@ private int GetPackages()
 
     private async Task ProcessItemsAsync(IProgress<int> progress)
     {
-        // Recursively search for .lnk files.
+        // Process all the shortcut files.
         var currentCount = 0;
         for (var i = 0; i < shortcuts?.Count; i++)
         {
@@ -317,6 +308,7 @@ private async Task ProcessItemsAsync(IProgress<int> progress)
                     }
                     catch
                     {
+                        _log.Error("Error getting icon from package");
                     }
                 }
             }
@@ -348,7 +340,13 @@ public void ProcessShortcut(string filePath)
         }
 
         var wshShell = new WshShell();
-        var shortcut = (IWshShortcut)wshShell.CreateShortcut(filePath);
+        if (wshShell.CreateShortcut(filePath) is not IWshShortcut shortcut)
+        {
+            _log.Error("Error getting shortcut");
+            return;
+        }
+
+        // Proceed with using the shortcut object.
         var targetPath = shortcut.TargetPath;
 
         // Exclude shortcuts that point to empty targets, filesystem folders, or WSA apps.
@@ -369,6 +367,7 @@ public void ProcessShortcut(string filePath)
             return;
         }
 
+        // Add the app for this shortcut to the list.
         allApps.Add(new InstalledAppInfo
         {
             Name = appName,
@@ -392,6 +391,8 @@ public void ProcessPackage(Package package)
             // Note we use Package.Logo, not AppListEntry.DisplayInfo.GetLogo
             // because the latter doesn't get consistently-sized icons.
             var appListEntry = entries[0];
+
+            // Add the app for this package to the list.
             allApps.Add(new InstalledAppInfo
             {
                 Name = package.DisplayName,
@@ -401,9 +402,9 @@ public void ProcessPackage(Package package)
         }
     }
 
-    private void AppsDataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    private void AppsListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-        if (AppsDataGrid.SelectedItem is InstalledAppInfo app)
+        if (AppsListView.SelectedItem is InstalledAppInfo app)
         {
             selectedApp = app;
             if (!string.IsNullOrEmpty(app.TargetPath))
@@ -424,27 +425,4 @@ private void AppsDataGrid_SelectionChanged(object sender, SelectionChangedEventA
             ToolNameTextBox.Text = string.Empty;
         }
     }
-
-    private void AppsDataGrid_Sorting(object sender, DataGridColumnEventArgs e)
-    {
-        var header = e.Column.Header.ToString();
-        switch (header)
-        {
-            case "Name":
-                if (e.Column.SortDirection == null || e.Column.SortDirection == DataGridSortDirection.Descending)
-                {
-                    AppsDataGrid.ItemsSource = new ObservableCollection<InstalledAppInfo>(
-                        from item in SortedApps orderby item.Name ascending select item);
-                    e.Column.SortDirection = DataGridSortDirection.Ascending;
-                }
-                else
-                {
-                    AppsDataGrid.ItemsSource = new ObservableCollection<InstalledAppInfo>(
-                        from item in SortedApps orderby item.Name descending select item);
-                    e.Column.SortDirection = DataGridSortDirection.Descending;
-                }
-
-                break;
-        }
-    }
 }
diff --git a/tools/PI/DevHome.PI/Controls/ProgressTextRing.xaml b/tools/PI/DevHome.PI/Controls/ProgressTextRing.xaml
index b75ce7bcec..20b3df7c18 100644
--- a/tools/PI/DevHome.PI/Controls/ProgressTextRing.xaml
+++ b/tools/PI/DevHome.PI/Controls/ProgressTextRing.xaml
@@ -3,7 +3,6 @@
     x:Class="DevHome.PI.Controls.ProgressTextRing"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:DevHome.PI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
diff --git a/tools/PI/DevHome.PI/Helpers/ExternalTool_v1.cs b/tools/PI/DevHome.PI/Helpers/ExternalTool_v1.cs
index 5ea11a62a4..bcd7a30b87 100644
--- a/tools/PI/DevHome.PI/Helpers/ExternalTool_v1.cs
+++ b/tools/PI/DevHome.PI/Helpers/ExternalTool_v1.cs
@@ -25,20 +25,11 @@ public partial class ExternalTool_v1 : ObservableObject
     [JsonConverter(typeof(EnumStringConverter<ExternalToolArgType>))]
     public ExternalToolArgType ArgType { get; private set; } = ExternalToolArgType.None;
 
-    public string ArgPrefix
-    {
-        get; private set;
-    }
+    public string ArgPrefix { get; private set; }
 
-    public string OtherArgs
-    {
-        get; private set;
-    }
+    public string OtherArgs { get; private set; }
 
-    public bool IsPinned
-    {
-        get; private set;
-    }
+    public bool IsPinned { get; private set; }
 
     public ExternalTool_v1(
         string name,
diff --git a/tools/PI/DevHome.PI/Helpers/WindowHelper.cs b/tools/PI/DevHome.PI/Helpers/WindowHelper.cs
index 735a1f126c..f5fa568a0f 100644
--- a/tools/PI/DevHome.PI/Helpers/WindowHelper.cs
+++ b/tools/PI/DevHome.PI/Helpers/WindowHelper.cs
@@ -382,7 +382,7 @@ public static async Task<SoftwareBitmapSource> GetSoftwareBitmapSourceFromSoftwa
             var decoder = await BitmapDecoder.CreateAsync(fileStream.AsRandomAccessStream());
             var softwareBitmap = await decoder.GetSoftwareBitmapAsync();
 
-            // SoftwareBitmapSource::SetBitmapAsync only supports SoftwareBitmap with
+            // SoftwareBitmapSource.SetBitmapAsync only supports SoftwareBitmap with
             // bgra8 pixel format and pre-multiplied or no alpha.
             if (softwareBitmap.BitmapPixelFormat != BitmapPixelFormat.Bgra8
                 || softwareBitmap.BitmapAlphaMode == BitmapAlphaMode.Straight)
diff --git a/tools/PI/DevHome.PI/Models/InstalledAppInfo.cs b/tools/PI/DevHome.PI/Models/InstalledAppInfo.cs
index 95eced148b..3040b2eb90 100644
--- a/tools/PI/DevHome.PI/Models/InstalledAppInfo.cs
+++ b/tools/PI/DevHome.PI/Models/InstalledAppInfo.cs
@@ -24,17 +24,7 @@ public class InstalledAppInfo
 
     public bool IsMsix
     {
-        get
-        {
-            if (AppUserModelId is not null)
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
+        get => AppUserModelId is not null;
 
         set
         {

From f3c155d43979d20fbcbb12eacd4164d9c13d9d5b Mon Sep 17 00:00:00 2001
From: Andrew Whitechapel <andreww-msft@outlook.com>
Date: Thu, 20 Jun 2024 11:53:30 -0700
Subject: [PATCH 3/7] Another fix from feedback.

---
 tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
index 9847763293..b3f3198280 100644
--- a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
+++ b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
@@ -222,7 +222,7 @@ private async void AppListButton_Click(object sender, RoutedEventArgs e)
 
     private int GetShortcuts()
     {
-        var count = 0;
+        int count;
 
         // Search for .lnk files in the per-user and all-users Start Menu Programs directories.
         // %APPDATA%\Microsoft\Windows\Start Menu\Programs
@@ -244,11 +244,7 @@ private int GetShortcuts()
             shortcuts.AddRange(Directory.GetFiles(commonStartMenuProgramsPath, "*.lnk", SearchOption.AllDirectories));
         }
 
-        if (shortcuts is not null)
-        {
-            count = shortcuts.Count;
-        }
-
+        count = shortcuts?.Count ?? 0;
         return count;
     }
 

From 132c652ec77eccc78c78ccc7562abec03c294109 Mon Sep 17 00:00:00 2001
From: Andrew Whitechapel <andreww-msft@outlook.com>
Date: Thu, 20 Jun 2024 12:24:46 -0700
Subject: [PATCH 4/7] Prepend underscore to private field names.

---
 .../Controls/AddToolControl.xaml.cs           | 102 +++++++++---------
 1 file changed, 50 insertions(+), 52 deletions(-)

diff --git a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
index b3f3198280..54f967609d 100644
--- a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
+++ b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
@@ -28,43 +28,43 @@ public sealed partial class AddToolControl : UserControl, INotifyPropertyChanged
 {
     private static readonly ILogger _log = Log.ForContext("SourceContext", nameof(AddToolControl));
 
-    private readonly string invalidToolInfo = CommonHelper.GetLocalizedString("InvalidToolInfoMessage");
-    private readonly string messageCloseText = CommonHelper.GetLocalizedString("MessageCloseText");
+    private readonly string _invalidToolInfo = CommonHelper.GetLocalizedString("InvalidToolInfoMessage");
+    private readonly string _messageCloseText = CommonHelper.GetLocalizedString("MessageCloseText");
 
     // We have 3 sets of operations, and we arbitrarily divide the progress timing into 3 equal segments.
     private const int ShortcutProcessingEndIndex = 33;
     private const int PackageProcessingEndIndex = 67;
 
-    private InstalledAppInfo? selectedApp;
-    private List<string>? shortcuts;
-    private List<Package>? packages;
-    private List<InstalledAppInfo> allApps = [];
-    private int itemCount;
+    private InstalledAppInfo? _selectedApp;
+    private List<string>? _shortcuts;
+    private List<Package>? _packages;
+    private List<InstalledAppInfo> _allApps = [];
+    private int _itemCount;
 
     public ObservableCollection<InstalledAppInfo> SortedApps { get; set; } = [];
 
     public event PropertyChangedEventHandler? PropertyChanged;
 
-    private bool isLoading;
+    private bool _isLoading;
 
     public bool IsLoading
     {
-        get => isLoading;
+        get => _isLoading;
         set
         {
-            isLoading = value;
+            _isLoading = value;
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoading)));
         }
     }
 
-    private int progressPercentage;
+    private int _progressPercentage;
 
     public int ProgressPercentage
     {
-        get => progressPercentage;
+        get => _progressPercentage;
         set
         {
-            progressPercentage = value;
+            _progressPercentage = value;
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ProgressPercentage)));
         }
     }
@@ -99,8 +99,6 @@ private void HandleBrowseButton()
                     lpstrFilter = pFilter,
                     nFilterIndex = 1,
                     nMaxFile = 255,
-
-                    // TODO - This should be the Settings window, not the bar window
                     hwndOwner = barWindow?.CurrentHwnd ?? Windows.Win32.Foundation.HWND.Null,
                 };
 
@@ -130,7 +128,7 @@ private void OkButton_Click(object sender, RoutedEventArgs e)
 
         ExternalToolsHelper.Instance.AddExternalTool(tool);
         var toolRegisteredMessage = CommonHelper.GetLocalizedString("ToolRegisteredMessage", ToolNameTextBox.Text);
-        WindowHelper.ShowTimedMessageDialog(this, toolRegisteredMessage, messageCloseText);
+        WindowHelper.ShowTimedMessageDialog(this, toolRegisteredMessage, _messageCloseText);
         ClearValues();
     }
 
@@ -141,14 +139,14 @@ private void ClearValues()
         LaunchRadio.IsChecked = true;
         ArgumentsTextBox.Text = string.Empty;
         IsPinnedToggleSwitch.IsOn = true;
-        selectedApp = null;
+        _selectedApp = null;
     }
 
     private ExternalTool? GetCurrentToolDefinition()
     {
         if (string.IsNullOrEmpty(ToolNameTextBox.Text) || string.IsNullOrEmpty(ToolPathTextBox.Text))
         {
-            WindowHelper.ShowTimedMessageDialog(this, invalidToolInfo, messageCloseText);
+            WindowHelper.ShowTimedMessageDialog(this, _invalidToolInfo, _messageCloseText);
             return null;
         }
 
@@ -157,7 +155,7 @@ private void ClearValues()
         {
             activationType = ToolActivationType.Protocol;
         }
-        else if (selectedApp is not null && selectedApp.IsMsix)
+        else if (_selectedApp is not null && _selectedApp.IsMsix)
         {
             activationType = ToolActivationType.Msix;
         }
@@ -167,8 +165,8 @@ private void ClearValues()
             ToolPathTextBox.Text,
             activationType,
             ArgumentsTextBox.Text,
-            selectedApp?.AppUserModelId ?? string.Empty,
-            selectedApp?.IconFilePath ?? string.Empty,
+            _selectedApp?.AppUserModelId ?? string.Empty,
+            _selectedApp?.IconFilePath ?? string.Empty,
             IsPinnedToggleSwitch.IsOn);
     }
 
@@ -179,23 +177,23 @@ private void CancelButton_Click(object sender, RoutedEventArgs e)
 
     private async void AppListButton_Click(object sender, RoutedEventArgs e)
     {
-        allApps.Clear();
+        _allApps.Clear();
         SortedApps.Clear();
 
-        itemCount = GetShortcuts();
-        if (itemCount == 0)
+        _itemCount = GetShortcuts();
+        if (_itemCount == 0)
         {
-            _log.Error("Error getting shortcuts");
+            _log.Error("Error getting _shortcuts");
         }
 
         var packageCount = GetPackages();
         if (packageCount == 0)
         {
-            _log.Error("Error getting packages");
+            _log.Error("Error getting _packages");
         }
 
-        itemCount += packageCount;
-        if (itemCount == 0)
+        _itemCount += packageCount;
+        if (_itemCount == 0)
         {
             _log.Error("Error getting list of installed apps");
             return;
@@ -212,7 +210,7 @@ private async void AppListButton_Click(object sender, RoutedEventArgs e)
 
         await ProcessItemsAsync(progress);
 
-        foreach (var app in allApps)
+        foreach (var app in _allApps)
         {
             SortedApps.Add(app);
         }
@@ -233,18 +231,18 @@ private int GetShortcuts()
         var commonStartMenuProgramsPath =
             Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonStartMenu), "Programs");
 
-        shortcuts = [];
+        _shortcuts = [];
         if (Directory.Exists(startMenuProgramsPath))
         {
-            shortcuts.AddRange(Directory.GetFiles(startMenuProgramsPath, "*.lnk", SearchOption.AllDirectories));
+            _shortcuts.AddRange(Directory.GetFiles(startMenuProgramsPath, "*.lnk", SearchOption.AllDirectories));
         }
 
         if (Directory.Exists(commonStartMenuProgramsPath))
         {
-            shortcuts.AddRange(Directory.GetFiles(commonStartMenuProgramsPath, "*.lnk", SearchOption.AllDirectories));
+            _shortcuts.AddRange(Directory.GetFiles(commonStartMenuProgramsPath, "*.lnk", SearchOption.AllDirectories));
         }
 
-        count = shortcuts?.Count ?? 0;
+        count = _shortcuts?.Count ?? 0;
         return count;
     }
 
@@ -252,10 +250,10 @@ private int GetPackages()
     {
         var count = 0;
         var packageManager = new PackageManager();
-        packages = packageManager.FindPackagesForUserWithPackageTypes(string.Empty, PackageTypes.Main).ToList();
-        if (packages is not null)
+        _packages = packageManager.FindPackagesForUserWithPackageTypes(string.Empty, PackageTypes.Main).ToList();
+        if (_packages is not null)
         {
-            count = packages.Count;
+            count = _packages.Count;
         }
 
         return count;
@@ -265,32 +263,32 @@ private async Task ProcessItemsAsync(IProgress<int> progress)
     {
         // Process all the shortcut files.
         var currentCount = 0;
-        for (var i = 0; i < shortcuts?.Count; i++)
+        for (var i = 0; i < _shortcuts?.Count; i++)
         {
-            await Task.Run(() => ProcessShortcut(shortcuts[i]));
+            await Task.Run(() => ProcessShortcut(_shortcuts[i]));
 
             // Report progress.
             currentCount++;
-            var percentComplete = (i + 1) * ShortcutProcessingEndIndex / itemCount;
+            var percentComplete = (i + 1) * ShortcutProcessingEndIndex / _itemCount;
             progress.Report(percentComplete);
         }
 
-        for (var j = 0; j < packages?.Count; j++)
+        for (var j = 0; j < _packages?.Count; j++)
         {
-            await Task.Run(() => ProcessPackage(packages[j]));
+            await Task.Run(() => ProcessPackage(_packages[j]));
 
             // Report progress.
             currentCount++;
-            var percentComplete = ShortcutProcessingEndIndex + ((j + 1) * ShortcutProcessingEndIndex / itemCount);
+            var percentComplete = ShortcutProcessingEndIndex + ((j + 1) * ShortcutProcessingEndIndex / _itemCount);
             progress.Report(percentComplete);
         }
 
-        allApps = allApps.OrderBy(app => app.Name).ToList();
+        _allApps = _allApps.OrderBy(app => app.Name).ToList();
 
         // We get the icon data on the UI thread, because BitmapImages must be created on the UI thread.
-        for (var k = 0; k < allApps.Count; k++)
+        for (var k = 0; k < _allApps.Count; k++)
         {
-            var app = allApps[k];
+            var app = _allApps[k];
             if (app.IsMsix)
             {
                 if (app.AppPackage is not null)
@@ -317,7 +315,7 @@ private async Task ProcessItemsAsync(IProgress<int> progress)
             }
 
             currentCount++;
-            var percentComplete = PackageProcessingEndIndex + ((k + 1) * ShortcutProcessingEndIndex / itemCount);
+            var percentComplete = PackageProcessingEndIndex + ((k + 1) * ShortcutProcessingEndIndex / _itemCount);
             progress.Report(percentComplete);
 
             // Yield to make sure the UI thread can update the progress output.
@@ -329,7 +327,7 @@ public void ProcessShortcut(string filePath)
     {
         var appName = Path.GetFileNameWithoutExtension(filePath);
 
-        // Exclude Microsoft Virtual Desktop and WSA shortcuts.
+        // Exclude Microsoft Virtual Desktop _shortcuts.
         if (appName.Contains("Microsoft Virtual Desktop", StringComparison.OrdinalIgnoreCase))
         {
             return;
@@ -345,7 +343,7 @@ public void ProcessShortcut(string filePath)
         // Proceed with using the shortcut object.
         var targetPath = shortcut.TargetPath;
 
-        // Exclude shortcuts that point to empty targets, filesystem folders, or WSA apps.
+        // Exclude _shortcuts that point to empty targets, filesystem folders, or WSA apps.
         if (string.IsNullOrEmpty(targetPath)
             || Directory.Exists(targetPath)
             || targetPath.Contains("WsaClient.exe", StringComparison.OrdinalIgnoreCase))
@@ -364,7 +362,7 @@ public void ProcessShortcut(string filePath)
         }
 
         // Add the app for this shortcut to the list.
-        allApps.Add(new InstalledAppInfo
+        _allApps.Add(new InstalledAppInfo
         {
             Name = appName,
             ShortcutFilePath = filePath,
@@ -389,7 +387,7 @@ public void ProcessPackage(Package package)
             var appListEntry = entries[0];
 
             // Add the app for this package to the list.
-            allApps.Add(new InstalledAppInfo
+            _allApps.Add(new InstalledAppInfo
             {
                 Name = package.DisplayName,
                 AppUserModelId = appListEntry.AppUserModelId,
@@ -402,7 +400,7 @@ private void AppsListView_SelectionChanged(object sender, SelectionChangedEventA
     {
         if (AppsListView.SelectedItem is InstalledAppInfo app)
         {
-            selectedApp = app;
+            _selectedApp = app;
             if (!string.IsNullOrEmpty(app.TargetPath))
             {
                 ToolPathTextBox.Text = app.TargetPath;
@@ -416,7 +414,7 @@ private void AppsListView_SelectionChanged(object sender, SelectionChangedEventA
         }
         else
         {
-            selectedApp = null;
+            _selectedApp = null;
             ToolPathTextBox.Text = string.Empty;
             ToolNameTextBox.Text = string.Empty;
         }

From 237e03ffa030113c1d3644f2bb9ca3aa1334d530 Mon Sep 17 00:00:00 2001
From: Andrew Whitechapel <andreww-msft@outlook.com>
Date: Fri, 21 Jun 2024 10:34:26 -0700
Subject: [PATCH 5/7] Fixed RedirectStandardOutput

---
 tools/PI/DevHome.PI/Helpers/ExternalTool.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/PI/DevHome.PI/Helpers/ExternalTool.cs b/tools/PI/DevHome.PI/Helpers/ExternalTool.cs
index 55163feb1d..c108d075d8 100644
--- a/tools/PI/DevHome.PI/Helpers/ExternalTool.cs
+++ b/tools/PI/DevHome.PI/Helpers/ExternalTool.cs
@@ -158,7 +158,8 @@ internal async Task<bool> Invoke(int? pid, HWND? hwnd)
                     var startInfo = new ProcessStartInfo(Executable)
                     {
                         Arguments = parsedArguments,
-                        UseShellExecute = true,
+                        UseShellExecute = false,
+                        RedirectStandardOutput = true,
                     };
                     var process = Process.Start(startInfo);
                     result = process is not null;

From c8dbdb101566799bbe33b552ba40254ca353907e Mon Sep 17 00:00:00 2001
From: Andrew Whitechapel <andreww-msft@outlook.com>
Date: Fri, 21 Jun 2024 11:11:11 -0700
Subject: [PATCH 6/7] Removed WSA check

---
 tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
index 54f967609d..28c8a1abd6 100644
--- a/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
+++ b/tools/PI/DevHome.PI/Controls/AddToolControl.xaml.cs
@@ -343,10 +343,8 @@ public void ProcessShortcut(string filePath)
         // Proceed with using the shortcut object.
         var targetPath = shortcut.TargetPath;
 
-        // Exclude _shortcuts that point to empty targets, filesystem folders, or WSA apps.
-        if (string.IsNullOrEmpty(targetPath)
-            || Directory.Exists(targetPath)
-            || targetPath.Contains("WsaClient.exe", StringComparison.OrdinalIgnoreCase))
+        // Exclude _shortcuts that point to empty targets or filesystem folders.
+        if (string.IsNullOrEmpty(targetPath) || Directory.Exists(targetPath))
         {
             return;
         }

From 2c453c4593e7aff865c127204b62953959eb5ca1 Mon Sep 17 00:00:00 2001
From: Andrew Whitechapel <andreww-msft@outlook.com>
Date: Fri, 21 Jun 2024 14:10:19 -0700
Subject: [PATCH 7/7] Update strings

---
 tools/PI/DevHome.PI/Strings/en-us/Resources.resw | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/PI/DevHome.PI/Strings/en-us/Resources.resw b/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
index 27074de28a..a057e15b86 100644
--- a/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
+++ b/tools/PI/DevHome.PI/Strings/en-us/Resources.resw
@@ -1009,4 +1009,8 @@
     <value>The name you want to use for this tool in the menu and toolbar</value>
     <comment>Describes a textbox where the user can enter a name for the tool.</comment>
   </data>
+  <data name="SwitchToSmallLayoutToolTip" xml:space="preserve">
+    <value>Collapse the large content panel</value>
+    <comment>The tooltip for a button which collapses the large content panel.</comment>
+  </data>
 </root>
\ No newline at end of file