From d448aad129b1f3320dc6a07021dd121960d5ed7d Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 10 Apr 2019 17:36:19 +0200 Subject: [PATCH 1/2] Update portable.xaml. #2307 updated the portable.xaml submodule but the changes were then lost in a subsequent merge. Re-updates the submodule to target the `fixes/moar-line-info` branch. --- .../Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github index ab55261737..7452b23169 160000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github +++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github @@ -1 +1 @@ -Subproject commit ab5526173722b8988bc5ca3c03c8752ce89c0975 +Subproject commit 7452b23169e4948907fa10e2c115b672897d0e04 From 63da34f25a64f4c3a343ffe9d1da74e81f1f2006 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 10 Apr 2019 17:38:44 +0200 Subject: [PATCH 2/2] Set `ProvideLineInfo` in XAML reader settings. --- src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs index a1f8bf6cf6..4c352f199f 100644 --- a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs +++ b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs @@ -162,7 +162,8 @@ namespace Avalonia.Markup.Xaml var readerSettings = new XamlXmlReaderSettings() { BaseUri = uri, - LocalAssembly = localAssembly + LocalAssembly = localAssembly, + ProvideLineInfo = true, }; var context = IsDesignMode ? AvaloniaXamlSchemaContext.DesignInstance : AvaloniaXamlSchemaContext.Instance;