Merge pull request #2275 from AvaloniaUI/update/portable-xaml

Update portable.xaml to latest upstream master.
7 years ago · c170ba4629
2 changed files with 2 additions and 2 deletions
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlSchemaContext.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlSchemaContext.cs
@ -33,7 +33,7 @@ namespace Avalonia.Markup.Xaml.PortableXaml

        private IRuntimeTypeProvider _avaloniaTypeProvider;

-        protected internal override XamlType GetXamlType(string xamlNamespace, string name, params XamlType[] typeArguments)
+        protected override XamlType GetXamlType(string xamlNamespace, string name, params XamlType[] typeArguments)
        {
            XamlType type = null;
            try
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
@ -1 +1 @@
-Subproject commit 8abbe09592668efb573ac4d5548ba2d7e464ba78
+Subproject commit ab5526173722b8988bc5ca3c03c8752ce89c0975