Merge branch 'main' into wasdk/1.6

Author: Arlodotexe

CommunityToolkit.App.Shared/Helpers/NavigationViewHelper.cs

@@ -72,7 +72,7 @@ private static IEnumerable<GroupNavigationItemData> GenerateSubcategoryNavItems(
             {
                 Content = subcategoryGroup.Key,
                 SelectsOnInvoked = false,
-                IsExpanded = true,
+                IsExpanded = false,
                 Style = (Style)App.Current.Resources["SubcategoryNavigationViewItemStyle"],
             }, subcategoryGroup.ToArray());
         }

CommunityToolkit.App.Shared/Pages/GettingStartedPage.xaml

@@ -1,4 +1,4 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <Page x:Class="CommunityToolkit.App.Shared.Pages.GettingStartedPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -72,7 +72,7 @@
                         Orientation="Vertical"
                         Spacing="4">
                 <TextBlock FontWeight="SemiBold"
-                           Text="Version 8.0" />
+                           Text="{x:Bind AppVersion}" />
                 <TextBlock FontSize="36"
                            FontWeight="SemiBold">
                     <Run Text="Windows Community Toolkit" />

CommunityToolkit.App.Shared/Pages/GettingStartedPage.xaml.cs

@@ -3,11 +3,14 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.Tooling.SampleGen.Metadata;
+using Windows.ApplicationModel;
 
 namespace CommunityToolkit.App.Shared.Pages;
 
 public sealed partial class GettingStartedPage : Page
 {
+    public string AppVersion => $"Version {Package.Current.Id.Version.Major}.{Package.Current.Id.Version.Minor}";
+
     public GettingStartedPage()
     {
         this.InitializeComponent();

CommunityToolkit.App.Shared/Pages/SettingsPage.xaml

@@ -73,7 +73,7 @@
                     <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
                                Text="About" />
 
-                    <controls:SettingsExpander Description="© 2023. All rights reserved."
+                    <controls:SettingsExpander Description="© 2024. All rights reserved."
                                                Header="Windows Community Toolkit Gallery"
                                                IsExpanded="True">
                         <controls:SettingsExpander.HeaderIcon>
@@ -82,7 +82,7 @@
                         </controls:SettingsExpander.HeaderIcon>
                         <TextBlock win:IsTextSelectionEnabled="True"
                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                   Text="Version 8.0.0" />
+                                   Text="{x:Bind AppVersion}" />
                         <controls:SettingsExpander.Items>
                             <controls:SettingsCard HorizontalContentAlignment="Left"
                                                    ContentAlignment="Left">

CommunityToolkit.App.Shared/Pages/SettingsPage.xaml.cs

@@ -2,13 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Windows.ApplicationModel;
+
 namespace CommunityToolkit.App.Shared.Pages
 {
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
     public sealed partial class SettingsPage : Page
     {
+        public string AppVersion => $"Version {Package.Current.Id.Version.Major}.{Package.Current.Id.Version.Minor}.{Package.Current.Id.Version.Build}";
+
         public SettingsPage()
         {
             this.InitializeComponent();

CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs

@@ -154,7 +154,7 @@ private static async Task<string> GetDocumentationFileContents(ToolkitFrontMatte
         // TODO: https://github.com/CommunityToolkit/Labs-Windows/issues/142
         // MSBuild uses wildcard to find the files, and the wildcards decide where they end up
         // Single experiments use relative paths, the allExperiment head uses absolute paths that grab from all experiments
-        // The wildcard captures decide the paths. This discrepency is accounted for manually.
+        // The wildcard captures decide the paths. This discrepancy is accounted for manually.
         // Logic here is the exact same that MSBuild uses to find and include the files we need.
         var assemblyName = typeof(ToolkitSampleRenderer).Assembly.GetName().Name;
         if (string.IsNullOrWhiteSpace(assemblyName))
@@ -178,9 +178,9 @@ private static async Task<string> GetDocumentationFileContents(ToolkitFrontMatte
             var textContents = await FileIO.ReadTextAsync(file);
 
             // Remove YAML - need to use array overload as single string not supported on .NET Standard 2.0
-            var blocks = textContents.Split(new[] { "---" }, StringSplitOptions.RemoveEmptyEntries);
+            var blocks = textContents.Split(new[] { "---" }, 2, StringSplitOptions.RemoveEmptyEntries);
 
-            return blocks.LastOrDefault() ?? "Couldn't find content after YAML Front Matter removal.";
+            return blocks.LastOrDefault()?.Replace("<br>", " ") ?? "Couldn't find content after YAML Front Matter removal.";
         }
         catch (Exception e)
         {

ProjectHeads/AllComponents/WinAppSdk/Package.appxmanifest

@@ -31,7 +31,7 @@
       Executable="$targetnametoken$.exe"
       EntryPoint="$targetentrypoint$">
       <uap:VisualElements
-        DisplayName="CommunityToolkit Sample App"
+        DisplayName="Windows Community Toolkit Gallery"
         Square150x150Logo="Assets\MedTile.png"
         Square44x44Logo="Assets\AppList.png"
         Description="CommunityToolkit Samples"
@@ -50,5 +50,6 @@
   <Capabilities>
     <rescap:Capability Name="runFullTrust" />
     <Capability Name="internetClient" />
+    <DeviceCapability Name="webcam"/>
   </Capabilities>
 </Package>

ProjectHeads/Head.Uwp.props

@@ -128,7 +128,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14"/>
-        <PackageReference Include="PolySharp" Version="1.13.1">
+        <PackageReference Include="PolySharp" Version="1.14.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>