From 3eebc5498c6b91267a421528f4d5e0103191d88f Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Thu, 5 Jan 2023 16:10:44 +1100
Subject: [PATCH 1/3] remove MSBuild.Sdk.Extras and AggregatePackage.NuGet.Sdk

---
 global.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/global.json b/global.json
index a3e251852f..e4a0cc20c2 100644
--- a/global.json
+++ b/global.json
@@ -4,8 +4,6 @@
         "rollForward": "latestFeature"
     },
     "msbuild-sdks": {
-        "Microsoft.Build.Traversal": "1.0.43",
-        "MSBuild.Sdk.Extras": "3.0.22",
-        "AggregatePackage.NuGet.Sdk" : "0.1.12"
+        "Microsoft.Build.Traversal": "1.0.43"
     }
 }

From f84cdbeda946113ff74a211fa23cf82f6f4feeac Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Thu, 5 Jan 2023 21:37:03 +1100
Subject: [PATCH 2/3] respect success in LoadGroupSre

---
 .../AvaloniaXamlIlRuntimeCompiler.cs                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs
index 2bb91e8a32..e3d154ffdd 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs
@@ -179,7 +179,7 @@ namespace Avalonia.Markup.Xaml.XamlIl
             }
             finally
             {
-                if( _sreCanSave)
+                if(!success &&  _sreCanSave)
                     DumpRuntimeCompilationResults();
             }
         }

From dea807609fca0f355744291e22bba56acab6df9a Mon Sep 17 00:00:00 2001
From: daniel <danielmayost@gmail.com>
Date: Thu, 5 Jan 2023 18:13:53 +0200
Subject: [PATCH 3/3] Move UpdateLogicalTree Call to CurrentContent Change

---
 src/Avalonia.Controls/TransitioningContentControl.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/TransitioningContentControl.cs b/src/Avalonia.Controls/TransitioningContentControl.cs
index 545032befb..2e0a36ad19 100644
--- a/src/Avalonia.Controls/TransitioningContentControl.cs
+++ b/src/Avalonia.Controls/TransitioningContentControl.cs
@@ -69,6 +69,10 @@ public class TransitioningContentControl : ContentControl
         {
             Dispatcher.UIThread.Post(() => UpdateContentWithTransition(Content));
         }
+        else if (change.Property == CurrentContentProperty)
+        {
+            UpdateLogicalTree(change.OldValue, change.NewValue);
+        }
     }
 
     protected override void ContentChanged(AvaloniaPropertyChangedEventArgs e)
@@ -94,8 +98,6 @@ public class TransitioningContentControl : ContentControl
         if (PageTransition != null)
             await PageTransition.Start(this, null, true, localToken);
 
-        UpdateLogicalTree(CurrentContent, content);
-
         if (localToken.IsCancellationRequested)
         {
             return;