From d8d6a47809c0b492c1ebcf66e545db85969153ea Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 1 Mar 2021 15:43:39 +0000
Subject: [PATCH 1/2] make cell template the content of DataGridTemplateColumn

saves a lot of bloat when decalring TemplatedColumns.
---
 src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
index e513a7b678..a93f5314c6 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
@@ -22,6 +22,7 @@ namespace Avalonia.Controls
                 o => o.CellTemplate,
                 (o, v) => o.CellTemplate = v);
 
+        [Content]
         public IDataTemplate CellTemplate
         {
             get { return _cellTemplate; }

From 30a0be6ef51c24294bbd911b22a2df6e4879ee57 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 1 Mar 2021 18:26:29 +0000
Subject: [PATCH 2/2] missing using.

---
 src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
index a93f5314c6..7e95dd100c 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
@@ -8,6 +8,7 @@ using Avalonia.Controls.Utils;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Media;
+using Avalonia.Metadata;
 using Avalonia.Utilities;
 
 namespace Avalonia.Controls