From 46137e8d182d6eea1af95bae643507fde2577186 Mon Sep 17 00:00:00 2001
From: Karen <7976322+karkarl@users.noreply.github.com>
Date: Fri, 8 Sep 2023 17:15:16 -0700
Subject: [PATCH] WinUI Gallery 2.2.0.0 Release (#1353)

---
 .../Assets/ControlImages/Placeholder.png         | Bin 0 -> 5368 bytes
 WinUIGallery/ContentIncludes.props               |   1 +
 WinUIGallery/DataModel/ControlInfoData.json      |   4 +---
 WinUIGallery/Package.Dev.appxmanifest            |   2 +-
 WinUIGallery/Package.appxmanifest                |   2 +-
 WinUIGallery/Properties/AssemblyInfo.cs          |   4 ++--
 6 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 WinUIGallery/Assets/ControlImages/Placeholder.png

diff --git a/WinUIGallery/Assets/ControlImages/Placeholder.png b/WinUIGallery/Assets/ControlImages/Placeholder.png
new file mode 100644
index 0000000000000000000000000000000000000000..16894dac6297ac130a947599873bbac386d846ba
GIT binary patch
literal 5368
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
WIKOL*+5%Dl0000<MNUMnLSTY3T`<G|

literal 0
HcmV?d00001

diff --git a/WinUIGallery/ContentIncludes.props b/WinUIGallery/ContentIncludes.props
index c886bc462..d3e73dc0b 100644
--- a/WinUIGallery/ContentIncludes.props
+++ b/WinUIGallery/ContentIncludes.props
@@ -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" />
diff --git a/WinUIGallery/DataModel/ControlInfoData.json b/WinUIGallery/DataModel/ControlInfoData.json
index 9ea25af16..35cbadada 100644
--- a/WinUIGallery/DataModel/ControlInfoData.json
+++ b/WinUIGallery/DataModel/ControlInfoData.json
@@ -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,
@@ -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,
diff --git a/WinUIGallery/Package.Dev.appxmanifest b/WinUIGallery/Package.Dev.appxmanifest
index 376fb3ffd..8570c1bae 100644
--- a/WinUIGallery/Package.Dev.appxmanifest
+++ b/WinUIGallery/Package.Dev.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.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>
diff --git a/WinUIGallery/Package.appxmanifest b/WinUIGallery/Package.appxmanifest
index 0f54f79d7..a4b84cf71 100644
--- 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=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>
diff --git a/WinUIGallery/Properties/AssemblyInfo.cs b/WinUIGallery/Properties/AssemblyInfo.cs
index 378eef0fa..99bab15c3 100644
--- a/WinUIGallery/Properties/AssemblyInfo.cs
+++ b/WinUIGallery/Properties/AssemblyInfo.cs
@@ -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)]