From 2bec4c14c5b77bf2b94f5943d311d18b78d2ce1b Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Mon, 27 Jul 2020 15:14:10 +0200
Subject: [PATCH 01/11] Fixes SKFontStyleSlant to FontStyle conversion

---
 src/Avalonia.Visuals/Media/FontStyle.cs             |  8 ++++----
 src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs |  3 ++-
 src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs       | 11 +++++++++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Visuals/Media/FontStyle.cs b/src/Avalonia.Visuals/Media/FontStyle.cs
index cbc92b1a9f..b9d04bf9ff 100644
--- a/src/Avalonia.Visuals/Media/FontStyle.cs
+++ b/src/Avalonia.Visuals/Media/FontStyle.cs
@@ -11,13 +11,13 @@ namespace Avalonia.Media
         Normal,
 
         /// <summary>
-        /// An oblique font.
+        /// An italic font.
         /// </summary>
-        Oblique,
+        Italic,
 
         /// <summary>
-        /// An italic font.
+        /// An oblique font.
         /// </summary>
-        Italic,
+        Oblique
     }
 }
diff --git a/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs b/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs
index d36baf331d..7ca44e7282 100644
--- a/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs
+++ b/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs
@@ -56,7 +56,8 @@ namespace Avalonia.Skia
                     continue;
                 }
 
-                var key = new FontKey(fontFamily.Name, (FontStyle)typeface.FontSlant, (FontWeight)typeface.FontWeight);
+                var key = new FontKey(fontFamily.Name, typeface.FontSlant.ToAvalonia(),
+                    (FontWeight)typeface.FontWeight);
 
                 typeFaceCollection.AddTypeface(key, typeface);
             }
diff --git a/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs b/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
index ec7e0a67ed..1e772ef067 100644
--- a/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
+++ b/src/Skia/Avalonia.Skia/SkiaSharpExtensions.cs
@@ -138,6 +138,17 @@ namespace Avalonia.Skia
             }
         }
 
+        public static FontStyle ToAvalonia(this SKFontStyleSlant slant)
+        {
+            return slant switch
+            {
+                SKFontStyleSlant.Upright => FontStyle.Normal,
+                SKFontStyleSlant.Italic => FontStyle.Italic,
+                SKFontStyleSlant.Oblique => FontStyle.Oblique,
+                _ => throw new ArgumentOutOfRangeException(nameof (slant), slant, null)
+            };
+        }
+
         public static SKPath Clone(this SKPath src)
         {
             return src != null ? new SKPath(src) : null;

From 8e1443384f5b8323178a5102e3fcdb1891008f5f Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Mon, 27 Jul 2020 17:25:33 +0200
Subject: [PATCH 02/11] Add app compat baseline

---
 src/Avalonia.Visuals/ApiCompatBaseline.txt | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 src/Avalonia.Visuals/ApiCompatBaseline.txt

diff --git a/src/Avalonia.Visuals/ApiCompatBaseline.txt b/src/Avalonia.Visuals/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..00618448a2
--- /dev/null
+++ b/src/Avalonia.Visuals/ApiCompatBaseline.txt
@@ -0,0 +1,4 @@
+Compat issues with assembly Avalonia.Visuals:
+EnumValuesMustMatch : Enum value 'Avalonia.Media.FontStyle Avalonia.Media.FontStyle.Italic' is (System.Int32)1 in the implementation but (System.Int32)2 in the contract.
+EnumValuesMustMatch : Enum value 'Avalonia.Media.FontStyle Avalonia.Media.FontStyle.Oblique' is (System.Int32)2 in the implementation but (System.Int32)1 in the contract.
+Total Issues: 2

From d759435c05a089086484d664752b5a35297e903d Mon Sep 17 00:00:00 2001
From: Rustam Sayfutdinov <rstm.sf@gmail.com>
Date: Mon, 27 Jul 2020 21:52:51 +0300
Subject: [PATCH 03/11] Reverts changing colors for default theme by

'36c5ad4621d372cf932f1259c77a23c4d1cb6962'
---
 src/Avalonia.Themes.Default/TitleBar.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Themes.Default/TitleBar.xaml b/src/Avalonia.Themes.Default/TitleBar.xaml
index 4dba5b4ba4..7f8ed24076 100644
--- a/src/Avalonia.Themes.Default/TitleBar.xaml
+++ b/src/Avalonia.Themes.Default/TitleBar.xaml
@@ -5,7 +5,7 @@
     </Border>
   </Design.PreviewWith>
   <Style Selector="TitleBar">
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>    
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>    
     <Setter Property="VerticalAlignment" Value="Top" />
     <Setter Property="HorizontalAlignment" Value="Stretch" />
     <Setter Property="Background" Value="Transparent" />
@@ -23,7 +23,7 @@
   </Style>
 
   <Style Selector="TitleBar:fullscreen">
-    <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+    <Setter Property="Background" Value="{DynamicResource ThemeAccentColor}" />
   </Style>
 
   <Style Selector="TitleBar /template/ Border#PART_Background">

From c932094ec417a7cb99ca24ccf13a6818d9d8dec8 Mon Sep 17 00:00:00 2001
From: Rustam Sayfutdinov <rstm.sf@gmail.com>
Date: Mon, 27 Jul 2020 23:32:48 +0300
Subject: [PATCH 04/11] Reverts using resource by
 'd8604567eec0445e2898a78437b5016b021a2cd4'

---
 src/Avalonia.Themes.Default/Window.xaml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Themes.Default/Window.xaml b/src/Avalonia.Themes.Default/Window.xaml
index 1856eec206..7d74a7e6a0 100644
--- a/src/Avalonia.Themes.Default/Window.xaml
+++ b/src/Avalonia.Themes.Default/Window.xaml
@@ -1,9 +1,8 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="Window">
-  <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>  
-  <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource SystemControlBackgroundAltHighBrush}" />
-  <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-  <Setter Property="FontSize" Value="{DynamicResource ContentControlFontSize}"/>  
-  <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>  
+  <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource HighlightForegroundColor}" />
+  <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
+  <Setter Property="FontSize" Value="{DynamicResource FontSizeSmall}"/>  
   <Setter Property="Template">
     <ControlTemplate>
       <Panel>

From 4ad03c6108768b251e34dee60b204f7171ce8a58 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 28 Jul 2020 10:20:57 -0300
Subject: [PATCH 05/11] order resources when passed to xamlx to ensure
 deterministic naming.

---
 src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs | 2 +-
 src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
index c1cc0e7bf0..c9c9c562bd 100644
--- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
+++ b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
@@ -128,7 +128,7 @@ namespace Avalonia.Build.Tasks
                 asm.MainModule.Types.Add(typeDef);
                 var builder = typeSystem.CreateTypeBuilder(typeDef);
                 
-                foreach (var res in group.Resources.Where(CheckXamlName))
+                foreach (var res in group.Resources.Where(CheckXamlName).OrderBy(x=>x.FilePath.ToLowerInvariant()))
                 {
                     try
                     {
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
index 8d9fee734a..23f06e93fc 160000
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
@@ -1 +1 @@
-Subproject commit 8d9fee734afaced9366774fda41b6aa2ab19875f
+Subproject commit 23f06e93fcccdc8d2e2b2b083bdfae02e015f295

From fe51ec856b23d864db92212c94512bf0c51991ed Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 28 Jul 2020 10:47:52 -0300
Subject: [PATCH 06/11] update xamlil

---
 src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
index 23f06e93fc..7d15a92274 160000
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
@@ -1 +1 @@
-Subproject commit 23f06e93fcccdc8d2e2b2b083bdfae02e015f295
+Subproject commit 7d15a9227461cf4d62bc2ed251fcc25c96b28aaf

From 0ea68f9da20a69365e6f5f71ea43a46e04b589b6 Mon Sep 17 00:00:00 2001
From: Someone357 <60839190+Someone357@users.noreply.github.com>
Date: Wed, 29 Jul 2020 11:42:41 +0200
Subject: [PATCH 07/11] Make RadialGradientBrush raise a Changed event

---
 src/Avalonia.Visuals/Media/RadialGradientBrush.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Avalonia.Visuals/Media/RadialGradientBrush.cs b/src/Avalonia.Visuals/Media/RadialGradientBrush.cs
index ee42c3d7e4..16c367c0d0 100644
--- a/src/Avalonia.Visuals/Media/RadialGradientBrush.cs
+++ b/src/Avalonia.Visuals/Media/RadialGradientBrush.cs
@@ -30,6 +30,11 @@ namespace Avalonia.Media
             AvaloniaProperty.Register<RadialGradientBrush, double>(
                 nameof(Radius),
                 0.5);
+        
+        static RadialGradientBrush()
+        {
+            AffectsRender<RadialGradientBrush>(CenterProperty, GradientOriginProperty, RadiusProperty);
+        }
 
         /// <summary>
         /// Gets or sets the start point for the gradient.

From 004c7da6434ec20718736c29b8611997d2645fd2 Mon Sep 17 00:00:00 2001
From: Michael Babienco <mbabienco@southern.edu>
Date: Wed, 29 Jul 2020 11:50:17 -0400
Subject: [PATCH 08/11] Fix native menus not being setup properly Closes #4395

---
 src/Avalonia.Native/AvaloniaNativeMenuExporter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
index 41ad988c34..07fe2b7d72 100644
--- a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
+++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Native
     class AvaloniaNativeMenuExporter : ITopLevelNativeMenuExporter
     {
         private IAvaloniaNativeFactory _factory;
-        private bool _resetQueued;
+        private bool _resetQueued = true; // so initial layout resets trigger a menu reset properly
         private bool _exported = false;
         private IAvnWindow _nativeWindow;
         private NativeMenu _menu;
@@ -39,7 +39,7 @@ namespace Avalonia.Native
         public void SetNativeMenu(NativeMenu menu)
         {
             _menu = menu == null ? new NativeMenu() : menu;
-
+            _resetQueued = true; // we've reset the menu to something new, so make sure that a reset is queued
             DoLayoutReset();
         }
 

From 4c4199f9d560bb46de9770f902e5505af5e7e1be Mon Sep 17 00:00:00 2001
From: Michael Babienco <mbabienco@southern.edu>
Date: Wed, 29 Jul 2020 12:28:21 -0400
Subject: [PATCH 09/11] Use default param instead of setting _resetQueued to
 true on menu set

---
 src/Avalonia.Native/AvaloniaNativeMenuExporter.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
index 07fe2b7d72..5a99249fee 100644
--- a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
+++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
@@ -39,8 +39,7 @@ namespace Avalonia.Native
         public void SetNativeMenu(NativeMenu menu)
         {
             _menu = menu == null ? new NativeMenu() : menu;
-            _resetQueued = true; // we've reset the menu to something new, so make sure that a reset is queued
-            DoLayoutReset();
+            DoLayoutReset(true);
         }
 
         internal void UpdateIfNeeded()
@@ -74,9 +73,9 @@ namespace Avalonia.Native
             return result;
         }
 
-        private void DoLayoutReset()
+        private void DoLayoutReset(bool forceUpdate = false)
         {
-            if (_resetQueued)
+            if (_resetQueued || forceUpdate)
             {
                 _resetQueued = false;
 
@@ -109,7 +108,7 @@ namespace Avalonia.Native
             if (_resetQueued)
                 return;
             _resetQueued = true;
-            Dispatcher.UIThread.Post(DoLayoutReset, DispatcherPriority.Background);
+            Dispatcher.UIThread.Post(() => DoLayoutReset(), DispatcherPriority.Background);
         }
 
         private void SetMenu(NativeMenu menu)

From f9a6944177ce739afe190f3f85d8210e0c287cbb Mon Sep 17 00:00:00 2001
From: Michael Babienco <mbabienco@southern.edu>
Date: Wed, 29 Jul 2020 12:37:38 -0400
Subject: [PATCH 10/11] Remove unneeded comment

---
 src/Avalonia.Native/AvaloniaNativeMenuExporter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
index 5a99249fee..6d1b95b997 100644
--- a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
+++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Native
     class AvaloniaNativeMenuExporter : ITopLevelNativeMenuExporter
     {
         private IAvaloniaNativeFactory _factory;
-        private bool _resetQueued = true; // so initial layout resets trigger a menu reset properly
+        private bool _resetQueued = true;
         private bool _exported = false;
         private IAvnWindow _nativeWindow;
         private NativeMenu _menu;

From b831b28bdd5deb2236c107282f972652c117871a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 29 Jul 2020 13:53:02 -0300
Subject: [PATCH 11/11] update skia sharp.

---
 build/SkiaSharp.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/SkiaSharp.props b/build/SkiaSharp.props
index a8d9332c57..bbef48050e 100644
--- a/build/SkiaSharp.props
+++ b/build/SkiaSharp.props
@@ -1,6 +1,6 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.0" />
+    <PackageReference Include="SkiaSharp" Version="2.80.1" />
     <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.80.0" />
   </ItemGroup>
 </Project>