From 6fc5af3a68dd22130de3d6c6565ec8003d282589 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 12 May 2021 20:24:13 +0100
Subject: [PATCH 1/3] use datatemplates instead of itemstemplate for
 datavalidationerrors.

---
 src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
index b513fd5eae..b1c8650292 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
@@ -28,13 +28,13 @@
     <Style.Resources>
       <DataTemplate x:Key="InlineDataValidationErrorTemplate">
         <ItemsControl Items="{Binding}">
-          <ItemsControl.ItemTemplate>
+          <ItemsControl.DataTemplates>
             <DataTemplate>
               <TextBlock Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}"
                          Text="{Binding}"
                          TextWrapping="Wrap" />
             </DataTemplate>
-          </ItemsControl.ItemTemplate>
+          </ItemsControl.DataTemplates>
         </ItemsControl>
       </DataTemplate>
       <ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors">

From b0d5e3197c1580af8aff283ce9ef9778eb4ef9bc Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 13 May 2021 01:00:34 -0400
Subject: [PATCH 2/3] Include inner exception when throwing from BindingEntry

---
 src/Avalonia.Base/PropertyStore/BindingEntry.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/PropertyStore/BindingEntry.cs b/src/Avalonia.Base/PropertyStore/BindingEntry.cs
index 1b29338f07..362736eb06 100644
--- a/src/Avalonia.Base/PropertyStore/BindingEntry.cs
+++ b/src/Avalonia.Base/PropertyStore/BindingEntry.cs
@@ -79,7 +79,7 @@ namespace Avalonia.PropertyStore
 
         public void OnError(Exception error)
         {
-            throw new NotImplementedException();
+            throw new NotImplementedException("BindingEntry.OnError is not implemented", error);
         }
 
         public void OnNext(BindingValue<T> value)

From 2043ed3a30ca9feab071f7683b403b1bf059d912 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 13 May 2021 10:26:22 +0100
Subject: [PATCH 3/3] dont provide any templates for datavalidation errors.

---
 .../Controls/DataValidationErrors.xaml             | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
index b1c8650292..53c5d4eda6 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
@@ -27,14 +27,12 @@
   <Style Selector="DataValidationErrors">
     <Style.Resources>
       <DataTemplate x:Key="InlineDataValidationErrorTemplate">
-        <ItemsControl Items="{Binding}">
-          <ItemsControl.DataTemplates>
-            <DataTemplate>
-              <TextBlock Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}"
-                         Text="{Binding}"
-                         TextWrapping="Wrap" />
-            </DataTemplate>
-          </ItemsControl.DataTemplates>
+        <ItemsControl Items="{Binding}" TextBlock.Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}">
+          <ItemsControl.Styles>
+            <Style Selector="TextBlock">
+              <Setter Property="TextWrapping" Value="Wrap" />
+            </Style>
+          </ItemsControl.Styles>
         </ItemsControl>
       </DataTemplate>
       <ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors">