From a3445d81699ba610e525e9f32599c10e2cbf627b Mon Sep 17 00:00:00 2001
From: Pratik Anand <praanan@microsoft.com>
Date: Wed, 20 Sep 2023 16:15:20 -0700
Subject: [PATCH 1/6] merged after spacing issues with DesktopWap wappproj.
 Rest of changes are titlebar sample page

---
 WinUIGallery/ControlPages/TitleBarPage.xaml   |  53 ++++-
 .../ControlPages/TitleBarPage.xaml.cs         |  94 +++++++-
 .../Window/TitleBar/TitleBarSample2.txt       |   4 +-
 .../Window/TitleBar/TitleBarSample3.txt       |  10 +
 WinUIGallery/DataModel/ControlInfoData.json   |   2 +-
 WinUIGallery/Helper/TitleBarHelper.cs         |  24 +-
 WinUIGallery/Helper/WindowHelper.cs           |  15 ++
 .../Navigation/NavigationRootPage.xaml        |   1 +
 .../WinUIGallery.DesktopWap.Package.wapproj   | 208 +++++++++---------
 9 files changed, 267 insertions(+), 144 deletions(-)
 create mode 100644 WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt

diff --git a/WinUIGallery/ControlPages/TitleBarPage.xaml b/WinUIGallery/ControlPages/TitleBarPage.xaml
index 4a090fa0b..aef25d2de 100644
--- a/WinUIGallery/ControlPages/TitleBarPage.xaml
+++ b/WinUIGallery/ControlPages/TitleBarPage.xaml
@@ -26,13 +26,35 @@
     </Page.Resources>
 
     <StackPanel>
+        <local:ControlExample HeaderText="Default titlebar (when no user defined titlebar is set)"
+                              CSharpSource="Window\TitleBar\TitleBarSample2.txt">
+            <local:ControlExample.Example>
+                <StackPanel Orientation="Vertical" Spacing="10">
+                    <TextBlock TextWrapping="WrapWholeWords">
+                        WinUI provides a default titlebar in case where user doesn't explicit provides a uielement for setting the titlebar. The system titlebar (Windows provided titlebar) disappears and client area content is extended to non client area.
+                        In this default case, entire non client region (titlebar region) get system titlebar behaviors like drag regions, system menu on context click etc.
+                        <LineBreak></LineBreak>
+                        This is recommended way of using TitleBar apis and covers most common scenarios.
+                        <LineBreak></LineBreak>
+                        It can be applied by just calling ExtendsContentIntoTitleBar api. This internally calls SetTitleBar api with null argument and provides the default case.
+                        <LineBreak></LineBreak>
+                        Use the button below to toggle between system titlebar and default custom titlebar.
+                    </TextBlock>
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Top" Spacing="20">
+                        <Button x:Name="defaultTitleBar" Click="defaultTitleBar_Click"></Button>
+                    </StackPanel>
+                </StackPanel>
+            </local:ControlExample.Example>
+        </local:ControlExample>
         <local:ControlExample HeaderText="User defined UIElement as custom titlebar for the window"
                               CSharpSource="Window/TitleBar/TitleBarSample1.txt">
             <local:ControlExample.Example>
                 <StackPanel Orientation="Vertical" Spacing="10">
                     <TextBlock TextWrapping="WrapWholeWords">
-                        User can set a top-level UIElement (defined as appTitleBar here) as titlebar for the window. The system titlebar disappears and the chosen uielement starts acting like the titlebar. <LineBreak></LineBreak>
+                        For finer controls, a user can set a top-level UIElement (defined as appTitleBar here) as titlebar for the window. The system titlebar disappears and the chosen uielement starts acting like the titlebar (gets all system titlebar behavior). <LineBreak></LineBreak>
                         The Background and Foreground Color dropdowns set the foreground and background of titlebar and caption buttons respectively.
+                        <LineBreak></LineBreak>
+                        Use the button below to toggle between system titlebar and custom WinUI titlebar.
                     </TextBlock>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Top" Spacing="10">
                         <Button x:Name="customTitleBar" Click="customTitleBar_Click"></Button>
@@ -64,7 +86,8 @@
                                             <Rectangle Fill="Green" AutomationProperties.Name="Green"/>
                                             <Rectangle Fill="Blue" AutomationProperties.Name="Blue"/>
                                             <Rectangle Fill="White" AutomationProperties.Name="White"/>
-                                            <Rectangle Fill="Black" AutomationProperties.Name="Black"/>                                        </GridView.Items>
+                                            <Rectangle Fill="Black" AutomationProperties.Name="Black"/>
+                                        </GridView.Items>
                                     </GridView>
 
                                 </Flyout>
@@ -111,23 +134,33 @@
             </local:ControlExample.Example>
 
         </local:ControlExample>
-        <local:ControlExample HeaderText="Fallback titlebar when no user defined titlebar is set"
-                              CSharpSource="Window/TitleBar/TitleBarSample2.txt">
+        <local:ControlExample HeaderText="Titlebar Customizations : Interactive controls in Titlebar (non client) area"
+                              CSharpSource="Window\TitleBar\TitleBarSample3.txt">
             <local:ControlExample.Example>
                 <StackPanel Orientation="Vertical" Spacing="10">
                     <TextBlock TextWrapping="WrapWholeWords">
-                        WinUI provides a fallback titlebar in case where user doesn't want to provide a uielement for setting the titlebar.
-                        A small horizontal section next to min/max/close caption buttons is chosen as the fallback titlebar.
-                         <LineBreak></LineBreak>
-                        It can be applied by just calling ExtendsContentIntoTitleBar api only and not calling SetTitleBar afterwards. It can also be manually triggered by calling SetTitleBar api with null arument.
+                        WinUI custom titlebar now hosting interactive clickable controls within non client region of the window, when using custom titlebar.
                         <LineBreak></LineBreak>
-                        Use the Color dropdown controls in the section above to change color of the fallback titlebar.
+                        This is achieved by using lower level
+                        <Hyperlink NavigateUri="https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.windowing.appwindowtitlebar">
+                           Microsoft.UI.AppwindowTitlebar
+                        </Hyperlink>
+                        and
+                        <Italic>Microsoft.UI.NonClientInputPointerSource apis</Italic>
+                        <LineBreak></LineBreak>
+                        <LineBreak></LineBreak>
+                        WinUI allows  <Bold> mix and match </Bold> of higher level WinUI custom titlebar apis with lower level Appwindow and NonClientInputPointerSource apis for most cases.
+                        One exception is one should not use <Italic> Window.SetTitlebar </Italic> api along with any lower level api which also sets drag regions as it can result in unexpected behavior.
+                        If needed, set <Italic> Window.SetTitlebar </Italic> to null (default case) and proceed to use lower level apis for drag functionality.
+                        <LineBreak></LineBreak>
+                        Use the button below to toggle between system titlebar and default custom titlebar.
                     </TextBlock>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Top" Spacing="20">
-                        <Button x:Name="defaultTitleBar" Click="defaultTitleBar_Click"></Button>
+                        <Button x:Name="addInteractiveElements" Click="AddInteractiveElements_Click">Add interactive control to titlebar</Button>
                     </StackPanel>
                 </StackPanel>
             </local:ControlExample.Example>
         </local:ControlExample>
+
     </StackPanel>
 </Page>
diff --git a/WinUIGallery/ControlPages/TitleBarPage.xaml.cs b/WinUIGallery/ControlPages/TitleBarPage.xaml.cs
index 1ad7a489e..27353231b 100644
--- a/WinUIGallery/ControlPages/TitleBarPage.xaml.cs
+++ b/WinUIGallery/ControlPages/TitleBarPage.xaml.cs
@@ -15,6 +15,12 @@
 using WinUIGallery.DesktopWap.Helper;
 using Microsoft.UI.Xaml.Shapes;
 using System.Threading.Tasks;
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml.Navigation;
+using Microsoft.UI.Input;
+using System.IO;
+using Windows.Foundation;
+using System;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -29,7 +35,8 @@ namespace AppUIBasics.ControlPages
     public sealed partial class TitleBarPage : Page
     {
         private Windows.UI.Color currentBgColor = Colors.Transparent;
-        private Windows.UI.Color currentFgColor = Colors.Black;
+        private Windows.UI.Color currentFgColor = ThemeHelper.ActualTheme == ElementTheme.Dark ? Colors.White : Colors.Black;
+        private bool sizeChangedEventHandlerAdded = false;
 
         public TitleBarPage()
         {
@@ -41,11 +48,17 @@ public TitleBarPage()
             };
         }
 
+        protected override void OnNavigatedFrom(NavigationEventArgs e)
+        {
+            ResetTitlebarSettings();
+        }
+
+
 
-        private void SetTitleBar(UIElement titlebar)
+        private void SetTitleBar(UIElement titlebar, bool forceCustomTitlebar = false)
         {
             var window = WindowHelper.GetWindowForElement(this as UIElement);
-            if (!window.ExtendsContentIntoTitleBar)
+            if (forceCustomTitlebar || !window.ExtendsContentIntoTitleBar)
             {
                 window.ExtendsContentIntoTitleBar = true;
                 window.SetTitleBar(titlebar);
@@ -60,18 +73,43 @@ private void SetTitleBar(UIElement titlebar)
             UpdateTitleBarColor();
         }
 
+        private void ResetTitlebarSettings()
+        {
+            var window = WindowHelper.GetWindowForElement(this as UIElement);
+            UIElement titleBarElement = UIHelper.FindElementByName(this as UIElement, "AppTitleBar");
+            SetTitleBar(titleBarElement, forceCustomTitlebar: true);
+            ClearClickThruRegions();
+            var txtBoxNonClientArea = UIHelper.FindElementByName(this as UIElement, "AppTitleBarTextBox") as FrameworkElement;
+            txtBoxNonClientArea.Visibility = Visibility.Collapsed;
+            addInteractiveElements.Content = "Add interactive control to titlebar";
+        }
+
+        private void SetClickThruRegions(Windows.Graphics.RectInt32[] rects)
+        {
+            var window = WindowHelper.GetWindowForElement(this as UIElement);
+            var nonClientInputSrc = InputNonClientPointerSource.GetForWindowId(window.AppWindow.Id);
+            nonClientInputSrc.ConfigureRegion(NonClientRegionKind.Transparent, rects);
+        }
+
+        private void ClearClickThruRegions()
+        {
+            var window = WindowHelper.GetWindowForElement(this as UIElement);
+            var noninputsrc = InputNonClientPointerSource.GetForWindowId(window.AppWindow.Id);
+            noninputsrc.ClearRegion(NonClientRegionKind.Transparent);
+        }
+
         public void UpdateButtonText()
         {
             var window = WindowHelper.GetWindowForElement(this as UIElement);
             if (window.ExtendsContentIntoTitleBar)
             {
-                customTitleBar.Content = "Reset to system TitleBar";
-                defaultTitleBar.Content = "Reset to system TitleBar";
+                customTitleBar.Content = "Reset to System TitleBar";
+                defaultTitleBar.Content = "Reset to System TitleBar";
             }
             else
             {
                 customTitleBar.Content = "Set Custom TitleBar";
-                defaultTitleBar.Content = "Set Fallback Custom TitleBar";
+                defaultTitleBar.Content = "Set Default Custom TitleBar";
             }
 
         }
@@ -117,7 +155,6 @@ private void customTitleBar_Click(object sender, RoutedEventArgs e)
         {
             UIElement titleBarElement = UIHelper.FindElementByName(sender as UIElement, "AppTitleBar");
             SetTitleBar(titleBarElement);
-
             // announce visual change to automation
             UIHelper.AnnounceActionForAccessibility(sender as UIElement, "TitleBar size and width changed", "TitleBarChangedNotificationActivityId");
         }
@@ -128,5 +165,48 @@ private void defaultTitleBar_Click(object sender, RoutedEventArgs e)
             // announce visual change to automation
             UIHelper.AnnounceActionForAccessibility(sender as UIElement, "TitleBar size and width changed", "TitleBarChangedNotificationActivityId");
         }
+
+        private void AddInteractiveElements_Click(object sender, RoutedEventArgs e)
+        {
+            var txtBoxNonClientArea = UIHelper.FindElementByName(sender as UIElement, "AppTitleBarTextBox") as FrameworkElement;
+
+            if (txtBoxNonClientArea.Visibility == Visibility.Visible)
+            {
+                ResetTitlebarSettings();
+            }
+            else
+            {
+                addInteractiveElements.Content = "Remove interactive control from titlebar";
+                txtBoxNonClientArea.Visibility = Visibility.Visible;
+                if (!sizeChangedEventHandlerAdded)
+                {
+                    sizeChangedEventHandlerAdded = true;
+                    // run this code when textbox has been made visible and its actual width and height has been calculated
+                    txtBoxNonClientArea.SizeChanged += (object sender, SizeChangedEventArgs e) =>
+                    {
+                        if (txtBoxNonClientArea.Visibility != Visibility.Collapsed)
+                        {
+                            GeneralTransform transformTxtBox = txtBoxNonClientArea.TransformToVisual(null);
+                            Rect bounds = transformTxtBox.TransformBounds(new Rect(0, 0, txtBoxNonClientArea.ActualWidth, txtBoxNonClientArea.ActualHeight));
+
+                            var scale = WindowHelper.GetRasterizationScaleForElement(this);
+
+                            var transparentRect = new Windows.Graphics.RectInt32(
+                                _X: (int)Math.Round(bounds.X * scale),
+                                _Y: (int)Math.Round(bounds.Y * scale),
+                                _Width: (int)Math.Round(bounds.Width * scale),
+                                _Height: (int)Math.Round(bounds.Height * scale)
+                            );
+                            var rectArr = new Windows.Graphics.RectInt32[] { transparentRect };
+                            SetClickThruRegions(rectArr);
+                        }
+                    };
+                }
+                txtBoxNonClientArea.Width += 1; //to trigger size changed event
+            }
+            // announce visual change to automation
+            UIHelper.AnnounceActionForAccessibility(sender as UIElement, "TitleBar size and width changed", "TitleBarChangedNotificationActivityId");
+        }
+       
     }
 }
diff --git a/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample2.txt b/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample2.txt
index 752e3b23f..d6bcc6eaf 100644
--- a/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample2.txt
+++ b/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample2.txt
@@ -1,4 +1,4 @@
-// no UIElement is set for titlebar, fallback titlebar is created
+// no UIElement is set for titlebar, default titlebar is created which extends to entire non client area
 Window window = App.MainWindow;
 window.ExtendsContentIntoTitleBar = true;
-window.SetTitleBar(null);  // this line is optional as by it is null by default
+// window.SetTitleBar(null);  // optional line as not setting any UIElement as titlebar is same as setting null as titlebar
diff --git a/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt b/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt
new file mode 100644
index 000000000..dc8ce34d3
--- /dev/null
+++ b/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt
@@ -0,0 +1,10 @@
+Window window = App.MainWindow;
+window.ExtendsContentIntoTitleBar = true;
+window.SetTitleBar(AppTitleBar);
+var nonClientInputSrc = InputNonClientPointerSource.GetForWindowId(window.AppWindow.Id);
+
+// Windows.Graphics.RectInt32[] rects defines the area which allows click throughs in custom titlebar 
+// it is non dpi-aware client coordinates 
+// and thus, appropriate calculations are needed from xaml coordinates befure calling this api
+// see TitleBarPage.xaml.cs for detailed implementation
+nonClientInputSrc.ConfigureRegion(NonClientRegionKind.Transparent, rects); // areas defined will be click through and can host button and textboxes
diff --git a/WinUIGallery/DataModel/ControlInfoData.json b/WinUIGallery/DataModel/ControlInfoData.json
index 93afa0e78..cc2379f6a 100644
--- a/WinUIGallery/DataModel/ControlInfoData.json
+++ b/WinUIGallery/DataModel/ControlInfoData.json
@@ -2830,7 +2830,7 @@
           "Subtitle": "An example showing a custom UIElement used as the titlebar for the app's window.",
           "ImagePath": "ms-appx:///Assets/ControlImages/TitleBar.png",
           "ImageIconPath": "ms-appx:///Assets/ControlIcons/DefaultIcon.png",
-          "Description": "This sample shows how to use a custom UIElement as titlebar for app's window.",
+          "Description": "This sample shows how to use a custom titlebar for the app's window. There are 2 ways of doing it : using default titlebar and setting an UIElement as a custom titlebar.",
           "Content": "<p>Look at the <i>TitleBarPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
           "IsUpdated": true,
           "Docs": [
diff --git a/WinUIGallery/Helper/TitleBarHelper.cs b/WinUIGallery/Helper/TitleBarHelper.cs
index 2217b5a88..bfc094845 100644
--- a/WinUIGallery/Helper/TitleBarHelper.cs
+++ b/WinUIGallery/Helper/TitleBarHelper.cs
@@ -19,27 +19,11 @@
 
 namespace WinUIGallery.DesktopWap.Helper
 {
+
     internal class TitleBarHelper
     {
-
-        private static void triggerTitleBarRepaint(Window window)
-        {
-            // to trigger repaint tracking task id 38044406
-            var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(window);
-            var activeWindow = AppUIBasics.Win32.GetActiveWindow();
-            if (hwnd == activeWindow)
-            {
-                AppUIBasics.Win32.SendMessage(hwnd, AppUIBasics.Win32.WM_ACTIVATE, AppUIBasics.Win32.WA_INACTIVE, IntPtr.Zero);
-                AppUIBasics.Win32.SendMessage(hwnd, AppUIBasics.Win32.WM_ACTIVATE, AppUIBasics.Win32.WA_ACTIVE, IntPtr.Zero);
-            }
-            else
-            {
-                AppUIBasics.Win32.SendMessage(hwnd, AppUIBasics.Win32.WM_ACTIVATE, AppUIBasics.Win32.WA_ACTIVE, IntPtr.Zero);
-                AppUIBasics.Win32.SendMessage(hwnd, AppUIBasics.Win32.WM_ACTIVATE, AppUIBasics.Win32.WA_INACTIVE, IntPtr.Zero);
-            }
-
-        }
-
+        // workaround as Appwindow titlebar doesn't update caption button colors correctly when changed while app is running
+        // https://task.ms/44172495
         public static Windows.UI.Color ApplySystemThemeToCaptionButtons(Window window)
         {
             var res = Application.Current.Resources;
@@ -61,7 +45,7 @@ public static void SetCaptionButtonColors(Window window, Windows.UI.Color color)
         {
             var res = Application.Current.Resources;
             res["WindowCaptionForeground"] = color;
-            triggerTitleBarRepaint(window);
+            window.AppWindow.TitleBar.ButtonForegroundColor = color;
         }
     }
 }
diff --git a/WinUIGallery/Helper/WindowHelper.cs b/WinUIGallery/Helper/WindowHelper.cs
index 5398cb12e..5bb134e30 100644
--- a/WinUIGallery/Helper/WindowHelper.cs
+++ b/WinUIGallery/Helper/WindowHelper.cs
@@ -66,6 +66,21 @@ static public Window GetWindowForElement(UIElement element)
             }
             return null;
         }
+        // get dpi for an element
+        static public double GetRasterizationScaleForElement(UIElement element)
+        {
+            if (element.XamlRoot != null)
+            {
+                foreach (Window window in _activeWindows)
+                {
+                    if (element.XamlRoot == window.Content.XamlRoot)
+                    {
+                        return element.XamlRoot.RasterizationScale;
+                    }
+                }
+            }
+            return 0.0;
+        }
 
         static public List<Window> ActiveWindows { get { return _activeWindows; }}
 
diff --git a/WinUIGallery/Navigation/NavigationRootPage.xaml b/WinUIGallery/Navigation/NavigationRootPage.xaml
index b4985ad02..ecd085e52 100644
--- a/WinUIGallery/Navigation/NavigationRootPage.xaml
+++ b/WinUIGallery/Navigation/NavigationRootPage.xaml
@@ -67,6 +67,7 @@
                     VerticalAlignment="Center"
                     Style="{StaticResource CaptionTextBlockStyle}"
                     Text="{x:Bind AppTitleText}" />
+                <TextBox x:Name="AppTitleBarTextBox" Width="300" Height="40" Margin="16,0,0,0" Visibility="Collapsed" /> 
             </StackPanel>
         </Border>
 
diff --git a/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj b/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
index 09c1142ea..afb90e67e 100644
--- a/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
+++ b/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x86">
-      <Configuration>Debug</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x86">
-      <Configuration>Release</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
-    <SDKIdentifier>Windows</SDKIdentifier>
-    <SDKVersion>10.0</SDKVersion>
-  </PropertyGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
-  <Import Project="common.props" />
-  <PropertyGroup>
-    <ProjectGuid>4c7b20d7-5f5c-440e-8da3-b19a328cc8bd</ProjectGuid>
-    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-    <EntryPointProjectUniqueName>WinUIGallery.csproj</EntryPointProjectUniqueName>
-    <AppxBundleNameForOutput>WinUIGallery.DesktopWap</AppxBundleNameForOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(IsInWinUIRepo)' == 'true'">
-    <PackageCertificateKeyFile>$(ProjectRoot)build\MSTest.pfx</PackageCertificateKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(IsInWinUIRepo)' != 'true'">
-    <PackageCertificateKeyFile Condition="'$(PackageCertificateKeyFile)'==''">$(SolutionDir)..\build\WinUI-Gallery-Test.pfx</PackageCertificateKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
-    <AppxBundlePlatforms Condition="'$(BuildAllAppFlavors)' == 'true'">x86|x64|ARM64</AppxBundlePlatforms>
-    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest" Condition="!('$(Configuration)' == 'Debug')">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-    <AppxManifest Include="Package.Dev.appxmanifest" Condition="'$(Configuration)' == 'Debug'">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="WinUIGallery.csproj">
-      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
-      <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup Condition="'$(WindowsAppSdkPackageVersion)' != ''">
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="[$(WindowsAppSdkPackageVersion)]" GeneratePathProperty="true">
-      <IncludeAssets>build</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="[$(MicrosoftWindowsSDKBuildToolsNugetPackageVersion)]">
-      <IncludeAssets>build</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+    <SDKIdentifier>Windows</SDKIdentifier>
+    <SDKVersion>10.0</SDKVersion>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <Import Project="common.props" />
+  <PropertyGroup>
+    <ProjectGuid>4c7b20d7-5f5c-440e-8da3-b19a328cc8bd</ProjectGuid>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <EntryPointProjectUniqueName>WinUIGallery.csproj</EntryPointProjectUniqueName>
+    <AppxBundleNameForOutput>WinUIGallery.DesktopWap</AppxBundleNameForOutput>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(IsInWinUIRepo)' == 'true'">
+    <PackageCertificateKeyFile>$(ProjectRoot)build\MSTest.pfx</PackageCertificateKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(IsInWinUIRepo)' != 'true'">
+    <PackageCertificateKeyFile Condition="'$(PackageCertificateKeyFile)'==''">$(SolutionDir)..\build\WinUI-Gallery-Test.pfx</PackageCertificateKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
+    <AppxBundlePlatforms Condition="'$(BuildAllAppFlavors)' == 'true'">x86|x64|ARM64</AppxBundlePlatforms>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest" Condition="!('$(Configuration)' == 'Debug')">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <AppxManifest Include="Package.Dev.appxmanifest" Condition="'$(Configuration)' == 'Debug'">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="WinUIGallery.csproj">
+      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
+      <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(WindowsAppSdkPackageVersion)' != ''">
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="[$(WindowsAppSdkPackageVersion)]" GeneratePathProperty="true">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="[$(MicrosoftWindowsSDKBuildToolsNugetPackageVersion)]">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>
\ No newline at end of file

From 8a10cb3e5df65aea3835f703e0623166ba216bfb Mon Sep 17 00:00:00 2001
From: Pratik Anand <praanan@microsoft.com>
Date: Wed, 20 Sep 2023 20:04:26 -0700
Subject: [PATCH 2/6] restored wappproj from main branch

---
 .../WinUIGallery.DesktopWap.Package.wapproj   | 208 +++++++++---------
 1 file changed, 104 insertions(+), 104 deletions(-)

diff --git a/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj b/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
index afb90e67e..09c1142ea 100644
--- a/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
+++ b/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x86">
-      <Configuration>Debug</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x86">
-      <Configuration>Release</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
-    <SDKIdentifier>Windows</SDKIdentifier>
-    <SDKVersion>10.0</SDKVersion>
-  </PropertyGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
-  <Import Project="common.props" />
-  <PropertyGroup>
-    <ProjectGuid>4c7b20d7-5f5c-440e-8da3-b19a328cc8bd</ProjectGuid>
-    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-    <EntryPointProjectUniqueName>WinUIGallery.csproj</EntryPointProjectUniqueName>
-    <AppxBundleNameForOutput>WinUIGallery.DesktopWap</AppxBundleNameForOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(IsInWinUIRepo)' == 'true'">
-    <PackageCertificateKeyFile>$(ProjectRoot)build\MSTest.pfx</PackageCertificateKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(IsInWinUIRepo)' != 'true'">
-    <PackageCertificateKeyFile Condition="'$(PackageCertificateKeyFile)'==''">$(SolutionDir)..\build\WinUI-Gallery-Test.pfx</PackageCertificateKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
-    <AppxBundlePlatforms Condition="'$(BuildAllAppFlavors)' == 'true'">x86|x64|ARM64</AppxBundlePlatforms>
-    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest" Condition="!('$(Configuration)' == 'Debug')">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-    <AppxManifest Include="Package.Dev.appxmanifest" Condition="'$(Configuration)' == 'Debug'">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="WinUIGallery.csproj">
-      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
-      <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup Condition="'$(WindowsAppSdkPackageVersion)' != ''">
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="[$(WindowsAppSdkPackageVersion)]" GeneratePathProperty="true">
-      <IncludeAssets>build</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="[$(MicrosoftWindowsSDKBuildToolsNugetPackageVersion)]">
-      <IncludeAssets>build</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+    <SDKIdentifier>Windows</SDKIdentifier>
+    <SDKVersion>10.0</SDKVersion>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <Import Project="common.props" />
+  <PropertyGroup>
+    <ProjectGuid>4c7b20d7-5f5c-440e-8da3-b19a328cc8bd</ProjectGuid>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <EntryPointProjectUniqueName>WinUIGallery.csproj</EntryPointProjectUniqueName>
+    <AppxBundleNameForOutput>WinUIGallery.DesktopWap</AppxBundleNameForOutput>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(IsInWinUIRepo)' == 'true'">
+    <PackageCertificateKeyFile>$(ProjectRoot)build\MSTest.pfx</PackageCertificateKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(IsInWinUIRepo)' != 'true'">
+    <PackageCertificateKeyFile Condition="'$(PackageCertificateKeyFile)'==''">$(SolutionDir)..\build\WinUI-Gallery-Test.pfx</PackageCertificateKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
+    <AppxBundlePlatforms Condition="'$(BuildAllAppFlavors)' == 'true'">x86|x64|ARM64</AppxBundlePlatforms>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest" Condition="!('$(Configuration)' == 'Debug')">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <AppxManifest Include="Package.Dev.appxmanifest" Condition="'$(Configuration)' == 'Debug'">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="WinUIGallery.csproj">
+      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
+      <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(WindowsAppSdkPackageVersion)' != ''">
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="[$(WindowsAppSdkPackageVersion)]" GeneratePathProperty="true">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="[$(MicrosoftWindowsSDKBuildToolsNugetPackageVersion)]">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>
\ No newline at end of file

From 857e8754289f7b3d5b0fbd284d7a8914c845ddd9 Mon Sep 17 00:00:00 2001
From: Pratik Anand <praanan@microsoft.com>
Date: Wed, 20 Sep 2023 21:06:12 -0700
Subject: [PATCH 3/6] fixed compilation issues post merge. everything tested

---
 WinUIGallery/ContentIncludes.props                            | 1 +
 WinUIGallery/ControlPages/TitleBarPage.xaml.cs                | 4 ++--
 .../Window/TitleBar/TitleBarSample3.txt                       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WinUIGallery/ContentIncludes.props b/WinUIGallery/ContentIncludes.props
index b56b5faa7..467eb0f1e 100644
--- a/WinUIGallery/ContentIncludes.props
+++ b/WinUIGallery/ContentIncludes.props
@@ -372,6 +372,7 @@
     <Content Include="ControlPagesSampleCode\Window\CreateWindowSample1.txt" />
     <Content Include="ControlPagesSampleCode\Window\TitleBar\TitleBarSample1.txt" />
     <Content Include="ControlPagesSampleCode\Window\TitleBar\TitleBarSample2.txt" />
+    <Content Include="ControlPagesSampleCode\Window\TitleBar\TitleBarSample3.txt" />
     <Content Include="Common\ReadMe.txt" />
     <Content Include="DataModel\ControlInfoData.json" />
   </ItemGroup>
diff --git a/WinUIGallery/ControlPages/TitleBarPage.xaml.cs b/WinUIGallery/ControlPages/TitleBarPage.xaml.cs
index 27353231b..48afc7865 100644
--- a/WinUIGallery/ControlPages/TitleBarPage.xaml.cs
+++ b/WinUIGallery/ControlPages/TitleBarPage.xaml.cs
@@ -88,14 +88,14 @@ private void SetClickThruRegions(Windows.Graphics.RectInt32[] rects)
         {
             var window = WindowHelper.GetWindowForElement(this as UIElement);
             var nonClientInputSrc = InputNonClientPointerSource.GetForWindowId(window.AppWindow.Id);
-            nonClientInputSrc.ConfigureRegion(NonClientRegionKind.Transparent, rects);
+            nonClientInputSrc.SetRegionRects(NonClientRegionKind.Passthrough, rects);
         }
 
         private void ClearClickThruRegions()
         {
             var window = WindowHelper.GetWindowForElement(this as UIElement);
             var noninputsrc = InputNonClientPointerSource.GetForWindowId(window.AppWindow.Id);
-            noninputsrc.ClearRegion(NonClientRegionKind.Transparent);
+            noninputsrc.ClearRegionRects(NonClientRegionKind.Passthrough);
         }
 
         public void UpdateButtonText()
diff --git a/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt b/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt
index dc8ce34d3..4f355121c 100644
--- a/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt
+++ b/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt
@@ -7,4 +7,4 @@ var nonClientInputSrc = InputNonClientPointerSource.GetForWindowId(window.AppWin
 // it is non dpi-aware client coordinates 
 // and thus, appropriate calculations are needed from xaml coordinates befure calling this api
 // see TitleBarPage.xaml.cs for detailed implementation
-nonClientInputSrc.ConfigureRegion(NonClientRegionKind.Transparent, rects); // areas defined will be click through and can host button and textboxes
+nonClientInputSrc.SetRegionRects(NonClientRegionKind.Passthrough, rects); // areas defined will be click through and can host button and textboxes

From ad7eadaf1e287ecea1656c51c9ea07d18eae69e1 Mon Sep 17 00:00:00 2001
From: Pratik Anand <praanan@microsoft.com>
Date: Thu, 28 Sep 2023 21:46:23 -0700
Subject: [PATCH 4/6] grammatical and spelling changes

---
 WinUIGallery/ControlPages/TitleBarPage.xaml | 8 ++++----
 WinUIGallery/DataModel/ControlInfoData.json | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WinUIGallery/ControlPages/TitleBarPage.xaml b/WinUIGallery/ControlPages/TitleBarPage.xaml
index aef25d2de..115c049fd 100644
--- a/WinUIGallery/ControlPages/TitleBarPage.xaml
+++ b/WinUIGallery/ControlPages/TitleBarPage.xaml
@@ -31,10 +31,10 @@
             <local:ControlExample.Example>
                 <StackPanel Orientation="Vertical" Spacing="10">
                     <TextBlock TextWrapping="WrapWholeWords">
-                        WinUI provides a default titlebar in case where user doesn't explicit provides a uielement for setting the titlebar. The system titlebar (Windows provided titlebar) disappears and client area content is extended to non client area.
+                        WinUI provides a default titlebar in such cases where the user doesn't explicitly provide a uielement, for setting the titlebar. The system titlebar (Windows-provided titlebar) disappears and client area content is extended to non client area.
                         In this default case, entire non client region (titlebar region) get system titlebar behaviors like drag regions, system menu on context click etc.
                         <LineBreak></LineBreak>
-                        This is recommended way of using TitleBar apis and covers most common scenarios.
+                        This is the recommended way of using TitleBar apis and covers most common scenarios.
                         <LineBreak></LineBreak>
                         It can be applied by just calling ExtendsContentIntoTitleBar api. This internally calls SetTitleBar api with null argument and provides the default case.
                         <LineBreak></LineBreak>
@@ -143,13 +143,13 @@
                         <LineBreak></LineBreak>
                         This is achieved by using lower level
                         <Hyperlink NavigateUri="https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.windowing.appwindowtitlebar">
-                           Microsoft.UI.AppwindowTitlebar
+                           Microsoft.UI.AppWindowTitlebar
                         </Hyperlink>
                         and
                         <Italic>Microsoft.UI.NonClientInputPointerSource apis</Italic>
                         <LineBreak></LineBreak>
                         <LineBreak></LineBreak>
-                        WinUI allows  <Bold> mix and match </Bold> of higher level WinUI custom titlebar apis with lower level Appwindow and NonClientInputPointerSource apis for most cases.
+                        WinUI allows  <Bold> mix and match </Bold> of higher level WinUI custom titlebar apis with lower level AppWindow and NonClientInputPointerSource apis for most cases.
                         One exception is one should not use <Italic> Window.SetTitlebar </Italic> api along with any lower level api which also sets drag regions as it can result in unexpected behavior.
                         If needed, set <Italic> Window.SetTitlebar </Italic> to null (default case) and proceed to use lower level apis for drag functionality.
                         <LineBreak></LineBreak>
diff --git a/WinUIGallery/DataModel/ControlInfoData.json b/WinUIGallery/DataModel/ControlInfoData.json
index cc2379f6a..6f0205fd9 100644
--- a/WinUIGallery/DataModel/ControlInfoData.json
+++ b/WinUIGallery/DataModel/ControlInfoData.json
@@ -2830,7 +2830,7 @@
           "Subtitle": "An example showing a custom UIElement used as the titlebar for the app's window.",
           "ImagePath": "ms-appx:///Assets/ControlImages/TitleBar.png",
           "ImageIconPath": "ms-appx:///Assets/ControlIcons/DefaultIcon.png",
-          "Description": "This sample shows how to use a custom titlebar for the app's window. There are 2 ways of doing it : using default titlebar and setting an UIElement as a custom titlebar.",
+          "Description": "This sample shows how to use a custom titlebar for the app's window. There are 2 ways of doing it: using default titlebar and setting an UIElement as a custom titlebar.",
           "Content": "<p>Look at the <i>TitleBarPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
           "IsUpdated": true,
           "Docs": [

From 249a8111681ff72c602f9e2ddd4d3bc64de2bcc9 Mon Sep 17 00:00:00 2001
From: Pratik Anand <praanan@microsoft.com>
Date: Fri, 29 Sep 2023 17:28:37 -0700
Subject: [PATCH 5/6] updated sample

---
 .../Window/TitleBar/TitleBarSample3.txt        | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt b/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt
index 4f355121c..f3afd4b40 100644
--- a/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt
+++ b/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt
@@ -3,8 +3,20 @@ window.ExtendsContentIntoTitleBar = true;
 window.SetTitleBar(AppTitleBar);
 var nonClientInputSrc = InputNonClientPointerSource.GetForWindowId(window.AppWindow.Id);
 
+// textbox on titlebar area
+var txtBoxNonClientArea = UIHelper.FindElementByName(sender as UIElement, "AppTitleBarTextBox") as FrameworkElement;
+GeneralTransform transformTxtBox = txtBoxNonClientArea.TransformToVisual(null);
+Rect bounds = transformTxtBox.TransformBounds(new Rect(0, 0, txtBoxNonClientArea.ActualWidth, txtBoxNonClientArea.ActualHeight));
+
 // Windows.Graphics.RectInt32[] rects defines the area which allows click throughs in custom titlebar 
-// it is non dpi-aware client coordinates 
-// and thus, appropriate calculations are needed from xaml coordinates befure calling this api
-// see TitleBarPage.xaml.cs for detailed implementation
+// it is non dpi-aware client coordinates. Hence, we convert dpi aware coordinates to non-dpi coordinates
+var scale = WindowHelper.GetRasterizationScaleForElement(this);
+var transparentRect = new Windows.Graphics.RectInt32(
+    _X: (int)Math.Round(bounds.X * scale),
+    _Y: (int)Math.Round(bounds.Y * scale),
+    _Width: (int)Math.Round(bounds.Width * scale),
+    _Height: (int)Math.Round(bounds.Height * scale)
+);
+var rects = new Windows.Graphics.RectInt32[] { transparentRect };
+
 nonClientInputSrc.SetRegionRects(NonClientRegionKind.Passthrough, rects); // areas defined will be click through and can host button and textboxes

From 19b68e77984528685bf64b594e118cd57869302e Mon Sep 17 00:00:00 2001
From: Pratik Anand <praanan@microsoft.com>
Date: Tue, 3 Oct 2023 11:27:35 -0700
Subject: [PATCH 6/6] updated minwidth and provided comments

---
 WinUIGallery/Navigation/NavigationRootPage.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WinUIGallery/Navigation/NavigationRootPage.xaml b/WinUIGallery/Navigation/NavigationRootPage.xaml
index ecd085e52..2408be646 100644
--- a/WinUIGallery/Navigation/NavigationRootPage.xaml
+++ b/WinUIGallery/Navigation/NavigationRootPage.xaml
@@ -67,7 +67,7 @@
                     VerticalAlignment="Center"
                     Style="{StaticResource CaptionTextBlockStyle}"
                     Text="{x:Bind AppTitleText}" />
-                <TextBox x:Name="AppTitleBarTextBox" Width="300" Height="40" Margin="16,0,0,0" Visibility="Collapsed" /> 
+                <TextBox x:Name="AppTitleBarTextBox" MinWidth="300" Height="40" Margin="16,0,0,0" Visibility="Collapsed"  PlaceholderText="Enter any text" /> 
             </StackPanel>
         </Border>