Revert pull request #1339 due to WinUI 2.7 dependency breaking wappro…

…j builds
microsoft · Sep 1, 2023 · 029471c · 029471c
1 parent 6f8ba6a
commit 029471c
Show file tree

Hide file tree

Showing 11 changed files with 113 additions and 100 deletions.
diff --git a/WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml b/WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml
@@ -19,7 +19,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:AppUIBasics"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     mc:Ignorable="d">
 
     <Page.Resources>
@@ -109,23 +109,24 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TextBlock Text="With the release of Windows 11, Segoe Fluent Icons is the recommended icon font." />
-        <toolkit:SettingsExpander
-            Grid.Row="1"
-            Header="Instructions on how to use Segoe Fluent Icons"
-            IsExpanded="False">
-            <toolkit:SettingsExpander.Items>
-                <toolkit:SettingsCard Padding="16,8" ContentAlignment="Left">
+        <TextBlock Text="With the release of Windows 11, Segoe Fluent Icons is the recommended icon font."/>
+        <labs:SettingsExpander Grid.Row="1"
+                  IsExpanded="False"
+                  Header="Instructions on how to use Segoe Fluent Icons">
+            <labs:SettingsExpander.Items>
+                <labs:SettingsCard ContentAlignment="Left" Padding="16,8">
                     <RichTextBlock TextWrapping="Wrap">
                         <Paragraph FontWeight="SemiBold">
                             How to get the font
                         </Paragraph>
                         <Paragraph>
                             On Windows 11: There's nothing you need to do, the font comes with Windows.<LineBreak />
-                            On Windows 10: Segoe Fluent Icons is not included by default on Windows 10. You can download it <Hyperlink NavigateUri="https://learn.microsoft.com/windows/apps/design/downloads/#fonts">here</Hyperlink>                            .</Paragraph>
+                            On Windows 10: Segoe Fluent Icons is not included by default on Windows 10. You can download it
+                            <Hyperlink NavigateUri="https://learn.microsoft.com/windows/apps/design/downloads/#fonts">here</Hyperlink>.
+                        </Paragraph>
                     </RichTextBlock>
-                </toolkit:SettingsCard>
-                <toolkit:SettingsCard Padding="16,8" ContentAlignment="Left">
+                </labs:SettingsCard>
+                <labs:SettingsCard ContentAlignment="Left" Padding="16,8">
                     <StackPanel Orientation="Vertical" Spacing="8">
                         <RichTextBlock TextWrapping="Wrap">
                             <Paragraph FontWeight="SemiBold">
@@ -134,38 +135,43 @@
                             <Paragraph>
                                 If you don't specify a FontFamily,
                                 or you specify a FontFamily that is not available on the system at runtime,
-                                the <Hyperlink NavigateUri="https://learn.microsoft.com/uwp/api/windows.ui.xaml.controls.fonticon">FontIcon</Hyperlink> falls back to the default font family defined by the SymbolThemeFontFamily resource.</Paragraph>
+                                the <Hyperlink NavigateUri="https://learn.microsoft.com/uwp/api/windows.ui.xaml.controls.fonticon">FontIcon</Hyperlink> falls back to the default font family defined by the SymbolThemeFontFamily resource.
+                            </Paragraph>
                             <Paragraph>
                                 An icon with a 16-epx font size is the equivalent of a 16x16-epx icon, to make sizing and positioning more predictable.
                                 For optimal appearance, use these specific sizes: 16, 20, 24, 32, 40, 48, and 64. Deviating from these font sizes could lead to less crisp or blurry outcomes.
                             </Paragraph>
                             <Paragraph>
-                                All glyphs in Segoe Fluent Icons have the same fixed width with a consistent height and left origin point, so <Hyperlink NavigateUri="https://learn.microsoft.com/windows/apps/design/style/segoe-fluent-icons-font#layering-and-mirroring">layering</Hyperlink> and colorization effects can be achieved by drawing glyphs directly on top of each other.</Paragraph>
+                                All glyphs in Segoe Fluent Icons have the same fixed width with a consistent height and left origin point, so
+                                <Hyperlink NavigateUri="https://learn.microsoft.com/windows/apps/design/style/segoe-fluent-icons-font#layering-and-mirroring">layering</Hyperlink> and colorization effects can be achieved by drawing glyphs directly on top of each other.
+                            </Paragraph>
                         </RichTextBlock>
-                        <controls:SampleCodePresenter CodeSourceFile="Icons/FontIconSample2_xaml.txt" SampleType="XAML" />
+                        <controls:SampleCodePresenter
+                            SampleType="XAML"
+                            CodeSourceFile="Icons/FontIconSample2_xaml.txt">
+                        </controls:SampleCodePresenter>
                     </StackPanel>
-                </toolkit:SettingsCard>
-            </toolkit:SettingsExpander.Items>
-        </toolkit:SettingsExpander>
+                </labs:SettingsCard>
+            </labs:SettingsExpander.Items>
+        </labs:SettingsExpander>
 
-        <StackPanel
-            Grid.Row="2"
-            Margin="0,24,0,0"
-            Spacing="8">
-            <TextBlock Style="{ThemeResource BodyStrongTextBlockStyle}" Text="Fluent Icons Library" />
+        <StackPanel Grid.Row="2" Spacing="8" Margin="0,24,0,0">
+            <TextBlock
+            Style="{ThemeResource BodyStrongTextBlockStyle}"
+            Text="Fluent Icons Library" />
             <AutoSuggestBox
-                MinWidth="304"
-                MaxWidth="320"
-                HorizontalAlignment="Left"
-                PlaceholderText="Search icons"
-                QueryIcon="Find"
-                TextChanged="SearchTextBox_TextChanged" />
+            MinWidth="304"
+            MaxWidth="320"
+            HorizontalAlignment="Left"
+            PlaceholderText="Search icons"
+            QueryIcon="Find"
+            TextChanged="SearchTextBox_TextChanged" />
         </StackPanel>
 
         <controls1:SampleThemeListener
-            Grid.Row="3"
-            MaxHeight="600"
-            VerticalAlignment="Top">
+                Grid.Row="3"
+                MaxHeight="600"
+                VerticalAlignment="Top">
             <Grid
                 Background="{ThemeResource ControlExampleDisplayBrush}"
                 BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"

diff --git a/WinUIGallery/Controls/HomePageHeaderImage.xaml b/WinUIGallery/Controls/HomePageHeaderImage.xaml
@@ -7,7 +7,7 @@
     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:toolkit="using:CommunityToolkit.WinUI"
+    xmlns:toolkit="using:CommunityToolkit.WinUI.UI"
     Loaded="OnLoaded"
     Loading="OnLoading"
     Unloaded="OnUnloaded"

diff --git a/WinUIGallery/Controls/HomePageHeaderImage.xaml.cs b/WinUIGallery/Controls/HomePageHeaderImage.xaml.cs
@@ -9,10 +9,10 @@
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.UI.Composition;
 using Microsoft.UI;
-using CommunityToolkit.WinUI.Animations;
+using CommunityToolkit.WinUI.UI.Animations;
 using Windows.UI;
 using System;
-using CommunityToolkit.WinUI;
+using CommunityToolkit.WinUI.UI;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

diff --git a/WinUIGallery/Controls/PageHeader.xaml b/WinUIGallery/Controls/PageHeader.xaml
@@ -6,7 +6,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:WinUIGallery.DesktopWap.Controls.CopyButton"
-    xmlns:converters="using:CommunityToolkit.WinUI.Converters"
+    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:data="using:AppUIBasics.Data"
     xmlns:local="using:WinUIGallery.DesktopWap.Controls"
@@ -30,6 +30,7 @@
             Style="{StaticResource TitleTextBlockStyle}"
             Text="{x:Bind Item.Title}"
             AutomationProperties.AutomationId="PageHeader"
+            AutomationProperties.HeadingLevel="Level1"
             TextTrimming="CharacterEllipsis"
             TextWrapping="NoWrap" />
         <TextBlock

diff --git a/WinUIGallery/ItemPage.xaml b/WinUIGallery/ItemPage.xaml
@@ -14,7 +14,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:WinUIGallery.DesktopWap.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.Converters"
+    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     x:Name="pageRoot"

diff --git a/WinUIGallery/Package.appxmanifest b/WinUIGallery/Package.appxmanifest
@@ -7,7 +7,7 @@
     xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
     IgnorableNamespaces="uap mp uap3">
   <!--Note: package version and assembly version must be kept in sync-->
-  <Identity Name="Microsoft.WinUI3ControlsGallery" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="2.1.0.0" />
+  <Identity Name="Microsoft.WinUI3ControlsGallery" Publisher="CN=WinUI-Gallery-Test" Version="2.2.0.0" />
   <mp:PhoneIdentity PhoneProductId="863667e0-667a-4bb4-ac52-c59656c7333a" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>WinUI 3 Gallery</DisplayName>

diff --git a/WinUIGallery/Properties/launchSettings.json b/WinUIGallery/Properties/launchSettings.json
@@ -6,7 +6,8 @@
     },
     "WinUIGallery Unpackaged": {
       "commandName": "Project",
-      "nativeDebugging": true
+      "nativeDebugging": true,
+      "remoteDebugEnabled": true
     }
   }
 }