Revert "[CmdPal][AOT] Replace CommunityToolkit.MarkdownTextBlock with CommunityToolkit.Lab.MarkdownTextBlock (#39974)"

This reverts commit 7d257cf00c.

.github/actions/spell-check/expect.txt

@@ -1385,7 +1385,6 @@ riid
 ringbuffer
 RKey
 RNumber
-Rns
 rop
 ROUNDSMALL
 ROWSETEXT

.pipelines/versionAndSignCheck.ps1

@@ -28,6 +28,8 @@ $versionExceptions = @(
     "ObjectModelCsProjection.dll",
     "RendererCsProjection.dll") -join '|';
 $nullVersionExceptions = @(
+    "SkiaSharp.Views.WinUI.Native.dll",
+    "libSkiaSharp.dll",
     "codicon.ttf",
     "e_sqlite3.dll",
     "getfilesiginforedist.dll",

Directory.Packages.props

@@ -20,7 +20,6 @@
     <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="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.250513-build.2126" />
     <PackageVersion Include="ControlzEx" Version="6.0.0" />
     <PackageVersion Include="HelixToolkit" Version="2.24.0" />
     <PackageVersion Include="HelixToolkit.Core.Wpf" Version="2.24.0" />

NOTICE.md

@@ -1497,7 +1497,6 @@ SOFTWARE.
 - Appium.WebDriver 4.4.5
 - Azure.AI.OpenAI 1.0.0-beta.17
 - CommunityToolkit.Common 8.4.0
-- CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock 0.1.250513-build.2126
 - CommunityToolkit.Mvvm 8.4.0
 - CommunityToolkit.WinUI.Animations 8.2.250402
 - CommunityToolkit.WinUI.Collections 8.2.250402

nuget.config

@@ -3,14 +3,10 @@
 	<packageSources>
 		<clear />
 		<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-		<add key="lab" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" />
 	</packageSources>
 	<packageSourceMapping>
 		<packageSource key="nuget.org">
 			<package pattern="*" />
 		</packageSource>
-		<packageSource key="lab">
-			<package pattern="CommunityToolkit.Labs.*" />
-		</packageSource>
 	</packageSourceMapping>
 </configuration>

src/common/CalculatorEngineCommon/CalculatorEngineCommon.rc

@@ -0,0 +1,36 @@
+#include <windows.h>
+#include "resource.h"
+#include "../version/version.h"
+
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN 
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END

src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj

@@ -98,6 +98,11 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\version\version.vcxproj">
+      <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ExprtkEvaluator.h" />
     <ClInclude Include="pch.h" />
@@ -105,6 +110,7 @@
     <ClInclude Include="Calculator.h">
       <DependentUpon>Calculator.idl</DependentUpon>
     </ClInclude>
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ExprtkEvaluator.cpp">
@@ -128,6 +134,9 @@
   <ItemGroup>
     <None Include="PropertySheet.props" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="CalculatorEngineCommon.rc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="..\..\..\deps\spdlog.props" />
   <ImportGroup Label="ExtensionTargets">

src/common/CalculatorEngineCommon/resource.h

@@ -0,0 +1,13 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by CalculatorEngineCommon.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "CalculatorEngineCommon"
+#define INTERNAL_NAME "CalculatorEngineCommon"
+#define ORIGINAL_FILENAME "CalculatorEngineCommon.dll"
+
+// Non-localizable
+//////////////////////////////

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.Labs.WinUI.MarkdownTextBlock"
+    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
     x:Name="ShortcutContentControl"
     mc:Ignorable="d">
     <Grid MinWidth="498" MinHeight="220">

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.Labs.WinUI.MarkdownTextBlock"
+    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
     d:DesignHeight="300"
     d:DesignWidth="400"
     mc:Ignorable="d">

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

@@ -11,21 +11,14 @@
     xmlns:converters="using:CommunityToolkit.WinUI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.CmdPal.UI"
-    xmlns:markdownTextBlockRns="using:CommunityToolkit.WinUI.Controls.MarkdownTextBlockRns"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:toolkit="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
+    xmlns:toolkit="using:CommunityToolkit.WinUI.UI.Controls"
     xmlns:viewmodels="using:Microsoft.CmdPal.UI.ViewModels"
     Background="Transparent"
     mc:Ignorable="d">
 
     <Page.Resources>
         <ResourceDictionary>
-            <markdownTextBlockRns:MarkdownThemes
-                x:Key="DefaultMarkdownThemeConfig"
-                H3FontSize="12"
-                H3FontWeight="Normal" />
-            <toolkit:MarkdownConfig x:Key="DefaultMarkdownConfig" Themes="{StaticResource DefaultMarkdownThemeConfig}" />
-
             <StackLayout
                 x:Name="VerticalStackLayout"
                 Orientation="Vertical"
@@ -52,7 +45,10 @@
                 <Grid Margin="0,4,4,4" Padding="12,8,8,8">
                     <toolkit:MarkdownTextBlock
                         Background="Transparent"
-                        Config="{StaticResource DefaultMarkdownConfig}"
+                        Header3FontSize="12"
+                        Header3FontWeight="Normal"
+                        Header3Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        IsTextSelectionEnabled="True"
                         Text="{x:Bind Body, Mode=OneWay}" />
                 </Grid>
             </DataTemplate>
@@ -67,7 +63,10 @@
                 <Grid>
                     <toolkit:MarkdownTextBlock
                         Background="Transparent"
-                        Config="{StaticResource DefaultMarkdownConfig}"
+                        Header3FontSize="12"
+                        Header3FontWeight="Normal"
+                        Header3Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        IsTextSelectionEnabled="True"
                         Text="{x:Bind Body, Mode=OneWay}" />
                 </Grid>
             </DataTemplate>

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

@@ -71,8 +71,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.Labs.WinUI.Controls.MarkdownTextBlock" />
+    <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
     <PackageReference Include="Microsoft.WindowsAppSDK" />

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

@@ -9,10 +9,8 @@
     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.Controls"
+    xmlns:toolkit="using:CommunityToolkit.WinUI.UI.Controls"
     xmlns:ui="using:CommunityToolkit.WinUI"
     xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
     Background="Transparent"
@@ -146,11 +144,6 @@
                     </ItemsControl>
                 </StackPanel>
             </DataTemplate>
-            <markdownTextBlockRns:MarkdownThemes
-                x:Key="DefaultMarkdownThemeConfig"
-                H3FontSize="12"
-                H3FontWeight="Normal" />
-            <labToolkit:MarkdownConfig x:Key="DefaultMarkdownConfig" Themes="{StaticResource DefaultMarkdownThemeConfig}" />
         </ResourceDictionary>
     </Page.Resources>
 
@@ -415,11 +408,14 @@
                             TextWrapping="WrapWholeWords"
                             Visibility="{x:Bind ViewModel.Details.Title, Converter={StaticResource StringNotEmptyToVisibilityConverter}, Mode=OneWay}" />
 
-                        <labToolkit:MarkdownTextBlock
+                        <toolkit:MarkdownTextBlock
                             Grid.Row="2"
                             Margin="0,12,0,24"
                             Background="Transparent"
-                            Config="{StaticResource DefaultMarkdownConfig}"
+                            Header3FontSize="12"
+                            Header3FontWeight="Normal"
+                            Header3Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            IsTextSelectionEnabled="True"
                             Text="{x:Bind ViewModel.Details.Body, Mode=OneWay}" />
 
                         <ItemsRepeater