Fix trivial AOT problem

Closes #38829

If we always UpdateProperty here, then there's a possible
race condition, where we raise the PropertyChanged(SearchText)
before the subclass actually retrieves the new SearchText from the
model. In that race situation, if the UI thread handles the
PropertyChanged before ListViewModel fetches the SearchText, it'll
think that the old search text is the _new_ value.

src/modules/cmdpal/Microsoft.CmdPal.Common/Contracts/IFileService.cs

@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.CmdPal.Common.Contracts;
-
-public interface IFileService
-{
-    T Read<T>(string folderPath, string fileName);
-
-    void Save<T>(string folderPath, string fileName, T content);
-
-    void Delete(string folderPath, string fileName);
-}

src/modules/cmdpal/Microsoft.CmdPal.Common/Contracts/ILocalSettingsService.cs

@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.CmdPal.Common.Contracts;
-
-public interface ILocalSettingsService
-{
-    Task<bool> HasSettingAsync(string key);
-
-    Task<T?> ReadSettingAsync<T>(string key);
-
-    Task SaveSettingAsync<T>(string key, T value);
-}

src/modules/cmdpal/Microsoft.CmdPal.Common/Extensions/ApplicationExtensions.cs

@@ -1,40 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.CmdPal.Common.Services;
-using Microsoft.UI.Xaml;
-
-namespace Microsoft.CmdPal.Common.Extensions;
-
-/// <summary>
-/// Extension class implementing extension methods for <see cref="Application"/>.
-/// </summary>
-public static class ApplicationExtensions
-{
-    /// <summary>
-    /// Get registered services at the application level from anywhere in the
-    /// application.
-    ///
-    /// Note:
-    /// https://learn.microsoft.com/uwp/api/windows.ui.xaml.application.current?view=winrt-22621#windows-ui-xaml-application-current
-    /// "Application is a singleton that implements the static Current property
-    /// to provide shared access to the Application instance for the current
-    /// application. The singleton pattern ensures that state managed by
-    /// Application, including shared resources and properties, is available
-    /// from a single, shared location."
-    ///
-    /// Example of usage:
-    /// <code>
-    /// Application.Current.GetService<T>()
-    /// </code>
-    /// </summary>
-    /// <typeparam name="T">Service type.</typeparam>
-    /// <param name="application">Current application.</param>
-    /// <returns>Service reference.</returns>
-    public static T GetService<T>(this Application application)
-        where T : class
-    {
-        return (application as IApp)!.GetService<T>();
-    }
-}

src/modules/cmdpal/Microsoft.CmdPal.Common/Extensions/IHostExtensions.cs

@@ -1,40 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace Microsoft.CmdPal.Common.Extensions;
-
-public static class IHostExtensions
-{
-    /// <summary>
-    /// <inheritdoc cref="ActivatorUtilities.CreateInstance(IServiceProvider, Type, object[])"/>
-    /// </summary>
-    public static T CreateInstance<T>(this IHost host, params object[] parameters)
-    {
-        return ActivatorUtilities.CreateInstance<T>(host.Services, parameters);
-    }
-
-    /// <summary>
-    /// Gets the service object for the specified type, or throws an exception
-    /// if type was not registered.
-    /// </summary>
-    /// <typeparam name="T">Service type</typeparam>
-    /// <param name="host">Host object</param>
-    /// <returns>Service object</returns>
-    /// <exception cref="ArgumentException">Throw an exception if the specified
-    /// type is not registered</exception>
-    public static T GetService<T>(this IHost host)
-        where T : class
-    {
-        if (host.Services.GetService(typeof(T)) is not T service)
-        {
-            throw new ArgumentException($"{typeof(T)} needs to be registered in ConfigureServices.");
-        }
-
-        return service;
-    }
-}

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

@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.IO;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-
-namespace Microsoft.CmdPal.Common.Helpers;
-
-public static class Json
-{
-    public static async Task<T> ToObjectAsync<T>(string value)
-    {
-        if (typeof(T) == typeof(bool))
-        {
-            return (T)(object)bool.Parse(value);
-        }
-
-        await using var stream = new MemoryStream(Encoding.UTF8.GetBytes(value));
-        return (await JsonSerializer.DeserializeAsync<T>(stream))!;
-    }
-
-    public static async Task<string> StringifyAsync<T>(T value)
-    {
-        if (typeof(T) == typeof(bool))
-        {
-            return value!.ToString()!.ToLowerInvariant();
-        }
-
-        await using var stream = new MemoryStream();
-        await JsonSerializer.SerializeAsync(stream, value);
-        return Encoding.UTF8.GetString(stream.ToArray());
-    }
-}

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

@@ -9,7 +9,7 @@ using Microsoft.UI.Dispatching;
 
 namespace Microsoft.CmdPal.Common.Helpers;
 
-public static class NativeEventWaiter
+public static partial class NativeEventWaiter
 {
     public static void WaitForEventLoop(string eventName, Action callback)
     {

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

@@ -9,7 +9,7 @@ using Windows.Win32.Foundation;
 
 namespace Microsoft.CmdPal.Common.Helpers;
 
-public static class RuntimeHelper
+public static partial class RuntimeHelper
 {
     public static bool IsMSIX
     {

src/modules/cmdpal/Microsoft.CmdPal.Common/Messages/HideWindowMessage.cs

@@ -4,6 +4,6 @@
 
 namespace Microsoft.CmdPal.Common.Messages;
 
-public record HideWindowMessage()
+public partial record HideWindowMessage()
 {
 }

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

@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\..\..\Common.Dotnet.AotCompatibility.props" />
   <PropertyGroup>
     <RootNamespace>Microsoft.CmdPal.Common</RootNamespace>
     <Nullable>enable</Nullable>

src/modules/cmdpal/Microsoft.CmdPal.Common/Models/LocalSettingsOptions.cs

@@ -1,18 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.CmdPal.Common.Models;
-
-public class LocalSettingsOptions
-{
-    public string? ApplicationDataFolder
-    {
-        get; set;
-    }
-
-    public string? LocalSettingsFile
-    {
-        get; set;
-    }
-}

src/modules/cmdpal/Microsoft.CmdPal.Common/NativeMethods.txt

@@ -1,16 +1,7 @@
-EnableWindow
-CoCreateInstance
-FileOpenDialog
-FileSaveDialog
-IFileOpenDialog
-IFileSaveDialog
-SHCreateItemFromParsingName
 GetCurrentPackageFullName
 SetWindowLong
 GetWindowLong
 WINDOW_EX_STYLE
-SHLoadIndirectString
-StrFormatByteSizeEx
 SFBS_FLAGS
 MAX_PATH
 GetDpiForWindow

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

@@ -1,48 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.IO;
-using System.Text;
-using System.Text.Json;
-using Microsoft.CmdPal.Common.Contracts;
-
-namespace Microsoft.CmdPal.Common.Services;
-
-public class FileService : IFileService
-{
-    private static readonly Encoding _encoding = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);
-
-#pragma warning disable CS8603 // Possible null reference return.
-    public T Read<T>(string folderPath, string fileName)
-    {
-        var path = Path.Combine(folderPath, fileName);
-        if (File.Exists(path))
-        {
-            using var fileStream = File.OpenText(path);
-            return JsonSerializer.Deserialize<T>(fileStream.BaseStream);
-        }
-
-        return default;
-    }
-#pragma warning restore CS8603 // Possible null reference return.
-
-    public void Save<T>(string folderPath, string fileName, T content)
-    {
-        if (!Directory.Exists(folderPath))
-        {
-            Directory.CreateDirectory(folderPath);
-        }
-
-        var fileContent = JsonSerializer.Serialize(content);
-        File.WriteAllText(Path.Combine(folderPath, fileName), fileContent, _encoding);
-    }
-
-    public void Delete(string folderPath, string fileName)
-    {
-        if (fileName != null && File.Exists(Path.Combine(folderPath, fileName)))
-        {
-            File.Delete(Path.Combine(folderPath, fileName));
-        }
-    }
-}

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

@@ -1,18 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.CmdPal.Common.Services;
-
-/// <summary>
-/// Interface for the current application singleton object exposing the API
-/// that can be accessed from anywhere in the application.
-/// </summary>
-public interface IApp
-{
-    /// <summary>
-    /// Gets services registered at the application level.
-    /// </summary>
-    public T GetService<T>()
-        where T : class;
-}

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

@@ -1,120 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using Microsoft.CmdPal.Common.Contracts;
-using Microsoft.CmdPal.Common.Helpers;
-using Microsoft.CmdPal.Common.Models;
-using Microsoft.Extensions.Options;
-using Windows.Storage;
-
-namespace Microsoft.CmdPal.Common.Services;
-
-public class LocalSettingsService : ILocalSettingsService
-{
-    // TODO! for now, we're hardcoding the path as effectively:
-    // %localappdata%\CmdPal\LocalSettings.json
-    private const string DefaultApplicationDataFolder = "CmdPal";
-    private const string DefaultLocalSettingsFile = "LocalSettings.json";
-
-    private readonly IFileService _fileService;
-    private readonly LocalSettingsOptions _options;
-
-    private readonly string _localApplicationData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-    private readonly string _applicationDataFolder;
-    private readonly string _localSettingsFile;
-
-    private readonly bool _isMsix;
-
-    private Dictionary<string, object> _settings;
-    private bool _isInitialized;
-
-    public LocalSettingsService(IFileService fileService, IOptions<LocalSettingsOptions> options)
-    {
-        _isMsix = false; // RuntimeHelper.IsMSIX;
-
-        _fileService = fileService;
-        _options = options.Value;
-
-        _applicationDataFolder = Path.Combine(_localApplicationData, _options.ApplicationDataFolder ?? DefaultApplicationDataFolder);
-        _localSettingsFile = _options.LocalSettingsFile ?? DefaultLocalSettingsFile;
-
-        _settings = new Dictionary<string, object>();
-    }
-
-    private async Task InitializeAsync()
-    {
-        if (!_isInitialized)
-        {
-            _settings = await Task.Run(() => _fileService.Read<Dictionary<string, object>>(_applicationDataFolder, _localSettingsFile)) ?? new Dictionary<string, object>();
-
-            _isInitialized = true;
-        }
-    }
-
-    public async Task<bool> HasSettingAsync(string key)
-    {
-        if (_isMsix)
-        {
-            return ApplicationData.Current.LocalSettings.Values.ContainsKey(key);
-        }
-        else
-        {
-            await InitializeAsync();
-
-            if (_settings != null)
-            {
-                return _settings.ContainsKey(key);
-            }
-        }
-
-        return false;
-    }
-
-    public async Task<T?> ReadSettingAsync<T>(string key)
-    {
-        if (_isMsix)
-        {
-            if (ApplicationData.Current.LocalSettings.Values.TryGetValue(key, out var obj))
-            {
-                return await Json.ToObjectAsync<T>((string)obj);
-            }
-        }
-        else
-        {
-            await InitializeAsync();
-
-            if (_settings != null && _settings.TryGetValue(key, out var obj))
-            {
-                var s = obj.ToString();
-
-                if (s != null)
-                {
-                    return await Json.ToObjectAsync<T>(s);
-                }
-            }
-        }
-
-        return default;
-    }
-
-    public async Task SaveSettingAsync<T>(string key, T value)
-    {
-        if (_isMsix)
-        {
-            ApplicationData.Current.LocalSettings.Values[key] = await Json.StringifyAsync(value!);
-        }
-        else
-        {
-            await InitializeAsync();
-
-            _settings[key] = await Json.StringifyAsync(value!);
-
-            await Task.Run(() => _fileService.Save(_applicationDataFolder, _localSettingsFile, _settings));
-        }
-    }
-}

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentFormViewModel.cs

@@ -4,7 +4,6 @@
 
 using System.Text.Json;
 using AdaptiveCards.ObjectModel.WinUI3;
-using AdaptiveCards.Templating;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Models;
@@ -36,35 +35,90 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
             return;
         }
 
+        TemplateJson = model.TemplateJson;
+        StateJson = model.StateJson;
+        DataJson = model.DataJson;
+
         try
         {
-            TemplateJson = model.TemplateJson;
-            StateJson = model.StateJson;
-            DataJson = model.DataJson;
+            // Parse the template and data JSON
+            var templateJsonObject = JsonObject.Parse(TemplateJson);
+            var dataJsonObject = JsonObject.Parse(DataJson);
 
-            AdaptiveCardTemplate template = new(TemplateJson);
-            var cardJson = template.Expand(DataJson);
+            // Manually replace placeholders in the template with data
+            foreach (var key in dataJsonObject.Keys)
+            {
+                if (templateJsonObject.ContainsKey(key))
+                {
+                    templateJsonObject[key] = dataJsonObject[key];
+                }
+            }
+
+            // Serialize the modified template back to a JSON string
+            var cardJson = templateJsonObject.Stringify();
+
+            // Construct the AdaptiveCard
             Card = AdaptiveCard.FromJsonString(cardJson);
         }
         catch (Exception e)
         {
-            // If we fail to parse the card JSON, then display _our own card_
-            // with the exception
-            AdaptiveCardTemplate template = new(ErrorCardJson);
+            // Handle errors (similar to your existing error handling)
             var serializeString = (string? s) => JsonSerializer.Serialize(s, JsonSerializationContext.Default.String);
 
-            // todo: we could probably stick Card.Errors in there too
-            var dataJson = $$"""
-{
-    "error_message": {{serializeString(e.Message)}},
-    "error_stack": {{serializeString(e.StackTrace)}},
-    "inner_exception": {{serializeString(e.InnerException?.Message)}},
-    "template_json": {{serializeString(TemplateJson)}},
-    "data_json": {{serializeString(DataJson)}}
-}
-""";
-            var cardJson = template.Expand(dataJson);
-            Card = AdaptiveCard.FromJsonString(cardJson);
+            var dataJson = $$"""  
+                {  
+                   "error_message": {{serializeString(e.Message)}},  
+                   "error_stack": {{serializeString(e.StackTrace)}},  
+                   "inner_exception": {{serializeString(e.InnerException?.Message)}},  
+                   "template_json": {{serializeString(TemplateJson)}},  
+                   "data_json": {{serializeString(DataJson)}}  
+                }  
+                """;
+
+            // Directly construct the error card JSON string
+            var errorCardJson = $$"""  
+                {  
+                   "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",  
+                   "type": "AdaptiveCard",  
+                   "version": "1.5",  
+                   "body": [  
+                       {  
+                           "type": "TextBlock",  
+                           "text": "Error parsing form from extension",  
+                           "wrap": true,  
+                           "style": "heading",  
+                           "size": "ExtraLarge",  
+                           "weight": "Bolder",  
+                           "color": "Attention"  
+                       },  
+                       {  
+                           "type": "TextBlock",  
+                           "wrap": true,  
+                           "text": {{serializeString(e.Message)}},  
+                           "color": "Attention"  
+                       },  
+                       {  
+                           "type": "TextBlock",  
+                           "text": {{serializeString(e.StackTrace)}},  
+                           "fontType": "Monospace"  
+                       },  
+                       {  
+                           "type": "TextBlock",  
+                           "wrap": true,  
+                           "text": "Inner exception:"  
+                       },  
+                       {  
+                           "type": "TextBlock",  
+                           "wrap": true,  
+                           "text": {{serializeString(e.InnerException?.Message)}},  
+                           "color": "Attention"  
+                       }  
+                   ]  
+                }  
+                """;
+
+            // Create the AdaptiveCard object from the JSON string
+            Card = AdaptiveCard.FromJsonString(errorCardJson);
         }
 
         UpdateProperty(nameof(Card));
@@ -102,45 +156,4 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
             });
         }
     }
-
-    private static readonly string ErrorCardJson = """
-{
-    "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
-    "type": "AdaptiveCard",
-    "version": "1.5",
-    "body": [
-        {
-            "type": "TextBlock",
-            "text": "Error parsing form from extension",
-            "wrap": true,
-            "style": "heading",
-            "size": "ExtraLarge",
-            "weight": "Bolder",
-            "color": "Attention"
-        },
-        {
-            "type": "TextBlock",
-            "wrap": true,
-            "text": "${error_message}",
-            "color": "Attention"
-        },
-        {
-            "type": "TextBlock",
-            "text": "${error_stack}",
-            "fontType": "Monospace"
-        },
-        {
-            "type": "TextBlock",
-            "wrap": true,
-            "text": "Inner exception:"
-        },
-        {
-            "type": "TextBlock",
-            "wrap": true,
-            "text": "${inner_exception}",
-            "color": "Attention"
-        }
-    ]
-}
-""";
 }

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

@@ -2,7 +2,7 @@
   <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
   <Import Project="..\..\..\Common.Dotnet.AotCompatibility.props" />
 
-  <PropertyGroup>
+	<PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -17,7 +17,6 @@
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Common" />
     <PackageReference Include="CommunityToolkit.Mvvm" />
-    <PackageReference Include="AdaptiveCards.Templating" />
     <PackageReference Include="AdaptiveCards.ObjectModel.WinUI3" GeneratePathProperty="true" />
 
     <PackageReference Include="Microsoft.Windows.CsWin32">

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/PageViewModel.cs

@@ -182,6 +182,7 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
             return; // throw?
         }
 
+        var updateProperty = true;
         switch (propertyName)
         {
             case nameof(Name):
@@ -198,9 +199,21 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
             case nameof(Icon):
                 this.Icon = new(model.Icon);
                 break;
+            default:
+                updateProperty = false;
+                break;
         }
 
-        UpdateProperty(propertyName);
+        // GH #38829: If we always UpdateProperty here, then there's a possible
+        // race condition, where we raise the PropertyChanged(SearchText)
+        // before the subclass actually retrieves the new SearchText from the
+        // model. In that race situation, if the UI thread handles the
+        // PropertyChanged before ListViewModel fetches the SearchText, it'll
+        // think that the old search text is the _new_ value.
+        if (updateProperty)
+        {
+            UpdateProperty(propertyName);
+        }
     }
 
     public new void ShowException(Exception ex, string? extensionHint = null)

src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs

@@ -6,11 +6,12 @@ using ManagedCommon;
 using Microsoft.CmdPal.Common.Helpers;
 using Microsoft.CmdPal.Common.Services;
 using Microsoft.CmdPal.Ext.Apps;
+using Microsoft.CmdPal.Ext.Indexer;
+using Microsoft.CmdPal.Ext.Shell;
+/*
 using Microsoft.CmdPal.Ext.Bookmarks;
 using Microsoft.CmdPal.Ext.Calc;
-using Microsoft.CmdPal.Ext.Indexer;
 using Microsoft.CmdPal.Ext.Registry;
-using Microsoft.CmdPal.Ext.Shell;
 using Microsoft.CmdPal.Ext.System;
 using Microsoft.CmdPal.Ext.TimeDate;
 using Microsoft.CmdPal.Ext.WebSearch;
@@ -19,6 +20,7 @@ using Microsoft.CmdPal.Ext.WindowsSettings;
 using Microsoft.CmdPal.Ext.WindowsTerminal;
 using Microsoft.CmdPal.Ext.WindowWalker;
 using Microsoft.CmdPal.Ext.WinGet;
+*/
 using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels.BuiltinCommands;
 using Microsoft.CmdPal.UI.ViewModels.Models;
@@ -110,20 +112,22 @@ public partial class App : Application
         var allApps = new AllAppsCommandProvider();
         services.AddSingleton<ICommandProvider>(allApps);
         services.AddSingleton<ICommandProvider, ShellCommandsProvider>();
-        services.AddSingleton<ICommandProvider, CalculatorCommandProvider>();
         services.AddSingleton<ICommandProvider, IndexerCommandsProvider>();
-        services.AddSingleton<ICommandProvider, BookmarksCommandProvider>();
+
+        // services.AddSingleton<ICommandProvider, CalculatorCommandProvider>();
+        // services.AddSingleton<ICommandProvider, BookmarksCommandProvider>();
 
         // TODO GH #527 re-enable the clipboard commands
         // services.AddSingleton<ICommandProvider, ClipboardHistoryCommandsProvider>();
-        services.AddSingleton<ICommandProvider, WindowWalkerCommandsProvider>();
-        services.AddSingleton<ICommandProvider, WebSearchCommandsProvider>();
+        // services.AddSingleton<ICommandProvider, WindowWalkerCommandsProvider>();
+        // services.AddSingleton<ICommandProvider, WebSearchCommandsProvider>();
 
         // GH #38440: Users might not have WinGet installed! Or they might have
         // a ridiculously old version. Or might be running as admin.
         // We shouldn't explode in the App ctor if we fail to instantiate an
         // instance of PackageManager, which will happen in the static ctor
         // for WinGetStatics
+        /*
         try
         {
             var winget = new WinGetExtensionCommandsProvider();
@@ -136,14 +140,15 @@ public partial class App : Application
             Logger.LogError("Couldn't load winget");
             Logger.LogError(ex.ToString());
         }
+        */
 
-        services.AddSingleton<ICommandProvider, WindowsTerminalCommandsProvider>();
-        services.AddSingleton<ICommandProvider, WindowsSettingsCommandsProvider>();
-        services.AddSingleton<ICommandProvider, RegistryCommandsProvider>();
-        services.AddSingleton<ICommandProvider, WindowsServicesCommandsProvider>();
-        services.AddSingleton<ICommandProvider, BuiltInsCommandProvider>();
-        services.AddSingleton<ICommandProvider, TimeDateCommandsProvider>();
-        services.AddSingleton<ICommandProvider, SystemCommandExtensionProvider>();
+        // services.AddSingleton<ICommandProvider, WindowsTerminalCommandsProvider>();
+        // services.AddSingleton<ICommandProvider, WindowsSettingsCommandsProvider>();
+        // services.AddSingleton<ICommandProvider, RegistryCommandsProvider>();
+        // services.AddSingleton<ICommandProvider, WindowsServicesCommandsProvider>();
+        // services.AddSingleton<ICommandProvider, BuiltInsCommandProvider>();
+        // services.AddSingleton<ICommandProvider, TimeDateCommandsProvider>();
+        // services.AddSingleton<ICommandProvider, SystemCommandExtensionProvider>();
 
         // Models
         services.AddSingleton<TopLevelCommandManager>();

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml

@@ -5,7 +5,6 @@
     xmlns:controls="using:Microsoft.CmdPal.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
     x:Name="ShortcutContentControl"
     mc:Ignorable="d">
     <Grid MinWidth="498" MinHeight="220">
@@ -66,11 +65,13 @@
                     IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsWarningAltGr, Mode=OneWay}"
                     Severity="Warning" />
             </Grid>
+            <!--
             <tk7controls:MarkdownTextBlock
                 x:Uid="InvalidShortcutWarningLabel"
                 Background="Transparent"
                 FontSize="12"
                 Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+            -->
         </StackPanel>
     </Grid>
 </UserControl>

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml

@@ -5,7 +5,6 @@
     xmlns:controls="using:Microsoft.CmdPal.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
     d:DesignHeight="300"
     d:DesignWidth="400"
     mc:Ignorable="d">
@@ -36,10 +35,12 @@
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ItemsControl>
+        <!--
         <tk7controls:MarkdownTextBlock
             Grid.Column="1"
             VerticalAlignment="Center"
             Background="Transparent"
             Text="{x:Bind Text}" />
+        -->
     </Grid>
 </UserControl>

src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml

@@ -12,7 +12,6 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.CmdPal.UI"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:toolkit="using:CommunityToolkit.WinUI.UI.Controls"
     xmlns:viewmodels="using:Microsoft.CmdPal.UI.ViewModels"
     Background="Transparent"
     mc:Ignorable="d">
@@ -40,7 +39,7 @@
                     <cmdPalControls:ContentFormControl ViewModel="{x:Bind}" />
                 </Grid>
             </DataTemplate>
-
+            <!--
             <DataTemplate x:Key="MarkdownContentTemplate" x:DataType="viewmodels:ContentMarkdownViewModel">
                 <Grid Margin="0,4,4,4" Padding="12,8,8,8">
                     <toolkit:MarkdownTextBlock
@@ -52,6 +51,7 @@
                         Text="{x:Bind Body, Mode=OneWay}" />
                 </Grid>
             </DataTemplate>
+            -->
 
             <DataTemplate x:Key="NestedFormContentTemplate" x:DataType="viewmodels:ContentFormViewModel">
                 <Grid>
@@ -59,6 +59,7 @@
                 </Grid>
             </DataTemplate>
 
+            <!--
             <DataTemplate x:Key="NestedMarkdownContentTemplate" x:DataType="viewmodels:ContentMarkdownViewModel">
                 <Grid>
                     <toolkit:MarkdownTextBlock
@@ -70,7 +71,8 @@
                         Text="{x:Bind Body, Mode=OneWay}" />
                 </Grid>
             </DataTemplate>
-
+            -->
+            
             <DataTemplate x:Key="TreeContentTemplate" x:DataType="viewmodels:ContentTreeViewModel">
                 <StackPanel
                     Margin="0,4,4,4"

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/GpoValueChecker.cs

@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.CmdPal.Ext.Bookmarks;
 using Microsoft.UI.Xaml.Documents;
 using Microsoft.Win32;
 

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

@@ -3,8 +3,9 @@
   <Import Project="..\..\..\CmdPalVersion.props" />
   <Import Project="CmdPal.pre.props" />
   <Import Project="CmdPal.Branding.props" />
+  <Import Project="..\..\..\Common.Dotnet.AotCompatibility.props" />
 
-  <PropertyGroup>
+	<PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Microsoft.CmdPal.UI</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -61,7 +62,7 @@
     <PackageReference Include="CommunityToolkit.WinUI.Converters" />
     <PackageReference Include="CommunityToolkit.WinUI.Animations" />
     <PackageReference Include="CommunityToolkit.WinUI.Extensions" />
-    <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" />
+<!--    <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" /> -->
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
     <PackageReference Include="Microsoft.WindowsAppSDK" />
@@ -82,7 +83,6 @@
     <!-- LOAD BEARING: GeneratePathProperty=true on BOTH the AC dependencies. Don't forget the AdaptiveCardsWorkaround below -->
     <PackageReference Include="AdaptiveCards.ObjectModel.WinUI3" GeneratePathProperty="true" />
     <PackageReference Include="AdaptiveCards.Rendering.WinUI3" GeneratePathProperty="True" />
-    <PackageReference Include="AdaptiveCards.Templating" />
     <PackageReference Include="System.Text.RegularExpressions" />
   </ItemGroup>
 
@@ -97,27 +97,26 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
+	  <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Indexer\Microsoft.CmdPal.Ext.Indexer.csproj" />
+	  <ProjectReference Include="..\Microsoft.CmdPal.UI.ViewModels\Microsoft.CmdPal.UI.ViewModels.csproj" />
+	  <ProjectReference Include="..\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj" />
+	  <ProjectReference Include="..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
+	  <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Shell\Microsoft.CmdPal.Ext.Shell.csproj" />
+	  <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj" />
+<!--
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WebSearch\Microsoft.CmdPal.Ext.WebSearch.csproj" />
-    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Indexer\Microsoft.CmdPal.Ext.Indexer.csproj" />
-    <ProjectReference Include="..\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj" />
-    <ProjectReference Include="..\Microsoft.CmdPal.UI.ViewModels\Microsoft.CmdPal.UI.ViewModels.csproj" />
-
-    <ProjectReference Include="..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
-
-    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Bookmark\Microsoft.CmdPal.Ext.Bookmarks.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Registry\Microsoft.CmdPal.Ext.Registry.csproj" />
-    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Shell\Microsoft.CmdPal.Ext.Shell.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.TimeDate\Microsoft.CmdPal.Ext.TimeDate.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowsServices\Microsoft.CmdPal.Ext.WindowsServices.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowsSettings\Microsoft.CmdPal.Ext.WindowsSettings.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowsTerminal\Microsoft.CmdPal.Ext.WindowsTerminal.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowWalker\Microsoft.CmdPal.Ext.WindowWalker.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj" />
-
+-->
     <ProjectReference Include="..\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj">
       <ReferenceOutputAssembly>True</ReferenceOutputAssembly>
       <Private>True</Private>

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

@@ -10,7 +10,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:help="using:Microsoft.CmdPal.UI.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:toolkit="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
     xmlns:ui="using:CommunityToolkit.WinUI"
     xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
     Background="Transparent"
@@ -373,7 +373,8 @@
                             TextAlignment="Center"
                             TextWrapping="WrapWholeWords"
                             Visibility="{x:Bind ViewModel.Details.Title, Converter={StaticResource StringNotEmptyToVisibilityConverter}, Mode=OneWay}" />
-
+                        
+                        <!--
                         <toolkit:MarkdownTextBlock
                             Grid.Row="2"
                             Margin="0,12,0,24"
@@ -383,7 +384,8 @@
                             Header3Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                             IsTextSelectionEnabled="True"
                             Text="{x:Bind ViewModel.Details.Body, Mode=OneWay}" />
-
+                        -->
+                        
                         <ItemsRepeater
                             Grid.Row="3"
                             ItemTemplate="{StaticResource DetailsDataTemplateSelector}"

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCache.cs

@@ -12,7 +12,7 @@ using Microsoft.CmdPal.Ext.Apps.Utils;
 
 namespace Microsoft.CmdPal.Ext.Apps;
 
-public sealed class AppCache : IDisposable
+public sealed partial class AppCache : IDisposable
 {
     private Win32ProgramFileSystemWatchers _win32ProgramRepositoryHelper;
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj

@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-  <PropertyGroup>
+  <Import Project="..\..\..\..\Common.Dotnet.AotCompatibility.props" />
+
+	<PropertyGroup>
     <RootNamespace>Microsoft.CmdPal.Ext.Apps</RootNamespace>
     <Nullable>enable</Nullable>
     <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/ReparsePoint.cs

@@ -319,7 +319,7 @@ public static class ReparsePoint
 
         public static AppExecutionAliasMetadata FromPersistedRepresentationIntPtr(IntPtr reparseDataBufferPtr, AppExecutionAliasReparseTagBufferLayoutVersion version)
         {
-            var dataOffset = Marshal.SizeOf(typeof(AppExecutionAliasReparseTagHeader));
+            var dataOffset = Marshal.SizeOf<AppExecutionAliasReparseTagHeader>();
             var dataBufferPtr = reparseDataBufferPtr + dataOffset;
 
             string? packageFullName = null;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/FileSystemWatcherWrapper.cs

@@ -8,7 +8,7 @@ using System.IO;
 namespace Microsoft.CmdPal.Ext.Apps.Storage;
 
 // File System Watcher Wrapper class which implements the IFileSystemWatcherWrapper interface
-public sealed class FileSystemWatcherWrapper : FileSystemWatcher, IFileSystemWatcherWrapper
+public sealed partial class FileSystemWatcherWrapper : FileSystemWatcher, IFileSystemWatcherWrapper
 {
     public FileSystemWatcherWrapper()
     {

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/PackageRepository.cs

@@ -15,7 +15,7 @@ namespace Microsoft.CmdPal.Ext.Apps.Storage;
 /// A repository for storing packaged applications such as UWP apps or appx packaged desktop apps.
 /// This repository will also monitor for changes to the PackageCatalog and update the repository accordingly
 /// </summary>
-internal sealed class PackageRepository : ListRepository<UWPApplication>, IProgramRepository
+internal sealed partial class PackageRepository : ListRepository<UWPApplication>, IProgramRepository
 {
     private readonly IPackageCatalog _packageCatalog;
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/Win32ProgramFileSystemWatchers.cs

@@ -9,7 +9,7 @@ using System.Linq;
 
 namespace Microsoft.CmdPal.Ext.Apps.Storage;
 
-internal sealed class Win32ProgramFileSystemWatchers : IDisposable
+internal sealed partial class Win32ProgramFileSystemWatchers : IDisposable
 {
     public string[] PathsToWatch { get; set; }
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/Win32ProgramRepository.cs

@@ -14,7 +14,7 @@ using Win32Program = Microsoft.CmdPal.Ext.Apps.Programs.Win32Program;
 
 namespace Microsoft.CmdPal.Ext.Apps.Storage;
 
-internal sealed class Win32ProgramRepository : ListRepository<Programs.Win32Program>, IProgramRepository
+internal sealed partial class Win32ProgramRepository : ListRepository<Programs.Win32Program>, IProgramRepository
 {
     private static readonly IFileSystem FileSystem = new FileSystem();
     private static readonly IPath Path = FileSystem.Path;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Microsoft.CmdPal.Ext.Indexer.csproj

@@ -1,6 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-  <PropertyGroup>
+  <Import Project="..\..\..\..\Common.Dotnet.AotCompatibility.props" />
+
+	<PropertyGroup>
     <RootNamespace>Microsoft.CmdPal.Ext.Indexer</RootNamespace>
 
     <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>
@@ -26,7 +28,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
-
   <ItemGroup>
     <None Remove="Assets\FileExplorer.svg" />
   </ItemGroup>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Microsoft.CmdPal.Ext.WinGet.csproj

@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-  <PropertyGroup>
+  <Import Project="..\..\..\..\Common.Dotnet.AotCompatibility.props" />
+
+	<PropertyGroup>
     <RootNamespace>Microsoft.CmdPal.Ext.WinGet</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <PublishProfile>win-$(Platform).pubxml</PublishProfile>

src/modules/cmdpal/ext/ProcessMonitorExtension/ProcessMonitorExtension.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-  <PropertyGroup>
+  <Import Project="..\..\..\..\Common.Dotnet.AotCompatibility.props" />
+	<PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>ProcessMonitorExtension</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>