From 513cbadacb45b1a740e065c22b721d6a109a6428 Mon Sep 17 00:00:00 2001
From: Jeroen van Langen <jvanlangen@live.nl>
Date: Tue, 25 Jan 2022 13:03:44 +0100
Subject: [PATCH 1/3] Minor typo fixed

---
 samples/ControlCatalog.Android/Assets/AboutAssets.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog.Android/Assets/AboutAssets.txt b/samples/ControlCatalog.Android/Assets/AboutAssets.txt
index ee39886295..a9b0638eb1 100644
--- a/samples/ControlCatalog.Android/Assets/AboutAssets.txt
+++ b/samples/ControlCatalog.Android/Assets/AboutAssets.txt
@@ -1,7 +1,7 @@
 Any raw assets you want to be deployed with your application can be placed in
 this directory (and child directories) and given a Build Action of "AndroidAsset".
 
-These files will be deployed with you package and will be accessible using Android's
+These files will be deployed with your package and will be accessible using Android's
 AssetManager, like this:
 
 public class ReadAsset : Activity
@@ -16,4 +16,4 @@ public class ReadAsset : Activity
 
 Additionally, some Android functions will automatically load asset files:
 
-Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
\ No newline at end of file
+Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");

From fd3c44bb8197524e2b8a79dc5c4f88448d2e89b4 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 25 Jan 2022 17:32:04 -0500
Subject: [PATCH 2/3] Ensure menu children are closed on menu flyout presenter
 detached

---
 .../Flyouts/MenuFlyoutPresenter.cs                  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
index 3a45c85c70..bcd859100a 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
@@ -43,5 +43,18 @@ namespace Avalonia.Controls
         {
             return new MenuItemContainerGenerator(this);
         }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+
+            foreach (var i in LogicalChildren)
+            {
+                if (i is MenuItem menuItem)
+                {
+                    menuItem.IsSubMenuOpen = false;
+                }
+            }
+        }
     }
 }

From 1bbe38c34f0d41e524a39d226db7f8bdc8f3cb79 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 26 Jan 2022 19:16:46 +0000
Subject: [PATCH 3/3] update copyright year

---
 build/SharedVersion.props                     | 2 +-
 src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/SharedVersion.props b/build/SharedVersion.props
index 7d75901288..7f24ef35bc 100644
--- a/build/SharedVersion.props
+++ b/build/SharedVersion.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Product>Avalonia</Product>
     <Version>0.10.999</Version>
-    <Copyright>Copyright 2021 &#169; The AvaloniaUI Project</Copyright>
+    <Copyright>Copyright 2022 &#169; The AvaloniaUI Project</Copyright>
     <PackageProjectUrl>https://avaloniaui.net</PackageProjectUrl>
     <RepositoryUrl>https://github.com/AvaloniaUI/Avalonia/</RepositoryUrl>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
index c959fdc143..a1d06f800f 100644
--- a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
+++ b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
@@ -99,7 +99,7 @@
       </StackPanel>
      </StackPanel> 
     <StackPanel VerticalAlignment="Bottom" Margin="10">
-      <TextBlock Text="© 2021 The Avalonia Project" TextWrapping="Wrap" HorizontalAlignment="Center" />
+      <TextBlock Text="© 2022 The Avalonia Project" TextWrapping="Wrap" HorizontalAlignment="Center" />
     </StackPanel>
   </Grid>
 </Window>