Merge branch 'master' into diagnostic-key

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>

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");
+Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");

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;
+                }
+            }
+        }
     }
 }

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>