Skip to content
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

Jump to bottom

WinUI Gallery 2.2.0.0 Release #1353

Merged
merged 3 commits into from
Sep 9, 2023
Merged

WinUI Gallery 2.2.0.0 Release #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e35a33e
replace icon with placeholder
karkarl Sep 7, 2023
e47a5c6
update version info
karkarl Sep 7, 2023
62357f3
update version info
karkarl Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added WinUIGallery/Assets/ControlImages/Placeholder.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions WinUIGallery/ContentIncludes.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
<Content Include="Assets\ControlImages\PersonPicture.png" />
<Content Include="Assets\ControlImages\PipsPager.png" />
<Content Include="Assets\ControlImages\Pivot.png" />
<Content Include="Assets\ControlImages\Placeholder.png" />
<Content Include="Assets\ControlImages\ProgressBar.png" />
<Content Include="Assets\ControlImages\ProgressRing.png" />
<Content Include="Assets\ControlImages\PullToRefresh.png" />
Expand Down
4 changes: 1 addition & 3 deletions WinUIGallery/DataModel/ControlInfoData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,6 @@
"ApiNamespace": "Microsoft.UI.Xaml.Controls",
"Subtitle": "A control that presents a collection of items using various layouts.",
"ImagePath": "ms-appx:///Assets/ControlImages/ItemsView.png",
"ImageIconPath": "ms-appx:///Assets/ControlIcons/ItemsViewIcon.png",
"Description": "The ItemsView lets you show a collection of items using scrollable & swappable layouts.",
"Content": "<p><b>ItemsView</b> can contain a collection of items of any type. To populate the view, set the <b>ItemsSource</b> property to a data source.</p><p>Set a <b>Layout</b> to define how the items are laid out.</p><p>Set an <b>ItemTemplate</b> to define the look of individual items.</p><p>Look at the <i>ItemsViewPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
"IsNew": true,
Expand Down Expand Up @@ -1428,8 +1427,7 @@
"Title": "AnnotatedScrollBar",
"ApiNamespace": "Microsoft.UI.Xaml.Controls",
"Subtitle": "A control that extends a regular vertical scrollbar's functionality for an easy navigation through large collections.",
"ImagePath": "ms-appx:///Assets/ControlImages/AnnotatedScrollBar.png",
"ImageIconPath": "ms-appx:///Assets/ControlIcons/AnnotatedScrollBarIcon.png",
"ImagePath": "ms-appx:///Assets/ControlImages/Placeholder.png",
"Description": "The AnnotatedScrollBar lets you navigate through a large collection of items via a clickable rail with labels which act as markers.",
"Content": "<p><b>AnnotatedScrollBar</b> can be connected to a scrollable container, like a ScrollView, via its <b>ScrollController</b> property.</p><p>Populate the <b>Labels</b> property with special values that act as markers.</p><p>Set the <b>LabelTemplate</b> and <b>DetailLabelTemplate</b> data templates to define the labels' and more granular tooltips' looks.</p><p>Look at the <i>AnnotatedScrollBarPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
"IsNew": true,
Expand Down
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
Expand Up @@ -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.Debug" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="2.1.0.0" />
<Identity Name="Microsoft.WinUI3ControlsGallery.Debug" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="2.2.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
Expand Up @@ -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=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" 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>
Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
// Note: package version and assembly version must be kept in sync
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]
[assembly: AssemblyVersion("2.2.0.0")]
[assembly: AssemblyFileVersion("2.2.0.0")]
[assembly: ComVisible(false)]