From 58f619290bbb86a292c2f3610b3c977bd79a5d12 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 30 Jun 2023 12:16:08 +0100
Subject: [PATCH 1/5] attempt to make build services auto updated.

---
 packages/Avalonia/Avalonia.csproj | 1 -
 packages/Avalonia/Avalonia.props  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index b8373cf609..00f0c0577c 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -5,7 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Avalonia.BuildServices" Version="0.0.22" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
         <PrivateAssets>all</PrivateAssets>
diff --git a/packages/Avalonia/Avalonia.props b/packages/Avalonia/Avalonia.props
index a2da228887..eaf11d805a 100644
--- a/packages/Avalonia/Avalonia.props
+++ b/packages/Avalonia/Avalonia.props
@@ -13,5 +13,6 @@
   <!-- Allow loading the AvaloniaVS extension when referencing the Avalonia nuget package -->
   <ItemGroup>
     <ProjectCapability Include="Avalonia"/>
+    <PackageReference Include="Avalonia.BuildServices" Version="0.0.*" />
   </ItemGroup>
 </Project>

From e7e37cfaa1cb9dd4ff35871e8588433c12188484 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 30 Jun 2023 12:45:00 +0100
Subject: [PATCH 2/5] Revert "attempt to make build services auto updated."

This reverts commit 58f619290bbb86a292c2f3610b3c977bd79a5d12.
---
 packages/Avalonia/Avalonia.csproj | 1 +
 packages/Avalonia/Avalonia.props  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index 00f0c0577c..b8373cf609 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+      <PackageReference Include="Avalonia.BuildServices" Version="0.0.22" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
         <PrivateAssets>all</PrivateAssets>
diff --git a/packages/Avalonia/Avalonia.props b/packages/Avalonia/Avalonia.props
index eaf11d805a..a2da228887 100644
--- a/packages/Avalonia/Avalonia.props
+++ b/packages/Avalonia/Avalonia.props
@@ -13,6 +13,5 @@
   <!-- Allow loading the AvaloniaVS extension when referencing the Avalonia nuget package -->
   <ItemGroup>
     <ProjectCapability Include="Avalonia"/>
-    <PackageReference Include="Avalonia.BuildServices" Version="0.0.*" />
   </ItemGroup>
 </Project>

From 628a54be63fb7c4ee9b7eee62b38f95ca3fd1595 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 30 Jun 2023 12:46:13 +0100
Subject: [PATCH 3/5] fix build services version.

---
 packages/Avalonia/Avalonia.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index b8373cf609..50b7df15fa 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Avalonia.BuildServices" Version="0.0.22" />
+      <PackageReference Include="Avalonia.BuildServices" Version="0.0.26" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
         <PrivateAssets>all</PrivateAssets>

From 2aabc38895d5bf1a7446216d34020c3248ecf5db Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 30 Jun 2023 13:50:50 +0100
Subject: [PATCH 4/5] fix build services.

---
 packages/Avalonia/Avalonia.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index 50b7df15fa..b2d369f93b 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Avalonia.BuildServices" Version="0.0.26" />
+      <PackageReference Include="Avalonia.BuildServices" Version="0.0.27" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
         <PrivateAssets>all</PrivateAssets>

From 013e9dd8f071f2c42590f5a78e9e83a3c7f43548 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 30 Jun 2023 15:24:51 +0200
Subject: [PATCH 5/5] Fix PresenterPropertyChanged add handler

---
 src/Avalonia.Controls/TextBox.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 3b92baa42a..37e7b7beac 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -812,14 +812,14 @@ namespace Avalonia.Controls
         {
             base.OnAttachedToVisualTree(e);
 
-            if (IsFocused)
+            if (_presenter != null)
             {
-                if(_presenter != null)
+                if (IsFocused)
                 {
                     _presenter.ShowCaret();
-
-                    _presenter.PropertyChanged += PresenterPropertyChanged;
                 }
+
+                _presenter.PropertyChanged += PresenterPropertyChanged;
             }
         }