Skip to content

Switch to 2.0.1 stable, bump Gallery version, fix build error #2165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Marcel W. (marcelwgn) merged 1 commit into from
Apr 30, 2026
Merged

Switch to 2.0.1 stable, bump Gallery version, fix build error #2165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WinUIGallery/Package.Dev.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" 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.Debug" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="2.8.0.0" />
<Identity Name="Microsoft.WinUI3ControlsGallery.Debug" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="2.9.0.0" />
<mp:PhoneIdentity PhoneProductId="863667e0-667a-4bb4-ac52-c59656c7333a" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>WinUI 3 Gallery Dev</DisplayName>
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Package.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" 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.8.0.0" />
<Identity Name="Microsoft.WinUI3ControlsGallery" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="2.9.0.0" />
<mp:PhoneIdentity PhoneProductId="863667e0-667a-4bb4-ac52-c59656c7333a" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>WinUI 3 Gallery</DisplayName>
Expand Down
3 changes: 2 additions & 1 deletion WinUIGallery/Samples/ControlPages/Design/IconographyPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
xmlns:helpers="using:WinUIGallery.Helpers"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:models="using:WinUIGallery.Models"
xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
helpers:PageScrollBehaviorHelper.SuppressHostScrolling="True"
mc:Ignorable="d">

Expand Down Expand Up @@ -238,7 +239,7 @@
ItemsSource="{x:Bind SelectedItem.Tags, Mode=OneWay}"
SelectionMode="None">
<ItemsView.Layout>
<FlowLayout LineSpacing="4" MinItemSpacing="4" />
<toolkit:WrapLayout HorizontalSpacing="4" VerticalSpacing="4" />
</ItemsView.Layout>
<ItemsView.ItemTemplate>
<DataTemplate x:DataType="x:String">
Expand Down
3 changes: 2 additions & 1 deletion WinUIGallery/Samples/ControlPages/Design/IconographyPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using CommunityToolkit.WinUI.Controls;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using System;
Expand Down Expand Up @@ -159,7 +160,7 @@ private void IconsItemsView_SelectionChanged(ItemsView sender, ItemsViewSelectio

if (TagsItemsView != null)
{
TagsItemsView.Layout = new FlowLayout { LineSpacing = 4, MinItemSpacing = 4 };
TagsItemsView.Layout = new WrapLayout { VerticalSpacing = 4, HorizontalSpacing = 4 };
}
}

Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/WinUIGallery.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@

<!-- App Version and Assembly Info -->
<PropertyGroup>
<Version>2.8.0.0</Version>
<Version>2.9.0.0</Version>
<AssemblyTitle>WinUIGallery</AssemblyTitle>
<AssemblyProduct>WinUIGallery</AssemblyProduct>
<AssemblyCopyright>Copyright © Microsoft Corporation. All rights reserved.</AssemblyCopyright>
Expand Down
2 changes: 1 addition & 1 deletion standalone.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<!-- The NuGet versions of dependencies to build against. -->
<WindowsSdkPackageVersion>10.0.22621.42</WindowsSdkPackageVersion>
<WindowsAppSdkPackageVersion>2.0.0-experimental7</WindowsAppSdkPackageVersion>
<WindowsAppSdkPackageVersion>2.0.1</WindowsAppSdkPackageVersion>
<MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
<GraphicsWin2DVersion>1.4.0</GraphicsWin2DVersion>
<ColorCodeVersion>2.0.15</ColorCodeVersion>
Expand Down