Merge pull request #2443 from AvaloniaUI/fixes/designer-again

Update portable.xaml to give better error info (again)
7 years ago · a30a43f197
2 changed files with 3 additions and 2 deletions
--- 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;
--- 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