Merge branch 'main' into yuleng/aot/build

Merge branch 'leilzh/loggeraot' into yuleng/aot/build
merge main
2025-12-29 16:36:40 +01:00 · 2025-07-01 17:08:31 +08:00 · 2025-07-01 15:06:33 +08:00 · 2025-07-01 14:48:22 +08:00 · 2025-07-01 14:28:05 +08:00 · 2025-07-01 14:28:01 +08:00
8 changed files with 49 additions and 29 deletions
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -21,7 +21,8 @@
    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
    <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
    <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
-    <PackageVersion Include="ControlzEx" Version="6.0.0" />
+	<PackageVersion Include="MarkdownTextBlock" Version="0.0.1" />
+	<PackageVersion Include="ControlzEx" Version="6.0.0" />
    <PackageVersion Include="HelixToolkit" Version="2.24.0" />
    <PackageVersion Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
    <PackageVersion Include="hyjiacan.pinyin4net" Version="4.1.1" />
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
@@ -5,7 +5,7 @@
    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"
+    xmlns:labToolkit="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
    x:Name="ShortcutContentControl"
    mc:Ignorable="d">
    <Grid MinWidth="498" MinHeight="220">
@@ -66,7 +66,7 @@
                    IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsWarningAltGr, Mode=OneWay}"
                    Severity="Warning" />
            </Grid>
-            <tk7controls:MarkdownTextBlock
+            <labToolkit:MarkdownTextBlock
                x:Uid="InvalidShortcutWarningLabel"
                Background="Transparent"
                FontSize="12"
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
@@ -5,7 +5,7 @@
    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"
+    xmlns:labToolkit="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
    d:DesignHeight="300"
    d:DesignWidth="400"
    mc:Ignorable="d">
@@ -36,7 +36,7 @@
                </DataTemplate>
            </ItemsControl.ItemTemplate>
        </ItemsControl>
-        <tk7controls:MarkdownTextBlock
+        <labToolkit:MarkdownTextBlock
            Grid.Column="1"
            VerticalAlignment="Center"
            Background="Transparent"
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml
@@ -12,13 +12,21 @@
    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:toolkit="using:CommunityToolkit.WinUI.Controls"
+    xmlns:labToolkit="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
    xmlns:viewmodels="using:Microsoft.CmdPal.UI.ViewModels"
+    xmlns:markdownTextBlockRns="using:CommunityToolkit.WinUI.Controls.MarkdownTextBlockRns"
    Background="Transparent"
    mc:Ignorable="d">

    <Page.Resources>
        <ResourceDictionary>
+            <markdownTextBlockRns:MarkdownThemes
+                x:Key="DefaultMarkdownThemeConfig"
+                H3FontSize="12"
+                H3FontWeight="Normal" />
+            <labToolkit:MarkdownConfig x:Key="DefaultMarkdownConfig" Themes="{StaticResource DefaultMarkdownThemeConfig}" />
+
            <StackLayout
                x:Name="VerticalStackLayout"
                Orientation="Vertical"
@@ -43,16 +51,12 @@

            <DataTemplate x:Key="MarkdownContentTemplate" x:DataType="viewmodels:ContentMarkdownViewModel">
                <Grid Margin="0,4,4,4" Padding="12,8,8,8">
-                    <toolkit:MarkdownTextBlock
+                    <labToolkit:MarkdownTextBlock
                        Background="Transparent"
-                        Header3FontSize="12"
-                        Header3FontWeight="Normal"
-                        Header3Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        IsTextSelectionEnabled="True"
+                        Config="{StaticResource DefaultMarkdownConfig}"
                        Text="{x:Bind Body, Mode=OneWay}" />
                </Grid>
            </DataTemplate>
-
            <DataTemplate x:Key="NestedFormContentTemplate" x:DataType="viewmodels:ContentFormViewModel">
                <Grid>
                    <cmdPalControls:ContentFormControl ViewModel="{x:Bind}" />
@@ -61,12 +65,9 @@

            <DataTemplate x:Key="NestedMarkdownContentTemplate" x:DataType="viewmodels:ContentMarkdownViewModel">
                <Grid>
-                    <toolkit:MarkdownTextBlock
+                    <labToolkit:MarkdownTextBlock
                        Background="Transparent"
-                        Header3FontSize="12"
-                        Header3FontWeight="Normal"
-                        Header3Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        IsTextSelectionEnabled="True"
+                        Config="{StaticResource DefaultMarkdownConfig}"
                        Text="{x:Bind Body, Mode=OneWay}" />
                </Grid>
            </DataTemplate>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
@@ -23,9 +23,23 @@
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(CIBuild)'=='true'">
+    <PropertyGroup>
+	    <SelfContained>true</SelfContained>
+	    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+	    <PublishTrimmed>true</PublishTrimmed>
+	    <PublishSingleFile>false</PublishSingleFile>
+	    <DisableRuntimeMarshalling>false</DisableRuntimeMarshalling>
+	    <PublishAot>true</PublishAot>
+	    <EnableMsixTooling>true</EnableMsixTooling>
+    </PropertyGroup>	
+
+  <!--<PropertyGroup Condition="'$(CIBuild)'=='true'">
    <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
-  </PropertyGroup>
+  </PropertyGroup>-->
+
+<PropertyGroup>
+	<GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
+</PropertyGroup>

  <PropertyGroup>
    <!-- This lets us actually reference types from Microsoft.Terminal.UI -->
@@ -71,7 +85,8 @@
    <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="MarkdownTextBlock" />
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt
@@ -20,7 +20,6 @@ SetActiveWindow
 MonitorFromWindow
 GetMonitorInfo
 GetDpiForMonitor
-CoAllowSetForegroundWindow
 WM_HOTKEY
 WM_NCLBUTTONDBLCLK

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml
@@ -9,9 +9,11 @@
    xmlns:cpcontrols="using:Microsoft.CmdPal.UI.Controls"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:help="using:Microsoft.CmdPal.UI.Helpers"
+    xmlns:labToolkit="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
+    xmlns:markdownTextBlockRns="using:CommunityToolkit.WinUI.Controls.MarkdownTextBlockRns"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:toolkit="using:CommunityToolkit.WinUI.UI.Controls"
    xmlns:ui="using:CommunityToolkit.WinUI"
+    xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
    xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
    Background="Transparent"
    mc:Ignorable="d">
@@ -144,6 +146,11 @@
                    </ItemsControl>
                </StackPanel>
            </DataTemplate>
+            <markdownTextBlockRns:MarkdownThemes
+                x:Key="DefaultMarkdownThemeConfig"
+                H3FontSize="12"
+                H3FontWeight="Normal" />
+            <labToolkit:MarkdownConfig x:Key="DefaultMarkdownConfig" Themes="{StaticResource DefaultMarkdownThemeConfig}" />
        </ResourceDictionary>
    </Page.Resources>

@@ -408,14 +415,11 @@
                            TextWrapping="WrapWholeWords"
                            Visibility="{x:Bind ViewModel.Details.Title, Converter={StaticResource StringNotEmptyToVisibilityConverter}, Mode=OneWay}" />

-                        <toolkit:MarkdownTextBlock
+                        <labToolkit:MarkdownTextBlock
                            Grid.Row="2"
                            Margin="0,12,0,24"
                            Background="Transparent"
-                            Header3FontSize="12"
-                            Header3FontWeight="Normal"
-                            Header3Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                            IsTextSelectionEnabled="True"
+                            Config="{StaticResource DefaultMarkdownConfig}"
                            Text="{x:Bind ViewModel.Details.Body, Mode=OneWay}" />

                        <ItemsRepeater
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-x64.pubxml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-x64.pubxml
@@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <PublishSingleFile>False</PublishSingleFile>
    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-    <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed>
-    <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">False</PublishTrimmed>
+    <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">True</PublishTrimmed>
+    <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
  </PropertyGroup>
 </Project>
Author	SHA1	Message	Date
Yu Leng (from Dev Box)	af9d0aa8c6	Merge branch 'main' into yuleng/aot/build	2025-07-01 17:08:31 +08:00
Yu Leng (from Dev Box)	c31912a60e	Merge branch 'leilzh/loggeraot' into yuleng/aot/build	2025-07-01 15:06:33 +08:00
Yu Leng (from Dev Box)	43a539ba1d	merge main	2025-07-01 14:48:22 +08:00
Yu Leng (from Dev Box)	f7678e3606	merge main	2025-07-01 14:28:05 +08:00
Yu Leng (from Dev Box)	098d60ea2a	merge main	2025-07-01 14:28:01 +08:00
Leilei Zhang	6f829144be	Merge branch 'main' of https://github.com/microsoft/PowerToys into leilzh/loggeraot	2025-07-01 10:53:59 +08:00
Leilei Zhang	140d264eed	remove unused	2025-06-20 14:55:18 +08:00
Leilei Zhang	c56689cdc0	make logger aot compatiable	2025-06-20 14:32:40 +08:00